version bump to 4.9.5_p01

(Portage version: 2.1.10.57/cvs/Linux x86_64)

4 files changed, 18 insertions, 4 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/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}"