Attachment #149260 for bug #212221

Lines 1-6 Link Here

(-)a/geant/files/geant-4.9.1_p01-configure.patch




 
 exec 4>&1
 case "$silent" in
@@ -982,7 +983,7 @@ EOF
 : general instructions
 needman=true
 firsttime=true

 case "$user" in
 '') user=`whoami 2>&1`;;
 esac
@@ -1315,7 +1316,6 @@ case "$config_sh" in
 '')
 myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1`
 

 myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \
 	./tr '[A-Z]' '[a-z]' | tr '\012' ' '`
 newmyuname="$myuname"
@@ -1911,7 +1911,7 @@ fi
 	
 	. $src/.config/bin/$g4system/move.sh
 

 
 	fi #end of cppflags
 
@@ -2119,7 +2119,7 @@ EOM
 cp -i $src/.config/bin/$g4system/env.csh .
 cp -i $src/.config/bin/$g4system/env.sh  .
 

 	fi #end of -lib or user
 else #there is no env.sh
 
@@ -2217,7 +2217,7 @@ done
 
 : who configured the system
 cf_time=`$date 2>&1`

 case "$cf_by" in
 "")
 	cf_by=`(whoami) 2>/dev/null`
@@ -4200,9 +4200,9 @@ fi
 if test "X$g4osname" = "XLinux" ; then
 g4vis_xmflags=" -I$g4vis_xmhome/include "
 	if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then

 	fi
 fi
 
@@ -4908,9 +4908,9 @@ fi
 if test "X$g4osname" = "XLinux" ; then
 g4vis_xmflags=" -I$g4vis_xmhome/include "
 	if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then

 	fi
 fi
 
@@ -6123,7 +6123,7 @@ esac
 
 echo ""
 

 				case $g4_gmake_version in
 				GNU*) 
 				g4_gmake=y				
@@ -6133,7 +6133,7 @@ echo ""
 				;;
 				esac				
 

 				case $g4_make_version in
 				GNU*) 
 				g4_make=y				
@@ -6145,7 +6145,7 @@ echo ""
 
 if  [ $g4_gmake = y ] ; then
 
-g4make=gmake
+g4make="gmake "`echo $MAKEOPTS`
 
 g4message=`cat << EOM
 
@@ -6159,7 +6159,7 @@ fi
 
 if [ $g4_gmake = n ] && [ $g4_make = y ] ; then
 
-g4make=make
+g4make="make "`echo $MAKEOPTS`
 
 g4message=`cat << EOM
 

Lines 1-6 Link Here

(-)a/geant/files/geant-4.9.1_p01-no-source.patch

Lines 36-38 Link Here

(-)- config/scripts/move.sh.SH.orig (+6 lines)
36	echo ""	38	echo ""
37	echo "Installing headers..."	39	echo "Installing headers..."
38	echo ""	40	echo ""
		41	cd $g4install/source
		42	$g4make includes dependencies=""
		43	-fi
		44
		45	# Move libraries
		46	if [ X$g4install != X$g4final_install ] ; then




LICENSE="geant4"
SLOT="4"
KEYWORDS="~amd64 ~x86"
IUSE="athena +data dawn debug examples gdml geant3 minimal motif
	+opengl openinventor +raytracerx +vrml zlib"

DEPEND="sci-physics/clhep

}

src_compile() {
	GEANT4_DIR=/usr/share/${PN}
	# The Configure shell script saves its options
	# in .config/bin/*/config.sh

	local myconf="$(g4vis_use opengl openglx)"
	use opengl && myconf="${glconf} $(g4vis_use motif openglxm)"
	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
	export CPPVERBOSE=y

		-D g4lib_build_static=n \
		|| die "Building shared geant failed"

	# rm -rf tmp
	#
	#	./Configure \
	#		-deO -build \
	#		-D g4lib_build_shared=n \
	#		-D g4lib_build_static=y \
	#		|| die "Building shared geant failed"
}

src_install() {

	./Configure \
		|| die "Final install failed"

	insinto ${GEANT4_DIR}
	sed -i \
		-e "s:${S}:${GEANT4_DIR}:g" \
		-e "s:${D}:/:g" \
		env.*sh
	doins env.*sh || die "failed installing shell scripts"
	doins -r config
	insinto "${GEANT4_DIR}/data"
	if use data; then
		cd "${WORKDIR}"
		# give an explicit list of data dirs since the archive names don't
		# 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
		cd "${S}"
	fi

	# doc and examples


pkg_postinst() {
	elog "You can set the Geant4 environment variables"
	elog "from ${ROOT}${GEANT4_DIR} shell scripts."
	elog "Ex: for bash"
	elog "     source ${ROOT}${GEANT4_DIR}/env.sh"
	elog
	elog "Help us to improve the ebuild and dependencies in"
	elog "http://bugs.gentoo.org/show_bug.cgi?id=212221"

Return to bug 212221

Lines 25-31 done Link Here

(-)a/geant/geant-4.9.1_p01.ebuild (-16 / +26 lines)
25	LICENSE="geant4"	25	LICENSE="geant4"
26	SLOT="4"	26	SLOT="4"
27	KEYWORDS="~amd64 ~x86"	27	KEYWORDS="~amd64 ~x86"
28	IUSE="athena +data dawn debug examples gdml geant3 minimal +motif	28	IUSE="athena +data dawn debug examples gdml geant3 minimal motif
29	+opengl openinventor +raytracerx +vrml zlib"	29	+opengl openinventor +raytracerx +vrml zlib"
30		30
31	DEPEND="sci-physics/clhep	31	DEPEND="sci-physics/clhep
Lines 92-104 g4w_use() { Link Here
92	}	92	}
93		93
94	src_compile() {	94	src_compile() {
95	GEANT4_DATA_DIR=/usr/share/${PN}	95	GEANT4_DIR=/usr/share/${PN}
96	# The Configure shell script saves its options	96	# The Configure shell script saves its options
97	# in .config/bin/*/config.sh	97	# in .config/bin/*/config.sh
98		98
99	local myconf="$(g4vis_use opengl openglx)"	99	local myconf="$(g4vis_use opengl openglx)"
100	use opengl && myconf="${glconf} $(g4vis_use motif openglxm)"	100	use opengl && myconf="${glconf} $(g4vis_use motif openglxm)"
101	use data && myconf="${myconf} -D g4data=${GEANT_DATA_DIR}"	101	DATA="${GEANT4_DIR}/data"
		102	use data && myconf="${myconf}
		103	-D g4levelgammadata=${DATA}/PhotonEvaporation2.0
		104	-D g4radioactivedata=${DATA}/RadioactiveDecay3.2
		105	-D g4ledata=${DATA}/G4EMLOW5.1
		106	-D g4neutronhpcrosssections=${DATA}/G4NDL3.12
		107	-D g4abladata=${DATA}/G4ABLA3.0"
102		108
103	# switch to see compiling flags	109	# switch to see compiling flags
104	export CPPVERBOSE=y	110	export CPPVERBOSE=y
Lines 142-154 src_compile() { Link Here
142	-D g4lib_build_static=n \	148	-D g4lib_build_static=n \
143	\|\| die "Building shared geant failed"	149	\|\| die "Building shared geant failed"
144		150
145	rm -rf tmp	151	# rm -rf tmp
146		152	#
147	./Configure \	153	# ./Configure \
148	-deO -build \	154	# -deO -build \
149	-D g4lib_build_shared=n \	155	# -D g4lib_build_shared=n \
150	-D g4lib_build_static=y \	156	# -D g4lib_build_static=y \
151	\|\| die "Building shared geant failed"	157	# \|\| die "Building shared geant failed"
152	}	158	}
153		159
154	src_install() {	160	src_install() {
Lines 159-176 src_install() { Link Here
159	./Configure \	165	./Configure \
160	\|\| die "Final install failed"	166	\|\| die "Final install failed"
161		167
162	insinto ${GEANT4_DATA_DIR}	168	insinto ${GEANT4_DIR}
163	sed -i \	169	sed -i \
164	-e "s:${S}:${GEANT4_DATA_DIR}:g" \	170	-e "s:${S}:${GEANT4_DIR}:g" \
165	-e "s:${D}:/:g" \	171	-e "s:${D}:/:g" \
166	env.*sh	172	env.*sh
167	doins env.*sh \|\| die "failed installing shell scripts"	173	doins env.*sh \|\| die "failed installing shell scripts"
168	doins -r config	174	doins -r config
		175	insinto "${GEANT4_DIR}/data"
169	if use data; then	176	if use data; then
170	cd "${WORKDIR}"	177	cd "${WORKDIR}"
171	for d in ${GEANT4_DATA}; do	178	# give an explicit list of data dirs since the archive names don't
172	doins -r ${d/.} \|\| die "installing data ${d} failed"	179	# always match the content
		180	for d in "G4NDL3.12 G4EMLOW5.1 RadioactiveDecay3.2 PhotonEvaporation2.0 G4ABLA3.0"; do
		181	doins -r ${d} \|\| die "installing data ${d} failed"
173	done	182	done
		183	cd "${S}"
174	fi	184	fi
175		185
176	# doc and examples	186	# doc and examples
Lines 188-196 src_install() { Link Here
188		198
189	pkg_postinst() {	199	pkg_postinst() {
190	elog "You can set the Geant4 environment variables"	200	elog "You can set the Geant4 environment variables"
191	elog "from ${ROOT}${GEANT4_DATA_DIR} shell scripts."	201	elog "from ${ROOT}${GEANT4_DIR} shell scripts."
192	elog "Ex: for bash"	202	elog "Ex: for bash"
193	elog " source ${ROOT}${GEANT4_DATA_DIR}/env.sh"	203	elog " source ${ROOT}${GEANT4_DIR}/env.sh"
194	elog	204	elog
195	elog "Help us to improve the ebuild and dependencies in"	205	elog "Help us to improve the ebuild and dependencies in"
196	elog "http://bugs.gentoo.org/show_bug.cgi?id=212221"	206	elog "http://bugs.gentoo.org/show_bug.cgi?id=212221"

Lines 28-34 Link Here

(-)- Configure.orig (-9 / +27 lines)
28		30
29	exec 4>&1	31	exec 4>&1
30	case "$silent" in	32	case "$silent" in
31	@@ -982,7 +983,7 @@	33	@@ -982,7 +983,7 @@ EOF
32	: general instructions	34	: general instructions
33	needman=true	35	needman=true
34	firsttime=true	36	firsttime=true
Lines 37-43 Link Here
37	case "$user" in	39	case "$user" in
38	'') user=`whoami 2>&1`;;	40	'') user=`whoami 2>&1`;;
39	esac	41	esac
40	@@ -1315,7 +1316,6 @@	42	@@ -1315,7 +1316,6 @@ case "$config_sh" in
41	'')	43	'')
42	myuname=`( ($uname -a) 2>/dev/null \|\| hostname) 2>&1`	44	myuname=`( ($uname -a) 2>/dev/null \|\| hostname) 2>&1`
43		45
Lines 45-51 Link Here
45	myuname=`echo $myuname \| $sed -e 's/^[^=]*=//' -e 's/\///g' \| \	47	myuname=`echo $myuname \| $sed -e 's/^[^=]*=//' -e 's/\///g' \| \
46	./tr '[A-Z]' '[a-z]' \| tr '\012' ' '`	48	./tr '[A-Z]' '[a-z]' \| tr '\012' ' '`
47	newmyuname="$myuname"	49	newmyuname="$myuname"
48	@@ -1911,7 +1911,7 @@	50	@@ -1911,7 +1911,7 @@ fi
49		51
50	. $src/.config/bin/$g4system/move.sh	52	. $src/.config/bin/$g4system/move.sh
51		53
Lines 54-60 Link Here
54		56
55	fi #end of cppflags	57	fi #end of cppflags
56		58
57	@@ -2119,7 +2119,7 @@	59	@@ -2119,7 +2119,7 @@ EOM
58	cp -i $src/.config/bin/$g4system/env.csh .	60	cp -i $src/.config/bin/$g4system/env.csh .
59	cp -i $src/.config/bin/$g4system/env.sh .	61	cp -i $src/.config/bin/$g4system/env.sh .
60		62
Lines 63-69 Link Here
63	fi #end of -lib or user	65	fi #end of -lib or user
64	else #there is no env.sh	66	else #there is no env.sh
65		67
66	@@ -2217,7 +2217,7 @@	68	@@ -2217,7 +2217,7 @@ done
67		69
68	: who configured the system	70	: who configured the system
69	cf_time=`$date 2>&1`	71	cf_time=`$date 2>&1`
Lines 72-78 Link Here
72	case "$cf_by" in	74	case "$cf_by" in
73	"")	75	"")
74	cf_by=`(whoami) 2>/dev/null`	76	cf_by=`(whoami) 2>/dev/null`
75	@@ -4200,9 +4200,9 @@	77	@@ -4200,9 +4200,9 @@ fi
76	if test "X$g4osname" = "XLinux" ; then	78	if test "X$g4osname" = "XLinux" ; then
77	g4vis_xmflags=" -I$g4vis_xmhome/include "	79	g4vis_xmflags=" -I$g4vis_xmhome/include "
78	if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then	80	if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then
Lines 84-90 Link Here
84	fi	86	fi
85	fi	87	fi
86		88
87	@@ -4908,9 +4908,9 @@	89	@@ -4908,9 +4908,9 @@ fi
88	if test "X$g4osname" = "XLinux" ; then	90	if test "X$g4osname" = "XLinux" ; then
89	g4vis_xmflags=" -I$g4vis_xmhome/include "	91	g4vis_xmflags=" -I$g4vis_xmhome/include "
90	if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then	92	if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then
Lines 96-102 Link Here
96	fi	98	fi
97	fi	99	fi
98		100
99	@@ -6123,7 +6123,7 @@	101	@@ -6123,7 +6123,7 @@ esac
100		102
101	echo ""	103	echo ""
102		104
Lines 105-111 Link Here
105	case $g4_gmake_version in	107	case $g4_gmake_version in
106	GNU*)	108	GNU*)
107	g4_gmake=y	109	g4_gmake=y
108	@@ -6133,7 +6133,7 @@	110	@@ -6133,7 +6133,7 @@ echo ""
109	;;	111	;;
110	esac	112	esac
111		113
Lines 114-116 Link Here
114	case $g4_make_version in	116	case $g4_make_version in
115	GNU*)	117	GNU*)
116	g4_make=y	118	g4_make=y
		119	@@ -6145,7 +6145,7 @@ echo ""
		120
		121	if [ $g4_gmake = y ] ; then
		122
		123	-g4make=gmake
		124	+g4make="gmake "`echo $MAKEOPTS`
		125
		126	g4message=`cat << EOM
		127
		128	@@ -6159,7 +6159,7 @@ fi
		129
		130	if [ $g4_gmake = n ] && [ $g4_make = y ] ; then
		131
		132	-g4make=make
		133	+g4make="make "`echo $MAKEOPTS`
		134
		135	g4message=`cat << EOM
		136