Fix some global libraries issues, see bug #231314, thanks Benjamin Bannier for his patch.

Package-Manager: portage-2.1.4.4

4 files changed, 27 insertions, 82 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index 4322f6257d65..f2fef71712c1 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/geant
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.8 2008/07/06 23:31:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.9 2008/07/10 10:21:10 bicatali Exp $
+
+  10 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  geant-4.9.1_p02.ebuild:
+  Fix some global libraries issues, see bug #231314, thanks Benjamin Bannier
+  for his patch.
 
   06 Jul 2008; Jeroen Roovers <jer@gentoo.org> geant-3.21.14-r1.ebuild:
   Fix duplicate KEYWORDS definition.
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 50f8f2affbac..d50a0cdba4be 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST G4ABLA.3.0.tar.gz 54909 RMD160 5a032ee8e90d00f39b67114fe257ec47001f347b SHA1 5f38676f1650a508e49d35f9405ac96984388135 SHA256 ff0b77be6b36204eeeba71099f6b7530edd80b79eb015994535bc4334bc821eb
 DIST G4EMLOW.5.1.tar.gz 8287134 RMD160 163f76c359bf9d4f8a2eb3d734de50c2b6dc4d72 SHA1 092e27f2befe10f3e4b2f7450d1ba3f9fe0435bb SHA256 b1bebb1a502257ba9d379e6719be7a453b0aa31c9b01d5026866e9bd811c17d9
 DIST G4NDL.3.12.tar.gz 54904967 RMD160 5ea321deb3c1ddc8094c3d28457d627cacd6f2f0 SHA1 d42d0835e8921c15902d7aa410f1207edfbd54df SHA256 05a4d74ff1faa8fa3382fbda780ea258b2e4af7e5ae29856d1deaf72b4235290
@@ -6,8 +9,14 @@ DIST PhotonEvaporation.2.0.tar.gz 7506068 RMD160 24d46b08b2ffeca5b3be186baffb650
 DIST geant321_3.21.14.dfsg-8.diff.gz 41909 RMD160 4edbe5d3dd93a78198fa2d2d83770c8b85eee4de SHA1 39f48c4263f543b74eee6095c11f5ade9798f253 SHA256 785277dab1e1d3e17d60c85f3826bc67bbd6de7e6a6d40ff7af901371c4d2ce1
 DIST geant321_3.21.14.dfsg.orig.tar.gz 10922928 RMD160 253b35bd9cda82c2213ec042274f7e6ff6b9e333 SHA1 ae6f39ccc18eacd576a3493992db5da3b3d3b128 SHA256 186fe98a08ad1de39f68698a09a46e7c2f14c37b22f8f990257b0bd66215c5b4
 DIST geant4.9.1.p02.tar.gz 17538957 RMD160 284c8bc5f7786fda50c8c5954bdf8dea2aace2e5 SHA1 216b705635c838e0d86878953b82525ba9b9ed51 SHA256 0c8c0a5c2e091edd658637d38dea1fa3879493df7ad008cd9d88138758c9402d
-EBUILD geant-3.21.14-r1.ebuild 1862 RMD160 380158e17b201c9b80ec0e176ad158b2ae70364e SHA1 7f177717cf0a92b6cd09cd7dfa6a14717cb9c3e3 SHA256 0a85d220bec9df371c5fafdc385d002ba1d91e9dabc9750ac96caf1452c195fc
 EBUILD geant-3.21.14-r2.ebuild 1862 RMD160 eeda33cc3e52970e9161c3a69a123fd61ed5db3a SHA1 d8faee234755fce52bb5b13106d9afcbbf030a28 SHA256 7e2f02e0f4a2949ba44eb5d68bf78eecaafc04af88f656fc6197de50939687cd
-EBUILD geant-4.9.1_p02.ebuild 6794 RMD160 6171346e10e1f9460816db76dd38859899285035 SHA1 a27dec246620b2ec3d4e3a9aff52f5890aae4629 SHA256 05ede3b384c81de30f3e97f3f850f1430515f957d6c92e72d40d77ece3ae4404
-MISC ChangeLog 1889 RMD160 a5027bb2caf8bc012d7f58bbccb31ae97ae33f93 SHA1 e148379ff9063b902c25dc46a3c621586e0c51fe SHA256 4f1639b3bbd7af923aa2185f45c594b1b1e745af8c10d9f77ededf99dacd367a
+EBUILD geant-4.9.1_p02.ebuild 6905 RMD160 96d4c7f769b0cbda991684bb065cd283e810dea5 SHA1 1d2313e6d1a14446a4e410387e3c80b1383d2821 SHA256 959d1eed8b5e1f4218238d13e11906cf85c2a684a7441df033c521fd75927235
+MISC ChangeLog 2070 RMD160 0c8f3717fc962148417401588c96b43c65f9b85f SHA1 960b68188fc3d44f8d08bc8c868a0e4d10790425 SHA256 45521472e1b7791611ec163ca419b5835205372c86187377a3576166a815ae43
 MISC metadata.xml 636 RMD160 2bbfc0cfcdebe77f9ad05972113ac667f5a54b35 SHA1 10087a104bf422a551a607331e0c17f190b39108 SHA256 d907eea3902c0c887e648f4dcbf8337f5fb157f028001facac1c42e7a35fcb04
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkh14swACgkQ1ycZbhPLE2CQwwCfYM5ybHgHrSP+6QUhnizIa/LW
+vqsAoKgIlVy9kjUdopISgWoYCtztKXAS
+=8WLI
+-----END PGP SIGNATURE-----
diff --git a/sci-physics/geant/geant-3.21.14-r1.ebuild b/sci-physics/geant/geant-3.21.14-r1.ebuild
deleted file mode 100644
index 0bad0e111e92..000000000000
--- a/sci-physics/geant/geant-3.21.14-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-3.21.14-r1.ebuild,v 1.4 2008/07/06 23:31:21 jer Exp $
-
-DEB_PN=geant321
-DEB_PV=${PV}.dfsg
-DEB_PR=8
-DEB_P=${DEB_PN}_${DEB_PV}
-
-inherit eutils multilib fortran
-
-DESCRIPTION="CERN's detector description and simulation Tool"
-HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/geant/index.html"
-
-LICENSE="GPL-2 LGPL-2 BSD"
-SRC_URI="mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
-	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.diff.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-libs/openmotif
-	virtual/lapack
-	dev-lang/cfortran
-	sci-physics/cernlib
-	sci-physics/paw"
-
-DEPEND="${RDEPEND}
-	virtual/latex-base
-	x11-misc/imake
-	x11-misc/makedepend"
-
-S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig"
-
-FORTRAN="gfortran g77 ifc"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${DEB_P}-${DEB_PR}".diff
-	rm -f ${DEB_P}-${DEB_PR}.diff
-	cd "${S}"
-	cp debian/add-ons/Makefile .
-	export DEB_BUILD_OPTIONS="${FORTRANC} nostrip nocheck"
-	sed -i \
-		-e 's:/usr/local:/usr:g' \
-		Makefile || die "sed'ing the Makefile failed"
-
-	einfo "Applying Debian patches"
-	emake -j1 patch || die "debian patch failed"
-
-	# since we depend on cfortran, do not use the one from cernlib
-	rm -f src/include/cfortran/cfortran.h
-}
-
-src_compile() {
-	# create local LaTeX cache directory
-	mkdir -p .texmf-var
-	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 DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}"/debian
-	dodoc changelog README.* deadpool.txt NEWS copyright || die "dodoc failed"
-	newdoc add-ons/README README.add-ons || die "newdoc failed"
-}
diff --git a/sci-physics/geant/geant-4.9.1_p02.ebuild b/sci-physics/geant/geant-4.9.1_p02.ebuild
index 5754ac0eedad..4e8d16819d30 100644
--- a/sci-physics/geant/geant-4.9.1_p02.ebuild
+++ b/sci-physics/geant/geant-4.9.1_p02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.1_p02.ebuild,v 1.2 2008/06/27 10:46:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.1_p02.ebuild,v 1.3 2008/07/10 10:21:10 bicatali Exp $
 
 EAPI="1"
 
@@ -76,6 +76,9 @@ src_unpack() {
 		-e 's:$(G4BIN)/$(G4SYSTEM):$(G4TMP):g' \
 		-e 's:$(G4TMP)/$(G4SYSTEM):$(G4TMP):g' \
 		source/GNUmakefile || die "sed GNUmakefile failed"
+	sed -i \
+		-e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \
+		config/globlib.gmk || die "sed globlib.gmk failed"
 }
 
 src_compile() {
@@ -124,16 +127,16 @@ src_compile() {
 	export G4LIB_BUILD_SHARED=y
 	emake || die "Building shared geant failed"
 
+	if use global; then
+		export G4LIB_USE_GRANULAR=y
+		emake global || die "Building global libraries failed"
+	fi
+
 	if use static; then
 		rm -rf tmp
 		export G4LIB_BUILD_STATIC=y ; unset G4LIB_BUILD_SHARED
 		emake || die "Building static geant failed"
 	fi
-
-	if use global; then
-		export G4LIB_USE_GRANULAR=y
-		emake global || die "Building global libraries failed"
-	fi
 }
 
 g4_create_env_script() {