diff options
| -rw-r--r-- | sci-physics/root/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-physics/root/Manifest | 40 | ||||
| -rw-r--r-- | sci-physics/root/files/digest-root-5.12.00e (renamed from sci-physics/root/files/digest-root-5.12.00a) | 6 | ||||
| -rw-r--r-- | sci-physics/root/root-5.12.00e.ebuild (renamed from sci-physics/root/root-5.12.00a.ebuild) | 88 |
4 files changed, 69 insertions, 71 deletions
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index 8b9c91bf8..743751e58 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,10 +2,10 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ -*root-5.12.00a (23 Aug 2006) +*root-5.12.00e (12 Sep 2006) - 23 Aug 2006; Sebastien Fabbro <seb@ist.utl.pt> root-5.12.00a.ebuild - +root-5.12.00a.ebuild, +metadata.xml (added longdescription) + 12 Sep 2006; Sebastien Fabbro <seb@ist.utl.pt> root-5.12.00e.ebuild + +root-5.12.00e.ebuild, +metadata.xml (added longdescription) Major version bump, and major ebuild change. Closes bug #109307, #124635, #98235, #98236, #34415. diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index d45349f86..294a1f2d9 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -1,30 +1,22 @@ DIST Users_Guide_5_12.pdf 10408114 RMD160 0cbe41ac350367ca02ca84f18a31780634008e04 SHA1 c2943d4b834e09665151fb32eb5193e2b20c0427 SHA256 63828312436b8b720b2ae71f8afabd6cc9ff1060de4ed29370e7ebcd12786ca8 DIST html512.tar.gz 42082413 RMD160 5c710f4e66c054b574958dec42c1e16aa1601000 SHA1 089789108b50920be06445c54b5feab92596b3bf SHA256 e28f4366edafa22a8fe26a60f04bcabdefd741edfe1ada4b6d8276cf518dbad6 -DIST root_v5.12.00a.source.tar.gz 18334664 RMD160 874f3bb6df74685ff71ec719b59faf70a1c26da9 SHA1 a6e24d81c41b083bbed8dd050552db8d2ad5e141 SHA256 c9ade73854904387f25f239df0eb801e459860bfbaea7d995bf2103cd4a67f01 -EBUILD root-5.12.00a.ebuild 4509 RMD160 915f6daa56d7c325173b5e33a4f5d48a303e28e9 SHA1 0e83f1aef5a6396d1bc1ff2b91320b8f1f69d052 SHA256 6ef0439b7cff267958e327db11f66f95ace6d9db80c40a6affa987b05e8da88a -MD5 4ffb2d982fbd74c332e3fd89dbb87d90 root-5.12.00a.ebuild 4509 -RMD160 915f6daa56d7c325173b5e33a4f5d48a303e28e9 root-5.12.00a.ebuild 4509 -SHA256 6ef0439b7cff267958e327db11f66f95ace6d9db80c40a6affa987b05e8da88a root-5.12.00a.ebuild 4509 -MISC ChangeLog 4623 RMD160 3a70d24a5c0270bc5cf15c569c367773f519e3c4 SHA1 ab3a2a1230a4c38633d2b1628da96c4fc221062a SHA256 36b068f84f23f5d05856b79a01e52e2a47e898f5ee32198e34bd808c61e58377 -MD5 c9d0346b9d3a7db8cea38c2cbad150ef ChangeLog 4623 -RMD160 3a70d24a5c0270bc5cf15c569c367773f519e3c4 ChangeLog 4623 -SHA256 36b068f84f23f5d05856b79a01e52e2a47e898f5ee32198e34bd808c61e58377 ChangeLog 4623 -MISC ChangeLog~ 4144 RMD160 8b1fe538df438eaf651f38ac234b89c7981ebb21 SHA1 52701fed606cfaa0aa514dba2b35d8ce0a6c9261 SHA256 df3077f32b7799288dc05de9dc0983a384f66a173db70c00ff543332d65a4ed6 -MD5 e4a4ef67e47d45e0a427ac5bfe4468ca ChangeLog~ 4144 -RMD160 8b1fe538df438eaf651f38ac234b89c7981ebb21 ChangeLog~ 4144 -SHA256 df3077f32b7799288dc05de9dc0983a384f66a173db70c00ff543332d65a4ed6 ChangeLog~ 4144 -MISC cernlib-2005-r2.ebuild~ 2518 RMD160 195d7a7e110dc8c9838d780e5d443e90387b2d1d SHA1 f20ede83a6fae515b338ef338fc026d3c9456951 SHA256 140c8e77c1a53c56de1e094ba8d954099329f8aef0f224022a9da5b436094ea6 -MD5 11f0b831458dd8f3e3ec0c3bf421601a cernlib-2005-r2.ebuild~ 2518 -RMD160 195d7a7e110dc8c9838d780e5d443e90387b2d1d cernlib-2005-r2.ebuild~ 2518 -SHA256 140c8e77c1a53c56de1e094ba8d954099329f8aef0f224022a9da5b436094ea6 cernlib-2005-r2.ebuild~ 2518 +DIST root_v5.12.00e.source.tar.gz 18163950 RMD160 249b8947e32ab8ab8a592fb6a846b679ef115f16 SHA1 96ae7260f708f180f8c680a7c41ce8578260a2a1 SHA256 3a91081c55e10a5ed1df43bf9612575371edcb0f071d03561c50c9aefaab32d8 +EBUILD root-5.12.00e.ebuild 4657 RMD160 e7f899322c6fe484d23f3903b786bc9660bd6368 SHA1 2c51aa9b69cd43f1e7132fe201e3350b9b4d0d42 SHA256 54f3fa7d4bf758089d1c9b6a340b88cd6db0b3b13eddc2b78efeeb2f8997772b +MD5 2a95677e4275e94e3757b28d03f7cceb root-5.12.00e.ebuild 4657 +RMD160 e7f899322c6fe484d23f3903b786bc9660bd6368 root-5.12.00e.ebuild 4657 +SHA256 54f3fa7d4bf758089d1c9b6a340b88cd6db0b3b13eddc2b78efeeb2f8997772b root-5.12.00e.ebuild 4657 +MISC ChangeLog 4623 RMD160 51ec5fe8589b5d2f5d604b165672039e6796f24a SHA1 bbba2dad156ed6c0af77ed2c024bb133553b3edd SHA256 d1a776db955fd0035745641225e6e0b9bd3040aec912357d4156774c348b74ed +MD5 51bbf02b428a108a650dc6a352dab02d ChangeLog 4623 +RMD160 51ec5fe8589b5d2f5d604b165672039e6796f24a ChangeLog 4623 +SHA256 d1a776db955fd0035745641225e6e0b9bd3040aec912357d4156774c348b74ed ChangeLog 4623 MISC metadata.xml 656 RMD160 2eda5f5e67a6ff9e27ba190678cae38c847b8c34 SHA1 8071d551ff29c35bfbaccbbd7f98c03d4de61efe SHA256 ef3f0aa46a02f397acdc8ef5ce9314f707330458ea1e066b31affe351a7aaae8 MD5 3f3e300c5f1a90e2ba8e096b55703e56 metadata.xml 656 RMD160 2eda5f5e67a6ff9e27ba190678cae38c847b8c34 metadata.xml 656 SHA256 ef3f0aa46a02f397acdc8ef5ce9314f707330458ea1e066b31affe351a7aaae8 metadata.xml 656 -MISC root-5.12.00a.ebuild~ 4506 RMD160 72590f98b2dcfd812252daa962e20f8f099bc381 SHA1 7fea9a15bf2598d816571c6a53f7375d7b746652 SHA256 f50907b81f986a7e01f6bc90f2f2ed4c74c3e781086a6a088ed0007f37121908 -MD5 a90834235f205d55892a7f98330f2e4f root-5.12.00a.ebuild~ 4506 -RMD160 72590f98b2dcfd812252daa962e20f8f099bc381 root-5.12.00a.ebuild~ 4506 -SHA256 f50907b81f986a7e01f6bc90f2f2ed4c74c3e781086a6a088ed0007f37121908 root-5.12.00a.ebuild~ 4506 -MD5 a3cd847b0e4ae26f513094e079dd3f98 files/digest-root-5.12.00a 747 -RMD160 8b7f4203149751d82a349773830692f004094909 files/digest-root-5.12.00a 747 -SHA256 d65d70b5ad368f05428c3d12af07fcbb8865cfd708d9c64cf44921dd7fa41fcc files/digest-root-5.12.00a 747 +MISC root-5.12.00e.ebuild~ 4510 RMD160 6be2e36b0d19c98ffab195180da14def7b05e8e9 SHA1 e4d38f8116e77306daae064bb997ce24f4a8d71c SHA256 e993faeba81225ad2d039ae5bb46b6d5d69f8b37593600277991f7d3a8fe75a4 +MD5 4c47ce8fb2f58de95430a2eaff12103a root-5.12.00e.ebuild~ 4510 +RMD160 6be2e36b0d19c98ffab195180da14def7b05e8e9 root-5.12.00e.ebuild~ 4510 +SHA256 e993faeba81225ad2d039ae5bb46b6d5d69f8b37593600277991f7d3a8fe75a4 root-5.12.00e.ebuild~ 4510 +MD5 882d713c5fa96abc388f8979a29ef75a files/digest-root-5.12.00e 747 +RMD160 6cb31e442bbb16986d34c742324cc75c93586593 files/digest-root-5.12.00e 747 +SHA256 c104cdc278625563266ea5a20674e6ffc5d862a2ad77b5cb227cebd2164aef90 files/digest-root-5.12.00e 747 diff --git a/sci-physics/root/files/digest-root-5.12.00a b/sci-physics/root/files/digest-root-5.12.00e index 53cc13e0f..ab1455d3d 100644 --- a/sci-physics/root/files/digest-root-5.12.00a +++ b/sci-physics/root/files/digest-root-5.12.00e @@ -4,6 +4,6 @@ SHA256 63828312436b8b720b2ae71f8afabd6cc9ff1060de4ed29370e7ebcd12786ca8 Users_Gu MD5 f8d02b91c2da262ae6787cbe8e589a85 html512.tar.gz 42082413 RMD160 5c710f4e66c054b574958dec42c1e16aa1601000 html512.tar.gz 42082413 SHA256 e28f4366edafa22a8fe26a60f04bcabdefd741edfe1ada4b6d8276cf518dbad6 html512.tar.gz 42082413 -MD5 c1c5d8bb2d6027b8f31d4bc1d16af7fa root_v5.12.00a.source.tar.gz 18334664 -RMD160 874f3bb6df74685ff71ec719b59faf70a1c26da9 root_v5.12.00a.source.tar.gz 18334664 -SHA256 c9ade73854904387f25f239df0eb801e459860bfbaea7d995bf2103cd4a67f01 root_v5.12.00a.source.tar.gz 18334664 +MD5 23104b9973e09c4425f263820eb8bdf2 root_v5.12.00e.source.tar.gz 18163950 +RMD160 249b8947e32ab8ab8a592fb6a846b679ef115f16 root_v5.12.00e.source.tar.gz 18163950 +SHA256 3a91081c55e10a5ed1df43bf9612575371edcb0f071d03561c50c9aefaab32d8 root_v5.12.00e.source.tar.gz 18163950 diff --git a/sci-physics/root/root-5.12.00a.ebuild b/sci-physics/root/root-5.12.00e.ebuild index abed9dec5..af08589eb 100644 --- a/sci-physics/root/root-5.12.00a.ebuild +++ b/sci-physics/root/root-5.12.00e.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit flag-o-matic eutils +inherit flag-o-matic eutils fortran MY_VER=${PV%[a-z]} MY_PATCH=${PV##"${MY_VER}"} @@ -18,39 +18,29 @@ HOMEPAGE="http://root.cern.ch/" SLOT="0" LICENSE="LGPL-2" KEYWORDS="~amd64 ~x86" -IUSE="afs cern doc fftw icc kerberos ldap mysql opengl postgres - python ruby qt3 ssl tiff xml" - -RDEPEND="|| ( - virtual/x11 - x11-libs/libXpm - ) - >=media-libs/freetype-2.0.9 +IUSE="afs cern doc fftw kerberos ldap mysql opengl postgres + python ruby qt3 ssl xml" + +RDEPEND=" sys-apps/shadow ->=sci-libs/gsl-1.8 + >=sci-libs/gsl-1.8 + dev-libs/libpcre + || ( media-libs/libafterimage x11-wm/afterstep ) opengl? ( virtual/opengl virtual/glu ) - mysql? ( >=dev-db/mysql-3.23.49 ) - postgres? ( >=dev-db/postgresql-7.1.3-r4 ) + mysql? ( dev-db/mysql ) + postgres? ( dev-db/postgresql ) afs? ( net-fs/openafs ) kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) qt3? ( =x11-libs/qt-3* ) fftw? ( >=sci-libs/fftw-3 ) python? ( dev-lang/python ) - media-libs/libpng - dev-libs/libpcre cern? ( sci-physics/cernlib ) ruby? ( dev-lang/ruby ) ssl? ( dev-libs/openssl ) - xml? ( dev-libs/libxml2 ) - tiff? ( media-libs/tiff ) - icc? ( dev-lang/icc )" + xml? ( dev-libs/libxml2 )" -DEPEND="${RDEPEND} - || ( - virtual/x11 - x11-proto/xproto - )" +DEPEND="${RDEPEND}" S=${WORKDIR}/${PN} @@ -63,30 +53,43 @@ pkg_setup() { einfo "Example, for PYTHIA, you would do: " einfo "EXTRA_CONF=\"--enable-pythia --with-pythia-libdir=/usr/lib\" emerge root" einfo + + if use cern; then + FORTRAN="gfortran g77" + fortran_pkg_setup + # hack to support gfortran (upstream problem?) + if [[ "${FORTRANC}" == "gfortran" ]]; then + FORTRANLIBS="-lgfortran -lgfortranbegin" + else + FORTRANLIBS="-lg2c" + fi + fi } src_compile() { local rootconf="--disable-xrootd" # first determine building arch - # xrootd still not debugged upstream for amd64 + # xrootd still not debugged upstream for amd64 and probably others + + # icc/ifc still needs some work case ${ARCH} in x86) rootarch=linux - use icc && rootarch=linuxicc + #rootarch=linuxicc rootconf="--enable-xrootd" ;; amd64) rootarch=linuxx8664gcc - use icc && rootarch=linuxx8664icc + #rootarch=linuxx8664icc ;; ia64) rootarch=linuxia64gcc - use icc && rootarch=linuxia64ecc + #rootarch=linuxia64ecc ;; arm) - rootarcg=linuxarm + rootarch=linuxarm ;; ppc) rootarch=linuxppcgcc @@ -107,8 +110,7 @@ src_compile() { *) die "root not supported upstream for this architecture";; esac -s -# use configure cause not autoconf standard + # use configure cause not autoconf standard ./configure ${rootarch} \ --prefix=/usr \ --bindir=/usr/bin \ @@ -129,8 +131,10 @@ s --etcdir=/etc/${PN} \ --disable-alien \ --disable-asimage \ + --disable-builtin-afterimage \ --disable-builtin-freetype \ --disable-builtin-pcre \ + --disable-builtin-zlib \ --disable-chirp \ --disable-dcache \ --disable-globus \ @@ -138,40 +142,42 @@ s --disable-rpath \ --disable-sapdb \ --disable-srp \ - --enable-asimage \ - --enable-builtin-afterimage \ --enable-cintex \ --enable-exceptions \ --enable-explicitlink \ - --enable-mathmore \ --enable-mathcore \ - --enable-roofit \ + --enable-mathmore \ --enable-minuit2 \ --enable-reflex \ - --enable-rpath \ - --enable-shadowpw \ + --enable-roofit \ --enable-shared \ --enable-soversion \ --enable-table \ --enable-thread \ - --enable-xrootd \ + $(use_enable afs) \ + $(use_enable cern) \ $(use_enable kerberos krb5) \ $(use_enable ldap) \ $(use_enable mysql) \ $(use_enable opengl) \ $(use_enable postgres pgsql) \ + $(use_enable python) \ $(use_enable qt3 qt) \ $(use_enable qt3 qtgsi) \ - $(use_enable python) \ $(use_enable ruby) \ - $(use_enable cern) \ - $(use_enable tiff astiff) \ - $(use_enable xml) \ $(use_enable ssl) \ + $(use_enable xml) \ ${rootconf} \ ${EXTRA_CONF} \ || die "configure failed" - emake OPTFLAGS="${CXXFLAGS}" || die "emake failed" + + emake \ + OPTFLAGS="${CXXFLAGS}" \ + F77="${FORTRANC}" \ + F77LIBS="${FORTRANLIBS}" \ + || die "emake failed" + + make cintdlls || die "make cintdlls failed" } src_install() { |