Added a patch to avoid linking to G4zlib, closing bug #255017, thanks to Benjamin Bannier for the hint

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

4 files changed, 266 insertions, 5 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index bfdbec818d18..9c306cd07707 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-physics/geant
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.18 2009/01/10 12:13:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.19 2009/01/19 19:59:44 bicatali Exp $
+
+*geant-4.9.2-r1 (19 Jan 2009)
+
+  19 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/geant-4.9.2-zlib.patch, +geant-4.9.2-r1.ebuild:
+  Added a patch to avoid linking to G4zlib, closing bug #255017, thanks to
+  Benjamin Bannier for the hint
 
 *geant-4.9.2 (10 Jan 2009)
 
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 3daab105be71..d6dc619f9912 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX geant-4.9.2-zlib.patch 239 RMD160 790953077b7fc59d1ce7c3ed98cdb3dcc3134705 SHA1 7a0552dab08873665b8668a21a8c52841c8e5ae2 SHA256 f5ceee577afeb719718cd23887f9c1eba322077dce1f3d89bc075bacd63e5573
 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 G4EMLOW.6.2.tar.gz 8389172 RMD160 fa51dbb4f0e316b0e682a05c9db4c1dc29db7218 SHA1 627ca63927064f1846aa8d7e2e5c4783fe0b9610 SHA256 1affbc66d8809db0c8e450ca83a0da744e7f5b8e912ec52e93b1f24b47cbd781
@@ -14,13 +15,14 @@ DIST geant4.9.1.p03.tar.gz 17582985 RMD160 ff2d24b65f19809992e3254e8069c35bbc7f0
 DIST geant4.9.2.tar.gz 18752051 RMD160 d6ae7fb718e78fb9bb8fe2b8cfd21dca7ef3a293 SHA1 7e6fd6b254652bd50d534237678a2e2654300210 SHA256 28c9598ee38949e74d839bed5f822b3dcf353c2936d4403ab6a50c11dafac110
 EBUILD geant-3.21.14-r2.ebuild 1878 RMD160 898e60bbacea833a3e59e1ef33c30c8874320fba SHA1 25fd7be7e6943f01fb9dc1afa23c33b287caceaa SHA256 ed1d7b84a70306d49bb697723264339cd1de02bc7d1da173f4d35bb69395d602
 EBUILD geant-4.9.1_p03.ebuild 6846 RMD160 53993f8f170982b90489f914e1767a994065a88f SHA1 3680018d1f835bbcf535a66fed3d8965725d258b SHA256 005d0e5279431dd1b961bef1307ea16ed8b19c0db864769d04a41583a9dec170
+EBUILD geant-4.9.2-r1.ebuild 7391 RMD160 597f7132289027665ab91ba891eee7b2fe52343c SHA1 1f33344160729684c88e844d8b963e1c10d500d6 SHA256 ef9bf7e60ecf4f581fee1c1775193d770fdb9086fb56521759d8ef464ab425b4
 EBUILD geant-4.9.2.ebuild 7243 RMD160 1e54ef255d91d38faf527e795682b5ef49b571fd SHA1 1954b02fb5f22004542757c98225b5a4c78cb38f SHA256 2b992c230887ae303d5a0fc0da0b6cccc83bfb35ad5e82eb793f860572352b68
-MISC ChangeLog 3465 RMD160 af03214cce02c22b993c6d75769024148716b56d SHA1 ed1f5a3ea93bafb746b6c0879c4c127d2bc20329 SHA256 73ebdc447a3abeaf1753fd82b8e96f45f31fb72caff48515ef6a2c2ad8920e81
+MISC ChangeLog 3716 RMD160 e672feebe42a0cf1dcefd9fd81dcad383ebc800e SHA1 87c0de389aaba3d70025bb892093785f35f201f4 SHA256 d0f2c6098a156090b0c98bf02a37ca9d40925fd99cd20da8471c9a1364a6e628
 MISC metadata.xml 1398 RMD160 b6c91f04fffa3b84c1b680944363dd49bf34c8f9 SHA1 b56fe0e1425e823d63054db467c2d543d0386046 SHA256 666fb94f71ea2aa76ed69003fe3d374c0ac89f3c6dda33910e470a99d667d323
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklscoEACgkQ1ycZbhPLE2C2PQCfTfWsH/NO8G/st2RoJf3ek0Bg
-HbcAn2bWLJf6hksXFMRqTtLUQedKzykC
-=tlbd
+iEYEARECAAYFAkl027oACgkQ1ycZbhPLE2CRLgCgn+I3nSBGlDny2f5SheuVRjol
+URMAoIAqxqVn5jG8pt7/iBCjuK10/krT
+=d4i6
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/geant/files/geant-4.9.2-zlib.patch b/sci-physics/geant/files/geant-4.9.2-zlib.patch
new file mode 100644
index 000000000000..7b33733e6bb9
--- /dev/null
+++ b/sci-physics/geant/files/geant-4.9.2-zlib.patch
@@ -0,0 +1,11 @@
+--- config/binmake.gmk.orig	2009-01-19 16:37:42.177379773 +0000
++++ config/binmake.gmk	2009-01-19 16:38:04.671541248 +0000
+@@ -258,7 +258,7 @@
+   endif
+ endif
+ 
+-ifdef G4LIB_USE_ZLIB
++ifdef G4LIB_BUILD_ZLIB
+   LDLIBS2 += -lG4zlib
+ endif
+ 
diff --git a/sci-physics/geant/geant-4.9.2-r1.ebuild b/sci-physics/geant/geant-4.9.2-r1.ebuild
new file mode 100644
index 000000000000..43f2b57c0179
--- /dev/null
+++ b/sci-physics/geant/geant-4.9.2-r1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.2-r1.ebuild,v 1.1 2009/01/19 19:59:44 bicatali Exp $
+
+EAPI="2"
+
+inherit eutils fortran multilib versionator toolchain-funcs
+
+PV1=$(get_version_component_range 1 ${PV})
+PV2=$(get_version_component_range 2 ${PV})
+PV3=$(get_version_component_range 3 ${PV})
+MY_P=${PN}$(replace_version_separator 3 .)
+
+DESCRIPTION="CERN's detector description and simulation Tool"
+HOMEPAGE="http://geant4.cern.ch/"
+
+SRC_COM="http://geant4.web.cern.ch/geant4/support/source"
+SRC_URI="${SRC_COM}/${MY_P}.tar.gz"
+GEANT4_DATA="G4NDL.3.13
+	G4EMLOW.6.2
+	G4RadioactiveDecay.3.2
+	PhotonEvaporation.2.0
+	G4ABLA.3.0"
+for d in ${GEANT4_DATA}; do
+	SRC_URI="${SRC_URI} data? ( ${SRC_COM}/${d}.tar.gz )"
+done
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="athena +data dawn debug examples gdml geant3 global minimal +motif
+	+opengl openinventor qt4 +raytracerx static +vrml zlib"
+
+RDEPEND=">=sci-physics/clhep-2.0.4.2
+	motif? ( x11-libs/openmotif )
+	athena? ( x11-libs/libXaw )
+	qt4? ( || ( x11-libs/qt:4 x11-libs/qt-gui ) )
+	openinventor? ( >=media-libs/openinventor-2.1.5.10-r3 )
+	raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
+	opengl? ( virtual/opengl
+			  athena? ( x11-libs/Xaw3d )
+			  qt4? ( || ( x11-libs/qt:4[opengl] x11-libs/qt-opengl ) ) )
+	gdml? ( dev-libs/xerces-c )
+	geant3? ( sci-physics/geant:3 )
+	dawn? ( media-gfx/dawn )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	FORTRAN="gfortran g77 ifc"
+	use geant3 && fortran_pkg_setup
+	eval unset ${!G4*}
+}
+
+src_prepare() {
+	# fix bad zlib dependency
+	epatch "${FILESDIR}"/${P}-zlib.patch
+
+	# propagate user's flags.
+	sed -i -e 's/-o/$(LDFLAGS) -o/g' source/GNUmakefile || die
+	sed -i \
+		-e "/CXXFLAGS[[:space:]]*.=[[:space:]]-O2/s:=.*:= ${CXXFLAGS}:" \
+		-e "/FCFLAGS[[:space:]]*.=[[:space:]]-O2/s:=.*:= ${FFLAGS:--O2}:" \
+		-e "/CCFLAGS[[:space:]]*.=[[:space:]]-O2/s:=.*:= ${CFLAGS}:" \
+		-e "s:-Wl,-soname:${LDFLAGS} -Wl,-soname:g" \
+		config/sys/Linux*gmk || die "flag substitution failed"
+
+	# fix forced lib directory
+	sed -i \
+		-e 's:$(G4LIB)/$(G4SYSTEM):$(G4LIB):g' \
+		config/binmake.gmk || die "sed binmake.gmk failed"
+	sed -i \
+		-e '/$(G4LIB)\/$(G4SYSTEM)/d' \
+		config/architecture.gmk || die "sed architecture.gmk failed"
+	sed -i \
+		-e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \
+		config/common.gmk || die "sed common.gmk failed"
+	sed -i \
+		-e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \
+		-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_configure() {
+	export GEANT4_DIR="/usr/share/${PN}${PV1}"
+	# where to put compiled libraries;
+	# we set env var G4LIB in src_install()
+	# to avoid confusing make
+	export GEANT4_LIBDIR=/usr/$(get_libdir)/${PN}${PV1}
+
+	# these should always to be set
+	[[ $(tc-getCXX) = ic*c ]] && export G4SYSTEM=Linux-icc \
+							  || export G4SYSTEM=Linux-g++
+	export G4INSTALL="${S}"
+	export G4INCLUDE="${D}/usr/include/${PN}"
+	export CLHEP_BASE_DIR=/usr
+
+	# parse USE; just set flags of drivers to build, G4*_USE_* vars are set
+	# later automatically for G4*_BUILD_*_DRIVER
+	use minimal             && export G4UI_NONE=y \
+							&& export G4VIS_NONE=y
+
+	use motif               && export G4UI_BUILD_XM_SESSION=y
+	use athena              && export G4UI_BUILD_XAW_SESSION=y
+	use qt4                 && export G4UI_BUILD_QT_SESSION=y
+
+	use dawn                && export G4VIS_BUILD_DAWN_DRIVER=y
+	use raytracerx          && export G4VIS_BUILD_RAYTRACERX_DRIVER=y
+	use openinventor        && export G4VIS_BUILD_OI_DRIVER=y
+	use opengl              && export G4VIS_BUILD_OPENGLX_DRIVER=y
+	use opengl && use motif && export G4VIS_BUILD_OPENGLXM_DRIVER=y
+
+	use geant3              && export G4LIB_BUILD_G3TOG4=y
+	use zlib                && export G4LIB_USE_ZLIB=y
+	use vrml                && export G4VIS_BUILD_VRML_DRIVER=y \
+							&& export G4VIS_BUILD_VRMLFILE_DRIVER=y
+
+	use data                && export G4DATA="${GEANT4_DIR}/data"
+	use debug               && export G4DEBUG=y || export G4OPTIMIZE=y
+
+	# switch to see compiling flags
+	export CPPVERBOSE=y
+
+	# if shared libs are built, the script will also build static libs
+	# with pic flags
+	# avoid that by building it twice and removing temporary objects
+	export G4LIB_BUILD_SHARED=y
+
+}
+
+src_compile() {
+	cd "${S}/source/"
+	emake || die "Building shared geant failed"
+
+	if use global; then
+		export G4LIB_USE_GRANULAR=y
+		emake global || die "Building global libraries failed"
+		emake || die "Rebuilding shared geant 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
+}
+
+g4_create_env_script() {
+	# we need to change some variables to the final values since we hide these
+	# from make during the compile
+	export G4INSTALL=${GEANT4_DIR}
+	export G4LIB=${GEANT4_LIBDIR}
+	export G4INCLUDE=${G4INCLUDE/${D}/}
+	export G4WORKDIR=\${HOME}/${PN}${PV1}
+
+	local g4env=99${PN}${PV1}
+	cat <<-EOF > ${g4env}
+		LDPATH=${G4LIB}
+		CLHEP_BASE_DIR=${CLHEP_BASE_DIR}
+	EOF
+
+	# detailed data file locations
+	if use data; then
+		G4LEVELGAMMADATA="${G4DATA}/$(basename ${WORKDIR}/PhotonEvaporation*)"
+		G4RADIOACTIVEDATA="${G4DATA}$(basename ${WORKDIR}/RadioactiveDecay*)"
+		G4LEDATA="${G4DATA}/$(basename ${WORKDIR}/G4EMLOW*)"
+		G4ABLADATA="${G4DATA}/$(basename ${WORKDIR}/G4ABLA*)"
+		G4NEUTRONHPCROSSSECTIONS="${G4DATA}/$(basename ${WORKDIR}/G4NDL*)"
+		export G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA \
+			G4ABLADATA G4NEUTRONHPCROSSSECTIONS
+	fi
+
+	# read env variables defined upto now
+	printenv | grep ^G4 | uniq >> ${g4env}
+	# define env vars for capabilities we can build into user projects
+	printenv | uniq | \
+		sed -n -e '/^G4/s:BUILD\(.*\)_DRIVER:USE\1:gp' >> ${g4env}
+	doenvd ${g4env} || die "Installing environment scripts failed "
+}
+
+src_install() {
+	# install headers via make since we want them in a single directory
+	cd "${S}/source/"
+	einfo "Installing Geant4 headers"
+	emake includes || die 'Installing headers failed'
+	cd "${S}"
+
+	# but install libraries and Geant library tool manually
+	einfo "Installing Geant4 libraries"
+	insinto ${GEANT4_LIBDIR}
+	insopts -m0755
+	doins tmp/*.so || die
+	doins tmp/libname.map || die
+	insopts -m0644
+	if use static; then
+		doins tmp/*.a || die
+	fi
+	exeinto ${GEANT4_LIBDIR}
+	doexe tmp/liblist || die
+
+	g4_create_env_script
+
+	# configs
+	insinto ${GEANT4_DIR}
+	doins -r config || die
+
+	# install data
+	if use data; then
+		einfo "Installing Geant4 data"
+		insinto ${G4DATA}
+		pushd "${WORKDIR}" > /dev/null
+		for d in ${GEANT4_DATA}; do
+			local p=${d/.}
+			doins -r *${p/G4} || die "installing data ${d} failed"
+		done
+		popd > /dev/null
+	fi
+
+	# doc and examples
+	insinto /usr/share/doc/${PF}
+	local mypv="${PV1}.${PV2}.${PV3}"
+	doins ReleaseNotes/ReleaseNotes${mypv}.html
+	[[ -e ReleaseNotes/Patch${mypv}-1.txt ]] && \
+		dodoc ReleaseNotes/Patch${mypv}-*.txt
+
+	use examples && doins -r examples
+
+	# TODO: * momo with momo or java flag, and check java stuff
+}
+
+pkg_postinst() {
+	elog "Geant4 projects are by default build in \$HOME/geant4."
+	elog "If you want to change, set \$G4WORKDIR to another directory."
+}