New use flag to trigger external herwig library

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

6 files changed, 103 insertions, 44 deletions

diff --git a/sci-physics/cernlib-montecarlo/ChangeLog b/sci-physics/cernlib-montecarlo/ChangeLog
index bab18bfabea7..f0ac414f8122 100644
--- a/sci-physics/cernlib-montecarlo/ChangeLog
+++ b/sci-physics/cernlib-montecarlo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-physics/cernlib-montecarlo
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.5 2008/09/05 07:46:26 opfer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.6 2009/04/17 18:02:42 bicatali Exp $
+
+*cernlib-montecarlo-2006-r2 (17 Apr 2009)
+
+  17 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/cernlib-montecarlo-2006-noherwig.pach, metadata.xml,
+  -cernlib-montecarlo-2006.ebuild, +cernlib-montecarlo-2006-r2.ebuild:
+  New use flag to trigger external herwig library
 
   05 Sep 2008; Christian Faulhammer <opfer@gentoo.org>
   cernlib-montecarlo-2006.ebuild:
diff --git a/sci-physics/cernlib-montecarlo/Manifest b/sci-physics/cernlib-montecarlo/Manifest
index 05cc26206bde..7ae82b9547fa 100644
--- a/sci-physics/cernlib-montecarlo/Manifest
+++ b/sci-physics/cernlib-montecarlo/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST mclibs_2006.dfsg.2-1.diff.gz 35476 RMD160 ab74f1a53c13aac8b7dd106911c74b7528f3efd4 SHA1 dd52a0c04ff20d5dcbb41f33735e9496ecff99c3 SHA256 9b323f66d089ddc4a115dca4856234ff8bd27cf19c8dff25a1265f0a26ddbfc6
+AUX cernlib-montecarlo-2006-noherwig.pach 1993 RMD160 00bbaa63f49daf9311e6c33bc3711f3f0f8806a6 SHA1 a0faaa0244e2e9f8917e3639098a610777a10fb8 SHA256 bb85c46eb9d2acaf95dad615aac3b3c08b2607aea3368f7bbadd2532d58e177d
 DIST mclibs_2006.dfsg.2-5.diff.gz 38713 RMD160 24a7186fcc39174871044c782830ad42c11c1873 SHA1 2aba8e42db0fc317e559092b9d51b16520ac7678 SHA256 3c0d73211ad0cbb6c8b8c2d329a93ffcd853475e3027f5bb82120c112e0d0123
 DIST mclibs_2006.dfsg.2.orig.tar.gz 7406559 RMD160 116bc443dafc299d66d0e83080c1b3b5b34d41b9 SHA1 4c86439750f0b0824bf2f58cf9f2dab810be5293 SHA256 8e73ccb987cb8f930ed44eac807d4f8fd5b03d6926b2f8d62ffb6b31806acf73
 EBUILD cernlib-montecarlo-2006-r1.ebuild 1822 RMD160 230c6dd6dd5d285de0263eeb3f5dcb79962bd5e1 SHA1 04065bb6acca12e0fe4fd9c18606956c7647a0d0 SHA256 062b8f23a2b2a0f71f3bdfb558842b6dd9145e1b989292eb20b4dec90102389b
-EBUILD cernlib-montecarlo-2006.ebuild 1873 RMD160 45087636f8280dbf17c89daf15bab8cc9728b58f SHA1 228c471e670fa2cdc917b8fee33ba90916e70270 SHA256 b28bee020488387269b2b6f57bdbe3c711a9153af62de2482b0224978d17b6d5
-MISC ChangeLog 1162 RMD160 e874ea3f3f3c51695bb479ea2af4ef9c4d5609d9 SHA1 ba1deb3dedf0388b1ed05c876219bbd98ae17e56 SHA256 8a0be3bd3b77964da7b7aa7543f236413ae9535a7ee770a7005f3f8d971a215e
-MISC metadata.xml 521 RMD160 a4e90c0fd499ed1ee69a6d7b24723dbfcb7b3926 SHA1 29c78dd03fc7e89b50786c42ce42bac295d3bc2f SHA256 af5aea6c7cfa8536dfbf94bb99ba41f810b8495c3f3733a7c6d3a1a81438c1d0
+EBUILD cernlib-montecarlo-2006-r2.ebuild 1866 RMD160 2cc546735560628560d78344057e0bf4abd95edf SHA1 ee520fe45355045596f34b306f8a32bbc5c4ae15 SHA256 fe9ba5b7d912899f0aacbf89a6b37d603d3aa453f31f3bf78559da1ad3499b40
+MISC ChangeLog 1447 RMD160 f23bed3749733bdf057e9fd16e85bfd283cc2be5 SHA1 d6479b76b5bc8a4cbfc5b965c421c4ec40658a79 SHA256 1b221df364b8f481fb9b4d050c5425dfd6152c3a4feb85aec25a16fc40e02568
+MISC metadata.xml 665 RMD160 af9455141b04bef1ca123e0972dfe42394ed4114 SHA1 8fa6aaafe86b3e4d9cae2f1251d8a94a44872ec4 SHA256 c5e63a2fc2c3e38285e31547e814cfab76b8aac8da77114a9a0d7ad16ef38dc5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkjA49gACgkQNQqtfCuFneMHRwCdFr8G8cMEaQlxBhnxIUXbzN8R
-GYgAnjykiL0/Mq5cU1jj7t91bVt1Gzjk
-=t/SI
+iEYEARECAAYFAknoxEoACgkQ1ycZbhPLE2DO6wCdGzmhIoRKOCol2qLSgBgRhvgc
+W2IAmgMXj216B3aBbJNzga4mz8hK3TQG
+=1pRv
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006.ebuild b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild
index a8ab8cae75a9..2ab5a9d4a4eb 100644
--- a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006.ebuild
+++ b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006.ebuild,v 1.4 2008/09/05 07:46:26 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild,v 1.1 2009/04/17 18:02:42 bicatali Exp $
 
-inherit eutils multilib fortran
+EAPI=2
+inherit eutils toolchain-funcs
 
 DEB_PN=mclibs
 DEB_PV=${PV}.dfsg.2
-DEB_PR=1
+DEB_PR=5
 DEB_P=${DEB_PN}_${DEB_PV}
 
 DESCRIPTION="Monte-carlo library and tools for the cernlib"
@@ -17,12 +18,12 @@ SRC_URI="mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE=""
+IUSE="+herwig"
 
 RDEPEND="x11-libs/openmotif
-	virtual/lapack
 	dev-lang/cfortran
-	sci-physics/cernlib"
+	sci-physics/cernlib
+	herwig? ( !sci-physics/herwig )"
 
 DEPEND="${RDEPEND}
 	virtual/latex-base
@@ -31,42 +32,37 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig"
 
-FORTRAN="gfortran g77 ifc"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${DEB_P}-${DEB_PR}".diff
-
+src_prepare() {
+	cd "${WORKDIR}"
+	epatch "${WORKDIR}/${DEB_P}-${DEB_PR}.diff"
 	cd "${S}"
 	cp debian/add-ons/Makefile .
+	export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck"
 	sed -i \
 		-e 's:/usr/local:/usr:g' \
 		Makefile || die "sed'ing the Makefile failed"
 
 	einfo "Applying Debian patches"
-	emake -j1 \
-		DEB_BUILD_OPTIONS="${FORTRANC} ${nostrip}" \
-		patch || die "make patch failed"
+	emake -j1 patch || die "debian patch failed"
+
+	use herwig || epatch "${FILESDIR}"/${P}-noherwig.patch
 
 	# since we depend on cfortran, do not use the one from cernlib
-	# (adapted from debian/cernlib-debian.mk)
-	mv -f src/include/cfortran/cfortran.h \
-		src/include/cfortran/cfortran.h.disabled
-	# create local LaTeX cache directory
-	mkdir -p .texmf-var
+	rm -f src/include/cfortran/cfortran.h
 }
 
 src_compile() {
-	emake -j1 \
-		DEB_BUILD_OPTIONS="${FORTRANC} nostrip" \
-		|| die "emake failed"
+	VARTEXFONTS="${T}"/fonts
+	emake -j1 cernlib-indep cernlib-arch || die "emake failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}"/shlib \
+		emake -j1 cernlib-test || die "emake test failed"
 }
 
 src_install() {
-	emake \
-		DEB_BUILD_OPTIONS="${FORTRANC} nostrip" \
-		DESTDIR="${D}" \
-		install || die "emake install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	cd "${S}"/debian
 	dodoc changelog README.* deadpool.txt copyright || die "dodoc failed"
 	newdoc add-ons/README README.add-ons || die "newdoc failed"
diff --git a/sci-physics/cernlib-montecarlo/files/cernlib-montecarlo-2006-noherwig.pach b/sci-physics/cernlib-montecarlo/files/cernlib-montecarlo-2006-noherwig.pach
new file mode 100644
index 000000000000..d0cb42d1ba42
--- /dev/null
+++ b/sci-physics/cernlib-montecarlo/files/cernlib-montecarlo-2006-noherwig.pach
@@ -0,0 +1,52 @@
+diff --git a/mclibs-2006.dfsg.2.orig/Makefile b/mclibs-2006.dfsg.2.orig/Makefile
+index f3c89fd..780499e 100644
+--- a/mclibs-2006.dfsg.2.orig/Makefile
++++ b/mclibs-2006.dfsg.2.orig/Makefile
+@@ -89,9 +89,6 @@ install-includes:
+ 	done ; \
+ 	done
+ 
+-	# install some symlinks, e.g. herwig$$version -> herwig
+-	rm -f $(DESTDIR)$(includedir)/herwig && \
+-		ln -sf herwig59 $(DESTDIR)$(includedir)/herwig
+ 	rm -rf $(DESTDIR)$(includedir)/isajet758
+ 	mv $(DESTDIR)$(includedir)/isajet $(DESTDIR)$(includedir)/isajet758
+ 	ln -sf isajet758 $(DESTDIR)$(includedir)/isajet
+@@ -128,14 +125,12 @@ install-arch: install-includes
+ 	fi
+ 
+ 	# ... and mclibs documentation
+-	for dir in cojets eurodec herwig isajet pdflib ; do \
++	for dir in cojets eurodec isajet pdflib ; do \
+ 		install -d -m 0755 $(MCDOC)/$$dir ; \
+ 	done
+ 	install -p -m 0644 $(CERN_DOCDIR)/cojets.txt $(MCDOC)/cojets/
+ 	install -p -m 0644 $(CERN_DOCDIR)/isa* $(MCDOC)/isajet/
+ 	install -p -m 0644 $(CERN_DOCDIR)/eurodec.txt $(MCDOC)/eurodec/
+-	install -p -m 0644 $(CVSCOSRC)/mclibs/herwig/doc/herwig59 \
+-		$(MCDOC)/herwig/herwig59.txt
+ 	install -p -m 0644 $(CVSCOSRC)/mclibs/pdf/dpdf/pdfdoc.doc \
+ 		$(MCDOC)/pdflib/pdfdoc.txt
+ 
+diff --git a/mclibs-2006.dfsg.2.orig/src/mclibs/Imakefile b/mclibs-2006.dfsg.2.orig/src/mclibs/Imakefile
+index 0c9867d..0f04f1b 100644
+--- a/mclibs-2006.dfsg.2.orig/src/mclibs/Imakefile
++++ b/mclibs-2006.dfsg.2.orig/src/mclibs/Imakefile
+@@ -6,7 +6,7 @@
+    to them and their dependents.  They have already been purged from
+    Debianized source code.  Also, re-order libs so that dependent ones
+    come after dependees. */
+-LIBDIRS= cojets eurodec pdf photos herwig isajet
++LIBDIRS= cojets eurodec pdf photos isajet
+ 
+ SUBDIRS = $(LIBDIRS)
+ 
+@@ -16,7 +16,7 @@ InstallLibSubdirs($(LIBDIRS))
+ InstallSharedLibSubdirs($(LIBDIRS))
+ 
+ /* Again, purge Pythia, Jetset and dependents. */
+-INCLUDEDIRS= cojets eurodec herwig isajet pdf
++INCLUDEDIRS= cojets eurodec isajet pdf
+ 
+ InstallIncludeSubdirs($(INCLUDEDIRS))
+ 
diff --git a/sci-physics/cernlib-montecarlo/metadata.xml b/sci-physics/cernlib-montecarlo/metadata.xml
index 44b82fa188e8..cacbb7ee6b3f 100644
--- a/sci-physics/cernlib-montecarlo/metadata.xml
+++ b/sci-physics/cernlib-montecarlo/metadata.xml
@@ -9,4 +9,8 @@
   The libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are not
   available for Gentoo: see cernlib Debian packaging for explanation.
 </longdescription>
+<use>
+    <flag name="herwig">Build Herwig internal event generator, newer version
+    available in <pkg>sci-physics/herwig</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index e3e38b0114be..54281ccacf21 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -14,16 +14,16 @@ DIST geant321_3.21.14.dfsg.orig.tar.gz 10922928 RMD160 253b35bd9cda82c2213ec0422
 DIST geant4.9.1.p03.tar.gz 17582985 RMD160 ff2d24b65f19809992e3254e8069c35bbc7f0159 SHA1 970f5afd8e649faaa71d400b748f62224f538d34 SHA256 d791b7aa9da983af4f06f3f271574df0d3a01102c5584469bdabd9675be3ad33
 DIST geant4.9.2.p01.tar.gz 18793848 RMD160 ed09043acbcf22e309a22b0f418bba798e5ffb7b SHA1 57089fce2a0e585df1159325eb6cd9e526edf088 SHA256 969c9593f9dd65da8d43cbfad91c79859855c356629cfa33c2a759a685ece404
 DIST geant4.9.2.tar.gz 18752051 RMD160 d6ae7fb718e78fb9bb8fe2b8cfd21dca7ef3a293 SHA1 7e6fd6b254652bd50d534237678a2e2654300210 SHA256 28c9598ee38949e74d839bed5f822b3dcf353c2936d4403ab6a50c11dafac110
-EBUILD geant-3.21.14-r2.ebuild 1853 RMD160 3ae5d2a4a61e53dc180e5423bb021a264e205d9b SHA1 373546e86c390814a6ea1fdff3a3dc3f639c3238 SHA256 8cc5fdc5e03f6818587a0e6a92beea642e03efd80016ad2cc970cccc1f143c04
+EBUILD geant-3.21.14-r2.ebuild 1815 RMD160 2969f754e7e0c11de10f7aefc21a5b1bb9c62d8e SHA1 eeb5eff7859832276ec28c9fa2e8cd07aec82bdc SHA256 52fdd33f4986c3f8c27949349e768ce7c9d16fa0fcd6524ff84ebf8e58ec5832
 EBUILD geant-4.9.1_p03.ebuild 6846 RMD160 53993f8f170982b90489f914e1767a994065a88f SHA1 3680018d1f835bbcf535a66fed3d8965725d258b SHA256 005d0e5279431dd1b961bef1307ea16ed8b19c0db864769d04a41583a9dec170
 EBUILD geant-4.9.2-r2.ebuild 7729 RMD160 c07e18c00aa2a2e15e258d2ee394b44576689730 SHA1 f695844e0020c1e54406217921c6f6fc8870ea0b SHA256 0582de356c76b8801a9b109346d91718687d1af3c96f7b0b3608805b7c658957
 EBUILD geant-4.9.2_p01.ebuild 7685 RMD160 b9c14864dbe2c88e016fa5c1dfa7a8273978060d SHA1 bf882671dbdab4c0203ae4f6a2957470a452ba56 SHA256 af65a1f7c17757109cd19ce9f4836716db5f023c0815292965f83520fc4887c5
-MISC ChangeLog 5037 RMD160 de8066945ffdb2866cfef53c63ca8c7333f91a25 SHA1 d44b2502d38302703fe9cc5833afb385bb3ee184 SHA256 bd2ff01796a98fc2efd58908eddba26689e3a6404622071b0b1161a12be06b80
+MISC ChangeLog 5202 RMD160 2c5eafa93ed2308f16028780d543647a2f65fa64 SHA1 7855335d0451db17e5ffc95adc1d5a0b071c2123 SHA256 ab0ef12507cedecfc6ad0020da35368a66351a452af287a8fd6ef02eb22849a5
 MISC metadata.xml 1398 RMD160 b6c91f04fffa3b84c1b680944363dd49bf34c8f9 SHA1 b56fe0e1425e823d63054db467c2d543d0386046 SHA256 666fb94f71ea2aa76ed69003fe3d374c0ac89f3c6dda33910e470a99d667d323
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknH2OYACgkQ1ycZbhPLE2DyMACglEPfO8gg9OR5g3dgbiU4erl4
-XL0AoJWJS9FfHIVVBQzIlWVUmF8LwEky
-=Qri7
+iEYEARECAAYFAknoxLQACgkQ1ycZbhPLE2BfowCdE+OpZvX2+jqtm7ivhE0BAGNi
+70gAoI+Gs0vF6XH7tn8ZCSVxIa5ZkUke
+=g5+q
 -----END PGP SIGNATURE-----