From: Sebastien Fabbro Date: Mon, 5 Mar 2007 19:02:19 +0000 (+0000) Subject: version bump + adding some fixes from bug #87305. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a23b0cacaac9550736ac28a2ed982ed1e77574d3;p=gentoo.git version bump + adding some fixes from bug #87305. Package-Manager: portage-2.1.2-r9 --- diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index 2a23445e97d9..ad3c44d90217 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-physics/root # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.5 2007/02/05 16:04:09 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.6 2007/03/05 19:02:19 bicatali Exp $ + +*root-5.14.00c (05 Mar 2007) + + 05 Mar 2007; Sébastien Fabbro + +files/sparc-root-5.14.00c.patch, +root-5.14.00c.ebuild: + Version bump. Fixed parallel compiling and sparc architecture with a + patch, from bug #87305, thanks to fmmcor. *root-5.14.00b (05 Feb 2007) diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index 66fed11b56b2..178405884d88 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -9,11 +9,16 @@ AUX root-makefile.patch 742 RMD160 3b5eb20b17eb4797508d691f6e5211888cefaaf7 SHA1 MD5 58ce6f63773b28de747663b7e908e2bb files/root-makefile.patch 742 RMD160 3b5eb20b17eb4797508d691f6e5211888cefaaf7 files/root-makefile.patch 742 SHA256 983a5e3c96302b5347952547b3aa7ffce92cfc962f8ca60cdec313e6a2e69710 files/root-makefile.patch 742 +AUX sparc-root-5.14.00c.patch 1923 RMD160 ea2e0a0d1cc057723738e128a8e52db32a20e573 SHA1 3809bc7bbcd3ae91f664c1f09781928f0a5605f4 SHA256 793af6821f9bd824346f8f4dde3a909ce7eef27db5d95d445c7dea52941603ef +MD5 d3447020df0ccd1186805fa2109ac1be files/sparc-root-5.14.00c.patch 1923 +RMD160 ea2e0a0d1cc057723738e128a8e52db32a20e573 files/sparc-root-5.14.00c.patch 1923 +SHA256 793af6821f9bd824346f8f4dde3a909ce7eef27db5d95d445c7dea52941603ef files/sparc-root-5.14.00c.patch 1923 DIST Users_Guide_5_14.pdf 11080966 RMD160 b969430ae8309ed135de0ef9742ed650cbc9a4a6 SHA1 62d89d63d26792f2a832a27e857954e9f81ad670 SHA256 1879964f493777f5fe2a98aeab290bbcb9adc923a0292b328fced3830ce6fe8e DIST root_v3.05.04.source.tar.gz 9386408 RMD160 d20b2b5d933d8abf1a3343a9b8886a3ed97f1cfb SHA1 481f2b3a60e0c56be0a61f3e652e7e43c065aeb7 SHA256 ae93c08cfe4dc05c53fade420ac560fff88ec967b2e85b26a7268ef12e1bbe9e DIST root_v3.10.02.source.tar.gz 10321619 RMD160 f62f9d4eafbaf383f802ffc5beb2dd17ad1a4935 SHA1 46c1f3d9385470b1bae21e791b0ab1d7c4f81cc3 SHA256 48eb83668c9e4e96fe13581394cd2051c7842d42890692a203b5f262bb5ed72b DIST root_v4.02.00.source.tar.gz 13074632 RMD160 d2ab4f3dd4ae8fe9526aa6e2f1ad23d6b16af42c SHA1 5b1cf9068811898f83057be1a7c9877c291fea24 SHA256 fd4094311c5f3e2566340c00300d6fa681bb27c9d071475d484c4e961bf23dc9 DIST root_v5.14.00b.source.tar.gz 21403104 RMD160 20ecffe3c53ce42363912757f01089cc8b5df4e1 SHA1 d2aba87e1b0c783d6e09b68dd7b83fb85c20322a SHA256 14a0dda40da79bbddc6b0874bd5aba9173685f718dfb326ec068dca700fda12f +DIST root_v5.14.00c.source.tar.gz 21402659 RMD160 b4388a1f1401199e8d1b45d549a4cf73cb6de4c1 SHA1 eb837dd3d09dc954b532728837960256da6e6720 SHA256 cc281db914e7c5d77be4368f6953b63237c56ba8616975b1403e491c5b99e801 EBUILD root-3.05.04.ebuild 1708 RMD160 a8f69d6903d7d400cf3b6adde38018ef3e874e26 SHA1 f3cfb17ead943d166ee2a470ce17076822042e87 SHA256 5f197aeafdaa4f3d96a2c198108551d205db237b9cb3c5751d003fcd3acce139 MD5 857e7d0f03f943002500e0c645e14a25 root-3.05.04.ebuild 1708 RMD160 a8f69d6903d7d400cf3b6adde38018ef3e874e26 root-3.05.04.ebuild 1708 @@ -30,10 +35,14 @@ EBUILD root-5.14.00b.ebuild 3803 RMD160 fe8e2f1335fc3cbc95d4548a933a3f1f3d700765 MD5 6dc377cfb407e09a056206a3d1e00f1b root-5.14.00b.ebuild 3803 RMD160 fe8e2f1335fc3cbc95d4548a933a3f1f3d700765 root-5.14.00b.ebuild 3803 SHA256 b22e1b3fca71a4d53254deb2bf77bfa2e3673f31f16e3cb2b7ff939c8251bb4c root-5.14.00b.ebuild 3803 -MISC ChangeLog 4888 RMD160 9f9ab5e2fd55aaf808216f9373bcb0760a2d0cc8 SHA1 ae7407009324961c616e59f92152b97dd044f358 SHA256 31e4beb6a8e487925e963d7013249a40612e50f06b8a937cfce4d5cffcc940c3 -MD5 b1ac7c77f29203873f323deef37f9304 ChangeLog 4888 -RMD160 9f9ab5e2fd55aaf808216f9373bcb0760a2d0cc8 ChangeLog 4888 -SHA256 31e4beb6a8e487925e963d7013249a40612e50f06b8a937cfce4d5cffcc940c3 ChangeLog 4888 +EBUILD root-5.14.00c.ebuild 4594 RMD160 1b1ee8d0d6a3bca976bffb8d9dc43bff50bd2394 SHA1 751a1c376b95ffcd50b180bef3294709262727da SHA256 1bb5a91160fe1baf844efb8563be7de605a1588c1730abc00389d2405e378299 +MD5 87b07f9cd69047762ea4805383c38115 root-5.14.00c.ebuild 4594 +RMD160 1b1ee8d0d6a3bca976bffb8d9dc43bff50bd2394 root-5.14.00c.ebuild 4594 +SHA256 1bb5a91160fe1baf844efb8563be7de605a1588c1730abc00389d2405e378299 root-5.14.00c.ebuild 4594 +MISC ChangeLog 5149 RMD160 c74aefacb12605b01e14197e6f8dba44419da8aa SHA1 1e62ef1e7ea9952d759dac49e5ea6b94cf07f76a SHA256 3b1d91cd93b6d000a57ee8d482b64cd2b8a9dd4a73ca2f00aa3f3d3a9f964840 +MD5 42070a3acbbfc25bc1466b9c533798b0 ChangeLog 5149 +RMD160 c74aefacb12605b01e14197e6f8dba44419da8aa ChangeLog 5149 +SHA256 3b1d91cd93b6d000a57ee8d482b64cd2b8a9dd4a73ca2f00aa3f3d3a9f964840 ChangeLog 5149 MISC metadata.xml 597 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d SHA1 8fd69478a8a90f6222b1e428961815e0e697905a SHA256 8ae8ab4051e8534ca2df70f81fb999c478b8f1223980c0b366dc0501fa987c6c MD5 0aa16bc6128c88a9afdbf32450c6f8de metadata.xml 597 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d metadata.xml 597 @@ -50,10 +59,13 @@ SHA256 ab4af1c0dccfb80cb26c760547c705a5867657fd5f1bed2515400bb65a06a807 files/di MD5 06e27ee7e2af71eb01c6c1e7ff08b7b7 files/digest-root-5.14.00b 518 RMD160 14963ada9084f713070fbcef5826fe242c330b86 files/digest-root-5.14.00b 518 SHA256 507e823e940868418053b2180ca60e85ea3ab612aa32d1133d7987fe969eb7b4 files/digest-root-5.14.00b 518 +MD5 925bbecd2a66fb5e5a78167311593b92 files/digest-root-5.14.00c 518 +RMD160 36db4bbcbc36669c0fc0d68de34b480e22cb8d2f files/digest-root-5.14.00c 518 +SHA256 cab6449e6d7574cf2d951226d23715e891cb37083ec918433535f5ec810d6bb2 files/digest-root-5.14.00c 518 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFx1W4Wc/Ciu+QQGkRAvuCAJ9jzHswTi4ut91IQz9chMe2C+lHywCdEXZu -6hbQ6axZVBffJOF0MQpxK9I= -=au6z +iD8DBQFF7GlNWc/Ciu+QQGkRAj8uAJ4ga1eFhpY+trKASgB8+acABJjnUwCgi58D +LMp7l0aaJkfVC3SCrKoPAnQ= +=/qaC -----END PGP SIGNATURE----- diff --git a/sci-physics/root/files/digest-root-5.14.00c b/sci-physics/root/files/digest-root-5.14.00c new file mode 100644 index 000000000000..0298fb61e389 --- /dev/null +++ b/sci-physics/root/files/digest-root-5.14.00c @@ -0,0 +1,6 @@ +MD5 c52c3967606b5a07b648d03d7166a5c4 Users_Guide_5_14.pdf 11080966 +RMD160 b969430ae8309ed135de0ef9742ed650cbc9a4a6 Users_Guide_5_14.pdf 11080966 +SHA256 1879964f493777f5fe2a98aeab290bbcb9adc923a0292b328fced3830ce6fe8e Users_Guide_5_14.pdf 11080966 +MD5 4eff38190d89044d19d35856f5358a0d root_v5.14.00c.source.tar.gz 21402659 +RMD160 b4388a1f1401199e8d1b45d549a4cf73cb6de4c1 root_v5.14.00c.source.tar.gz 21402659 +SHA256 cc281db914e7c5d77be4368f6953b63237c56ba8616975b1403e491c5b99e801 root_v5.14.00c.source.tar.gz 21402659 diff --git a/sci-physics/root/files/sparc-root-5.14.00c.patch b/sci-physics/root/files/sparc-root-5.14.00c.patch new file mode 100644 index 000000000000..8735709f7c04 --- /dev/null +++ b/sci-physics/root/files/sparc-root-5.14.00c.patch @@ -0,0 +1,30 @@ +--- root/configure- 2007-02-09 15:44:32.000000000 +0000 ++++ root/configure 2007-02-09 15:48:07.000000000 +0000 +@@ -696,6 +696,7 @@ + linux:x86_64:*) arch=linuxx8664gcc ;; + linux:alpha:*) arch=linuxalphagcc ;; + linux:arm*:*) arch=linuxarm ;; ++ linux:sparc*:*) arch=linux ;; + linux:ppc64*:*) arch=linuxppc64gcc ;; + linux:ppc*:*) arch=linuxppcgcc ;; + linux:i*86:*) arch=linux ;; +--- root/xrootd/src/xrootd/config/ARCHS- 2007-02-09 15:40:20.000000000 +0000 ++++ root/xrootd/src/xrootd/config/ARCHS 2007-02-09 15:43:33.000000000 +0000 +@@ -35,6 +35,7 @@ + x86_64_linux_26 iccx8664 all for AMD Opteron 64 Linux kernel 2.6.x Intel icc + x86_64_linux iccx8664 all for AMD Opteron 64 Linux Intel icc + alpha_linux gcc all for Alpha Linux egcs and glibc ++sparc_linux gcc all for Sparc Linux gcc and glibc + arm_linux gcc no for ARM Linux egcs and glibc + ppc_linux gcc all for PPC Linux egcs/gcc and glibc + ppc_linux gccppc64 all for PPC Linux egcs/gcc and glibc - 64 bit +--- root/xrootd/src/xrootd/configure.classic- 2007-02-09 15:35:58.000000000 +0000 ++++ root/xrootd/src/xrootd/configure.classic 2007-02-09 15:37:38.000000000 +0000 +@@ -421,6 +421,7 @@ + linux:arm*:*) arch=arm_linux ; platform=linux; ccflv=gcc;; + linux:ppc64:*) arch=ppc_linux ; platform=linux; ccflv=gccppc64;; + linux:ppc*:*) arch=ppc_linux ; platform=linux; ccflv=gcc;; ++ linux:sparc*:*) arch=sparc_linux ; platform=linux; ccflv=gcc;; + darwin:power*:7.4*) arch=macosx_74 ; platform=macosx; ccflv=macos;; + darwin:power*:7*) arch=ppc_darwin_70 ; platform=macosx; ccflv=macos;; + darwin:power*:*) arch=macosx ; platform=macosx; ccflv=macos;; diff --git a/sci-physics/root/root-5.14.00c.ebuild b/sci-physics/root/root-5.14.00c.ebuild new file mode 100644 index 000000000000..8355d283e087 --- /dev/null +++ b/sci-physics/root/root-5.14.00c.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.14.00c.ebuild,v 1.1 2007/03/05 19:02:19 bicatali Exp $ + +inherit versionator flag-o-matic eutils toolchain-funcs qt3 + +DOC_PV=$(get_major_version)_$(get_version_component_range 2) + +DESCRIPTION="C++ data analysis framework and interpreter from CERN" +SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz + doc? ( ftp://root.cern.ch/root/doc/Users_Guide_${DOC_PV}.pdf )" +HOMEPAGE="http://root.cern.ch/" + +SLOT="0" +LICENSE="LGPL-2" +KEYWORDS="~amd64 ~sparc ~x86" +IUSE="afs doc fftw kerberos ldap mysql odbc opengl postgres + python ruby qt3 ssl xml" + +DEPEND="sys-apps/shadow + >=sci-libs/gsl-1.8 + dev-libs/libpcre + || ( media-libs/libafterimage x11-wm/afterstep ) + opengl? ( virtual/opengl virtual/glu ) + mysql? ( dev-db/mysql ) + postgres? ( dev-db/postgresql ) + afs? ( net-fs/openafs ) + kerberos? ( app-crypt/mit-krb5 ) + ldap? ( net-nds/openldap ) + qt3? ( $(qt_min_version 3.3.4) ) + fftw? ( >=sci-libs/fftw-3 ) + python? ( dev-lang/python ) + ruby? ( dev-lang/ruby ) + ssl? ( dev-libs/openssl ) + xml? ( dev-libs/libxml2 ) + odbc? ( dev-db/unixODBC )" + +S=${WORKDIR}/${PN} + +pkg_setup() { + elog + elog "You may want to build ROOT with these non Gentoo extra packages:" + elog "AliEn, castor, Chirp, Globus, Monalisa, Oracle, peac, " + elog "PYTHIA, PYTHIA6, SapDB, SRP, Venus" + elog "You can use the EXTRA_CONF variable for this." + elog "Example, for PYTHIA, you would do: " + elog "EXTRA_CONF=\"--enable-pythia --with-pythia-libdir=/usr/$(get_libdir)\" emerge root" + elog +} + +src_unpack() { + unpack ${A} + if [[ ${ARCH} == sparc ]]; then + einfo "Patch to allow ${ARCH} autoconf --- Bug 87305" + # first unpack all the way + cd ${S}/xrootd/src + einfo "Unpacking xrootd and mark it done" + tar xzf xrootd-20060928-1600.src.tgz + #touch headers.d + einfo "Patching for sparc..." + cd ${WORKDIR} + epatch ${FILESDIR}/sparc-${P}.patch + einfo "... complete. Now replace with something more sparc-friendly." + cd ${S}/xrootd/src + einfo "Building a kinder .tgz file" + tar czf xrootd-20060928-1600.src.tgz xrootd + einfo "Destroy all traces" + rm -rf xrootd + einfo "Unpacked for sparc" + fi +} + +src_compile() { + # the configure script is not the standard autotools + ./configure ${EXTRA_CONF} \ + --prefix=/usr \ + --bindir=/usr/bin \ + --mandir=/usr/share/man/man1 \ + --incdir=/usr/include/${PN} \ + --libdir=/usr/$(get_libdir)/${PN} \ + --aclocaldir=/usr/share/aclocal/ \ + --datadir=/usr/share/${PN} \ + --cintincdir=/usr/share/${PN}/cint \ + --fontdir=/usr/share/${PN}/fonts \ + --iconpath=/usr/share/${PN}/icons \ + --macrodir=/usr/share/${PN}/macros \ + --srcdir=/usr/share/${PN}/src \ + --docdir=/usr/share/doc/${PF} \ + --testdir=/usr/share/doc/${PF}/test \ + --tutdir=/usr/share/doc/${PF}/tutorial \ + --elispdir=/usr/share/emacs/site-lisp \ + --etcdir=/etc/${PN} \ + --disable-alien \ + --disable-builtin-afterimage \ + --disable-builtin-freetype \ + --disable-builtin-pcre \ + --disable-builtin-zlib \ + --disable-cern \ + --disable-chirp \ + --disable-dcache \ + --disable-globus \ + --disable-rfio \ + --disable-rpath \ + --disable-sapdb \ + --disable-srp \ + --enable-asimage \ + --enable-astiff \ + --enable-cintex \ + --enable-exceptions \ + --enable-explicitlink \ + --enable-gdml \ + --enable-mathcore \ + --enable-mathmore \ + --enable-minuit2 \ + --enable-reflex \ + --enable-roofit \ + --enable-shared \ + --enable-soversion \ + --enable-table \ + --enable-thread \ + --enable-xrootd \ + $(use_enable afs) \ + $(use_enable fftw fftw3) \ + $(use_enable kerberos krb5) \ + $(use_enable ldap) \ + $(use_enable mysql) \ + $(use_enable odbc) \ + $(use_enable opengl) \ + $(use_enable postgres pgsql) \ + $(use_enable python) \ + $(use_enable qt3 qt) \ + $(use_enable qt3 qtgsi) \ + $(use_enable ruby) \ + $(use_enable ssl) \ + $(use_enable xml) \ + || die "configure failed" + + emake \ + OPTFLAGS="${CXXFLAGS}" \ + rootcint compiledata || die "emake rootcint failed" + emake -j1 \ + OPTFLAGS="${CXXFLAGS}" \ + rootlibs || die "emake rootlibs failed" + emake \ + OPTFLAGS="${CXXFLAGS}" \ + || die "emake failed" + + # is this only for windows? not quite sure. + make cintdlls || die "make cintdlls failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + echo "LDPATH=\"/usr/$(get_libdir)/root\"" > 99root + doenvd 99root + + if use doc; then + einfo "Installing user's guide and ref manual" + insinto /usr/share/doc/${PF} + doins "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf + dohtml -r ${WORKDIR}/htmldoc + fi +}