View | Details | Raw Unified
Collapse All | Expand All

(-) a/geant/files/geant-4.9.1_p01-configure.patch (-11 / +29 lines)
 Lines 1-6    Link Here 
+++ Configure	2008-04-07 18:45:41.317949330 +0000
diff --git a/Configure b/Configure
@@ -579,16 +579,17 @@
index c233600..9ca0371 100755
--- a/Configure
@@ -579,16 +579,17 @@ EOM
 	;;
 	;;
 esac
 esac
 
 
 Lines 28-34    Link Here 
 
 
 exec 4>&1
 exec 4>&1
 case "$silent" in
 case "$silent" in
@@ -982,7 +983,7 @@
@@ -982,7 +983,7 @@ EOF
 : general instructions
 : general instructions
 needman=true
 needman=true
 firsttime=true
 firsttime=true
 Lines 37-43    Link Here 
 case "$user" in
 case "$user" in
 '') user=`whoami 2>&1`;;
 '') user=`whoami 2>&1`;;
 esac
 esac
@@ -1315,7 +1316,6 @@
@@ -1315,7 +1316,6 @@ case "$config_sh" in
 '')
 '')
 myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1`
 myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1`
 
 
 Lines 45-51    Link Here 
 myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \
 myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \
 	./tr '[A-Z]' '[a-z]' | tr '\012' ' '`
 	./tr '[A-Z]' '[a-z]' | tr '\012' ' '`
 newmyuname="$myuname"
 newmyuname="$myuname"
@@ -1911,7 +1911,7 @@
@@ -1911,7 +1911,7 @@ fi
 	
 	
 	. $src/.config/bin/$g4system/move.sh
 	. $src/.config/bin/$g4system/move.sh
 
 
 Lines 54-60    Link Here 
 
 
 	fi #end of cppflags
 	fi #end of cppflags
 
 
@@ -2119,7 +2119,7 @@
@@ -2119,7 +2119,7 @@ EOM
 cp -i $src/.config/bin/$g4system/env.csh .
 cp -i $src/.config/bin/$g4system/env.csh .
 cp -i $src/.config/bin/$g4system/env.sh  .
 cp -i $src/.config/bin/$g4system/env.sh  .
 
 
 Lines 63-69    Link Here 
 	fi #end of -lib or user
 	fi #end of -lib or user
 else #there is no env.sh
 else #there is no env.sh
 
 
@@ -2217,7 +2217,7 @@
@@ -2217,7 +2217,7 @@ done
 
 
 : who configured the system
 : who configured the system
 cf_time=`$date 2>&1`
 cf_time=`$date 2>&1`
 Lines 72-78    Link Here 
 case "$cf_by" in
 case "$cf_by" in
 "")
 "")
 	cf_by=`(whoami) 2>/dev/null`
 	cf_by=`(whoami) 2>/dev/null`
@@ -4200,9 +4200,9 @@
@@ -4200,9 +4200,9 @@ fi
 if test "X$g4osname" = "XLinux" ; then
 if test "X$g4osname" = "XLinux" ; then
 g4vis_xmflags=" -I$g4vis_xmhome/include "
 g4vis_xmflags=" -I$g4vis_xmhome/include "
 	if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then
 	if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then
 Lines 84-90    Link Here 
 	fi
 	fi
 fi
 fi
 
 
@@ -4908,9 +4908,9 @@
@@ -4908,9 +4908,9 @@ fi
 if test "X$g4osname" = "XLinux" ; then
 if test "X$g4osname" = "XLinux" ; then
 g4vis_xmflags=" -I$g4vis_xmhome/include "
 g4vis_xmflags=" -I$g4vis_xmhome/include "
 	if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then
 	if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then
 Lines 96-102    Link Here 
 	fi
 	fi
 fi
 fi
 
 
@@ -6123,7 +6123,7 @@
@@ -6123,7 +6123,7 @@ esac
 
 
 echo ""
 echo ""
 
 
 Lines 105-111    Link Here 
 				case $g4_gmake_version in
 				case $g4_gmake_version in
 				GNU*) 
 				GNU*) 
 				g4_gmake=y				
 				g4_gmake=y				
@@ -6133,7 +6133,7 @@
@@ -6133,7 +6133,7 @@ echo ""
 				;;
 				;;
 				esac				
 				esac				
 
 
 Lines 114-116    Link Here 
 				case $g4_make_version in
 				case $g4_make_version in
 				GNU*) 
 				GNU*) 
 				g4_make=y				
 				g4_make=y				
@@ -6145,7 +6145,7 @@ echo ""
 
 if  [ $g4_gmake = y ] ; then
 
-g4make=gmake
 
 g4message=`cat << EOM
 
@@ -6159,7 +6159,7 @@ fi
 
 if [ $g4_gmake = n ] && [ $g4_make = y ] ; then
 
-g4make=make
 
 g4message=`cat << EOM
 
(-) a/geant/files/geant-4.9.1_p01-no-source.patch (-2 / +10 lines)
 Lines 1-6    Link Here 
+++ config/scripts/move.sh.SH	2008-04-08 19:05:44.332687325 +0000
diff --git a/config/scripts/move.sh.SH b/config/scripts/move.sh.SH
@@ -445,33 +445,8 @@
index 5f633cc..b938dc7 100644
--- a/config/scripts/move.sh.SH
@@ -445,39 +445,13 @@ echo ""
 cd $g4install
 cd $g4install
 #echo `pwd`
 #echo `pwd`
 
 
 Lines 36-38    Link Here 
 echo ""
 echo ""
 echo "Installing headers..."
 echo "Installing headers..."
 echo ""
 echo ""
 cd $g4install/source
 $g4make includes dependencies=""
-fi
 
 # Move libraries
 if [ X$g4install != X$g4final_install ] ; then
(-) a/geant/geant-4.9.1_p01.ebuild (-16 / +26 lines)
 Lines 25-31   done Link Here 
LICENSE="geant4"
LICENSE="geant4"
SLOT="4"
SLOT="4"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 ~x86"
IUSE="athena +data dawn debug examples gdml geant3 minimal +motif
IUSE="athena +data dawn debug examples gdml geant3 minimal motif
	+opengl openinventor +raytracerx +vrml zlib"
	+opengl openinventor +raytracerx +vrml zlib"
DEPEND="sci-physics/clhep
DEPEND="sci-physics/clhep
 Lines 92-104   g4w_use() { Link Here 
}
}
src_compile() {
src_compile() {
	GEANT4_DATA_DIR=/usr/share/${PN}
	GEANT4_DIR=/usr/share/${PN}
	# The Configure shell script saves its options
	# The Configure shell script saves its options
	# in .config/bin/*/config.sh
	# in .config/bin/*/config.sh
	local myconf="$(g4vis_use opengl openglx)"
	local myconf="$(g4vis_use opengl openglx)"
	use opengl && myconf="${glconf} $(g4vis_use motif openglxm)"
	use opengl && myconf="${glconf} $(g4vis_use motif openglxm)"
	use data && myconf="${myconf} -D g4data=${GEANT_DATA_DIR}"
	DATA="${GEANT4_DIR}/data"
	use data && myconf="${myconf}
	-D g4levelgammadata=${DATA}/PhotonEvaporation2.0
	-D g4radioactivedata=${DATA}/RadioactiveDecay3.2
	-D g4ledata=${DATA}/G4EMLOW5.1
	-D g4neutronhpcrosssections=${DATA}/G4NDL3.12
	-D g4abladata=${DATA}/G4ABLA3.0"
	 # switch to see compiling flags
	 # switch to see compiling flags
	export CPPVERBOSE=y
	export CPPVERBOSE=y
 Lines 142-154   src_compile() { Link Here 
		-D g4lib_build_static=n \
		-D g4lib_build_static=n \
		|| die "Building shared geant failed"
		|| die "Building shared geant failed"
	rm -rf tmp
	# rm -rf tmp
	#
	./Configure \
	#	./Configure \
		-deO -build \
	#		-deO -build \
		-D g4lib_build_shared=n \
	#		-D g4lib_build_shared=n \
		-D g4lib_build_static=y \
	#		-D g4lib_build_static=y \
		|| die "Building shared geant failed"
	#		|| die "Building shared geant failed"
}
}
src_install() {
src_install() {
 Lines 159-176   src_install() { Link Here 
	./Configure \
	./Configure \
		|| die "Final install failed"
		|| die "Final install failed"
	insinto ${GEANT4_DATA_DIR}
	insinto ${GEANT4_DIR}
	sed -i \
	sed -i \
		-e "s:${S}:${GEANT4_DATA_DIR}:g" \
		-e "s:${S}:${GEANT4_DIR}:g" \
		-e "s:${D}:/:g" \
		-e "s:${D}:/:g" \
		env.*sh
		env.*sh
	doins env.*sh || die "failed installing shell scripts"
	doins env.*sh || die "failed installing shell scripts"
	doins -r config
	doins -r config
	insinto "${GEANT4_DIR}/data"
	if use data; then
	if use data; then
		cd "${WORKDIR}"
		cd "${WORKDIR}"
		for d in ${GEANT4_DATA}; do
		# give an explicit list of data dirs since the archive names don't
			doins -r ${d/.} || die "installing data ${d} failed"
		# always match the content
		for d in "G4NDL3.12 G4EMLOW5.1 RadioactiveDecay3.2 PhotonEvaporation2.0 G4ABLA3.0"; do
			doins -r ${d} || die "installing data ${d} failed"
		done
		done
		cd "${S}"
	fi
	fi
	# doc and examples
	# doc and examples
 Lines 188-196   src_install() { Link Here 
pkg_postinst() {
pkg_postinst() {
	elog "You can set the Geant4 environment variables"
	elog "You can set the Geant4 environment variables"
	elog "from ${ROOT}${GEANT4_DATA_DIR} shell scripts."
	elog "from ${ROOT}${GEANT4_DIR} shell scripts."
	elog "Ex: for bash"
	elog "Ex: for bash"
	elog "     source ${ROOT}${GEANT4_DATA_DIR}/env.sh"
	elog "     source ${ROOT}${GEANT4_DIR}/env.sh"
	elog
	elog
	elog "Help us to improve the ebuild and dependencies in"
	elog "Help us to improve the ebuild and dependencies in"
	elog "http://bugs.gentoo.org/show_bug.cgi?id=212221"
	elog "http://bugs.gentoo.org/show_bug.cgi?id=212221"