add back geant-4.9.5-r1.ebuild because geant-python cannot function correctly with 4.9.5_p01, upstream bug http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1317

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

6 files changed, 152 insertions, 26 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index 63a6847071e9..eb18e12cdcba 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,25 +1,6 @@
 # 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.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.
-
-  18 May 2012; Benda Xu <heroxbd@gentoo.org>
-  +files/geant-4.9.5-scripts-only-dataenv.patch, geant-4.9.5-r1.ebuild:
-  keyword amd64-linux and x86-linux; handle data dir via envd; fix clhep linking
-
-  16 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> -geant-4.9.5.ebuild,
-  geant-4.9.5-r1.ebuild:
-  Fix for openinventor to use SGI OpenInventor in portage instead of SoXt, bug
-  #408187
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.61 2012/05/20 16:27:19 heroxbd Exp $
 
 *geant-4.9.5-r1 (13 Mar 2012)
 
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index c9788d2a0e52..2ae53d55208e 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -7,7 +7,8 @@ AUX geant-4.9.4-no-benchmarks.patch 370 RMD160 759b19161b950963a04cb6bd7b7dadb91
 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 1014 RMD160 bbafd66c1014a84cc8a7445a26f2314e4abb359f SHA1 f1c2ec1e8fa514f4dd2d22ec88d6217a24dc03b4 SHA256 fa7d09b2a481b9183f6f1518e2490458b616c41a90824e6d6a37ca08bddc06b5
-AUX geant-4.9.5-scripts-only-dataenv.patch 2047 RMD160 6811e289da2f3b874f93ea9db7627f8baae995fb SHA1 f24fcb10cca91d866630fdc50172c046844af79a SHA256 db809c4866129cb9c9f2eabdf3e0decf25a3f97b8a4742a6de5b76ff3ce452f6
+AUX geant-4.9.5-scripts-only-dataenv.patch 2046 RMD160 0ca3d69afc2fdf07ad0dfb0ed256434ba8b5ebde SHA1 1777776d7b7435a27aec9c97cc9f2da69c6f7802 SHA256 1b878d401e117337d0d6c6b65fea33716eb482d3ddc243fa19c705474274f12a
+AUX geant-4.9.5_p01-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
@@ -26,10 +27,12 @@ DIST geant321_3.21.14.dfsg.orig.tar.gz 10922928 RMD160 253b35bd9cda82c2213ec0422
 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.p01.tar.gz 28466803 RMD160 42249229a97c2eaf5ed2471a93608a1d0daa38e1 SHA1 b1b938f735a8b966621704cc77448c786777dd01 SHA256 451f8c4a29bb0dc4b923d59d77535a657f0f8a30dc6c8ef639c8b1ebdb26a10e
+DIST geant4.9.5.tar.gz 28458437 RMD160 24e78b5243aa9ec47a48bbcb6d2afb4d9fe22dbf SHA1 846b48e82c1709d77a8f490fd12b039acc1d0cf9 SHA256 b6b31752319805052fb765f89ca38a23fb299a0a5bf900daeacd1950d6c9a597
 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_p01.ebuild 3040 RMD160 33d56a7ef1cc3822905fc90338669208d6549baf SHA1 4121d90e2d2c0e6640786bf092ca842a0ddc7f43 SHA256 a9858f37b1bbb85ec2baea0adb6260798cd00d438e0593440545d6a8c12736f9
-MISC ChangeLog 11731 RMD160 404afcfe07e30d759e6cd44118cef6942fcc05bc SHA1 036d377b90434bff15b739de00bba0a4ff79e25c SHA256 da399946e6e2df52eee5a1a0cebd51639a2050d356dc1e776c8f139e6f85377f
+EBUILD geant-4.9.5-r1.ebuild 3039 RMD160 d82456088c500a521ce766eceedb883ba7c6cc70 SHA1 af741560438def0977d579b11f1028b7ba4b006a SHA256 26fbb0583a4f5e81519f59c9f4683ec0e00256268dbd9605b21caf2f9712e26f
+EBUILD geant-4.9.5_p01.ebuild 3033 RMD160 64317a1a51a8a9a9bba996b6d3000996d4aff774 SHA1 734779a4499fd5fae6b36a059f7061281746d0ea SHA256 1c62aafc3bf1f9a735246ce411c2a234922549e37453ac6d0d4e44e457468508
+MISC ChangeLog 11006 RMD160 0b124c6b4e23e32b65e6c27d575e4d1e147fd562 SHA1 29efe90b1c30a8e7dd5ac32e539982611f9f23e9 SHA256 2caf9d7366d9ed35dbb4adef5f4c12fab346413ff96dc4b0b7fdf2493d96ccbf
 MISC metadata.xml 1569 RMD160 b4e64715d0d29b17b7fc46da45f4ebbff41fc380 SHA1 b30f9de8adea84a688b1343115afa304d5b0de4f SHA256 532c396760c97bbf207439e4f189679bbe02fda61d33446beeebc5f855b36f63
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 0eb839dd2d13..db10e2640693 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
@@ -24,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/files/geant-4.9.5_p01-scripts-only-dataenv.patch b/sci-physics/geant/files/geant-4.9.5_p01-scripts-only-dataenv.patch
new file mode 100644
index 000000000000..0eb839dd2d13
--- /dev/null
+++ b/sci-physics/geant/files/geant-4.9.5_p01-scripts-only-dataenv.patch
@@ -0,0 +1,56 @@
+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
++++ b/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake
+@@ -678,15 +678,4 @@ foreach(_shell bourne;cshell)
+     @ONLY
+     )
+ 
+-  # Install it to the required location
+-  install(FILES
+-    ${PROJECT_BINARY_DIR}/InstallTreeFiles/${_scriptfullname}
+-    DESTINATION ${CMAKE_INSTALL_BINDIR}
+-    PERMISSIONS 
+-    OWNER_READ OWNER_WRITE OWNER_EXECUTE
+-    GROUP_READ GROUP_EXECUTE
+-    WORLD_READ WORLD_EXECUTE
+-    COMPONENT Runtime
+-    )
+ endforeach()
+-
+diff --git a/cmake/Templates/geant4-env-skeleton.in b/cmake/Templates/geant4-env-skeleton.in
+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_FAMILY@ environment setup script for Geant4 @Geant4_VERSION@
+-#
+-# This script will configure your environment so that any Geant4 supplied
+-# tools, libraries and data are available in your PATH, library paths etc.
+-# Data libraries will only be setup if they were installed as part of the
+-# Geant4 installation.
+-#
+-# Source this script to perform the setup.
+-#
+-# This script is autogenerated by CMake DO NOT EDIT
+-#
+-
+-#----------------------------------------------------------------------------
+-# Locate directory of self
+-#
+-@GEANT4_ENV_SELFLOCATE_COMMAND@
+-
+-
+-#----------------------------------------------------------------------------
+-# Setup binary and library paths...
+-#
+-@GEANT4_ENV_BINPATH_SETUP@
+-@GEANT4_ENV_LIBPATH_SETUP@
+-
+ #----------------------------------------------------------------------------
+ # Resource file paths
+ # Data Library Paths are only set if they were installed by CMake
diff --git a/sci-physics/geant/geant-4.9.5-r1.ebuild b/sci-physics/geant/geant-4.9.5-r1.ebuild
new file mode 100644
index 000000000000..3a3c370f49d9
--- /dev/null
+++ b/sci-physics/geant/geant-4.9.5-r1.ebuild
@@ -0,0 +1,86 @@
+# 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.6 2012/05/20 16:27:19 heroxbd Exp $
+
+EAPI=4
+
+inherit cmake-utils eutils fortran-2 versionator
+
+PV1=$(get_version_component_range 1 ${PV})
+PV2=$(get_version_component_range 2 ${PV})
+PV3=$(get_version_component_range 3 ${PV})
+MYP=${PN}$(replace_version_separator 3 .)
+
+DESCRIPTION="Toolkit for simulation of passage of particles through matter"
+HOMEPAGE="http://geant4.cern.ch/"
+SRC_URI="http://geant4.cern.ch/support/source/${MYP}.tar.gz"
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64-linux ~x86-linux"
+IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor
+	raytracerx qt4 static-libs test vrml zlib"
+
+RDEPEND="virtual/fortran
+	>=sci-physics/clhep-2.1.1
+	dawn? ( media-gfx/dawn )
+	gdml? ( dev-libs/xerces-c )
+	motif? ( x11-libs/openmotif: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 ) )
+	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 )
+
+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)
+		$(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)
+	)
+	cmake-utils_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}"
+	doins ReleaseNotes/ReleaseNotes${mypv}.html
+	[[ -e ReleaseNotes/Patch${mypv}-1.txt ]] && \
+		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," \
+			"${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)"
+}
diff --git a/sci-physics/geant/geant-4.9.5_p01.ebuild b/sci-physics/geant/geant-4.9.5_p01.ebuild
index 7bba9f40340f..e570e3865b44 100644
--- a/sci-physics/geant/geant-4.9.5_p01.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_p01.ebuild,v 1.1 2012/05/19 17:46:49 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5_p01.ebuild,v 1.2 2012/05/20 16:27:19 heroxbd Exp $
 
 EAPI=4
 
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MYP}"
 
 PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch \
-	"${FILESDIR}"/${PN}-4.9.5-scripts-only-dataenv.patch )
+	"${FILESDIR}"/${P}-scripts-only-dataenv.patch )
 
 src_configure() {
 	mycmakeargs=(