version bump to 4.9.5_p01

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

5 files changed, 23 insertions, 9 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index 6260d6436f21..63a6847071e9 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,13 @@
 # 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.59 2012/05/19 10:29:55 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.60 2012/05/19 17:46:49 heroxbd Exp $
+
+*geant-4.9.5_p01 (19 May 2012)
+
+  19 May 2012; Benda Xu <heroxbd@gentoo.org> +geant-4.9.5_p01.ebuild,
+  -geant-4.9.5-r1.ebuild, files/geant-4.9.4-zlib.patch,
+  files/geant-4.9.5-scripts-only-dataenv.patch:
+  version bump to 4.9.5_p01
 
   19 May 2012; Benda Xu <heroxbd@gentoo.org> geant-4.9.5-r1.ebuild:
   delete the wrong sed phrase.
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index a43eb08dfc02..c9788d2a0e52 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -6,8 +6,8 @@ AUX geant-4.9.4-libdir.patch 1328 RMD160 518d42f5e9263828c3f90fdbde3d1d352d4b21a
 AUX geant-4.9.4-no-benchmarks.patch 370 RMD160 759b19161b950963a04cb6bd7b7dadb918c7fd08 SHA1 8c1bec8775809e5e4655269ee136f294204151c6 SHA256 5ff40079b5669335b1701831fba3922b525d2fdd594704750111d7eaea45b693
 AUX geant-4.9.4-no-examples.patch 486 RMD160 7ef349c41d31041af9b5edfd3e82c5fbcfbbae6a SHA1 314a826f5671edbc237e7a960d8c944af3463560 SHA256 4ae8e7bc5790b5cb207d440bd3c05e81196528517af2f32c0e3483ed41d12d99
 AUX geant-4.9.4-trajectory.patch 390 RMD160 4e654e0ff42c2c1b1c2320e2deb6f8ff0f3d45e6 SHA1 2adba855b88f7461d4dc14dfa4e958c97e90c682 SHA256 6e4c0b2a44960411132130d379f6c9a7f867a656e4851ac9b1fd584685ae204c
-AUX geant-4.9.4-zlib.patch 963 RMD160 3e4edc4c3eacb88c31d94f3b0cabccb7a0b8cbb4 SHA1 1dcef047511da7aca2e04e116b36cccb18e3ef49 SHA256 6fc50ad04fcd6b646635ca42ed2b42d26b9f46ec8bcfc5bedabb89134bb0cdfe
-AUX geant-4.9.5-scripts-only-dataenv.patch 1958 RMD160 7123f6a671f51563516a4f2922e03a2fb311bc27 SHA1 93c020e7ee67a5846441526fe6a5b237ce9d01ab SHA256 c8e4e4f524d3f4961245f95ecaee36e78de00f9bf2beee0b19e78ee341b0d7bb
+AUX geant-4.9.4-zlib.patch 1014 RMD160 bbafd66c1014a84cc8a7445a26f2314e4abb359f SHA1 f1c2ec1e8fa514f4dd2d22ec88d6217a24dc03b4 SHA256 fa7d09b2a481b9183f6f1518e2490458b616c41a90824e6d6a37ca08bddc06b5
+AUX geant-4.9.5-scripts-only-dataenv.patch 2047 RMD160 6811e289da2f3b874f93ea9db7627f8baae995fb SHA1 f24fcb10cca91d866630fdc50172c046844af79a SHA256 db809c4866129cb9c9f2eabdf3e0decf25a3f97b8a4742a6de5b76ff3ce452f6
 DIST G4ABLA.3.0.tar.gz 54909 RMD160 5a032ee8e90d00f39b67114fe257ec47001f347b SHA1 5f38676f1650a508e49d35f9405ac96984388135 SHA256 ff0b77be6b36204eeeba71099f6b7530edd80b79eb015994535bc4334bc821eb
 DIST G4EMLOW.6.19.tar.gz 14396144 RMD160 ba67b3f1ee215966adc99661a1db4a5bf09c5511 SHA1 f63e41a43a3d0c793a04dbb6cce0bdcfeedf6889 SHA256 8876defe74e4c1e9d6b58b2365a9b468ac8d996fb63fa1c6ba6240e0b185845f
 DIST G4EMLOW.6.2.tar.gz 8389172 RMD160 fa51dbb4f0e316b0e682a05c9db4c1dc29db7218 SHA1 627ca63927064f1846aa8d7e2e5c4783fe0b9610 SHA256 1affbc66d8809db0c8e450ca83a0da744e7f5b8e912ec52e93b1f24b47cbd781
@@ -25,11 +25,11 @@ DIST geant321_3.21.14.dfsg-9.diff.gz 47589 RMD160 78561bba0c79a13d34f64c4594cf73
 DIST geant321_3.21.14.dfsg.orig.tar.gz 10922928 RMD160 253b35bd9cda82c2213ec042274f7e6ff6b9e333 SHA1 ae6f39ccc18eacd576a3493992db5da3b3d3b128 SHA256 186fe98a08ad1de39f68698a09a46e7c2f14c37b22f8f990257b0bd66215c5b4
 DIST geant4.9.2.p02.tar.gz 18822956 RMD160 1b8923c4821ca627b56919b3c1eeb3b6a09dd0e5 SHA1 007ee6d4eb4f6479f3fe46e6ecff882e3ace1e7c SHA256 4d19bb76bf956004481bc433bf4735780ccc6354d3dc53321d532fd283243078
 DIST geant4.9.4.p03.tar.gz 25241424 RMD160 af3a64517bac181366c3a680d3723fbe7edd3ebb SHA1 4d1f46471446c210a85edae8d4759803e55bea28 SHA256 5090ca5b506238f16ba2ae2176221a18b6fde06f91180850a109fae1006910c0
-DIST geant4.9.5.tar.gz 28458437 RMD160 24e78b5243aa9ec47a48bbcb6d2afb4d9fe22dbf SHA1 846b48e82c1709d77a8f490fd12b039acc1d0cf9 SHA256 b6b31752319805052fb765f89ca38a23fb299a0a5bf900daeacd1950d6c9a597
+DIST geant4.9.5.p01.tar.gz 28466803 RMD160 42249229a97c2eaf5ed2471a93608a1d0daa38e1 SHA1 b1b938f735a8b966621704cc77448c786777dd01 SHA256 451f8c4a29bb0dc4b923d59d77535a657f0f8a30dc6c8ef639c8b1ebdb26a10e
 EBUILD geant-3.21.14-r2.ebuild 1885 RMD160 2022b046c7f52a4687948387cd7a084e2b0d19e1 SHA1 ea5a80bb06da07183946a96db02e2d0158b24312 SHA256 6d410dc45b374c86bd34c3ca3eaa740fc5eb91dcb91df86497b6c906e4577d93
 EBUILD geant-3.21.14-r3.ebuild 1719 RMD160 7158c53cb2f0e1098fd5f6d5249029fffe35cf3a SHA1 10f67d4d0c17aab06ce4f50fa3f2393a792c426b SHA256 5bb8f71e86a5f5562f0aab9f86f14937e863dffd2b9e1bb502fd5ba9a120f1b9
 EBUILD geant-4.9.2_p02.ebuild 8145 RMD160 3d1a138202fe2e3151ad684c18cec0e7a4dccbfc SHA1 d813033ebcae3ef491aae7a9a794ef63a8813d8d SHA256 02920927f1eb081a9753f7ac9c8a282d036955750796bbbd6b007fa55f6c1e26
 EBUILD geant-4.9.4_p03.ebuild 2398 RMD160 b0788b3a5e2169dcea5f373994500b21fb259026 SHA1 97bb383e9cf7631af96dc9dc9f9f09ee505318a7 SHA256 72ad2e70d0649e6dd0383273345f2099104ad0ab84ad6d3dfba25fe2cccd28c3
-EBUILD geant-4.9.5-r1.ebuild 2822 RMD160 e11fc58866c93f8550643420d2083b87b38bf6cc SHA1 5c3bb5a1ea1517df4997465b1005e29827108df1 SHA256 2dc5804d7247aa8a4c1389afe96084c387663e344e26d19cc8f7ed4dd91347b4
-MISC ChangeLog 11496 RMD160 fda280474b2d7fa66ff0cebec44004dd67997639 SHA1 81a8b2d71b7ca66b283db36fc731af19a3452273 SHA256 d62bd641f210ab7c41967e8bf929bbad72e3d003627ccb8e925a77d8d46659e8
+EBUILD geant-4.9.5_p01.ebuild 3040 RMD160 33d56a7ef1cc3822905fc90338669208d6549baf SHA1 4121d90e2d2c0e6640786bf092ca842a0ddc7f43 SHA256 a9858f37b1bbb85ec2baea0adb6260798cd00d438e0593440545d6a8c12736f9
+MISC ChangeLog 11731 RMD160 404afcfe07e30d759e6cd44118cef6942fcc05bc SHA1 036d377b90434bff15b739de00bba0a4ff79e25c SHA256 da399946e6e2df52eee5a1a0cebd51639a2050d356dc1e776c8f139e6f85377f
 MISC metadata.xml 1569 RMD160 b4e64715d0d29b17b7fc46da45f4ebbff41fc380 SHA1 b30f9de8adea84a688b1343115afa304d5b0de4f SHA256 532c396760c97bbf207439e4f189679bbe02fda61d33446beeebc5f855b36f63
diff --git a/sci-physics/geant/files/geant-4.9.4-zlib.patch b/sci-physics/geant/files/geant-4.9.4-zlib.patch
index 1aaa3e5083ed..f0429695ce38 100644
--- a/sci-physics/geant/files/geant-4.9.4-zlib.patch
+++ b/sci-physics/geant/files/geant-4.9.4-zlib.patch
@@ -1,3 +1,4 @@
+force use of system zlib instead of bundled G4zlib
 --- source/visualization/HepRep/sources.cmake.orig	2011-12-02 15:07:49.000000000 +0000
 +++ source/visualization/HepRep/sources.cmake	2011-12-18 06:21:22.000000000 +0000
 @@ -91,7 +91,7 @@
diff --git a/sci-physics/geant/files/geant-4.9.5-scripts-only-dataenv.patch b/sci-physics/geant/files/geant-4.9.5-scripts-only-dataenv.patch
index 15ee1c059f27..0eb839dd2d13 100644
--- a/sci-physics/geant/files/geant-4.9.5-scripts-only-dataenv.patch
+++ b/sci-physics/geant/files/geant-4.9.5-scripts-only-dataenv.patch
@@ -1,3 +1,4 @@
+tweak Geant4ToolchainBackwardCompatibility.cmake to get the envvars we want. bug 409853
 diff --git a/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake b/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake
 index 41a88c4..e93b923 100644
 --- a/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake
@@ -23,7 +24,7 @@ index ea8f104..db68b9c 100644
 --- a/cmake/Templates/geant4-env-skeleton.in
 +++ b/cmake/Templates/geant4-env-skeleton.in
 @@ -1,30 +1,3 @@
--#!@GEANT4_TC_SHELL_PROGRAM
+-#!@GEANT4_TC_SHELL_PROGRAM@
 -
 -#----------------------------------------------------------------------------
 -# @GEANT4_TC_SHELL_FAMILY@ environment setup script for Geant4 @Geant4_VERSION@
diff --git a/sci-physics/geant/geant-4.9.5-r1.ebuild b/sci-physics/geant/geant-4.9.5_p01.ebuild
index e907c30931a2..7bba9f40340f 100644
--- a/sci-physics/geant/geant-4.9.5-r1.ebuild
+++ b/sci-physics/geant/geant-4.9.5_p01.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2012/05/19 10:29:55 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5_p01.ebuild,v 1.1 2012/05/19 17:46:49 heroxbd Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ SRC_URI="http://geant4.cern.ch/support/source/${MYP}.tar.gz"
 
 LICENSE="geant4"
 SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64-linux ~x86-linux"
 IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor
 	raytracerx qt4 static-libs test vrml zlib"
 
@@ -41,6 +41,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch \
 src_configure() {
 	mycmakeargs=(
 		-DGEANT4_USE_SYSTEM_CLHEP=ON
+		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/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)
@@ -61,6 +62,10 @@ 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"
+
 	cmake-utils_src_install
 	insinto /usr/share/doc/${PF}
 	local mypv="${PV1}.${PV2}.${PV3}"