Split installation of all data into a new package sci-physics/geant-data, also fixing bug #472550

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

3 files changed, 18 insertions, 17 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index d121ead97d20..ee9b4f5244ce 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-physics/geant
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.73 2013/06/05 16:14:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.74 2013/06/10 16:51:50 bicatali Exp $
+
+*geant-4.9.6_p02-r1 (10 Jun 2013)
+
+  10 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +geant-4.9.6_p02-r1.ebuild, -geant-4.9.6_p01.ebuild:
+  Split installation of all data into a new package sci-physics/geant-data, also
+  fixing bug #472550
 
 *geant-4.9.6_p02 (05 Jun 2013)
 
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 7805d460b7e1..7ca19aef2cb2 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -27,19 +27,18 @@ DIST geant321_3.21.14.dfsg-8.diff.gz 41909 SHA256 785277dab1e1d3e17d60c85f3826bc
 DIST geant321_3.21.14.dfsg-9.diff.gz 47589 SHA256 419bc2315e2692fe84b353d445cbae7af995d84a6a0290b7f9051ee041243d20 SHA512 fd04f42e5ca8bc7f8015bacf038a78e90ac0ebc95ab85ed65e2010a7c05aed8874057de9f28e11fefee8b6c6b983a5db8dcd8480953c185e6d45d1ca16adba01 WHIRLPOOL 6ca0e08fdf464076dda58cd26dc7c92511d82315ea58979de8201c3f8eeab6860bb136d1ebffcea23b7a53b71b5a6a894495b3153c905aa31f9260517f30e526
 DIST geant321_3.21.14.dfsg.orig.tar.gz 10922928 SHA256 186fe98a08ad1de39f68698a09a46e7c2f14c37b22f8f990257b0bd66215c5b4 SHA512 733a77e529ecfe17c35d1e0bf44cf9062dbd9f2e3880e12cbfabf7372e6c60ea9690df010574094b44aef6fe306dfd85dfd4f42641b8f03efda3938a50313734 WHIRLPOOL fc2b230e1bf2ae1157cf9c92f474ff72fc1f3158e5db5a8f1a7d4f7c983fae9b886dc1aeb148019cb961bc602abc629d75a1aa728d66b10887daa45de040def6
 DIST geant4.9.4.p03.tar.gz 25241424 SHA256 5090ca5b506238f16ba2ae2176221a18b6fde06f91180850a109fae1006910c0
-DIST geant4.9.6.p01.tar.gz 25450720 SHA256 575c45029afc2405d70c38e6dcfd1a752564b2540f33a922230039be81c8e4b6 SHA512 8cb773e42b446c2716a0c09c6381fd45b37200fc7a69a33c68f72968165adf91e5b4254252e8b12b1b8d309912a6c7f73ed2f065b08e1c067a862e03e105cc9c WHIRLPOOL 2e7a6665bffe5bbed9a2d3876f934f5afd181d68115ad34bbc7bf71f9d29c5fb3877c18fcbbf30be4db3db415aeb25d001a8b0eae131cdb154f45732377f0280
 DIST geant4.9.6.p02.tar.gz 25480383 SHA256 cf5df83b7e2c99e6729449b32d3ecb0727b4692317426b66fc7fd41951c7351f SHA512 dab5f31568074869adecbbfb8855be0c0a2e92e5ba3119dbeb9cd414878721df3052198a05e5e3c19d0e2942a22602c6618dc0628b05134d3403a50c2bc2032c WHIRLPOOL 8c66d8aa1605a42e6b6f054c32eb49df0bb2afcdf54360ff630908ce7cfc8a7a37b62cdb2a1612af05f1f70a5575c6516aad1f6737a67692449b01e1137b2865
 EBUILD geant-3.21.14-r2.ebuild 1863 SHA256 280320afafaed437cb867022573df8db82440fe432ad65da970fb960efcd0b9a SHA512 49d0dbe37041d311f2e7f4180ae22c44855504ad93750abc442be931d916bcdae756c4de144610802bc166dd415bb032fc81aeeacab4f1b6f36b10c72392ca14 WHIRLPOOL a67420977142aa5572b9807b31ad739346b30fc8f45eedf2a69eb54b07d13845e66d1eb02f84b91bccb5c0a4e5280d8152298f705f08e5ac85f1ba54d026aaed
 EBUILD geant-3.21.14-r3.ebuild 1719 SHA256 53205b50b0d88302d5be5de4858ed392333a774dd47784f4c9f16a66855cfb6b SHA512 3b89b08be9e4659ac992d6d20cdde8d4a4d6fce84f272b2a29955c683de48300d5b702026daee964a484704a18b11606e8a72c4dcb37edd72f28d29fc6611a62 WHIRLPOOL 0898d71760e2b6e22680d7943f94382a23de3effdbd25b6e00fb883a708fda0be78d80fbdfb6f683ce4dfe8910fcea5a4418136effcad0baf99df4fc0015787b
 EBUILD geant-4.9.4_p03.ebuild 2375 SHA256 30f9299cd3e4497ef9a9e5dd67c77d48705ceef8dfb514f9a0a17b8e2bbf5da9 SHA512 e474e165bfec3de1841dfdba6770c9516327e9cfb9b69235db4b00014ffcdb070cbefac6335977c225b3a20b874bcf411ad666e782bd966692bfe734b677ed09 WHIRLPOOL 618b2f5b4ea75c5997c9b925e357003a30e2d2ee7ea1db0702f5dcf92d5d84e49602d7fe2acaecc77560443a827aa5c26b722688a00367cce88d4e6aaa05d2a5
-EBUILD geant-4.9.6_p01.ebuild 2897 SHA256 aace3f612832348a84d10ebed13ff72c2de7a3d990103ff39cc5dd3dfb45027f SHA512 4369a2e44f701f0db579ff3ea2f816d0d6ee7598e021b0c120ef1012642457ad33b9fc0ea985d490e513f9bc9cabf54eb189d982208ba4607857ab2e3f05be31 WHIRLPOOL 3c2cd50401945706b978e0a4d4be7f369be41c235364920330433fafeb0acfdcff1adb054248f29e8229471e198c975b501095efdb72d6d9b0e7470b558ee6d1
+EBUILD geant-4.9.6_p02-r1.ebuild 2712 SHA256 9b3b9d16847eab229f1254261837a100105decfba5fe2c245b461fb20e57105d SHA512 9b9a6761ba5eb2a456b9ba3420c1d32487e38ceca98f233b86c9f3981ca2bdcbe5514f5187da6c87a8c939587acb3f6d1e097c5f7f76a1dbeb3b0ea76bbb70dd WHIRLPOOL 8af399fc9e832aa7a8e1c2fb688db08a554c3510d2a29c5764992dd410fe7e6df98c7f80a700d32fde13c9a19066516c247300ab47a961f7aa055ce9693a0db9
 EBUILD geant-4.9.6_p02.ebuild 3501 SHA256 e670778d9a66288c2949476610227bb395960ab6af54badc7b48f6e60c92cab8 SHA512 4a96820cc8ad1f2b55b57d4adce8eab23559c32df652a11fe66966fae3b1a82f55136735ebdeb4f2c03983807546d30dfb92d8cfbd2d830d734b6bd909361c7f WHIRLPOOL 831190944b9040520e3e6a8129c38fe9537afdadd638ad24ed4a30c5e574066d56932debcac79bf6a7a99330255859af9793e44e2e2c53902dbc75b1d8417d7b
-MISC ChangeLog 14470 SHA256 f97803740126c1910eb0860a21164230dac97d83e63c2b4ad15d6d7e0a6d6e3b SHA512 97fcb3d8b3c91b294648c27486013aedb84e6fff828184669d098768fc805cfce66656d1a1dabf630243559844b2891d3dbcd8176828c7bddcf91f03c7579b20 WHIRLPOOL 148aee89d813e7223870274f5ae1fedb171297ced8004a5eefe1d9a40393cfd4094f0c7683f3824f164646dca1f3783de0ddb6801c227a9e1806b89ecc64d6a0
+MISC ChangeLog 14718 SHA256 644c84043e20a2cb4c045302598b866be5ac310a945a8d8955d052fb6270e0c6 SHA512 96ac8ca724dcdaa45d19baa6e16c2e93820c4c919750ca6d5efe9e0459e7aa8dbf67de015d0c74af01d38901c47f236ecca2e849af5c7607aa8184f6ebfc944f WHIRLPOOL 39f6e9ab97759f724c33f3781f269327c43a4c1c31744b2c7e1cfd0432bdc095bc917e015eaef253ebdab1121a4ae0c637165aef06dee19de3435970181c4320
 MISC metadata.xml 1282 SHA256 e7090594c8ba19a806d91d8e6bc96f86cea40dd985450b0e61b32121fabc35c8 SHA512 9288e028c5c5741921715ef6f6d9ca521138145e12611d7390b95072bf41ee725ea304965ac1b8d34db5881805fbf6bc3026d8076c280cca753f600893cb17f5 WHIRLPOOL e45205873b54f324ab20226dab43e9216651736417d1c4b83bd1daaf609e0177dce200c98b5b1826d617c5f6edb6a415d83c9f28b6f405a3de5eae168cbde298
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGvY/IACgkQ1ycZbhPLE2BrsACdGaO2hEMUAVCqFTl1AulkZ0Vs
-b/QAnRqEQS+Zg5pxvVQI5Dp01owjfN7m
-=fXRM
+iEYEAREIAAYFAlG2BCcACgkQ1ycZbhPLE2DmcgCfaB6AqXLfsTL4onlMPsme1pnI
+/WMAn27YOQ3rmg0spU3kEp7b5qYJyXn7
+=/I2g
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/geant/geant-4.9.6_p01.ebuild b/sci-physics/geant/geant-4.9.6_p02-r1.ebuild
index 33b46bfcb804..df0179a6a414 100644
--- a/sci-physics/geant/geant-4.9.6_p01.ebuild
+++ b/sci-physics/geant/geant-4.9.6_p02-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.6_p01.ebuild,v 1.2 2013/03/02 23:26:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.6_p02-r1.ebuild,v 1.1 2013/06/10 16:51:50 bicatali Exp $
 
 EAPI=5
 
@@ -33,6 +33,7 @@ RDEPEND="
 	raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}"
+PDEPEND="data? ( ~sci-physics/geant-data-${PV} )"
 
 S="${WORKDIR}/${MYP}"
 
@@ -42,8 +43,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DGEANT4_USE_SYSTEM_CLHEP=ON
 		-DCMAKE_INSTALL_LIBDIR="${EROOT}usr/$(get_libdir)"
+		-DGEANT4_INSTALL_DATA=OFF
 		$(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)
@@ -62,8 +63,7 @@ src_configure() {
 src_install() {
 	# adjust clhep linking flags for system clhep
 	# binmake.gmk is only useful for legacy build systems
-	sed -i "s,-lG4clhep,-lCLHEP," config/binmake.gmk || die "sed failed"
-
+	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
 	cmake-utils_src_install
 	insinto /usr/share/doc/${PF}
 	local mypv="${PV1}.${PV2}.${PV3}"
@@ -71,14 +71,9 @@ src_install() {
 	[[ -e ReleaseNotes/Patch${mypv}-1.txt ]] && \
 		dodoc ReleaseNotes/Patch${mypv}-*.txt
 	use examples && doins -r examples
-	if use data ; then
-		sed -n "s,export \(G4.\+DATA=\"\).*\(/share/Geant.\+/data/.\+\) > /dev/null ; pwd\`,\1${EPREFIX}/usr\2,p" \
-			"${CMAKE_BUILD_DIR}/InstallTreeFiles/geant4.sh" > 99geant
-		doenvd 99geant
-	fi
 }
 
 pkg_postinst() {
 	elog "The following scripts are provided for backward compatibility:"
-	elog "$(ls -1 ${EROOT}usr/share/Geant4-${PV2}.${PV3}.*/geant4make/*sh)"
+	elog "$(ls -1 ${EROOT%/}/usr/share/Geant4-${PV2}.${PV3}.*/geant4make/*sh)"
 }