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

(Portage version: 2.1.4.4)

3 files changed, 15 insertions, 79 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/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() {