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

(Portage version: 2.1.10.57/cvs/Linux x86_64)

5 files changed, 146 insertions, 23 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/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=(