Version bumps. Tests are not in tar ball anymore. Might have to re-apply patch for data environment variables

Package-Manager: portage-2.2.01.21418-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

6 files changed, 53 insertions, 328 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index 6cf399ee0c82..0a45d9e98a6e 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-physics/geant
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.67 2012/10/24 19:42:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.68 2012/12/14 16:51:50 bicatali Exp $
+
+*geant-4.9.5_p02 (14 Dec 2012)
+*geant-4.9.6 (14 Dec 2012)
+
+  14 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> +geant-4.9.5_p02.ebuild,
+  +geant-4.9.6.ebuild, -geant-4.9.2_p02.ebuild, -geant-4.9.5-r1.ebuild,
+  -geant-4.9.5_p01.ebuild, metadata.xml:
+  Version bumps. Tests are not in tar ball anymore. Might have to re-apply patch
+  for data environment variables
 
   24 Oct 2012; Ulrich Müller <ulm@gentoo.org> geant-3.21.14-r2.ebuild,
   geant-3.21.14-r3.ebuild, geant-4.9.2_p02.ebuild, geant-4.9.5-r1.ebuild,
@@ -335,4 +344,3 @@
   24 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml,
   +geant-3.21.14.ebuild:
   Initial import.
-
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 428f6f1bacca..e4f01468ee17 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -14,45 +14,29 @@ AUX geant-4.9.5-scripts-only-dataenv.patch 2046 SHA256 1b878d401e117337d0d6c6b65
 AUX geant-4.9.5_p01-scripts-only-dataenv.patch 2047 SHA256 db809c4866129cb9c9f2eabdf3e0decf25a3f97b8a4742a6de5b76ff3ce452f6 SHA512 7a0a719f296b8c186fa6a8196fc0a89338f960ed7399a5ce624a7bf794d34819ebc6ddc69cdfdca09194c7e0c83a4d05cae46f06792c1e7e7159cd93231c4040 WHIRLPOOL 33bcb6a9ec9a53120ccd170ee56276c6a660c9739762e8c76b4da6c3f55b811a64e9f8f946911b7662359f18069c138ac47f3d4509b73cbfb426204a620d1ff6
 DIST G4ABLA.3.0.tar.gz 54909 SHA256 ff0b77be6b36204eeeba71099f6b7530edd80b79eb015994535bc4334bc821eb
 DIST G4EMLOW.6.19.tar.gz 14396144 SHA256 8876defe74e4c1e9d6b58b2365a9b468ac8d996fb63fa1c6ba6240e0b185845f
-DIST G4EMLOW.6.2.tar.gz 8389172 SHA256 1affbc66d8809db0c8e450ca83a0da744e7f5b8e912ec52e93b1f24b47cbd781
-DIST G4NDL.3.13.tar.gz 57034762 SHA256 e994b873032b3d1c0bcc2679275c43354d3e1cd5091da76c8fcd4826536f17a3
 DIST G4NDL.3.14.tar.gz 58794491 SHA256 08ff1d4fb0953f2502d88f76fb9db1d4314c975564731f11c9372d0ea992cafa
 DIST G4NEUTRONXS.1.0.tar.gz 1186619 SHA256 577d28b7faa41caacb001a30384028cd5e3b7018755ab94a427ce0a7feeab365
 DIST G4PII.1.2.tar.gz 3387814 SHA256 80e680d7343ed051bcfffd910c682cfd66980cecd1c0bc435f06c6c740a6f99d
 DIST G4PhotonEvaporation.2.1.tar.gz 7504003 SHA256 08ab657a060518c9b7aab03b17628cbb31585ee9512e0f2033f2fb0d7d9b2bc7
-DIST G4RadioactiveDecay.3.2.tar.gz 761070 SHA256 31dc70aa59cb86ef0dbaf96c639e0541b7569d4fc98f92064ecdc8bc4b9c839b
 DIST G4RadioactiveDecay.3.3.tar.gz 732628 SHA256 7f421d6808422f9186a8a96fc1889a54af03c80a37b9f9d1d51ab359ea0264d1
-DIST PhotonEvaporation.2.0.tar.gz 7506068 SHA256 5aac0ce683ca23274a7736c8e8911d8cf32d2bf33aab33a9a23126664762d61d
 DIST RealSurface.1.0.tar.gz 1257863 SHA256 3e2d2506600d2780ed903f1f2681962e208039329347c58ba1916740679020b1
 DIST geant321_3.21.14.dfsg-8.diff.gz 41909 SHA256 785277dab1e1d3e17d60c85f3826bc67bbd6de7e6a6d40ff7af901371c4d2ce1
 DIST geant321_3.21.14.dfsg-9.diff.gz 47589 SHA256 419bc2315e2692fe84b353d445cbae7af995d84a6a0290b7f9051ee041243d20
 DIST geant321_3.21.14.dfsg.orig.tar.gz 10922928 SHA256 186fe98a08ad1de39f68698a09a46e7c2f14c37b22f8f990257b0bd66215c5b4
-DIST geant4.9.2.p02.tar.gz 18822956 SHA256 4d19bb76bf956004481bc433bf4735780ccc6354d3dc53321d532fd283243078
 DIST geant4.9.4.p03.tar.gz 25241424 SHA256 5090ca5b506238f16ba2ae2176221a18b6fde06f91180850a109fae1006910c0
-DIST geant4.9.5.p01.tar.gz 28466803 SHA256 451f8c4a29bb0dc4b923d59d77535a657f0f8a30dc6c8ef639c8b1ebdb26a10e
-DIST geant4.9.5.tar.gz 28458437 SHA256 b6b31752319805052fb765f89ca38a23fb299a0a5bf900daeacd1950d6c9a597
+DIST geant4.9.5.p02.tar.gz 28491693 SHA256 adb04fce9472228bb10d78cbc7f40493bfb37454beee22e7c80d630646cd3777 SHA512 0081ecdae0b61d8790a7083691d17e3d7727f8c065f412a94d61e2c01ae27d9585d7d91059795da251a34d7305cc04e17eb37d189df8b52f68974c3290272ad6 WHIRLPOOL ce36ba544f18484b6a2b8ffd19b68f126578177806a77a3aa55981254afd8b59a1567b654111879529a31be8e92e5ddf8da46dabc49ad447b40dee8a8f012e3b
+DIST geant4.9.6.tar.gz 25433109 SHA256 3b1caf87664ef35cab25563b2911653701e98c75a9bd6c64f364d1a1213247e5 SHA512 54b2622da86d669728719958dcbcc52dfe58ca2e5ed2d7f43d10b032e4a732363fe54a359417b33c471b29708c6733cb4e3afeda746cc1d3bdec72d0c1df1a19 WHIRLPOOL 892db0b4cae7ffa8c51279ae64d0cc366fe953eca406b2c8f55352a39bab9c80f5b8564a771211c95c3789d70c3d8f092b44e3a61b4cd2515c3e151cae6e8ecd
 EBUILD geant-3.21.14-r2.ebuild 1863 SHA256 280320afafaed437cb867022573df8db82440fe432ad65da970fb960efcd0b9a SHA512 49d0dbe37041d311f2e7f4180ae22c44855504ad93750abc442be931d916bcdae756c4de144610802bc166dd415bb032fc81aeeacab4f1b6f36b10c72392ca14 WHIRLPOOL a67420977142aa5572b9807b31ad739346b30fc8f45eedf2a69eb54b07d13845e66d1eb02f84b91bccb5c0a4e5280d8152298f705f08e5ac85f1ba54d026aaed
 EBUILD geant-3.21.14-r3.ebuild 1690 SHA256 05a1337ee41d67fcb5283efd7fff00c53ec257036e38a5af6115fca75e450688 SHA512 47149caab3dbca468591616d2c3a99c8b7b012e95e6f62e8c3a5853ee6f7ff9f1d49da46c9bd2b9e49140dc017c96ea25e4ad224b16946fcbfaed92be83b68be WHIRLPOOL a49f8f6f4403808e2127bd4babfa73fed5a517d94b7822b1b2de14eb46981e3e9e410ff7f348c558395fa8710fd997f4e280a0cadef4efe349a4061fad633ce5
-EBUILD geant-4.9.2_p02.ebuild 8128 SHA256 4af32f8638746f833f47c577ee90c89a4c6014faeea969babcaa9ce420b17fa8 SHA512 224d7610ad5b1495c5e26453323947e69ed0eebffe00678a87b1b8dc848d4814f29e4de3c34cc3b29beda01696ab2957c9f765acc6d59828764bd410c971fb23 WHIRLPOOL b9d17d47297b7e45fa4aa2e85a79bc293549ce067b055e6ad0bc5439c479b10938e1b2adbb33bb430fd2e6b599a766f063eddf8e954942baad4c7a9d5fe3e827
 EBUILD geant-4.9.4_p03.ebuild 2377 SHA256 f836adf68676439be4e6c155ca39bc5ca7c220954c6156a7e8a007cf930eda3a SHA512 fb08dede3c779b1d547aba9a6a45f5f8bdcb8f1fbf8aad3921d80da271c4d366103dd12291c2a6759d814d7348ecb8386dca265216c6ab467300136438bfcb8f WHIRLPOOL e0d05c95f0d333934a7df2622801d1c6c12de0dee54bdce268760e64445cde94fad5aa85d429c80a540adccfc34bf6b42a7e40fac855ef4e11a9f1dc5dd723fd
-EBUILD geant-4.9.5-r1.ebuild 3027 SHA256 f2c4da1c6d8955f424a91f42af9e1400a73d03fc2bbc59d38b3c35a999a46171 SHA512 dd5913b35649e49897c6e0877aa50bcdbe1625f65598b2706332f0eafc99cbf539caa301a845712bdf22f7b54eb1f52a3d04d7d37ec87f575f6d338329d6b11e WHIRLPOOL ba75d750ccbd319ff5b11dde36d37d049fe402e5190f295ddf606f9844962554d6cbfbaa8631eccec4c22011cdabe35b63874b9f419e5bf723933a1ca086a31b
-EBUILD geant-4.9.5_p01.ebuild 3021 SHA256 65243963624b794d7ef6b2271762fc12cf48ea77a56564acdeae113d496d2e7a SHA512 88cc850ee9f004cf37ed24d2a99225221c42fab588bad83c3de378b9386dc613ac7bb6bf61bdbf78c2f55eedf077b54490bd125505a6e5f9029cf7f08b39384c WHIRLPOOL bab7590d60dfae7ca5e1718c6ee0662b2495efba3fcc4db8f777b193887c3382eb544d8ca76926a2bc339fa7d7a9adade4bb8b13b927d3d310b6de50a62506d6
-MISC ChangeLog 13025 SHA256 686101944bf6d2d5828b8f01b645717b1bcb1eba20e92543ffe0bbc736def9fe SHA512 71784cf37a75ba03faaf59fad3756300cc6d07a0a92bae939495bddf3009272bb81304c6cd4a62c0438609a64e2b36557d8c5ab8c85db853fce1831bac66019d WHIRLPOOL 80969a99c482135aba40c2f7eeec7c24bf4b26ecd25f5413a202180f7d35827f01d1acd36d1d427cd0d0e916ffca4ee71eb54e86a5a83301c223fa2d56687e81
-MISC metadata.xml 1569 SHA256 532c396760c97bbf207439e4f189679bbe02fda61d33446beeebc5f855b36f63 SHA512 f675415df5040df08ad490c3118eb49dc6cb729c23abeb5521608f22b24ad6a74bfe1198bf2af8a2e8eae30cc0759fbe3f0d1b6ec6209d7204cdbd1d5ebb330e WHIRLPOOL b0e3b6b023d817de186740dd47e0593c1574c68915b546d78f75dc97374ed6c23988aa9a6dbdd7ef866f388dbd1d399a6f218857a75e2cec5d856b527a4d2203
+EBUILD geant-4.9.5_p02.ebuild 2996 SHA256 3385d13a2ebcd717ad2a9decf2880b74d981f09426132d78886a4867309df45f SHA512 9a8200ee0f1cfa4d8b5467d9cdb7a748782b91d31719df9c9e20d96cac9c75a39a1b3e21696ac53ae154f77a5f517756ad89ebb4c9282005e73fd63bf8526146 WHIRLPOOL 294967b4cf419788e4b23d56479dafd3e9a25ac0c5cbe22be8da0faf1f223add291e8e1051831f8c563abc13f0d66b59fe0b64823b99cc6bd3646cefb5c701e9
+EBUILD geant-4.9.6.ebuild 2882 SHA256 dabc1b726f811789a0c1756173d79ebfff715bb753410158fb82fe5b8ddecf51 SHA512 6334ab6de26ed7b098c375803374ef40a82d6960203343b586b87a3b420dec6626d2ac3c25e8ab4f9ac57be014b87a3c0c27a5b06ada6b438848533ac2290581 WHIRLPOOL b3200b0340672adfe7ecb74c3d2bdc3411144492d4dc83e894f25e1d9db575ba163c6e425e6e07a067fcb51df59b8a7210b5488d6dd1d12e0f34ac58a55b8ae2
+MISC ChangeLog 13396 SHA256 0192b04e22319b104403f5db343f83b1526e8ec3c0fa7faf022adc74badbbfd6 SHA512 bcefb3661c0b1102ec33369790c5745e1f1842d0eff3d5ad2bb08172d05f375142499ddf78451fd999d7a947d3a78fbb7cd3589f097aa7385a9a86240e0ca8ba WHIRLPOOL f3be6f8c57a205b6e845853d1d9cd68101fbf4300943c80f74b21b2e6a76187aa98b7b7a0daa81532efbd0a480520fcd0188be5bb7fea968c4fca55c84e7335f
+MISC metadata.xml 1559 SHA256 1998a5c57e775d84d17cb91f0b5865c95f3a00572b3eba51dfc339398b05c503 SHA512 1ab29ce2cf1b8bdd848eb6d6c3df567df001026ad1d26b9c55880a9239b7593eae3b8fd13a7b55f9110b9869b69f486fd11ec7e0964b1b307e8d9a5a308a7ae7 WHIRLPOOL d5e49493699cb2545ee624600ebdd13fbb4a64ff4402cc491784739ef86b19a0701fc03bb153191830519e0a4d9a0d7eb8350cfed7664504ca7beea71e602288
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQiETDAAoJEDxpGckxwJCBUhkQAJZOpSTBMQ8fJwgZQOH4SGYP
-NQIXALYGXJan6q0IbglrK0K9Q/Y0tTh8Vb1FSqwm1uPLEvV1vX0o5+YPYhKid6be
-ENArhac4Vta3z1IqeofSmF+LMKoOJPUIZ/Fg/7UllR06q1RYfZEqSllkAIR2wYZ3
-N1U35nI4l5ZJzKZlnN54DY1wwWlwhFe3cU9hqCD9mDfRgps2vWaCq8Tjker5aYNS
-BBn0m13Lr0ZpwtoZxuWAtjtSrERoiVLZ7aqlbgLeCnEuakSIGoRyRMshn5tbfoSD
-3BVuH7noCwiNJVXZrHl/eJQXKamZ9wiQWbZdoZWCB+ikCP+pKHMdSB/Q1uAw2G7p
-Tc27+JaIfGHR0tJvlpjRCwVrvjg9P+zAHM0gFbrYf3kUWE/H3NCSaXx0p+AYsTYR
-Cl6arNUGG8y55Mmld2m8RCLjs+t2rgojbRoMSPpgbAuUxFrAKS50Xvi9lSFcMAwS
-Ppr0LGh02xodYLdq7j1OxW2k6mbLau6fWn1AsYzI2wXqkQmevmPBvP91hV/Mg0Zb
-eVnWMNM+5fMOClFdHlaeJ4ORfyLpuqBQ1a78nWhL1XiU2JOYpmX/QxyGDQjVKeD6
-LaHDzpp8YamdAIHjfby1sVajVWYWoMa7i/1O5R1ZgSXbbeE7r0QHcriq1ZECtaKu
-hroOlAHNF+tS8qjU8PYh
-=gLU7
+iEYEAREIAAYFAlDLWZsACgkQ1ycZbhPLE2CMnACfQWEYx4OC/8HBnYQQaYt84fz1
+lPIAoKVfsXovbd35/DwtQNVAxi0HDhPV
+=UO8E
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/geant/geant-4.9.2_p02.ebuild b/sci-physics/geant/geant-4.9.2_p02.ebuild
deleted file mode 100644
index 20c0726865bf..000000000000
--- a/sci-physics/geant/geant-4.9.2_p02.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2012 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_p02.ebuild,v 1.18 2012/10/24 19:42:46 ulm Exp $
-
-EAPI=2
-
-inherit eutils fortran-2 multilib toolchain-funcs versionator
-
-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="Toolkit for simulation of passage of particles through matter"
-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 x86"
-IUSE="aida athena +data dawn debug examples gdml geant3 global minimal +motif
-	+opengl openinventor qt4 +raytracerx static +vrml zlib"
-
-RDEPEND="
-	<sci-physics/clhep-2.1
-	motif? ( x11-libs/motif:0 )
-	athena? ( x11-libs/libXaw )
-	qt4? ( x11-libs/qt-gui:4 )
-	openinventor? ( >=media-libs/openinventor-2.1.5.10-r3 )
-	raytracerx? (
-		x11-libs/libX11
-		x11-libs/libXmu )
-	opengl? (
-		virtual/opengl
-		athena? ( x11-libs/libXaw3d )
-		qt4? ( x11-libs/qt-opengl:4 ) )
-	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-2_pkg_setup
-	eval unset ${!G4*}
-}
-
-src_prepare() {
-	# fix bad zlib dependency
-	epatch "${FILESDIR}"/${PN}-4.9.2-zlib.patch
-
-	# propagate user's flags and compiler settings
-	sed -i -e 's/-o/$(LDFLAGS) -o/g' source/GNUmakefile || die
-	sed -i \
-		-e '/CXX.*:=.*g++/d' \
-		-e '/FC.*:=.*gfortran/d' \
-		-e 's/\(CXXFLAGS.*:=\).*/\1 -ansi/' \
-		-e '/CXXFLAGS.*+=.*pipe/d' \
-		-e "/CXXFLAGS.*=.*-O2/s|=.*|= ${CXXFLAGS}|" \
-		-e "/FCFLAGS.*=.*-O2/s|=.*|= ${FCFLAGS}|" \
-		-e "/CCFLAGS.*=.*-O2/s|=.*|= ${CFLAGS}|" \
-		-e "s|-Wl,-soname|${LDFLAGS} -Wl,-soname|g" \
-		-e "s/libq\*/lib\[q,Q\]t*/g" \
-		config/sys/Linux*gmk || die "flag substitution failed"
-	sed -i \
-		-e 's:g++:$(CXX):g' \
-		config/*.gmk || die "sed for forced g++ 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' \
-		config/moc.gmk || die "sed moc.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"
-
-	# work around a non defined fortran compiler
-	use geant3 && export FC=$(tc-getFC)
-	# don't worry about the g++ name of the file, we remove all specific
-	export G4SYSTEM=Linux-g++
-}
-
-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}
-	export G4INSTALL="${S}"
-	export G4WORKDIR="${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
-	if use qt4; then
-		export G4UI_BUILD_QT_SESSION=y
-		export QTLIBS="-L/usr/$(get_libdir)/qt4 -lQtCore -lQtGui"
-		export QTFLAGS="-I/usr/include/qt4 -I/usr/include/qt4/Qt"
-		use opengl && \
-			export GLQTLIBS="${QTLIBS} -lQtOpenGL"
-		#export QTFLAGS="${QTFLAGS} -I/usr/include/qt4/QtOpenGL"
-	fi
-	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 gdml                && export G4LIB_BUILD_GDML=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 aida                && export G4ANALYSIS_USE=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/"
-	einfo "Building shared library"
-	emake || die "Building shared geant failed"
-
-	if use global; then
-		export G4LIB_USE_GRANULAR=y
-		einfo "Building granular libraries"
-		emake global || die "Building global libraries failed"
-		emake || die "Rebuilding shared geant failed"
-	fi
-
-	if use static; then
-		einfo "Building static libraries"
-		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."
-}
diff --git a/sci-physics/geant/geant-4.9.5_p01.ebuild b/sci-physics/geant/geant-4.9.5_p02.ebuild
index d5ff9a83eccf..12906d3b82a0 100644
--- a/sci-physics/geant/geant-4.9.5_p01.ebuild
+++ b/sci-physics/geant/geant-4.9.5_p02.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5_p01.ebuild,v 1.5 2012/10/24 19:42:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5_p02.ebuild,v 1.1 2012/12/14 16:51:50 bicatali Exp $
 
 EAPI=4
 
-inherit cmake-utils eutils fortran-2 versionator
+inherit cmake-utils eutils fortran-2 versionator multilib
 
 PV1=$(get_version_component_range 1 ${PV})
 PV2=$(get_version_component_range 2 ${PV})
@@ -19,7 +19,7 @@ LICENSE="geant4"
 SLOT="4"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor
-	raytracerx qt4 static-libs test vrml zlib"
+	raytracerx qt4 static-libs vrml zlib"
 
 RDEPEND="
 	>=sci-physics/clhep-2.1.1
@@ -37,12 +37,12 @@ S="${WORKDIR}/${MYP}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.9.4-zlib.patch
-	"${FILESDIR}"/${P}-scripts-only-dataenv.patch )
+	"${FILESDIR}"/${PN}-4.9.5_p01-scripts-only-dataenv.patch )
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DGEANT4_USE_SYSTEM_CLHEP=ON
-		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+		-DCMAKE_INSTALL_LIBDIR="${EROOT}usr/$(get_libdir)"
 		$(use openinventor && echo "-DINVENTOR_SOXT_LIBRARY=${EROOT}usr/$(get_libdir)/libInventorXt.so")
 		$(cmake-utils_use data GEANT4_INSTALL_DATA)
 		$(cmake-utils_use dawn GEANT4_USE_NETWORKDAWN)
@@ -54,7 +54,6 @@ src_configure() {
 		$(cmake-utils_use openinventor GEANT4_USE_INVENTOR)
 		$(cmake-utils_use qt4 GEANT4_USE_QT)
 		$(cmake-utils_use raytracerx GEANT4_USE_RAYTRACER_X11)
-		$(cmake-utils_use test GEANT4_ENABLE_TESTING)
 		$(cmake-utils_use vrml GEANT4_USE_NETWORKVRML)
 		$(cmake-utils_use zlib GEANT4_USE_SYSTEM_ZLIB)
 		$(cmake-utils_use_build static-libs STATIC_LIBS)
diff --git a/sci-physics/geant/geant-4.9.5-r1.ebuild b/sci-physics/geant/geant-4.9.6.ebuild
index 2ebd54038578..93937d2276b1 100644
--- a/sci-physics/geant/geant-4.9.5-r1.ebuild
+++ b/sci-physics/geant/geant-4.9.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5-r1.ebuild,v 1.9 2012/10/24 19:42:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.6.ebuild,v 1.1 2012/12/14 16:51:50 bicatali Exp $
 
 EAPI=4
 
-inherit cmake-utils eutils fortran-2 versionator
+inherit cmake-utils eutils fortran-2 versionator multilib
 
 PV1=$(get_version_component_range 1 ${PV})
 PV2=$(get_version_component_range 2 ${PV})
@@ -18,43 +18,40 @@ SRC_URI="http://geant4.cern.ch/support/source/${MYP}.tar.gz"
 LICENSE="geant4"
 SLOT="4"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor
-	raytracerx qt4 static-libs test vrml zlib"
+IUSE="+data dawn examples gdml geant3 motif opengl openinventor
+	raytracerx qt4 static-libs vrml zlib"
 
 RDEPEND="
-	>=sci-physics/clhep-2.1.1
+	dev-libs/expat
+	>=sci-physics/clhep-2.1.3
 	dawn? ( media-gfx/dawn )
 	gdml? ( dev-libs/xerces-c )
 	motif? ( x11-libs/motif:0 )
 	opengl? ( virtual/opengl )
 	openinventor? ( media-libs/openinventor )
-	raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
 	qt4? ( x11-libs/qt-gui:4 opengl? ( x11-libs/qt-opengl:4 ) )
+	raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MYP}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.9.4-zlib.patch
-	"${FILESDIR}"/${PN}-4.9.5-scripts-only-dataenv.patch )
+PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch )
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DGEANT4_USE_SYSTEM_CLHEP=ON
-		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+		-DCMAKE_INSTALL_LIBDIR="${EROOT}usr/$(get_libdir)"
 		$(use openinventor && echo "-DINVENTOR_SOXT_LIBRARY=${EROOT}usr/$(get_libdir)/libInventorXt.so")
 		$(cmake-utils_use data GEANT4_INSTALL_DATA)
 		$(cmake-utils_use dawn GEANT4_USE_NETWORKDAWN)
 		$(cmake-utils_use gdml GEANT4_USE_GDML)
 		$(cmake-utils_use geant3 GEANT4_USE_G3TOG4)
-		$(cmake-utils_use granular GEANT4_BUILD_GRANULAR_BUILD)
 		$(cmake-utils_use motif GEANT4_USE_XM)
 		$(cmake-utils_use opengl GEANT4_USE_OPENGL_X11)
 		$(cmake-utils_use openinventor GEANT4_USE_INVENTOR)
 		$(cmake-utils_use qt4 GEANT4_USE_QT)
 		$(cmake-utils_use raytracerx GEANT4_USE_RAYTRACER_X11)
-		$(cmake-utils_use test GEANT4_ENABLE_TESTING)
 		$(cmake-utils_use vrml GEANT4_USE_NETWORKVRML)
 		$(cmake-utils_use zlib GEANT4_USE_SYSTEM_ZLIB)
 		$(cmake-utils_use_build static-libs STATIC_LIBS)
diff --git a/sci-physics/geant/metadata.xml b/sci-physics/geant/metadata.xml
index 7d3677c6e528..837a9e3e4319 100644
--- a/sci-physics/geant/metadata.xml
+++ b/sci-physics/geant/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-physics</herd>
-	<longdescription lang="en">
+<herd>sci-physics</herd>
+<longdescription lang="en">
   Geant simulates the passage of subatomic particles through matter, for
   instance, particle detectors. Geant 3 simulations are performed by
   linking Fortran code supplied by the user with the Geant libraries,
@@ -11,21 +11,21 @@
   Geant 4 is a complete rewrite in C++ with addition of other modern
   features and detectors.
 </longdescription>
-	<use>
-		<flag name="athena">Enable the MIT Athena (<pkg>x11-libs/libXaw</pkg>)
-    widget set (default is Motif)</flag>
-		<flag name="data">Add a lot of standard physics data files for geant4</flag>
-		<flag name="dawn">Add support for <pkg>media-gfx/dawn</pkg> (3D postscript
-    rendering)</flag>
-		<flag name="gdml">Enable geometry markup language for xml</flag>
-		<flag name="geant3">Add compatibility for geant321 to geant4</flag>
-		<flag name="global">Produce a huge global library instead of small
+<use>
+  <flag name="athena">Enable the MIT Athena (<pkg>x11-libs/libXaw</pkg>)
+  widget set (default is Motif)</flag>
+  <flag name="data">Add a lot of standard physics data files for geant4</flag>
+  <flag name="dawn">Add support for <pkg>media-gfx/dawn</pkg> (3D postscript
+  rendering)</flag>
+  <flag name="gdml">Enable geometry markup language for xml</flag>
+  <flag name="geant3">Add compatibility for geant321 to geant4</flag>
+  <flag name="global">Produce a huge global library instead of small
   ones</flag>
-		<flag name="granular">Produce many small libraries instead of global ones</flag>
-		<flag name="aida">Add support for Abstract Interfaces for Data Analysis </flag>
-		<flag name="openinventor">Add support for <pkg>media-libs/openinventor</pkg>
-    SGI toolkit</flag>
-		<flag name="raytracerx">Enable raytracing for physics events</flag>
-		<flag name="vrml">Enable output of geant4 in vrml formats</flag>
-	</use>
+  <flag name="granular">Produce many small libraries instead of global ones</flag>
+  <flag name="aida">Add support for Abstract Interfaces for Data Analysis </flag>
+  <flag name="openinventor">Add support for <pkg>media-libs/openinventor</pkg>
+  SGI toolkit</flag>
+  <flag name="raytracerx">Enable raytracing for physics events</flag>
+  <flag name="vrml">Enable output of geant4 in vrml formats</flag>
+</use>
 </pkgmetadata>