Fixed the environment file when the data use flag is enabled, bug #453224 thanks Oliver Freyermuth

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

3 files changed, 16 insertions, 12 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index 0a45d9e98a6e..f1ed97a878cf 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,10 @@
 # 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.68 2012/12/14 16:51:50 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.69 2013/01/21 17:17:25 bicatali Exp $
+
+  21 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> geant-4.9.6.ebuild:
+  Fixed the environment file when the data use flag is enabled, bug #453224
+  thanks Oliver Freyermuth
 
 *geant-4.9.5_p02 (14 Dec 2012)
 *geant-4.9.6 (14 Dec 2012)
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index e4f01468ee17..88a2362d4636 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -21,8 +21,8 @@ DIST G4PhotonEvaporation.2.1.tar.gz 7504003 SHA256 08ab657a060518c9b7aab03b17628
 DIST G4RadioactiveDecay.3.3.tar.gz 732628 SHA256 7f421d6808422f9186a8a96fc1889a54af03c80a37b9f9d1d51ab359ea0264d1
 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 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.5.p02.tar.gz 28491693 SHA256 adb04fce9472228bb10d78cbc7f40493bfb37454beee22e7c80d630646cd3777 SHA512 0081ecdae0b61d8790a7083691d17e3d7727f8c065f412a94d61e2c01ae27d9585d7d91059795da251a34d7305cc04e17eb37d189df8b52f68974c3290272ad6 WHIRLPOOL ce36ba544f18484b6a2b8ffd19b68f126578177806a77a3aa55981254afd8b59a1567b654111879529a31be8e92e5ddf8da46dabc49ad447b40dee8a8f012e3b
 DIST geant4.9.6.tar.gz 25433109 SHA256 3b1caf87664ef35cab25563b2911653701e98c75a9bd6c64f364d1a1213247e5 SHA512 54b2622da86d669728719958dcbcc52dfe58ca2e5ed2d7f43d10b032e4a732363fe54a359417b33c471b29708c6733cb4e3afeda746cc1d3bdec72d0c1df1a19 WHIRLPOOL 892db0b4cae7ffa8c51279ae64d0cc366fe953eca406b2c8f55352a39bab9c80f5b8564a771211c95c3789d70c3d8f092b44e3a61b4cd2515c3e151cae6e8ecd
@@ -30,13 +30,13 @@ EBUILD geant-3.21.14-r2.ebuild 1863 SHA256 280320afafaed437cb867022573df8db82440
 EBUILD geant-3.21.14-r3.ebuild 1690 SHA256 05a1337ee41d67fcb5283efd7fff00c53ec257036e38a5af6115fca75e450688 SHA512 47149caab3dbca468591616d2c3a99c8b7b012e95e6f62e8c3a5853ee6f7ff9f1d49da46c9bd2b9e49140dc017c96ea25e4ad224b16946fcbfaed92be83b68be WHIRLPOOL a49f8f6f4403808e2127bd4babfa73fed5a517d94b7822b1b2de14eb46981e3e9e410ff7f348c558395fa8710fd997f4e280a0cadef4efe349a4061fad633ce5
 EBUILD geant-4.9.4_p03.ebuild 2377 SHA256 f836adf68676439be4e6c155ca39bc5ca7c220954c6156a7e8a007cf930eda3a SHA512 fb08dede3c779b1d547aba9a6a45f5f8bdcb8f1fbf8aad3921d80da271c4d366103dd12291c2a6759d814d7348ecb8386dca265216c6ab467300136438bfcb8f WHIRLPOOL e0d05c95f0d333934a7df2622801d1c6c12de0dee54bdce268760e64445cde94fad5aa85d429c80a540adccfc34bf6b42a7e40fac855ef4e11a9f1dc5dd723fd
 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
+EBUILD geant-4.9.6.ebuild 2899 SHA256 3a9f23ca205aa2e93113218c5b6c9b84117c9e44f8b053a10ead63c726b5065a SHA512 4ed711a728f32a267c12d9391f79bccb23de50ae0ae6c7197a8588dc8cf71213c163c3a9d19961017cc40269ea4d503d5fac413e1fcedb3ad4ece70ecfa152c3 WHIRLPOOL 718e8d3b672d50e8d1ced86fa60a4ad7f4ba13dcefac505955ee1ace94100f7ff010b2e373691a6b2218e898992f8a9dce493a0cd56ef840c3b1d2ebefff6a82
+MISC ChangeLog 13575 SHA256 3f3bdeafbecbe95a90bec67059c5fc50a6c4e59b897423b1ffdf8321fb575137 SHA512 67a995b0d7773fcf9610ccbe866811929f2f045216788d89378b29cb3ecdc6afe89cb7106dd379dcac8deeedb28b82fb7ff155cdc82eeb2d1a6f06864c9b3371 WHIRLPOOL dab9474358fdf7c8497024bcdb92f8159caa98bcccfee260df7f9123eaad6588c84804b6c821affd81cd866d01bae1ca673cc5cdea2f31e6ca7e85dcdac4ab38
 MISC metadata.xml 1559 SHA256 1998a5c57e775d84d17cb91f0b5865c95f3a00572b3eba51dfc339398b05c503 SHA512 1ab29ce2cf1b8bdd848eb6d6c3df567df001026ad1d26b9c55880a9239b7593eae3b8fd13a7b55f9110b9869b69f486fd11ec7e0964b1b307e8d9a5a308a7ae7 WHIRLPOOL d5e49493699cb2545ee624600ebdd13fbb4a64ff4402cc491784739ef86b19a0701fc03bb153191830519e0a4d9a0d7eb8350cfed7664504ca7beea71e602288
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDLWZsACgkQ1ycZbhPLE2CMnACfQWEYx4OC/8HBnYQQaYt84fz1
-lPIAoKVfsXovbd35/DwtQNVAxi0HDhPV
-=UO8E
+iEYEAREIAAYFAlD9eCkACgkQ1ycZbhPLE2AjcwCgrafnsxbtuZ0nv1HDPAbo8vpO
+UrEAoIF9w5V6Vk90M9bbU152jEfBi1i3
+=IRZy
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/geant/geant-4.9.6.ebuild b/sci-physics/geant/geant-4.9.6.ebuild
index 93937d2276b1..461115fdad2f 100644
--- a/sci-physics/geant/geant-4.9.6.ebuild
+++ b/sci-physics/geant/geant-4.9.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.ebuild,v 1.1 2012/12/14 16:51:50 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.6.ebuild,v 1.2 2013/01/21 17:17:25 bicatali Exp $
 
 EAPI=4
 
@@ -72,7 +72,7 @@ src_install() {
 		dodoc ReleaseNotes/Patch${mypv}-*.txt
 	use examples && doins -r examples
 	if use data ; then
-		sed "s,export \(G4.\+DATA=\"\).*\(/share/Geant.\+/data/.\+\); pwd\`,\1${EPREFIX}/usr\2," \
+		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