Version bump. Revert to static data download (bug #454152). Removed old.

(Portage version: 2.2.01.21938-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

9 files changed, 46 insertions, 370 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index 0264ef3f1254..d121ead97d20 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-physics/geant
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.72 2013/05/12 03:33:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.73 2013/06/05 16:14:34 bicatali Exp $
+
+*geant-4.9.6_p02 (05 Jun 2013)
+
+  05 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> +geant-4.9.6_p02.ebuild,
+  -files/geant-4.9.2-zlib.patch, -files/geant-4.9.3-respect_flags.patch,
+  -files/geant-4.9.3-zlib.patch, -files/geant-4.9.5-scripts-only-dataenv.patch,
+  -files/geant-4.9.5_p01-scripts-only-dataenv.patch, -geant-4.9.5_p02.ebuild,
+  -geant-4.9.6.ebuild, geant-3.21.14-r3.ebuild:
+  Version bump. Revert to static data download (bug #454152). Removed old.
 
   12 May 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Drop obsolete use flags from metadata.xml
diff --git a/sci-physics/geant/files/geant-4.9.2-zlib.patch b/sci-physics/geant/files/geant-4.9.2-zlib.patch
deleted file mode 100644
index 7b33733e6bb9..000000000000
--- a/sci-physics/geant/files/geant-4.9.2-zlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/binmake.gmk.orig	2009-01-19 16:37:42.177379773 +0000
-+++ config/binmake.gmk	2009-01-19 16:38:04.671541248 +0000
-@@ -258,7 +258,7 @@
-   endif
- endif
- 
--ifdef G4LIB_USE_ZLIB
-+ifdef G4LIB_BUILD_ZLIB
-   LDLIBS2 += -lG4zlib
- endif
- 
diff --git a/sci-physics/geant/files/geant-4.9.3-respect_flags.patch b/sci-physics/geant/files/geant-4.9.3-respect_flags.patch
deleted file mode 100644
index 52a7caf3fc87..000000000000
--- a/sci-physics/geant/files/geant-4.9.3-respect_flags.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-Respect CXX, compiler flags
-Fix build with --as-needed
-
-http://bugs.gentoo.org/show_bug.cgi?id=344119
-
---- config/sys/Linux-g++.gmk
-+++ config/sys/Linux-g++.gmk
-@@ -2,9 +2,7 @@
- # ------ GNU/LINUX ------ gcc 3.2 and higher
- #
- ifeq ($(G4SYSTEM),Linux-g++)
--  CXX       := g++
--  CXXFLAGS  := -W -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
--  CXXFLAGS  += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
-+  CXXFLAGS  += -ansi
- #
- # Uncomment the following options to activate Pentium4 chip specific
- # floating-point operations on the SSE unit. It will allow for more stable
-@@ -14,27 +12,16 @@
- #       platforms. Will only run on Pentium4-based architectures !
- #
- # CXXFLAGS  += -march=pentium4 -mfpmath=sse
--  ifdef G4OPTIMISE
--    CXXFLAGS  += -O2
--    FCFLAGS   := -O2
--    CCFLAGS   := -O2
--  else
--    ifdef G4DEBUG
-+  ifdef G4DEBUG
-       CXXFLAGS  += -g
--      FCFLAGS   := -g
--      CCFLAGS   := -g
--    endif
-+      FCFLAGS   += -g
-+      CCFLAGS   += -g
-   endif
-   ifdef G4PROFILE
-     CXXFLAGS  += -pg
-     FCFLAGS   += -pg
-     CCFLAGS   += -pg
-   endif
--  ifdef G4OPTDEBUG
--    CXXFLAGS  += -O2 -g
--    FCFLAGS   += -O2 -g
--    CCFLAGS   += -O2 -g
--  endif
-   ifdef G4LIB_BUILD_SHARED
-     CXXFLAGS  += -fPIC
-     FCFLAGS   += -fPIC
-@@ -42,7 +29,6 @@
-   endif
-   G4RUNPATHOPTION := -Wl,-rpath 
-   CC := gcc
--  FC := gfortran
-   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
-   FCLIBS := -lg2c -lnsl
-   ECHO   := /bin/echo -e
-@@ -108,7 +94,7 @@
-   endif
-   ifndef QTLIBPATH
-     QTLIBPATH := $(QTHOME)/lib
--    QT_SEARCH_LIB := $(shell ls  $(QTLIBPATH)/qt$(QT_VERSION)/libq* 2>/dev/null | wc -l )
-+    QT_SEARCH_LIB := $(shell ls  $(QTLIBPATH)/qt$(QT_VERSION)/lib[q,Q]t* 2>/dev/null | wc -l )
-     ifneq ($(QT_SEARCH_LIB),0)
-       QTLIBPATH := $(QTHOME)/lib/qt$(QT_VERSION)
-     endif
-@@ -140,13 +126,13 @@
-   define build-granular-shared-lib
-     @libdir=`(cd $(@D);/bin/pwd)`; \
-      cd $(G4TMPDIR); \
--     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) *.o
-+     $(CXX) $(LDFLAGS) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) *.o $(INTYLIBS);
-   endef
-   define build-global-shared-lib
-     @libdir=`(cd $(@D);/bin/pwd)`; \
-      cd $(G4TMP)/$(G4SYSTEM); \
--     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) \
--                    $(foreach dir,$(SUBLIBS),$(dir)/*.o);
-+     $(CXX) $(LDFLAGS) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) \
-+                    $(foreach dir,$(SUBLIBS),$(dir)/*.o) $(INTYLIBS);
-   endef
- 
- endif
---- config/sys/Linux-icc.gmk
-+++ config/sys/Linux-icc.gmk
-@@ -3,17 +3,11 @@
- #
- ifeq ($(G4SYSTEM),Linux-icc)
-   CXX       := icc
--  CXXFLAGS  := -ansi -fp-model precise -no-gcc -w1
--  ifdef G4OPTIMISE
--    CXXFLAGS  += -O2
--    FCFLAGS   := -O2
--    CCFLAGS   := -O2
--  else
--    ifdef G4DEBUG
--      CXXFLAGS  += -g
--      FCFLAGS   := -g
--      CCFLAGS   := -g
--    endif
-+  CXXFLAGS  += -ansi
-+  ifdef G4DEBUG
-+    CXXFLAGS  += -g
-+    FCFLAGS   += -g
-+    CCFLAGS   += -g
-   endif
-   ifdef G4PROFILE
-     CXXFLAGS  += -qp
-@@ -61,13 +55,13 @@
-   define build-granular-shared-lib
-     @libdir=`(cd $(@D);/bin/pwd)`; \
-      cd $(G4TMPDIR); \
--     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) *.o
-+     $(CXX) $(LDFLAGS) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) *.o $(INTYLIBS);
-   endef
-   define build-global-shared-lib
-     @libdir=`(cd $(@D);/bin/pwd)`; \
-      cd $(G4TMP)/$(G4SYSTEM); \
--     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) \
--                    $(foreach dir,$(SUBLIBS),$(dir)/*.o);
-+     $(CXX) $(LDFLAGS) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) \
-+                    $(foreach dir,$(SUBLIBS),$(dir)/*.o) $(INTYLIBS);
-   endef
- 
- endif
diff --git a/sci-physics/geant/files/geant-4.9.3-zlib.patch b/sci-physics/geant/files/geant-4.9.3-zlib.patch
deleted file mode 100644
index f047abdb31cd..000000000000
--- a/sci-physics/geant/files/geant-4.9.3-zlib.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- config/binmake.gmk.orig
-+++ config/binmake.gmk
-@@ -234,7 +234,7 @@ ifdef GLOBALLIBS
-              -lG4intercoms \
-              -lG4global
- 
--  ifdef G4LIB_USE_ZLIB
-+  ifdef G4LIB_BUILD_ZLIB
-     LDLIBS2 += -lG4zlib
-   endif
- 
-
---- config/architecture.gmk.orig	2011-01-16 00:22:05.976079082 +0000
-+++ config/architecture.gmk	2011-01-16 00:23:18.346082379 +0000
-@@ -214,8 +214,10 @@
- else
-   LDFLAGS   += -L$(CLHEP_LIB_DIR)
-   LOADLIBS  := -l$(CLHEP_LIB) -lm
--  ifndef G4LIB_USE_ZLIB
--    LOADLIBS += -lz
-+  ifdef G4LIB_USE_ZLIB
-+    ifndef G4LIB_BUILD_ZLIB
-+      LOADLIBS += -lz
-+    endif
-   endif
- endif
- 
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
deleted file mode 100644
index db10e2640693..000000000000
--- a/sci-physics/geant/files/geant-4.9.5-scripts-only-dataenv.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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/files/geant-4.9.5_p01-scripts-only-dataenv.patch b/sci-physics/geant/files/geant-4.9.5_p01-scripts-only-dataenv.patch
deleted file mode 100644
index 0eb839dd2d13..000000000000
--- a/sci-physics/geant/files/geant-4.9.5_p01-scripts-only-dataenv.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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-3.21.14-r3.ebuild b/sci-physics/geant/geant-3.21.14-r3.ebuild
index ca97c09f7ed1..25117aa27ff7 100644
--- a/sci-physics/geant/geant-3.21.14-r3.ebuild
+++ b/sci-physics/geant/geant-3.21.14-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-3.21.14-r3.ebuild,v 1.3 2012/10/24 19:42:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-3.21.14-r3.ebuild,v 1.4 2013/06/05 16:14:34 bicatali Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ SRC_URI="
 
 SLOT="3"
 LICENSE="GPL-2 LGPL-2 BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-physics/geant/geant-4.9.5_p02.ebuild b/sci-physics/geant/geant-4.9.5_p02.ebuild
deleted file mode 100644
index f743fa62c75a..000000000000
--- a/sci-physics/geant/geant-4.9.5_p02.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2013 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_p02.ebuild,v 1.2 2013/03/02 23:26:38 hwoarang Exp $
-
-EAPI=4
-
-inherit cmake-utils eutils fortran-2 versionator multilib
-
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor
-	raytracerx qt4 static-libs vrml zlib"
-
-RDEPEND="
-	>=sci-physics/clhep-2.1.1
-	dawn? ( media-gfx/dawn )
-	gdml? ( dev-libs/xerces-c )
-	motif? ( x11-libs/motif:0 )
-	opengl? ( virtual/opengl )
-	openinventor? ( media-libs/openinventor )
-	raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
-	qt4? ( dev-qt/qtgui:4 opengl? ( dev-qt/qtopengl:4 ) )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.9.4-zlib.patch
-	"${FILESDIR}"/${PN}-4.9.5_p01-scripts-only-dataenv.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DGEANT4_USE_SYSTEM_CLHEP=ON
-		-DCMAKE_INSTALL_LIBDIR="${EROOT}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 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.6.ebuild b/sci-physics/geant/geant-4.9.6_p02.ebuild
index d8b67ffe20a9..cdb782d3b175 100644
--- a/sci-physics/geant/geant-4.9.6.ebuild
+++ b/sci-physics/geant/geant-4.9.6_p02.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.6.ebuild,v 1.3 2013/03/02 23:26:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.6_p02.ebuild,v 1.1 2013/06/05 16:14:34 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
 inherit cmake-utils eutils fortran-2 versionator multilib
 
@@ -13,7 +13,23 @@ 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"
+SRC_COM="http://geant4.cern.ch/support/source"
+SRC_URI="${SRC_COM}/${MYP}.tar.gz"
+
+NDLPV=4.2
+GEANT4_DATA="
+	G4NDL.${NDLPV}
+	G4EMLOW.6.32
+	G4RadioactiveDecay.3.6
+	G4SAIDDATA.1.1
+	G4NEUTRONXS.1.2
+	G4PII.1.3
+	G4PhotonEvaporation.2.3
+	G4ABLA.3.0
+	RealSurface.1.0"
+for d in ${GEANT4_DATA}; do
+	SRC_URI="${SRC_URI} data? ( ${SRC_COM}/${d}.tar.gz ${SRC_COM}/G4NDL${NDLPV}.TS.tar.gz )"
+done
 
 LICENSE="geant4"
 SLOT="4"
@@ -37,13 +53,15 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MYP}"
 
 PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch )
+GEANT4_DATA_DIR="/usr/share/geant4/data"
 
 src_configure() {
 	local mycmakeargs=(
 		-DGEANT4_USE_SYSTEM_CLHEP=ON
 		-DCMAKE_INSTALL_LIBDIR="${EROOT}usr/$(get_libdir)"
+		-DGEANT4_INSTALL_DATADIR="${EROOT}${GEANT4_DATA_DIR}"
+		-DGEANT4_INSTALL_DATA=OFF
 		$(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)
@@ -62,9 +80,19 @@ 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"
+	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
 
 	cmake-utils_src_install
+	if use data; then
+		einfo "Installing Geant4 data"
+		insinto ${GEANT4_DATA_DIR}
+		pushd "${WORKDIR}" > /dev/null
+		for d in ${GEANT4_DATA}; do
+			local p=${d/.}
+			doins -r *${p/G4}
+		done
+		popd > /dev/null
+	fi
 	insinto /usr/share/doc/${PF}
 	local mypv="${PV1}.${PV2}.${PV3}"
 	doins ReleaseNotes/ReleaseNotes${mypv}.html