keyword amd64-linux and x86-linux; handle data dir via envd; fix clhep linking

(Portage version: 2.1.10.57/cvs/Linux x86_64)

3 files changed, 74 insertions, 4 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index 26db72ffb834..bd08dc96f49f 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.57 2012/03/16 21:03:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.58 2012/05/18 11:09:15 heroxbd Exp $
+
+  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:
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
new file mode 100644
index 000000000000..15ee1c059f27
--- /dev/null
+++ b/sci-physics/geant/files/geant-4.9.5-scripts-only-dataenv.patch
@@ -0,0 +1,55 @@
+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
index 88b06bd0049b..429126fdd3b3 100644
--- a/sci-physics/geant/geant-4.9.5-r1.ebuild
+++ b/sci-physics/geant/geant-4.9.5-r1.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.2 2012/03/16 21:03:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5-r1.ebuild,v 1.3 2012/05/18 11:09:15 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"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor
 	raytracerx qt4 static-libs test vrml zlib"
 
@@ -26,6 +26,7 @@ RDEPEND="virtual/fortran
 	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 ) )
@@ -34,7 +35,12 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MYP}"
 
-PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch )
+PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch \
+	"${FILESDIR}"/${PN}-4.9.5-scripts-only-dataenv.patch )
+
+src_prepare() {
+	sed "s,-lG4clhep,$(clhep-config --libs)," config/binmake.gmk || die "sed failed"
+}
 
 src_configure() {
 	mycmakeargs=(
@@ -66,6 +72,11 @@ src_install() {
 	[[ -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() {