aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-doc/root-docs/ChangeLog23
-rw-r--r--app-doc/root-docs/Manifest10
-rw-r--r--app-doc/root-docs/files/root-docs-5.32-makehtml.patch44
-rw-r--r--app-doc/root-docs/files/root-docs-5.34-makehtml.patch (renamed from sci-physics/root/files/root-5.34-htmldoc.patch)30
-rw-r--r--app-doc/root-docs/root-docs-5.32.03.ebuild98
-rw-r--r--app-doc/root-docs/root-docs-5.32.ebuild25
-rw-r--r--app-doc/root-docs/root-docs-5.34.00.ebuild97
-rw-r--r--app-doc/root-docs/root-docs-9999.ebuild97
-rw-r--r--sci-libs/bigdft/ChangeLog8
-rw-r--r--sci-libs/bigdft/Manifest4
-rw-r--r--sci-libs/bigdft/bigdft-1.6.0-r2.ebuild (renamed from sci-libs/bigdft/bigdft-1.6.0-r1.ebuild)6
-rw-r--r--sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild (renamed from sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild)6
-rw-r--r--sci-libs/etsf_io/ChangeLog8
-rw-r--r--sci-libs/etsf_io/Manifest2
-rw-r--r--sci-libs/etsf_io/etsf_io-1.0.3-r1.ebuild (renamed from sci-libs/etsf_io/etsf_io-1.0.3.ebuild)7
-rw-r--r--sci-physics/abinit/ChangeLog6
-rw-r--r--sci-physics/abinit/Manifest2
-rw-r--r--sci-physics/abinit/abinit-6.12.3-r2.ebuild (renamed from sci-physics/abinit/abinit-6.12.3-r1.ebuild)8
-rw-r--r--sci-physics/elk/Manifest4
-rw-r--r--sci-physics/elk/elk-1.3.15.ebuild104
-rw-r--r--sci-physics/elk/elk-1.4.18.ebuild115
-rw-r--r--sci-physics/elk/elk-1.4.5.ebuild104
-rw-r--r--sci-physics/root/ChangeLog24
-rw-r--r--sci-physics/root/Manifest34
-rw-r--r--sci-physics/root/files/root-5.32.00-htmldoc.patch38
-rw-r--r--sci-physics/root/files/root-9999-dotfont.patch58
-rw-r--r--sci-physics/root/metadata.xml1
-rw-r--r--sci-physics/root/root-5.32.03-r3.ebuild (renamed from sci-physics/root/root-5.32.03-r2.ebuild)24
-rw-r--r--sci-physics/root/root-5.34.00.ebuild377
-rw-r--r--sci-physics/root/root-9999.ebuild56
30 files changed, 941 insertions, 479 deletions
diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index a2798b57d..aec7424f8 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -1,7 +1,28 @@
# ChangeLog for app-doc/root-docs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*root-docs-5.32.03 (20 Jun 2012)
+
+ 20 Jun 2012; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.32.ebuild,
+ +root-docs-5.32.03.ebuild, +files/root-docs-5.32-makehtml.patch:
+ Backport htmldoc generation fixes for 5.32 branch.
+
+*root-docs-5.34.00 (19 Jun 2012)
+
+ 19 Jun 2012; Andrew Savchenko <bircoph@gmail.com> +root-docs-5.34.00.ebuild:
+ Version bump based on live ebuild.
+
+*root-docs-9999 (19 Jun 2012)
+
+ 19 Jun 2012; Andrew Savchenko <bircoph@gmail.com>
+ +files/root-docs-5.34-makehtml.patch, +root-docs-9999.ebuild:
+ htmldoc generation for root must be separated, because it is
+ supposed to be run only root was installed to the live
+ filesystem. It can't be faked easily in the sandbox environment,
+ because ROOTSYS is not respected when --prefix or --*dir are
+ used for configure script.
+
*root-docs-5.32 (03 Dec 2011)
03 Dec 2011; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.30.ebuild,
diff --git a/app-doc/root-docs/Manifest b/app-doc/root-docs/Manifest
index d20c0db1c..fe27625f3 100644
--- a/app-doc/root-docs/Manifest
+++ b/app-doc/root-docs/Manifest
@@ -1 +1,9 @@
-DIST html532.tar.gz 868144440 RMD160 6de2c739cc7c56923338d34547d19258ccae13db SHA1 d2ca8298ca85067bac28609432c020e53168478b SHA256 9797ffc762acbe121a1be903a03de08b9e2254f7cae673cd9bf59664c6135108
+AUX root-docs-5.32-makehtml.patch 1074 RMD160 66a5184f36aec74b3f04f93ec3d7790eb221f25a SHA1 c4c760be51f90995b5a859b582fd62ab5fa7cee3 SHA256 cc5fc9fb780357c50137bbf1adb1630688abd288f3d337c06b154709e581a8de
+AUX root-docs-5.34-makehtml.patch 1389 RMD160 ab7affbe7b525bdfa7822784e6aa8619604417c8 SHA1 3cd6f5fd9495c75e0b24dc008d94072943f68e2c SHA256 dc0395adc808432506d4c18fdd56bf20e2e51a414c6cf4345d45e657889763e1
+DIST root_v5.32.03.source.tar.gz 55529362 RMD160 90ee828638f322c169875135b51231810dada383 SHA1 cc1125660073918d0f47e209a069be2b9e849dc3 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6
+DIST root_v5.34.00.source.tar.gz 56214534 RMD160 6089493c70f94a1c4edd87ebe79adb9f3570f903 SHA1 e7c8352d92be8510b36001efb020f3eb0bf22ed1 SHA256 808e04876dbc9cfbfea54ee11ba35e90382e8ff4219dbdbe2d2236a9dadf7df1
+EBUILD root-docs-5.32.03.ebuild 2751 RMD160 853b557e921d364f57fd0d7f6f11e323482413df SHA1 73caca1f03bf5be034d15a4e8d7b578afda262c1 SHA256 b508d9fb60407b0df12fc7d3fc9be933fb895a79d3e59cf6a46132351157b010
+EBUILD root-docs-5.34.00.ebuild 2689 RMD160 a34459ccd2002b0a7ede2c07e01205bb842d255a SHA1 9123d6916390beda5207eb582d994c4c72646d6c SHA256 8db4b13106fc81e618776d19b8f7bce306ade63ac86881b994f67984c0a26b62
+EBUILD root-docs-9999.ebuild 2689 RMD160 a34459ccd2002b0a7ede2c07e01205bb842d255a SHA1 9123d6916390beda5207eb582d994c4c72646d6c SHA256 8db4b13106fc81e618776d19b8f7bce306ade63ac86881b994f67984c0a26b62
+MISC ChangeLog 1334 RMD160 82a11846c16c1e6d796b9edbc1d8668a1a9f0927 SHA1 982e2da4714fe70292f6c14a29c7af4e284a44e9 SHA256 04935384ea3738bc649adc33b1472bf18c2da5000f886846c0fc05c8bb6d25af
+MISC metadata.xml 164 RMD160 6e4c63a6f70f174f40277eed39ac05fba4a49566 SHA1 e1af6f2028e69dee3c76e7e85353a144c83d3383 SHA256 9eddaccbdd2f6b3f93213d72782f07518dff1625fd8d63faf61dc97bd328b5e7
diff --git a/app-doc/root-docs/files/root-docs-5.32-makehtml.patch b/app-doc/root-docs/files/root-docs-5.32-makehtml.patch
new file mode 100644
index 000000000..5cad0102a
--- /dev/null
+++ b/app-doc/root-docs/files/root-docs-5.32-makehtml.patch
@@ -0,0 +1,44 @@
+--- root/Makefile.orig 2012-05-23 21:07:07.000000000 +0400
++++ root/Makefile 2012-05-23 22:47:48.935680301 +0400
+@@ -1039,8 +1039,7 @@
+ releasenotes:
+ @$(MAKERELNOTES)
+
+-html: $(ROOTEXE) changelog releasenotes
+- @$(MAKELOGHTML)
++html: compiledata releasenotes
+ @$(MAKEHTML)
+
+ # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
+--- root/build/unix/makehtml.sh.orig 2012-06-18 06:44:59.000000000 +0400
++++ root/build/unix/makehtml.sh 2012-06-18 19:39:41.262064654 +0400
+@@ -1,17 +1,17 @@
+ #! /bin/sh
+
+-ROOT=bin/root.exe
++ROOT=root.exe
+
+ dir=`pwd`
+ cd tutorials
+ # we need tutorials/hsimple.root
+ if [ ! -f hsimple.root ]; then
+- $ROOT -l -b -q hsimple.C
++ $ROOT -l -b -q hsimple.C && exit 1
+ fi
+ cd tree
+ # we need tutorials/tree/cernstaff.root
+ if [ ! -f cernstaff.root ]; then
+- $ROOT -l -b -q cernbuild.C
++ $ROOT -l -b -q cernbuild.C || exit 1
+ fi
+ cd $dir
+
+@@ -19,7 +19,7 @@
+ echo "Generating doc in directory htmldoc/..."
+ echo ""
+
+-$ROOT -l <<makedoc
++$ROOT -l <<makedoc || exit 1
+ THtml h;
+ h.LoadAllLibs();
+ h.MakeAll();
diff --git a/sci-physics/root/files/root-5.34-htmldoc.patch b/app-doc/root-docs/files/root-docs-5.34-makehtml.patch
index a999d0ced..57fb69b37 100644
--- a/sci-physics/root/files/root-5.34-htmldoc.patch
+++ b/app-doc/root-docs/files/root-docs-5.34-makehtml.patch
@@ -14,24 +14,30 @@
- fi
-endif
- @$(MAKELOGHTML)
-+html: $(ROOTEXE) releasenotes
++html: compiledata releasenotes
@$(MAKEHTML)
# Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
---- root/build/unix/makehtml.sh.orig 2012-05-23 23:25:45.000000000 +0400
-+++ root/build/unix/makehtml.sh 2012-05-24 13:04:43.919062126 +0400
-@@ -6,12 +6,12 @@
+--- root/build/unix/makehtml.sh.orig 2012-06-18 06:44:59.000000000 +0400
++++ root/build/unix/makehtml.sh 2012-06-18 19:39:41.262064654 +0400
+@@ -1,17 +1,17 @@
+ #! /bin/sh
+
+-ROOT=bin/root.exe
++ROOT=root.exe
+
+ dir=`pwd`
cd tutorials
# we need tutorials/hsimple.root
if [ ! -f hsimple.root ]; then
- $ROOT -l -b -q hsimple.C
-+ ../$ROOT -l -b -q hsimple.C && exit 1
++ $ROOT -l -b -q hsimple.C && exit 1
fi
cd tree
# we need tutorials/tree/cernstaff.root
if [ ! -f cernstaff.root ]; then
- $ROOT -l -b -q cernbuild.C
-+ ../../$ROOT -l -b -q cernbuild.C || exit 1
++ $ROOT -l -b -q cernbuild.C || exit 1
fi
cd $dir
@@ -44,15 +50,3 @@
THtml h;
h.LoadAllLibs();
h.MakeAll();
---- root/html/src/THtml.cxx.orig 2012-05-25 16:18:10.000000000 +0400
-+++ root/html/src/THtml.cxx 2012-05-29 19:22:40.810563296 +0400
-@@ -1913,6 +1913,9 @@
- void THtml::CreateStyleSheet() const {
- // Write the default ROOT style sheet.
- CopyFileFromEtcDir("ROOT.css");
-+ CopyFileFromEtcDir("info.png");
-+ CopyFileFromEtcDir("root-banner.png");
-+ CopyFileFromEtcDir("rootdrawing-logo.png");
- CopyFileFromEtcDir("shadowAlpha.png");
- CopyFileFromEtcDir("shadow.gif");
- }
diff --git a/app-doc/root-docs/root-docs-5.32.03.ebuild b/app-doc/root-docs/root-docs-5.32.03.ebuild
new file mode 100644
index 000000000..567cbb1cd
--- /dev/null
+++ b/app-doc/root-docs/root-docs-5.32.03.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.28-r1.ebuild,v 1.1 2011/05/17 17:51:07 bicatali Exp $
+
+EAPI=4
+
+ROOT_PN="root"
+PATCH_PV="5.32"
+
+if [[ ${PV} == "9999" ]] ; then
+ _SVN_DEP="dev-vcs/subversion"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+inherit eutils multilib toolchain-funcs virtualx
+
+DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
+HOMEPAGE="http://root.cern.ch/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${ROOT_PN}"
+VIRTUALX_REQUIRED="always"
+
+DEPEND="
+ ~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
+ >=sci-physics/root-5.32.03-r3[X,doc,graphviz,htmldoc,opengl]
+ virtual/pkgconfig
+ ${_SVN_DEP}"
+RDEPEND=""
+
+pkg_setup() {
+ # sandboxed user can't access video hardware, so xorg-x11 implementation
+ # should be used
+ GL_IMPLEM=$(eselect opengl show)
+ eselect opengl set xorg-x11
+}
+
+src_unpack() {
+ # can't use subversion eclass functions,
+ # we need to svn export the same root tree:
+ # 1) svn revisions for root and root-docs must be the same;
+ # 2) no need to abuse server twice.
+ if [[ ${PV} == "9999" ]] ; then
+ addpredict "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk/.svn"
+ svn export "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk" \
+ "${S}" || die "svn export failed"
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
+}
+
+src_configure() {
+ # we need only to setup paths here, html docs doesn't depend on USE flags
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --etcdir="${EPREFIX}"/etc/root \
+ --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+ --testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+ --with-cc=$(tc-getCC) \
+ --with-cxx=$(tc-getCXX) \
+ --with-f77=$(tc-getFC) \
+ --with-ld=$(tc-getCXX) \
+ --with-afs-shared=yes \
+ --with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
+ --with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps
+}
+
+src_compile() {
+ ROOTSYS="${S}" Xemake html
+ # if root.exe crashes, return code will be 0 due to gdb attach,
+ # so we need to check if last html file was generated;
+ # this check is volatile and can't catch crash on the last file.
+ [[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
+}
+
+src_install() {
+ mkdir -p "${ED}usr/share/doc/${PF}/"
+ # too large data to copy
+ mv htmldoc/* "${ED}usr/share/doc/${PF}/"
+}
+
+pkg_postinst() {
+ eselect opengl set ${GL_IMPLEM}
+}
diff --git a/app-doc/root-docs/root-docs-5.32.ebuild b/app-doc/root-docs/root-docs-5.32.ebuild
deleted file mode 100644
index 5b9d543a4..000000000
--- a/app-doc/root-docs/root-docs-5.32.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.28-r1.ebuild,v 1.1 2011/05/17 17:51:07 bicatali Exp $
-
-EAPI=3
-inherit versionator
-
-DESCRIPTION="An Object-Oriented Data Analysis Framework"
-MYP=html$(replace_version_separator 1 '')
-
-SRC_URI="ftp://root.cern.ch/root/${MYP}.tar.gz"
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="as-is"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/htmldoc
-
-src_install() {
- insinto /usr/share/doc/${PF}/html
- # use mv, there is too much to copy
- mv ${MYP}/* "${ED}"/usr/share/doc/${PF}/
-}
diff --git a/app-doc/root-docs/root-docs-5.34.00.ebuild b/app-doc/root-docs/root-docs-5.34.00.ebuild
new file mode 100644
index 000000000..a4c77b178
--- /dev/null
+++ b/app-doc/root-docs/root-docs-5.34.00.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.28-r1.ebuild,v 1.1 2011/05/17 17:51:07 bicatali Exp $
+
+EAPI=4
+
+ROOT_PN="root"
+PATCH_PV="5.34"
+
+if [[ ${PV} == "9999" ]] ; then
+ _SVN_DEP="dev-vcs/subversion"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+inherit eutils multilib toolchain-funcs virtualx
+
+DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
+HOMEPAGE="http://root.cern.ch/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${ROOT_PN}"
+VIRTUALX_REQUIRED="always"
+
+DEPEND="
+ ~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
+ virtual/pkgconfig
+ ${_SVN_DEP}"
+RDEPEND=""
+
+pkg_setup() {
+ # sandboxed user can't access video hardware, so xorg-x11 implementation
+ # should be used
+ GL_IMPLEM=$(eselect opengl show)
+ eselect opengl set xorg-x11
+}
+
+src_unpack() {
+ # can't use subversion eclass functions,
+ # we need to svn export the same root tree:
+ # 1) svn revisions for root and root-docs must be the same;
+ # 2) no need to abuse server twice.
+ if [[ ${PV} == "9999" ]] ; then
+ addpredict "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk/.svn"
+ svn export "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk" \
+ "${S}" || die "svn export failed"
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
+}
+
+src_configure() {
+ # we need only to setup paths here, html docs doesn't depend on USE flags
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --etcdir="${EPREFIX}"/etc/root \
+ --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+ --testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+ --with-cc=$(tc-getCC) \
+ --with-cxx=$(tc-getCXX) \
+ --with-f77=$(tc-getFC) \
+ --with-ld=$(tc-getCXX) \
+ --with-afs-shared=yes \
+ --with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
+ --with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps
+}
+
+src_compile() {
+ ROOTSYS="${S}" Xemake html
+ # if root.exe crashes, return code will be 0 due to gdb attach,
+ # so we need to check if last html file was generated;
+ # this check is volatile and can't catch crash on the last file.
+ [[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
+}
+
+src_install() {
+ mkdir -p "${ED}usr/share/doc/${PF}/"
+ # too large data to copy
+ mv htmldoc/* "${ED}usr/share/doc/${PF}/"
+}
+
+pkg_postinst() {
+ eselect opengl set ${GL_IMPLEM}
+}
diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
new file mode 100644
index 000000000..a4c77b178
--- /dev/null
+++ b/app-doc/root-docs/root-docs-9999.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.28-r1.ebuild,v 1.1 2011/05/17 17:51:07 bicatali Exp $
+
+EAPI=4
+
+ROOT_PN="root"
+PATCH_PV="5.34"
+
+if [[ ${PV} == "9999" ]] ; then
+ _SVN_DEP="dev-vcs/subversion"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+inherit eutils multilib toolchain-funcs virtualx
+
+DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
+HOMEPAGE="http://root.cern.ch/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${ROOT_PN}"
+VIRTUALX_REQUIRED="always"
+
+DEPEND="
+ ~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
+ virtual/pkgconfig
+ ${_SVN_DEP}"
+RDEPEND=""
+
+pkg_setup() {
+ # sandboxed user can't access video hardware, so xorg-x11 implementation
+ # should be used
+ GL_IMPLEM=$(eselect opengl show)
+ eselect opengl set xorg-x11
+}
+
+src_unpack() {
+ # can't use subversion eclass functions,
+ # we need to svn export the same root tree:
+ # 1) svn revisions for root and root-docs must be the same;
+ # 2) no need to abuse server twice.
+ if [[ ${PV} == "9999" ]] ; then
+ addpredict "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk/.svn"
+ svn export "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk" \
+ "${S}" || die "svn export failed"
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
+}
+
+src_configure() {
+ # we need only to setup paths here, html docs doesn't depend on USE flags
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --etcdir="${EPREFIX}"/etc/root \
+ --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+ --testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+ --with-cc=$(tc-getCC) \
+ --with-cxx=$(tc-getCXX) \
+ --with-f77=$(tc-getFC) \
+ --with-ld=$(tc-getCXX) \
+ --with-afs-shared=yes \
+ --with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
+ --with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps
+}
+
+src_compile() {
+ ROOTSYS="${S}" Xemake html
+ # if root.exe crashes, return code will be 0 due to gdb attach,
+ # so we need to check if last html file was generated;
+ # this check is volatile and can't catch crash on the last file.
+ [[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
+}
+
+src_install() {
+ mkdir -p "${ED}usr/share/doc/${PF}/"
+ # too large data to copy
+ mv htmldoc/* "${ED}usr/share/doc/${PF}/"
+}
+
+pkg_postinst() {
+ eselect opengl set ${GL_IMPLEM}
+}
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index 5334648c2..1d25edefd 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*bigdft-1.6.0-r2 (19 Jun 2012)
+*bigdft-1.6_pre1-r2 (19 Jun 2012)
+
+ 19 Jun 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
+ -bigdft-1.6_pre1-r1.ebuild, +bigdft-1.6_pre1-r2.ebuild,
+ -bigdft-1.6.0-r1.ebuild, +bigdft-1.6.0-r2.ebuild:
+ Reflect the split of the fortran interface out of sci-libs/netcdf
+
22 May 2012; Justin Lecher <jlec@gentoo.org> bigdft-1.6_pre1-r1.ebuild,
bigdft-1.6.0-r1.ebuild:
Add missing eutils.eclass, bump to EAPI=4, remove unnecessary bits
diff --git a/sci-libs/bigdft/Manifest b/sci-libs/bigdft/Manifest
index 5f1f645ce..02177f45a 100644
--- a/sci-libs/bigdft/Manifest
+++ b/sci-libs/bigdft/Manifest
@@ -1,2 +1,2 @@
-DIST bigdft-1.6-tuto.1.tar.gz 7510733 SHA256 32020c7e58b36fe1f58a47ef02af99bd0da81c6da7d6f15e89b8075494d39d87 SHA512 48684413b0807b5dcee4b97b5b83d9a839c44043801b923c5f0ce7c8a92024cfee64c1065d4d2ffc67cb249cfcd485680b5526aaaedba06e6a88ccc52ba290f2 WHIRLPOOL d6efcc6f9ded331c42e8e3b13a9260e2acd922c4fa0bf303455e33924a930df6aa01abec897c1d190d5016a5bb3781c491e8a17d500e5485717989bddd4f579d
-DIST bigdft-1.6.0.tar.gz 8876759 SHA256 2d3212ef5f1ebc10fe7c627397ac6282ad41e1433ec6e66905f9d39a302913c0 SHA512 facbb78d126885dd04fed6451aa9cd1f5c755055e146cda1d2d4e90e3310fc3066b661635477db96d5b143ffaaa3ebb01107681437fd9965f3c764cf1b034361 WHIRLPOOL 97bc6c28296a92b09139e3a65266daa583011620fad5aed208e0e48627ab1d9c0ef9993d6c4c3cce5696d5c707bcdfb4b8ca7e64379909b3cf073206e32f9572
+DIST bigdft-1.6-tuto.1.tar.gz 7510733 RMD160 1f759a7590491e2f143c592db01d0263646bae82 SHA1 5308af2e44b15a9a2c5d9cb14eec9b934a16c9f0 SHA256 32020c7e58b36fe1f58a47ef02af99bd0da81c6da7d6f15e89b8075494d39d87 SHA512 48684413b0807b5dcee4b97b5b83d9a839c44043801b923c5f0ce7c8a92024cfee64c1065d4d2ffc67cb249cfcd485680b5526aaaedba06e6a88ccc52ba290f2 WHIRLPOOL d6efcc6f9ded331c42e8e3b13a9260e2acd922c4fa0bf303455e33924a930df6aa01abec897c1d190d5016a5bb3781c491e8a17d500e5485717989bddd4f579d
+DIST bigdft-1.6.0.tar.gz 8876759 RMD160 6cc9f8c87447d540e0677311dfb9a1da6c7f0150 SHA1 b4c75d0bf95ddf66d8cade96f4c1c625a2b71f1b SHA256 2d3212ef5f1ebc10fe7c627397ac6282ad41e1433ec6e66905f9d39a302913c0 SHA512 facbb78d126885dd04fed6451aa9cd1f5c755055e146cda1d2d4e90e3310fc3066b661635477db96d5b143ffaaa3ebb01107681437fd9965f3c764cf1b034361 WHIRLPOOL 97bc6c28296a92b09139e3a65266daa583011620fad5aed208e0e48627ab1d9c0ef9993d6c4c3cce5696d5c707bcdfb4b8ca7e64379909b3cf073206e32f9572
diff --git a/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
index cdb304961..b4e40f540 100644
--- a/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
@@ -31,7 +31,11 @@ RDEPEND="
)
)
etsf_io? ( sci-libs/etsf_io )
- netcdf? ( sci-libs/netcdf[fortran] )"
+ netcdf? ( || (
+ sci-libs/netcdf[fortran]
+ sci-libs/netcdf-fortran
+ )
+ )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
>=sys-devel/autoconf-2.59
diff --git a/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild
index 6cdd6e4e3..f9860f679 100644
--- a/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild
@@ -32,7 +32,11 @@ RDEPEND="
)
)
etsf_io? ( sci-libs/etsf_io )
- netcdf? ( sci-libs/netcdf[fortran] )"
+ netcdf? ( || (
+ sci-libs/netcdf[fortran]
+ sci-libs/netcdf-fortran
+ )
+ )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
>=sys-devel/autoconf-2.59
diff --git a/sci-libs/etsf_io/ChangeLog b/sci-libs/etsf_io/ChangeLog
index b4391ae02..19ac5b64a 100644
--- a/sci-libs/etsf_io/ChangeLog
+++ b/sci-libs/etsf_io/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for sci-libs/etsf_io
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*etsf_io-1.0.3-r1 (19 Jun 2012)
+
+ 19 Jun 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
+ -etsf_io-1.0.3.ebuild, +etsf_io-1.0.3-r1.ebuild:
+ Reflect the split of the fortran interface out of sci-libs/netcdf
+
25 Jun 2011; Justin Lecher <jlec@gentoo.org> etsf_io-1.0.3.ebuild,
metadata.xml:
Fixed Malformed CVS Header on line: 3
diff --git a/sci-libs/etsf_io/Manifest b/sci-libs/etsf_io/Manifest
index b63a2dba4..45b7f5717 100644
--- a/sci-libs/etsf_io/Manifest
+++ b/sci-libs/etsf_io/Manifest
@@ -1 +1 @@
-DIST etsf_io-1.0.3.tar 453734 RMD160 df90acd34b0de104a07844ae2c9694edf27519c6 SHA1 ab3c4cb22ea2fc2498b396f186f221edd2463fcc SHA256 a02ead44b9634bdb6e47e50d76f35d56c10df468743e6fe5259c0dc478f7b32e
+DIST etsf_io-1.0.3.tar 453734 RMD160 df90acd34b0de104a07844ae2c9694edf27519c6 SHA1 ab3c4cb22ea2fc2498b396f186f221edd2463fcc SHA256 a02ead44b9634bdb6e47e50d76f35d56c10df468743e6fe5259c0dc478f7b32e SHA512 2a60533a588587da5629687942044ed58b72a554c484d3c22263314cbeb21aa819d5097e6637b599de06474d4d92cc84ea94fa365123e677311be3bf7b8e7bf5 WHIRLPOOL 714cfa983b5f3411a04df88ad54513f71b482368cba93b790d5d93388a9aea346cd83de80311ed0fe5fdc51fac4af8be4428764119a0cf9f17df24e91f2ae74a
diff --git a/sci-libs/etsf_io/etsf_io-1.0.3.ebuild b/sci-libs/etsf_io/etsf_io-1.0.3-r1.ebuild
index 402389b9e..a3c62340d 100644
--- a/sci-libs/etsf_io/etsf_io-1.0.3.ebuild
+++ b/sci-libs/etsf_io/etsf_io-1.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -16,7 +16,10 @@ IUSE="examples"
KEYWORDS="~amd64 ~x86"
RDEPEND="
- sci-libs/netcdf[fortran]
+ || (
+ sci-libs/netcdf[fortran]
+ sci-libs/netcdf-fortran
+ )
virtual/fortran"
DEPEND="${RDEPEND}"
diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog
index c3f4e3d01..a57ab4c07 100644
--- a/sci-physics/abinit/ChangeLog
+++ b/sci-physics/abinit/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*abinit-6.12.3-r2 (19 Jun 2012)
+
+ 19 Jun 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
+ -abinit-6.12.3-r1.ebuild, +abinit-6.12.3-r2.ebuild:
+ Reflect the split of the fortran interface out of sci-libs/netcdf
+
22 May 2012; Justin Lecher <jlec@gentoo.org> abinit-6.12.3-r1.ebuild,
metadata.xml:
Add missing eutils.eclass
diff --git a/sci-physics/abinit/Manifest b/sci-physics/abinit/Manifest
index 692c589e7..6392e02a1 100644
--- a/sci-physics/abinit/Manifest
+++ b/sci-physics/abinit/Manifest
@@ -1 +1 @@
-DIST abinit-6.12.3.tar.gz 58483889 SHA256 243a3832e258d12998d9d188141cfedeabdbfee9867c1951d7f27b8230dec5e9 SHA512 a14764c7c031890ea9cb64dd8fb439959fae4b50d59985bd2e9d9c12a06f71f92491c015c64c7273b4089cd57934a699f3d4c3c2f377032cbd655aa887241a65 WHIRLPOOL caa5e8159fac7353ee87663f195419acee57246f1a3015941368ed026c3a15a07cf135dbf57fc8a81f0cdd24c042af1ccc1c63e3e20a73042d3462530bd5b904
+DIST abinit-6.12.3.tar.gz 58483889 RMD160 d2a1009af7eaafa9d4df99aa6e98e35faa644931 SHA1 ab7bca747639902d586155cb5d335595e3b2b1dc SHA256 243a3832e258d12998d9d188141cfedeabdbfee9867c1951d7f27b8230dec5e9 SHA512 a14764c7c031890ea9cb64dd8fb439959fae4b50d59985bd2e9d9c12a06f71f92491c015c64c7273b4089cd57934a699f3d4c3c2f377032cbd655aa887241a65 WHIRLPOOL caa5e8159fac7353ee87663f195419acee57246f1a3015941368ed026c3a15a07cf135dbf57fc8a81f0cdd24c042af1ccc1c63e3e20a73042d3462530bd5b904
diff --git a/sci-physics/abinit/abinit-6.12.3-r1.ebuild b/sci-physics/abinit/abinit-6.12.3-r2.ebuild
index fc22cebc3..a5c883145 100644
--- a/sci-physics/abinit/abinit-6.12.3-r1.ebuild
+++ b/sci-physics/abinit/abinit-6.12.3-r2.ebuild
@@ -16,15 +16,17 @@ KEYWORDS="~amd64 ~x86"
IUSE="cuda cuda-double -debug +etsf_io +fftw +fftw-threads +fox gsl gui +hdf5 libabinit mpi +netcdf python -test +threads -vdwxc"
RDEPEND="~sci-libs/bigdft-1.6_pre1
- sci-libs/etsf_io
=sci-libs/libxc-1*[fortran]
sci-physics/atompaw[libxc]
etsf_io? ( sci-libs/etsf_io )
fox? ( >=sci-libs/fox-4.1.2-r1[sax] )
netcdf? (
- sci-libs/netcdf[fortran]
+ || (
+ sci-libs/netcdf[fortran]
+ sci-libs/netcdf-fortran
+ )
hdf5? (
- sci-libs/netcdf[fortran,hdf5]
+ sci-libs/netcdf[hdf5]
)
)
hdf5? ( sci-libs/hdf5[fortran] )
diff --git a/sci-physics/elk/Manifest b/sci-physics/elk/Manifest
index 88dada474..b0fce503e 100644
--- a/sci-physics/elk/Manifest
+++ b/sci-physics/elk/Manifest
@@ -1,3 +1 @@
-DIST elk-1.3.15.tgz 1834503 SHA256 6e35d1c3830aeea0fe8016e25efa9debddf0e4bd90fe910520a35608a2f81fcf SHA512 ab18c78616447abdba7f82215cf4f10ff26eb052e47693266246b60225a436d21f877f5b97f3e62c0a91d2fd267c9e017568e8d5a80e488835d279d40494cf1e WHIRLPOOL fc528cd6e4ca0ddf42996f126aaf7cbcfd65bcc284faa9c0eb84cfcfae1055f20c83aea8dc5bfefeacb4a29755980f5881ec2fecc8fabb648727780c4b1cea93
-DIST elk-1.4.18.tgz 1855415 SHA256 14df155a254f0d0b24ffa98a3a25130e1d55f652f87f1f20781bb45169a20281 SHA512 5bcae5903aa6880fa43000f43e2f6aa5789d20107e0dd004104821ae39e663d6e1172441c3b69ed214fde0b6786450be16800116c0905288afc6fe644c8190a2 WHIRLPOOL dddb8b8eca84484bb1d8906ba2ccb53659509f7624b7b602758857c81a3f7e81c0f8b17037c1dd760c5bfdec47e57e92d88fda956bd1c2feb3b41bb42812925f
-DIST elk-1.4.5.tgz 1851444 SHA256 84c4e19da2d76e25f0395343aa6e7ecf883a9a870d7b1c5256336e220d1fbb9e SHA512 8fdecd8e11a3b53e8a891963d005d753cc06ce3c5a27cfe581f2d64edbdc620551d3a91ce31be31f50fce60beb402562662b215e64ae93e4dbf507910c31e7be WHIRLPOOL 6b463d09e1e5e75e8a08cc9224a57d93927ce1998653872ace73f1bf9bcf3f9a826eaea284319bdb85f19da16523430ff62496171a4b497103f8bc45d00e2391
+DIST elk-1.4.22.tgz 1866287 RMD160 6af2454eab5af8c97447529db013fbfe41f016fb SHA1 71c9b7cb1ddd5ab2eb7d83e1922a7aa0c2e0ddf8 SHA256 bc8b70d42924c77c9328418bd133285fe2caa4a8b14df4016eecff647ca15ec0 SHA512 7c512ac6738d883fe1c76964c8bd44ef34269f58f4c8d97ee63949949391ef1040dc41cf0c2626492f6c94649b696d7b67eef8292011dc75c312a3c4b3c21da6 WHIRLPOOL 392804fc8bc3ce03208f9689ffafb84d4a61b343d80c09d787adcd23f25ab824dd0d6477bbad41ae2e61ab0acc9cba2f965d6c576fd7d69bb976fd29770e4a1d
diff --git a/sci-physics/elk/elk-1.3.15.ebuild b/sci-physics/elk/elk-1.3.15.ebuild
deleted file mode 100644
index ac1b4f0e6..000000000
--- a/sci-physics/elk/elk-1.3.15.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="All-electron full-potential linearised augmented-plane wave (FP-LAPW) code with advanced features."
-HOMEPAGE="http://elk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-debug lapack libxc mpi openmp test"
-
-RDEPEND="lapack? ( virtual/blas
- virtual/lapack )
- libxc? ( =sci-libs/libxc-1*[fortran] )
- mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-pkg_setup() {
- fortran-2_pkg_setup
- if use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like gcc[openmp]"
- fi
-}
-
-src_prepare() {
- if use libxc; then
- sed -i -e's/^\(SRC_libxc =\)/#\1/' "${S}/src/Makefile"
- fi
- if use mpi; then
- sed -i -e's/^\(SRC_mpi =\)/#\1/' "${S}/src/Makefile"
- fi
-}
-
-src_configure() {
- if use mpi; then
- MY_FC="mpif90"
- MY_CC="mpicc"
- MY_CXX="mpic++"
- else
- MY_FC="$(tc-getFC)"
- MY_CC="$(tc-getCC)"
- MY_CXX="$(tc-getCXX)"
- fi
- if use openmp; then
- MY_FC="${MY_FC} -fopenmp"
- MY_CC="${MY_CC} -fopenmp"
- MY_CXX="${MY_CXX} -fopenmp"
- fi
- MY_FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O3 -funroll-loops -ffast-math}}"
- MY_FCFLAGS="${MY_FCFLAGS} -I/usr/include -I/usr/$(get_libdir)/finclude"
- MY_CFLAGS="${CFLAGS:- -O3 -funroll-loops -ffast-math}"
- MY_CXXFLAGS="${CXXFLAGS:- ${CFLAGS:- -O3 -funroll-loops -ffast-math}}"
- echo "MAKE = make" > make.inc
- echo "F90 = $MY_FC" >> make.inc
- echo "F90_OPTS = $MY_FCFLAGS" >> make.inc
- echo "F77 = $MY_FC" >> make.inc
- echo "F77_OPTS = $MY_FCFLAGS" >> make.inc
- echo "CC = ${MY_CC}" >> make.inc
- echo "CXX = ${MY_CXX}" >> make.inc
- echo "CFLAGS = ${MY_CFLAGS}" >> make.inc
- echo "CXXFLAGS = ${MY_CXXFLAGS}" >> make.inc
- echo "LD = $(tc-getLD)" >> make.inc
- echo "AR = ar" >> make.inc
- echo "LIB_SYS = " >> make.inc
- if use lapack; then
- echo "LIB_LPK = $(pkg-config --libs lapack)" >> make.inc
- else
- echo "LIB_LPK = lapack.a blas.a" >> make.inc
- fi
- echo "LIB_FFT = fftlib.a" >> make.inc
- if use libxc; then
- echo "LIB_XC = -L/usr/$(get_libdir) -lxc" >> make.inc
- echo "SRC_libxc = libxc_funcs.f90 libxc.f90 libxcifc.f90" >>make.inc
- fi
-}
-
-src_compile() {
- emake -j1 || die "make failed"
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- dobin src/elk src/eos/eos src/spacegroup/spacegroup utilities/elk-bands
- dodoc README
- for doc in docs/*; do
- dodoc $doc
- done
- insinto /usr/share/${P}
- doins -r species
- doins -r utilities
- doins -r examples
- doins -r tests
-}
diff --git a/sci-physics/elk/elk-1.4.18.ebuild b/sci-physics/elk/elk-1.4.18.ebuild
deleted file mode 100644
index 27b3f3af5..000000000
--- a/sci-physics/elk/elk-1.4.18.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="All-electron full-potential linearised augmented-plane wave (FP-LAPW) code with advanced features."
-HOMEPAGE="http://elk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-debug lapack libxc mpi openmp perl test"
-
-RDEPEND="lapack? ( virtual/blas
- virtual/lapack )
- libxc? ( =sci-libs/libxc-1*[fortran] )
- mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
- perl? ( dev-lang/perl )
- dev-util/pkgconfig"
-
-DOCS=( README )
-
-FORTRAN_STANDARD=90
-
-pkg_setup() {
- # fortran-2.eclass does not handle mpi wrappers
- if use mpi; then
- export FC="mpif90"
- export F77="mpif77"
- export CC="mpicc"
- export CXX="mpic++"
- else
- tc-export FC F77 CC CXX
- fi
-
- if use openmp; then
- FORTRAN_NEED_OPENMP=1
- fi
-
- fortran-2_pkg_setup
-
- if use openmp; then
- export FC="${FC} -fopenmp"
- export F77="${F77} -fopenmp"
- export CC="${CC} -fopenmp"
- export CXX="${CXX} -fopenmp"
- fi
-}
-
-src_prepare() {
- if use libxc; then
- sed -i -e's/^\(SRC_libxc =\)/#\1/' "${S}/src/Makefile"
- fi
- if use mpi; then
- sed -i -e's/^\(SRC_mpi =\)/#\1/' "${S}/src/Makefile"
- fi
-}
-
-src_configure() {
- FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O3 -funroll-loops -ffast-math}}"
- FCFLAGS="${FCFLAGS} -I/usr/include -I/usr/$(get_libdir)/finclude"
- CFLAGS="${CFLAGS:- -O3 -funroll-loops -ffast-math}"
- CXXFLAGS="${CXXFLAGS:- ${CFLAGS}}"
- export FCFLAGS CFLAGS CXXFLAGS
- echo "MAKE = make" > make.inc
- echo "F90 = $FC" >> make.inc
- echo "F90_OPTS = $FCFLAGS" >> make.inc
- echo "F77 = $FC" >> make.inc
- echo "F77_OPTS = $FCFLAGS" >> make.inc
- echo "CC = ${CC}" >> make.inc
- echo "CXX = ${CXX}" >> make.inc
- echo "CFLAGS = ${CFLAGS}" >> make.inc
- echo "CXXFLAGS = ${CXXFLAGS}" >> make.inc
- echo "LD = $(tc-getLD)" >> make.inc
- echo "AR = ar" >> make.inc
- echo "LIB_SYS = " >> make.inc
- if use lapack; then
- echo "LIB_LPK = $(pkg-config --libs lapack)" >> make.inc
- else
- echo "LIB_LPK = lapack.a blas.a" >> make.inc
- fi
- echo "LIB_FFT = fftlib.a" >> make.inc
- if use libxc; then
- echo "LIB_XC = -L/usr/$(get_libdir) -lxc" >> make.inc
- echo "SRC_libxc = libxc_funcs.f90 libxc.f90 libxcifc.f90" >>make.inc
- fi
-}
-
-src_compile() {
- emake -j1 || die "make failed"
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- dobin src/elk src/protex src/eos/eos src/spacegroup/spacegroup
- dobin utilities/elk-bands
- use perl && dobin utilities/xps_exc.pl utilities/se.pl
- dodoc README
- for doc in docs/*; do
- dodoc $doc
- done
- insinto /usr/share/${P}
- doins -r species
- doins -r utilities
- doins -r examples
- doins -r tests
-}
diff --git a/sci-physics/elk/elk-1.4.5.ebuild b/sci-physics/elk/elk-1.4.5.ebuild
deleted file mode 100644
index ac1b4f0e6..000000000
--- a/sci-physics/elk/elk-1.4.5.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="All-electron full-potential linearised augmented-plane wave (FP-LAPW) code with advanced features."
-HOMEPAGE="http://elk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-debug lapack libxc mpi openmp test"
-
-RDEPEND="lapack? ( virtual/blas
- virtual/lapack )
- libxc? ( =sci-libs/libxc-1*[fortran] )
- mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-pkg_setup() {
- fortran-2_pkg_setup
- if use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like gcc[openmp]"
- fi
-}
-
-src_prepare() {
- if use libxc; then
- sed -i -e's/^\(SRC_libxc =\)/#\1/' "${S}/src/Makefile"
- fi
- if use mpi; then
- sed -i -e's/^\(SRC_mpi =\)/#\1/' "${S}/src/Makefile"
- fi
-}
-
-src_configure() {
- if use mpi; then
- MY_FC="mpif90"
- MY_CC="mpicc"
- MY_CXX="mpic++"
- else
- MY_FC="$(tc-getFC)"
- MY_CC="$(tc-getCC)"
- MY_CXX="$(tc-getCXX)"
- fi
- if use openmp; then
- MY_FC="${MY_FC} -fopenmp"
- MY_CC="${MY_CC} -fopenmp"
- MY_CXX="${MY_CXX} -fopenmp"
- fi
- MY_FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O3 -funroll-loops -ffast-math}}"
- MY_FCFLAGS="${MY_FCFLAGS} -I/usr/include -I/usr/$(get_libdir)/finclude"
- MY_CFLAGS="${CFLAGS:- -O3 -funroll-loops -ffast-math}"
- MY_CXXFLAGS="${CXXFLAGS:- ${CFLAGS:- -O3 -funroll-loops -ffast-math}}"
- echo "MAKE = make" > make.inc
- echo "F90 = $MY_FC" >> make.inc
- echo "F90_OPTS = $MY_FCFLAGS" >> make.inc
- echo "F77 = $MY_FC" >> make.inc
- echo "F77_OPTS = $MY_FCFLAGS" >> make.inc
- echo "CC = ${MY_CC}" >> make.inc
- echo "CXX = ${MY_CXX}" >> make.inc
- echo "CFLAGS = ${MY_CFLAGS}" >> make.inc
- echo "CXXFLAGS = ${MY_CXXFLAGS}" >> make.inc
- echo "LD = $(tc-getLD)" >> make.inc
- echo "AR = ar" >> make.inc
- echo "LIB_SYS = " >> make.inc
- if use lapack; then
- echo "LIB_LPK = $(pkg-config --libs lapack)" >> make.inc
- else
- echo "LIB_LPK = lapack.a blas.a" >> make.inc
- fi
- echo "LIB_FFT = fftlib.a" >> make.inc
- if use libxc; then
- echo "LIB_XC = -L/usr/$(get_libdir) -lxc" >> make.inc
- echo "SRC_libxc = libxc_funcs.f90 libxc.f90 libxcifc.f90" >>make.inc
- fi
-}
-
-src_compile() {
- emake -j1 || die "make failed"
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- dobin src/elk src/eos/eos src/spacegroup/spacegroup utilities/elk-bands
- dodoc README
- for doc in docs/*; do
- dodoc $doc
- done
- insinto /usr/share/${P}
- doins -r species
- doins -r utilities
- doins -r examples
- doins -r tests
-}
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index b58399718..53f441313 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,30 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
+*root-5.32.03-r3 (20 Jun 2012)
+
+ 20 Jun 2012; Andrew Savchenko <bircoph@gmail.com> -root-5.32.03-r2.ebuild,
+ +root-5.32.03-r3.ebuild:
+ Backport htmldoc fixes for 5.32 branch.
+
+*root-5.34.00 (19 Jun 2012)
+
+ 19 Jun 2012; Andrew Savchenko <bircoph@gmail.com> +root-5.34.00.ebuild:
+ Version bump form 5.34.00 based on live ebuild.
+
+ 19 Jun 2012; Andrew Savchenko <bircoph@gmail.com>
+ -files/root-5.34-dotfont.patch, files/root-5.34-htmldoc.patch,
+ root-9999.ebuild, +files/root-9999-dotfont.patch:
+ Split htmldoc to a separate ebuild: docs are supposed to be
+ generated after root was installed onto the live filesystem.
+
+ 14 Jun 2012; Andrew Savchenko <bircoph@gmail.com>
+ +files/root-5.34-dotfont.patch, root-9999.ebuild, metadata.xml:
+ Update live ebuild to account 5.34 barnch changes.
+ This adds experimental support for C++0x startard, imroves chances
+ of llvm build and makes clear openmp and mpi relationship: they are
+ used only for math and are mutually exclusive.
+
13 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> root-5.32.03-r2.ebuild,
metadata.xml:
sync with tree
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 8f23f7d7c..30117cc27 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,7 +1,33 @@
-DIST ROOTUsersGuide.pdf 9124822 RMD160 f5cbcd9f6f2e7603ed509b30589a2267b5abf8f7 SHA1 7a2e0febfb6021d54f6559ef6f75a29081195e36 SHA256 70a96c4a2573dc0d320142f86993ecfda24caa755e910340a3014120f2997c8b SHA512 c3b4c18ef2e13968afdf67c6003249d4cfe6ea661fa32ce25127361bae7e3376a25cd3b11591292f3975bcd8105291aca52f2f6214c9fe45f4bd6e7e44d54b25 WHIRLPOOL 11256ba7837d17e5795cf71ac32db43d7d8f797bfbddf5f71612fe2f8fb2e01354372c0ea8f0bc22868881eb0bfdc8a3e3f1b05293d2750d293aa4d59217b2e6
+AUX olbd.confd 197 RMD160 798de1808502f3e4ecfc5f024b56a419d9824057 SHA1 f2a4385fdf9849eafb1d5457727f6fbe80af1da3 SHA256 5a34da76bbe56cd3b8128f05c0d9900f9d7f7ffdcffc5deeb816c78ea46679ba
+AUX olbd.initd 714 RMD160 19a09e2264b984245f6a6b55c302a218bc41e452 SHA1 75e5d0764f00d5f9ef52966b597fa66c67bf7058 SHA256 a12efc3a4af4116558a6efd0964646b677d06879bb2114fc508324d9162bf815
+AUX proofd.confd 415 RMD160 3814aacb63d82b9d060086f9bef304d431a15b4e SHA1 31eb7af239a0042f887b5089a7c6c7ec5d6662e9 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38
+AUX proofd.initd 717 RMD160 09157e82a659255d802a02466dca833135c7839a SHA1 47d139d8cb08e055674018b6b7f68522bf65b5ca SHA256 f60fa92173370e237e3e2cf5be7add5aa63752e3b7496cf3a0a5acc1dc927ebc
+AUX root-5.28.00b-asneeded.patch 712 RMD160 0b3a3d41e309f13310fda607955ad88cc6bc176e SHA1 4fa704d2790e19933155da2587a9c6998d3c4e4f SHA256 17d1d41d8c7f78abbb7cd284af0a6aca544820db72fa72956b473c7c1817a96b
+AUX root-5.28.00b-glibc212.patch 276 RMD160 02901df4c8e5e3c7d50a78916f843fde83faf1f0 SHA1 842129d6247255b5fa72778a12f08e1383247cd8 SHA256 e51e127a80e2bf1afad41c2b7ca5233c362bce017057ca489bedb2a9442efb62
+AUX root-5.28.00b-prop-ldflags.patch 433 RMD160 fd1717af9210471d7de0f06a47011e03d3f76d9a SHA1 b5dac8b013219dcfe577f2972fcc1d548f153cc3 SHA256 04f4b65a91e28386c7a857fe361f091943f4bb6fc82a9473ac7605412c199191
+AUX root-5.28.00b-unuran.patch 1531 RMD160 8083784cc831fc304f2e94fdf3b8aa8379d0bd9a SHA1 5c4537ba1922775fb63d65340a18a3c2b1d2311b SHA256 09458c60c9d38af2d204939f752ec25364d04cf66810b7cae5e88368f84c31c8
+AUX root-5.32.00-afs.patch 1322 RMD160 208adb0105edbad04f74206363f582c0a4dbcf73 SHA1 e713c26f5481755ded620d50a6dffc63eb0cba9d SHA256 a8f8d551668299516e2e091fd29ae15ceb1ba034d9df95b76f99b1dabc94a8dc
+AUX root-5.32.00-cfitsio.patch 593 RMD160 c9fb2e0e57ad6c08bc26eb626772bc3ec901ac46 SHA1 9d07035b5ab27bede96033a777e3d21a26b3ae27 SHA256 9f4f244f272d75e115d8f139670fdcc0cdbcb68972689edbc78e467c3fad3e40
+AUX root-5.32.00-chklib64.patch 866 RMD160 9fada23b979e80dec76184e22895e47e689b55b4 SHA1 fde081f24090a3bb10473170a611384593072134 SHA256 5260cb5e7ab62bb19f6586cf4d9033597bcfd0132f178192be69ce515b2c7c35
+AUX root-5.32.00-dotfont.patch 2563 RMD160 7631b62e90a218ff87b80118044cba8144a669f9 SHA1 becf0e7e52bc189ab76ed7c3f972a2596414bd20 SHA256 7b4fc5da17ee8bfa71ed4cb60926a02e4b7058f8955dd54fb7f15ee4910823f6
+AUX root-5.32.00-explicit-functions.patch 610 RMD160 b8eb20aa9b6864fe138674c5991fe13aaa68981c SHA1 9f4faf15cf43cfa1e3ff4a394db5a4807bed713e SHA256 1afa92168b1f25ed457c08db85c85173613b82050b558765ba25e056f6f60abc
+AUX root-5.32.00-htmldoc.patch 485 RMD160 04d4e7cf5f3966efa4bad88f3acc3c14eb0637a1 SHA1 cbc71899eb9c477f7376c6d310912b860bd16106 SHA256 96674266856275b0ef83feefebc2fd5cd3edf73f207b2349b9c44e81e6ac7b98
+AUX root-5.32.00-nobyte-compile.patch 5527 RMD160 61c3dfdd4b8f71f64772e20901f6ee11b8f53e12 SHA1 f914ccb7f7d88dd8d9ba4c1f4d940b14134f2c3b SHA256 82152c92efd5002f9c2b230f141cae6c8111b03bd18370030d62f0f7d7127420
+AUX root-9999-dotfont.patch 2718 RMD160 6a94cf574791fe30b5d723d2134e44066b9fe79e SHA1 71aa116fc2eeac4b73e372ca424f7c35b8728567 SHA256 27d05ede039fb85472203839a628b15f8ee9fc3c39e1d29a19349e069f891d61
+AUX rootd.confd 199 RMD160 9ca9864292e7301d3feb6c36d88ba16002b7d7fa SHA1 822983a24e219bd860124f363a1e4250a17026dd SHA256 7b69f646ce0b2546ce797ec4a05949b02302dc5f4e41d2e8896ed0bc6575ac8d
+AUX rootd.initd 732 RMD160 9cce585e528e27c0fbd791be1f90fa6a1bb3164b SHA1 c15e805b0397bc8513e1c7e5631f2337c3564bbc SHA256 42b9fe01aa41965359c16d4b23f874cea65806d8c7ec11215dbba95ab80e90f3
+AUX xrootd.confd 200 RMD160 2344c73ca3c27adeb70b092850cfd292af7d58bd SHA1 f2b895f43d3537e8614a907c7c94642f01c084e4 SHA256 03c1191168ddea3bc6621e26eb56e509e6c9a4d58756ffbbd07ff6657200e57d
+AUX xrootd.initd 720 RMD160 fb03f7410061e5340cb1f03c1659c553b62cb81f SHA1 a52eebc9bda2a92d0c5f3bbd20d7ea27cecc8cca SHA256 08c85596b8489fec0cea64e1fa9a092094fb05ea0f1151fd26775e4d5a024a8e
+DIST ROOTUsersGuide.pdf 9124817 RMD160 52122f6f5870a12a6b701ffc4cbf428ab8382253 SHA1 dadfe5eb61a0a3f24067f73f6c6585927685701f SHA256 51c5ce0c7f32b83700b441a1c069e555bbb7949518858fc6189722501994f5c1
DIST RooFit_Users_Manual_2.91-33.pdf 1330062 RMD160 650b616018a5493d5fd7da1dc06c6e54eaa419fb SHA1 f176782746542b00ff60320b4a41e1218db3d006 SHA256 101c4e4c41962238fcabf1caa86cafc51241a1800594491b2e62ef8b565a5646
DIST TMVAUsersGuide-v4.03.pdf 3913533 RMD160 fbd62b90e7ad47ad69ec62d584417463ec13bf9c SHA1 84a63140cc3e01267d2cc7ffa374a7c24fbed37e SHA256 0cdbb4a2d19eb7a86e2911cfa73a905932e862d6c94be10b7662a9355b0241af
-DIST info.png 2060 RMD160 9e9e984337699e08d86a3352f414658d44d30480 SHA1 592745253491d94624ee68721f62ecdfb1b1b278 SHA256 51de6661250f3fb71c6c8250cbc4bdc4dc4283cc90240b4dc1ee6168e8d40279 SHA512 81a730eefbe7a7e15d5840491402c7644bf7ed5d5f8f3830ed9457b343cc7882480e993ea84aef93500742cd0fe8469859cd2c925e5582b91ef56406804ae276 WHIRLPOOL 02ea6daf9e3d21947ebf5dd01c455a13f2fcbf9981be34a150056a3510122ca49e3d137d4f242c7218d4d06ace09566d513a04f09071723ac244f5a38e982bac
-DIST root-banner.png 132555 RMD160 d4cf5f8a60ee1df686e47a696e76c1ecdda4f1e7 SHA1 6760c589cc13f0f906cbd8598b4edffc28ad911b SHA256 d165e1cc175f654ff79af39193a6144678f600e14a53dd20e2b216b3e8951e94 SHA512 139347f396e88c8062d847d612949204cb80e551a826d926950ca8ab967f0d496487fed17a227fc796ae4db23fca758d91a0af7943142adbed358e98d7667b1f WHIRLPOOL dd23e26acf9303b404cda8135d6946af3b1abba3dfdff8d80e56096f810d50a01ebfb52dc1e6ee1d1b99fbb5859dc850e0e368155339b5007294d95ce8909857
+DIST info.png 2060 RMD160 9e9e984337699e08d86a3352f414658d44d30480 SHA1 592745253491d94624ee68721f62ecdfb1b1b278 SHA256 51de6661250f3fb71c6c8250cbc4bdc4dc4283cc90240b4dc1ee6168e8d40279
+DIST root-banner.png 132555 RMD160 d4cf5f8a60ee1df686e47a696e76c1ecdda4f1e7 SHA1 6760c589cc13f0f906cbd8598b4edffc28ad911b SHA256 d165e1cc175f654ff79af39193a6144678f600e14a53dd20e2b216b3e8951e94
DIST root_v5.32.03.source.tar.gz 55529362 RMD160 90ee828638f322c169875135b51231810dada383 SHA1 cc1125660073918d0f47e209a069be2b9e849dc3 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6
-DIST rootdrawing-logo.png 15051 RMD160 a10172fa5e9a9737b6b5e678af3f8426d804e275 SHA1 dd4c0e3e2ef5ebc59440677a78605b4b54fff48a SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc7d155944a8e27284af83a6b SHA512 14aa13ebfed3c9412d7d7d04c250740b25fe3af6bcb07e618045a5cec2dc23698a251fd7df2db1a6c37331084db99b029b387ea81c25ac825fc7ae10ad164a68 WHIRLPOOL 877a959a5aead73ba69dbb805c9869cbd6a047ea476bd4e7fef80781563a61d20dad49dd4d8b0005bfc58e8f7c7d38efbb3e085a95974feb81dfc9e339c18741
+DIST root_v5.34.00.source.tar.gz 56214534 RMD160 6089493c70f94a1c4edd87ebe79adb9f3570f903 SHA1 e7c8352d92be8510b36001efb020f3eb0bf22ed1 SHA256 808e04876dbc9cfbfea54ee11ba35e90382e8ff4219dbdbe2d2236a9dadf7df1
+DIST rootdrawing-logo.png 15051 RMD160 a10172fa5e9a9737b6b5e678af3f8426d804e275 SHA1 dd4c0e3e2ef5ebc59440677a78605b4b54fff48a SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc7d155944a8e27284af83a6b
+EBUILD root-5.32.03-r3.ebuild 11393 RMD160 35b5a8a28943a4c211cd9ea8469f46ae58e7678d SHA1 cff1657585594d9d82ca39f618432d26bde4cd0a SHA256 4bffda3f13772d6272ff58d0a5f8563d4a64f3d359cbd5332db7b4a0f14e05c1
+EBUILD root-5.34.00.ebuild 11289 RMD160 f1a2c96533e9eaefcfd850a2e584d4ff02b74f65 SHA1 8c3c1c81979965c355b79ba80e0b0dfc154d5ceb SHA256 507988e86cf4494227d5ca952bd2aecaec506a61286dfc47e7fa29254a7c0803
+EBUILD root-9999.ebuild 11405 RMD160 da73f2f7e9e07cabe09c2b23dd781a945f8af7b2 SHA1 b46e3b6119de9df3c3afe5741cc47e6f0abcaffd SHA256 02f7bd243e846ecbf40776a9fa6b6f7f7df5445b0ea085c25c88c83d2ab9b8cc
+MISC ChangeLog 31275 RMD160 be5c5873f19ebc0e99e956b4242a49c6d04cb842 SHA1 b0321a086b85043e3330d275ecaa2ba65ee722a9 SHA256 861825d9ffaba1f8f8e0221af90caafe6d4fe17647e707e8e54c69ac99ddfb3a
+MISC metadata.xml 1794 RMD160 701c0b741ceed4d5cebdf346d5861f4c084d8f02 SHA1 62af471cd7970a4095adbe3a7d01ae8ec50cbdc4 SHA256 3076ff6ff6170f7ca4ae57d2ba226948fa93120c61216c7bc716f6c80b05d681
diff --git a/sci-physics/root/files/root-5.32.00-htmldoc.patch b/sci-physics/root/files/root-5.32.00-htmldoc.patch
index e6d498187..3b80b39cd 100644
--- a/sci-physics/root/files/root-5.32.00-htmldoc.patch
+++ b/sci-physics/root/files/root-5.32.00-htmldoc.patch
@@ -1,41 +1,3 @@
---- root/Makefile.orig 2012-05-23 21:07:07.000000000 +0400
-+++ root/Makefile 2012-05-23 22:47:48.935680301 +0400
-@@ -1039,8 +1039,7 @@
- releasenotes:
- @$(MAKERELNOTES)
-
--html: $(ROOTEXE) changelog releasenotes
-- @$(MAKELOGHTML)
-+html: $(ROOTEXE) releasenotes
- @$(MAKEHTML)
-
- # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
---- root/build/unix/makehtml.sh.orig 2012-05-23 23:25:45.000000000 +0400
-+++ root/build/unix/makehtml.sh 2012-05-24 13:04:43.919062126 +0400
-@@ -6,12 +6,12 @@
- cd tutorials
- # we need tutorials/hsimple.root
- if [ ! -f hsimple.root ]; then
-- $ROOT -l -b -q hsimple.C
-+ ../$ROOT -l -b -q hsimple.C && exit 1
- fi
- cd tree
- # we need tutorials/tree/cernstaff.root
- if [ ! -f cernstaff.root ]; then
-- $ROOT -l -b -q cernbuild.C
-+ ../../$ROOT -l -b -q cernbuild.C || exit 1
- fi
- cd $dir
-
-@@ -19,7 +19,7 @@
- echo "Generating doc in directory htmldoc/..."
- echo ""
-
--$ROOT -l <<makedoc
-+$ROOT -l <<makedoc || exit 1
- THtml h;
- h.LoadAllLibs();
- h.MakeAll();
--- root/html/src/THtml.cxx.orig 2012-05-25 16:18:10.000000000 +0400
+++ root/html/src/THtml.cxx 2012-05-29 19:22:40.810563296 +0400
@@ -1913,6 +1913,9 @@
diff --git a/sci-physics/root/files/root-9999-dotfont.patch b/sci-physics/root/files/root-9999-dotfont.patch
new file mode 100644
index 000000000..6c765f75a
--- /dev/null
+++ b/sci-physics/root/files/root-9999-dotfont.patch
@@ -0,0 +1,58 @@
+--- root/html/src/TClassDocOutput.cxx.orig 2012-06-08 02:13:51.000000000 +0400
++++ root/html/src/TClassDocOutput.cxx 2012-06-08 02:34:45.705436577 +0400
+@@ -625,7 +625,7 @@
+ << "size=\"8,10\";" << std::endl
+ << "ratio=auto;" << std::endl
+ << "margin=0;" << std::endl
+- << "node [shape=plaintext,fontsize=40,width=4,height=0.75];" << std::endl
++ << "node [shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\"DejaVu Serif\"];" << std::endl
+ << "\"" << fCurrentClass->GetName() << "\" [shape=ellipse];" << std::endl;
+
+ std::stringstream ssDep;
+@@ -704,7 +704,7 @@
+ outdot << ";" << std::endl;
+ } else if (writeAndMoreFor) {
+ outdot << " \"...andmore" << writeAndMoreFor->GetName()
+- << "\" [label=\"...and more\",fontname=\"Times-Italic\",fillcolor=lightgrey,style=filled];" << std::endl;
++ << "\" [label=\"...and more\",fontname=\"DejaVu Serif Italic\",fillcolor=lightgrey,style=filled];" << std::endl;
+ }
+ }
+ if (!levelExists) break;
+@@ -733,7 +733,7 @@
+ << "ranksep=0.1;" << std::endl
+ << "nodesep=0;" << std::endl
+ << "margin=0;" << std::endl;
+- outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << std::endl;
++ outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\"DejaVu Serif\"];" << std::endl;
+
+ std::stringstream ssDep;
+ const int numColumns = 3;
+@@ -939,7 +939,7 @@
+ << "ranksep=0;" << std::endl
+ << "nodesep=0;" << std::endl
+ << "size=\"8,10\";" << std::endl
+- << "node [fontsize=20,shape=plaintext];" << std::endl;
++ << "node [fontsize=20,shape=plaintext,fontname=\"DejaVu Serif\"];" << std::endl;
+
+ for (std::list<std::string>::iterator iFile = listFilesToParse.begin();
+ iFile != listFilesToParse.end(); ++iFile) {
+@@ -999,7 +999,8 @@
+ << "ranksep=0.7;" << std::endl
+ << "nodesep=0.3;" << std::endl
+ << "size=\"8,8\";" << std::endl
+- << "ratio=compress;" << std::endl;
++ << "ratio=compress;" << std::endl
++ << "node [fontname=\"DejaVu Serif\"];" << std::endl;
+
+ TString libs(fCurrentClass->GetSharedLibs());
+ outdot << "\"All Libraries\" [URL=\"LibraryDependencies.html\",shape=box,rank=max,fillcolor=lightgray,style=filled];" << std::endl;
+@@ -1109,7 +1110,8 @@
+
+ dotout << "digraph G {" << std::endl
+ << "ratio=auto;" << std::endl
+- << "rankdir=RL;" << std::endl;
++ << "rankdir=RL;" << std::endl
++ << "node [fontname=\"DejaVu Serif\"];" << std::endl;
+
+ // loop on all classes
+ TClassDocInfo* cdi = 0;
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index bcbc04f6f..cb56d9f97 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -16,6 +16,7 @@
GUI toolkit, and a complete visualization framework.
</longdescription>
<use>
+ <flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>>=4.7.0</flag>
<flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
<flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
<flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag>
diff --git a/sci-physics/root/root-5.32.03-r2.ebuild b/sci-physics/root/root-5.32.03-r3.ebuild
index d9b01f580..9d87c1c66 100644
--- a/sci-physics/root/root-5.32.03-r2.ebuild
+++ b/sci-physics/root/root-5.32.03-r3.ebuild
@@ -17,7 +17,7 @@ else
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
fi
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs virtualx ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
ROOFIT_DOC_PV=2.91-33
TMVA_DOC_PV=4.03
@@ -44,7 +44,6 @@ IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerbero
CDEPEND="
app-arch/xz-utils
- !app-doc/root-docs
>=dev-lang/cfortran-4.4-r2
dev-libs/libpcre
media-fonts/dejavu
@@ -107,11 +106,12 @@ RDEPEND="
reflex? ( dev-cpp/gccxml )
xinetd? ( sys-apps/xinetd )"
+PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
+
REQUIRED_USE="
!X? ( !opengl !qt4 !xft )
- htmldoc? ( X doc graphviz )"
-
-VIRTUALX_REQUIRED="htmldoc"
+ mpi? ( math !openmp )
+ openmp? ( math !mpi )"
S="${WORKDIR}/${PN}"
@@ -201,9 +201,6 @@ src_prepare() {
cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
die "htmldoc preparation failed"
-
- # set build etc directory
- sed "s%@PWD@%${S}%" -i build/unix/makehtml.sh || die "htmldoc sed failed"
fi
}
@@ -284,15 +281,6 @@ src_compile() {
if use emacs; then
elisp-compile build/misc/*.el || die "elisp-compile failed"
fi
- if use htmldoc; then
- LD_LIBRARY_PATH=${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \
- ROOTSYS=${S} DISPLAY=":50" \
- Xemake html || die "html doc generation failed"
- # if root.exe crashes, return code will be 0 due to gdb attach,
- # so we need to check if last html file was generated;
- # this check is volatile and can't catch crash on the last file.
- [[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
- fi
}
doc_install() {
@@ -303,8 +291,6 @@ doc_install() {
use math && dodoc \
"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
- # too large data to copy
- use htmldoc && mv htmldoc "${ED}usr/share/doc/${PF}/html"
fi
if use examples; then
diff --git a/sci-physics/root/root-5.34.00.ebuild b/sci-physics/root/root-5.34.00.ebuild
new file mode 100644
index 000000000..2a75fd843
--- /dev/null
+++ b/sci-physics/root/root-5.34.00.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+
+if [[ ${PV} == "9999" ]] ; then
+ _SVN=subversion
+ ESVN_REPO_URI="http://root.cern.ch/svn/root/trunk"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
+
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+PATCH_PV2=5.32.00
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="${SRC_URI}
+ doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf
+ math? (
+ ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+ http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
+ htmldoc? (
+ http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
+ http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
+ http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="+X afs avahi c++0x clarens doc emacs examples fits fftw graphviz htmldoc
+ kerberos ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix
+ pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
+
+CDEPEND="
+ app-arch/xz-utils
+ >=dev-lang/cfortran-4.4-r2
+ dev-libs/libpcre
+ media-fonts/dejavu
+ media-libs/freetype
+ media-libs/giflib
+ media-libs/libpng:0
+ media-libs/tiff:0
+ sys-libs/zlib
+ virtual/jpeg
+ virtual/shadow
+ X? (
+ media-libs/ftgl
+ media-libs/glew
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXpm
+ || (
+ >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
+ >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+ )
+ opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+ qt4? (
+ x11-libs/qt-gui:4
+ x11-libs/qt-opengl:4
+ x11-libs/qt-qt3support:4
+ x11-libs/qt-svg:4
+ x11-libs/qt-webkit:4
+ x11-libs/qt-xmlpatterns:4 )
+ xft? ( x11-libs/libXft )
+ )
+ afs? ( net-fs/openafs )
+ avahi? ( net-dns/avahi )
+ c++0x? ( >=sys-devel/gcc-4.7.0 )
+ clarens? ( dev-libs/xmlrpc-c[curl] )
+ emacs? ( virtual/emacs )
+ fits? ( sci-libs/cfitsio )
+ fftw? ( sci-libs/fftw:3.0 )
+ graphviz? ( media-gfx/graphviz )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap )
+ math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+ mysql? ( virtual/mysql )
+ odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+ oracle? ( dev-db/oracle-instantclient-basic )
+ postgres? ( dev-db/postgresql-base )
+ pythia6? ( sci-physics/pythia:6 )
+ pythia8? ( sci-physics/pythia:8 )
+ ruby? (
+ dev-lang/ruby
+ dev-ruby/rubygems )
+ ssl? ( dev-libs/openssl )
+ xml? ( dev-libs/libxml2 )
+ xrootd? ( >=net-libs/xrootd-3.2.0 )"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+
+RDEPEND="
+ virtual/fortran
+ ${CDEPEND}
+ reflex? ( dev-cpp/gccxml )
+ xinetd? ( sys-apps/xinetd )"
+
+PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
+
+REQUIRED_USE="
+ !X? ( !opengl !qt4 !xft )
+ mpi? ( math !openmp )
+ openmp? ( math !mpi )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ python_pkg_setup
+ echo
+ elog "There are extra options on packages not yet in Gentoo:"
+ elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+ elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+ elog "You can use the env variable EXTRA_ECONF variable for this."
+ elog "For example, for SRP, you would set: "
+ elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
+ echo
+ enewgroup rootd
+ enewuser rootd -1 -1 /var/spool/rootd rootd
+
+ if use math; then
+ if use openmp; then
+ if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+ ewarn "You are using a gcc without OpenMP capabilities"
+ die "Need an OpenMP capable compiler"
+ else
+ export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+ fi
+ elif use mpi; then
+ export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+ fi
+ fi
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+ "${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+ "${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+ "${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
+ "${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
+ "${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
+ "${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
+ "${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
+
+ # make sure we use system libs and headers
+ rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+ rm -rf graf2d/asimage/src/libAfterImage || die
+ rm -rf graf3d/ftgl/{inc,src} || die
+ rm -rf graf2d/freetype/src || die
+ rm -rf graf3d/glew/{inc,src} || die
+ rm -rf core/pcre/src || die
+ rm -rf math/unuran/src/unuran-*.tar.gz || die
+ LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
+ rm -rf core/lzma/src/*.tar.gz || die
+ rm graf3d/gl/{inc,src}/gl2ps.* || die
+ sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
+
+ # In Gentoo, libPythia6 is called libpythia6
+ # libungif is called libgif,
+ # iodbc is in /usr/include/iodbc
+ # pg_config.h is checked instead of libpq-fe.h
+ sed -i \
+ -e 's:libPythia6:libpythia6:g' \
+ -e 's:ungif:gif:g' \
+ -e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+ -e 's:libpq-fe.h:pg_config.h:' \
+ configure || die "adjusting configure for Gentoo failed"
+
+ # prefixify the configure script
+ sed -i \
+ -e 's:/usr:${EPREFIX}/usr:g' \
+ configure || die "prefixify configure failed"
+
+ # QTDIR only used for qt3 in gentoo, and configure looks for it.
+ unset QTDIR
+
+ # Make html docs self-consistent for offline work (based on Fedora spec)
+ if use htmldoc; then
+ epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
+ # make images local
+ sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
+ -i etc/html/ROOT.css || die "htmldoc sed failed"
+ sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
+ -i etc/html/ROOT.css || die "htmldoc sed failed"
+ sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
+ -i etc/html/header.html || die "htmldoc sed failed"
+
+ cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
+ die "htmldoc preparation failed"
+ fi
+}
+
+src_configure() {
+ # the configure script is not the standard autotools
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --etcdir="${EPREFIX}"/etc/root \
+ --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+ --testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+ --with-cc=$(tc-getCC) \
+ --with-cxx=$(tc-getCXX) \
+ --with-f77=$(tc-getFC) \
+ --with-ld=$(tc-getCXX) \
+ --with-afs-shared=yes \
+ --with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+ --disable-builtin-afterimage \
+ --disable-builtin-freetype \
+ --disable-builtin-ftgl \
+ --disable-builtin-glew \
+ --disable-builtin-pcre \
+ --disable-builtin-zlib \
+ --disable-builtin-lzma \
+ --disable-cling \
+ --enable-astiff \
+ --enable-explicitlink \
+ --enable-gdml \
+ --enable-memstat \
+ --enable-shadowpw \
+ --enable-shared \
+ --enable-soversion \
+ --enable-table \
+ --fail-on-missing \
+ $(use_enable X x11) \
+ $(use_enable X asimage) \
+ $(use_enable afs) \
+ $(use_enable avahi bonjour) \
+ $(use_enable clarens) \
+ $(use_enable clarens peac) \
+ $(use_enable fits fitsio) \
+ $(use_enable fftw fftw3) \
+ $(use_enable graphviz gviz) \
+ $(use_enable kerberos krb5) \
+ $(use_enable ldap) \
+ $(use_enable math gsl-shared) \
+ $(use_enable math genvector) \
+ $(use_enable math mathmore) \
+ $(use_enable math minuit2) \
+ $(use_enable math roofit) \
+ $(use_enable math tmva) \
+ $(use_enable math unuran) \
+ $(use_enable mysql) \
+ $(use_enable odbc) \
+ $(use_enable opengl) \
+ $(use_enable postgres pgsql) \
+ $(use_enable prefix rpath) \
+ $(use_enable pythia6) \
+ $(use_enable pythia8) \
+ $(use_enable python) \
+ $(use_enable qt4 qt) \
+ $(use_enable qt4 qtgsi) \
+ $(use_enable reflex cintex) \
+ $(use_enable reflex) \
+ $(use_enable ruby) \
+ $(use_enable ssl) \
+ $(use_enable xft) \
+ $(use_enable xml) \
+ $(use_enable xrootd) \
+ ${EXTRA_ECONF} \
+ || die "configure failed"
+}
+
+src_compile() {
+ emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
+ if use emacs; then
+ elisp-compile build/misc/*.el || die "elisp-compile failed"
+ fi
+}
+
+doc_install() {
+ cd "${S}"
+ if use doc; then
+ einfo "Installing user's guides"
+ dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
+ use math && dodoc \
+ "${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+ "${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+ fi
+
+ if use examples; then
+ # these should really be taken care of by the root make install
+ insinto /usr/share/doc/${PF}/examples/tutorials/tmva
+ doins -r tmva/test
+ else
+ rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+ fi
+}
+
+daemon_install() {
+ cd "${S}"
+ local daemons="rootd proofd"
+ dodir /var/spool/rootd
+ fowners rootd:rootd /var/spool/rootd
+ dodir /var/spool/rootd/{pub,tmp}
+ fperms 1777 /var/spool/rootd/{pub,tmp}
+
+ for i in ${daemons}; do
+ newinitd "${FILESDIR}"/${i}.initd ${i}
+ newconfd "${FILESDIR}"/${i}.confd ${i}
+ done
+ if use xinetd; then
+ insinto /etc/xinetd
+ doins etc/daemons/{rootd,proofd}.xinetd
+ fi
+}
+
+desktop_install() {
+ cd "${S}"
+ sed -e 's,@prefix@,/usr,' \
+ build/package/debian/root-system-bin.desktop.in > root.desktop
+ domenu root.desktop
+ doicon "${S}"/build/package/debian/root-system-bin.png
+
+ insinto /usr/share/icons/hicolor/48x48/mimetypes
+ doins build/package/debian/application-x-root.png
+
+ insinto /usr/share/icons/hicolor/48x48/apps
+ doicon build/package/debian/root-system-bin.xpm
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+ use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+ use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+ use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+ doenvd 99root
+
+ # The build system installs Emacs support unconditionally and in the wrong
+ # directory. Remove it and call elisp-install in case of USE=emacs.
+ rm -rf "${ED}"/usr/share/emacs
+ if use emacs; then
+ elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
+ fi
+
+ doc_install
+ daemon_install
+ desktop_install
+
+ # Cleanup of files either already distributed or unused on Gentoo
+ rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
+ rm "${ED}"usr/share/root/fonts/LICENSE || die
+ pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
+ rm -f posix/mktypes dll_stl/setup \
+ G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
+ rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
+ rm -f "${ED}"/etc/root/proof/*.sample || die
+ rm -rf "${ED}"/etc/root/daemons || die
+ popd > /dev/null
+ # these should be in PATH
+ mv "${ED}"etc/root/proof/utils/pq2/pq2* \
+ "${ED}"usr/bin/ || die
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ use python && python_mod_optimize /usr/$(get_libdir)/root
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ use python && python_mod_cleanup /usr/$(get_libdir)/root
+}
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 9f55ad400..e9b547650 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -8,8 +8,7 @@ PYTHON_DEPEND="python? 2"
if [[ ${PV} == "9999" ]] ; then
_SVN=subversion
- ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk"
- ESVN_OPTIONS="--non-interactive --trust-server-cert"
+ ESVN_REPO_URI="http://root.cern.ch/svn/root/trunk"
SRC_URI=""
KEYWORDS=""
else
@@ -17,13 +16,12 @@ else
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
fi
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs virtualx ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
ROOFIT_DOC_PV=2.91-33
TMVA_DOC_PV=4.03
PATCH_PV=5.28.00b
PATCH_PV2=5.32.00
-PATCH_PV3=5.34
DESCRIPTION="C++ data analysis framework and interpreter from CERN"
HOMEPAGE="http://root.cern.ch/"
@@ -39,13 +37,12 @@ SRC_URI="${SRC_URI}
SLOT="0"
LICENSE="LGPL-2.1"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerberos
- ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6
- pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
+IUSE="+X afs avahi c++0x clarens doc emacs examples fits fftw graphviz htmldoc
+ kerberos ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
+ pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
CDEPEND="
app-arch/xz-utils
- !app-doc/root-docs
>=dev-lang/cfortran-4.4-r2
dev-libs/libpcre
media-fonts/dejavu
@@ -78,6 +75,7 @@ CDEPEND="
)
afs? ( net-fs/openafs )
avahi? ( net-dns/avahi )
+ c++0x? ( >=sys-devel/gcc-4.7.0 )
clarens? ( dev-libs/xmlrpc-c[curl] )
emacs? ( virtual/emacs )
fits? ( sci-libs/cfitsio )
@@ -98,7 +96,7 @@ CDEPEND="
dev-ruby/rubygems )
ssl? ( dev-libs/openssl )
xml? ( dev-libs/libxml2 )
- xrootd? ( net-libs/xrootd )"
+ xrootd? ( >=net-libs/xrootd-3.2.0 )"
DEPEND="${CDEPEND}
virtual/pkgconfig"
@@ -109,11 +107,12 @@ RDEPEND="
reflex? ( dev-cpp/gccxml )
xinetd? ( sys-apps/xinetd )"
+PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
+
REQUIRED_USE="
!X? ( !opengl !qt4 !xft )
- htmldoc? ( X doc graphviz )"
-
-VIRTUALX_REQUIRED="htmldoc"
+ mpi? ( math !openmp )
+ openmp? ( math !mpi )"
S="${WORKDIR}/${PN}"
@@ -132,12 +131,13 @@ pkg_setup() {
enewuser rootd -1 -1 /var/spool/rootd rootd
if use math; then
- if use openmp && ! tc-has-openmp; then
- ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
- ewarn "If you want to build this package with OpenMP, abort now,"
- ewarn "and set CC to an OpenMP capable compiler"
- elif use openmp; then
- export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+ if use openmp; then
+ if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+ ewarn "You are using a gcc without OpenMP capabilities"
+ die "Need an OpenMP capable compiler"
+ else
+ export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+ fi
elif use mpi; then
export USE_MPI=1 USE_PARALLEL_MINUIT2=1
fi
@@ -153,7 +153,7 @@ src_prepare() {
"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
- "${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
+ "${FILESDIR}"/${PN}-9999-dotfont.patch
# make sure we use system libs and headers
rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -189,7 +189,7 @@ src_prepare() {
# Make html docs self-consistent for offline work (based on Fedora spec)
if use htmldoc; then
- epatch "${FILESDIR}"/${PN}-${PATCH_PV3}-htmldoc.patch
+ epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
# make images local
sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
-i etc/html/ROOT.css || die "htmldoc sed failed"
@@ -200,9 +200,6 @@ src_prepare() {
cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
die "htmldoc preparation failed"
-
- # set build etc directory
- sed "s%@PWD@%${S}%" -i build/unix/makehtml.sh || die "htmldoc sed failed"
fi
}
@@ -279,19 +276,10 @@ src_configure() {
}
src_compile() {
- emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}"
+ emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
if use emacs; then
elisp-compile build/misc/*.el || die "elisp-compile failed"
fi
- if use htmldoc; then
- LD_LIBRARY_PATH=${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \
- ROOTSYS=${S} DISPLAY=":50" \
- Xemake html || die "html doc generation failed"
- # if root.exe crashes, return code will be 0 due to gdb attach,
- # so we need to check if last html file was generated;
- # this check is volatile and can't catch crash on the last file.
- [[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
- fi
}
doc_install() {
@@ -302,8 +290,6 @@ doc_install() {
use math && dodoc \
"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
- # too large data to copy
- use htmldoc && mv htmldoc "${ED}usr/share/doc/${PF}/html"
fi
if use examples; then