version bump

Package-Manager: portage-2.2.7/cvs/Linux x86_64

5 files changed, 177 insertions, 24 deletions

diff --git a/sci-physics/geant-python/ChangeLog b/sci-physics/geant-python/ChangeLog
index 60274c3e136e..96bcb6f596d7 100644
--- a/sci-physics/geant-python/ChangeLog
+++ b/sci-physics/geant-python/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-physics/geant-python
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-python/ChangeLog,v 1.10 2013/09/05 19:44:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-python/ChangeLog,v 1.11 2013/12/20 06:09:22 heroxbd Exp $
+
+*geant-python-4.10.00 (20 Dec 2013)
+
+  20 Dec 2013; Benda Xu <heroxbd@gentoo.org>
+  +files/geant-python-4.10.0-config.patch,
+  +files/geant-python-4.10.0-polycone.patch, +geant-python-4.10.00.ebuild:
+  version bump
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> geant-python-4.9.6_p02.ebuild:
   Clean up PYTHON_COMPAT from old implementations.
diff --git a/sci-physics/geant-python/Manifest b/sci-physics/geant-python/Manifest
index 5428a5c2198c..342d2cc1c8f9 100644
--- a/sci-physics/geant-python/Manifest
+++ b/sci-physics/geant-python/Manifest
@@ -1,27 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX geant-python-4.10.0-config.patch 879 SHA256 472fdaabbc9bfc55e53e103c8c607f46ec254cb6cdb5d94f96fa0ec9a357eaa1 SHA512 409951aeaf6cb33d8ab0d70c94ab04901f449554c8e1e14706a40144e132d4f33543e85740d7f99ca32bfd28fac1e12ddd6deeee6d0b101c42283fdf74da5ea7 WHIRLPOOL 8e804ca3e0ad6d70fb9c1bf5201086108d6fceb1ac6035ebe498d05e77c9cab6156f775ff3d10eaae8a72fc83b33212aef87cdd512961ddb0fe22a8da79fcd0f
+AUX geant-python-4.10.0-polycone.patch 609 SHA256 8a32107400595505079f119fe90d16e5399b41a00761e24d927c4d88d7e0710f SHA512 d65395f12928ca500452545c19bcdefd0b3740fb27c2ff2ccd01748d70347e1d3e8935d94e9b1ae142037c0930551e58bc6dd93dd944c3d712255555a639d5c5 WHIRLPOOL 0ca9675689078c901de99094d15ae6467d7ebcd3f6f49a3068d9ab00e6c2b42e0cccf51019c93d097a9d7fcb74572288b03da3f59cd81404a0d92ec1dd85b1ef
 AUX geant-python-4.9.5-visverbose.patch 557 SHA256 0955cd39ce1f8e842e2804370359a4e367b14f4791a40fd653918c32884bed8a SHA512 6780065ef2ba4efa79bdd835e500f25309baf6b3d8bf2418b83f2cbb984a8b6a48d27e10a1327cd42e6e236663557fedb5bb2f9f34ee0d1631fc316868959fb0 WHIRLPOOL f3a982c6d8781bf04094f85cd6d0187d984dfb45eff1676d7e459b4d7614847890e40ec63b56a52e0c8bcc5e273d4d333795e14fac3056c22b0c960a9d3ba556
+DIST geant4.10.00.tar.gz 30780131 SHA256 ffec1714b03748b6d691eb0b91906f4c74422c1ad1f8afa918e03be421af8a17 SHA512 c9288b26df8b858622e728158b687cd7bc257c49f26a21b93d1b9fa4619c22dfea2a7604689118ac493b407888690db42d1ec9c8048aa1f45bf8beeb6a657e87 WHIRLPOOL 20eb2002e867a0fe3dab683820ebeeb5de2140c5cd7c4c57c07b5da2a62900d4ee2bf1f6372e034781ed536001e40a5a79d5654729e45a16995415febfefb26d
 DIST geant4.9.6.p02.tar.gz 25480383 SHA256 cf5df83b7e2c99e6729449b32d3ecb0727b4692317426b66fc7fd41951c7351f SHA512 dab5f31568074869adecbbfb8855be0c0a2e92e5ba3119dbeb9cd414878721df3052198a05e5e3c19d0e2942a22602c6618dc0628b05134d3403a50c2bc2032c WHIRLPOOL 8c66d8aa1605a42e6b6f054c32eb49df0bb2afcdf54360ff630908ce7cfc8a7a37b62cdb2a1612af05f1f70a5575c6516aad1f6737a67692449b01e1137b2865
+EBUILD geant-python-4.10.00.ebuild 3683 SHA256 9e9a573a9f1298c4830d1f15a51c1f4d4e74ef07c3df2da98563b833656b12e2 SHA512 3d3c76ad0523153aabb493aadb9f6de3a6c5c181dfa6705c560dd40465b7c287711a328ab0e311a3a03f26af4fa9c76245da5f1ce549b15183f690b87198ecdd WHIRLPOOL ec818afc9f0dcd10a7080eab59e5413324f633e94664d15b57f9e7e60eb351812501b988d99c8017728a16535828cb4e140a0812af161e701702a16af1dc21d0
 EBUILD geant-python-4.9.6_p02.ebuild 3586 SHA256 644cbb5d55847a886343c1fce4203b966064bae049c4b5617ad26c74e8125421 SHA512 69558bafd63c37e13af2a0abae136f3c8f7ac84b321ec00c372c45e2995671520c633c1082bf12346f9bb5ad9f9b375573543b8ea99767cfcd3569d557f2e789 WHIRLPOOL b78a06296cf4bcb3c8fc32407b3ac57c3fa7b7f50334bae46706d131d647db7ea35a4de820f2d3cbcf214bd939027237557861bbf0adc768d90bf97bd1a10145
-MISC ChangeLog 1981 SHA256 3f231636b86eac1dcb25ea4c0baa437256268a5e753ac8f59856d521f696eee6 SHA512 2d7a93fa612d8d51f1903fb4bd0953f656639ae69f53bd11f17903bd7135852be5d18bf91b3200d8781ed4086625c21865c65fabf3f15f568696ab5a36ffb065 WHIRLPOOL 5b30cb3d8e715d2e4d39e2769c1bcef249186461445913323831bc46d0b7013233cbdbb382a978102615423743f66cbac3c2d0bd50d2685625f5d458befb43cc
+MISC ChangeLog 2198 SHA256 98e81210aabbbac0a7dd2a241970f69becee075f922f7b0cbfd0f365daed524b SHA512 e6609c81f31456217725b79aff9e92da1e82416e020c059b98b94ab3d4ebfa94d2cecc2867959c384bddf10eb62863954e57458dc55166d71973c0cbab59285f WHIRLPOOL 3a4bccb25e346d0cb67c7d5ef559d5ba4070baf0d23103f2212b187260026c5502e6441975fef9b8e3448afd21042580d28022b3d9c11361d3417b107f62a60f
 MISC metadata.xml 240 SHA256 d3241f908758d6318e86dac13c97b7f58c4ffe74595ea7b00494ed312f26fac1 SHA512 a1f547acd80a2870b33dc9914d2e3fa948d05779e4a70cba55bb47d2c41b15d6072b0b8feb938ba6d32104fc9732d4c25ba28aa7b117f30ac405907ee9b52dd6 WHIRLPOOL 44a5de47075f89ce9ec2ae89c99f84906650d6aa7f1e89ba527130fa5443200e8a601b09d8c8fe021d03fc574df33d4d57ded9478e94abfb9d3762480c21409c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
-
-iQJ8BAEBCABmBQJSKN+CXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLDQP/jiHpZUirlMKViZyzZ6WpnM1
-04gDfF3O5PicOabNwQ3eo/5aQ1kNoaCV9A6zkQEnbj9fkuQnPp7IktVsrhXZgELc
-IC/zqB44bPJ/qCMaL6uIRlexpkWIrm00p9NDFeF+gEyynqKF17UTD7Q6Am0BECtm
-qUmmSl+wS+BDS6OvshXWqz/PJtAt/FMAEFYIHkbStTtzclHDUXPSCEkA2fAxbffQ
-E05zg85zNHu+JTKElZEckcsNkw3qx3yJldV4rO6ke0j8gMFORn0ls4aD5kp/XBlE
-WSzb5AzUW+f6wBtY9c3Y3nuHWScci8II4/n5DP87uRVuWvAOo9Q2bjBLqRmkYj5A
-op+ukxpvnmfCQEJ+kjOvAU06T5qsUohDujpTxY7KNjslJAOLKCTZyF84o26ZB4JU
-hTdCjSp5atmTIMZm2EK5Qxzo8SwYEzHROkOVXDn3KUGfJ4OrxlQlq07HoNHwErNx
-Z9CViYgFrij+S/+6xxUs185SWmxaCStPhsTw3kgD8jJPg0KW84tvwspvqHfbh/ed
-lzw14P9sEuhyz5IUHUvvevAed1nQvA9/lBzequJ7NPIJTBqz/869WmoDO9OHV35V
-l+26lZSNnYhcCjwbli8G/VTs9/c5p8J3g77giSoHzXIsCwQGQB1Hked1wvBqx64D
-7qc0diAE083a+30uLKHf
-=ztXn
------END PGP SIGNATURE-----
diff --git a/sci-physics/geant-python/files/geant-python-4.10.0-config.patch b/sci-physics/geant-python/files/geant-python-4.10.0-config.patch
new file mode 100644
index 000000000000..50f4dabb43c3
--- /dev/null
+++ b/sci-physics/geant-python/files/geant-python-4.10.0-config.patch
@@ -0,0 +1,27 @@
+do not hard code PATH; QGSP.hh is renamed to G4QGSParticipants.hh in geant-4.10
+
+http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1545
+http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1546
+Index: g4py/configure
+===================================================================
+--- g4py.orig/configure
++++ g4py/configure
+@@ -4,9 +4,6 @@
+ # ======================================================================
+ export LANG=C
+ 
+-PATH=/bin:/usr/bin
+-export PATH
+-
+ # ======================================================================
+ # testing the echo features
+ # ======================================================================
+@@ -377,7 +374,7 @@ fi
+ 
+ # ---
+ echo $ac_n "Checking for physics list support ...$ac_c"
+-if [ -f "$g4_incdir"/QGSP.hh ]; then
++if [ -f "$g4_incdir"/G4QGSParticipants.hh ]; then
+   enable_physicslist=1
+ fi
+ if [ $enable_physicslist = 0 ]; then
diff --git a/sci-physics/geant-python/files/geant-python-4.10.0-polycone.patch b/sci-physics/geant-python/files/geant-python-4.10.0-polycone.patch
new file mode 100644
index 000000000000..492e4700ac4f
--- /dev/null
+++ b/sci-physics/geant-python/files/geant-python-4.10.0-polycone.patch
@@ -0,0 +1,15 @@
+polycone API has been changed.
+
+http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1544
+Index: g4py/source/geometry/pyG4Polycone.cc
+===================================================================
+--- g4py.orig/source/geometry/pyG4Polycone.cc
++++ g4py/source/geometry/pyG4Polycone.cc
+@@ -96,7 +96,6 @@ void export_G4Polycone()
+     .def("GetStartPhi",    &G4Polycone::GetStartPhi)
+     .def("GetEndPhi",      &G4Polycone::GetEndPhi)
+     .def("IsOpen",         &G4Polycone::IsOpen)
+-    .def("IsGeneric",      &G4Polycone::IsGeneric)
+     .def("GetNumRZCorner", &G4Polycone::GetNumRZCorner)
+ 
+     // operators
diff --git a/sci-physics/geant-python/geant-python-4.10.00.ebuild b/sci-physics/geant-python/geant-python-4.10.00.ebuild
new file mode 100644
index 000000000000..ac84b3f91060
--- /dev/null
+++ b/sci-physics/geant-python/geant-python-4.10.00.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-python/geant-python-4.10.00.ebuild,v 1.1 2013/12/20 06:09:22 heroxbd Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit python-r1 versionator multilib eutils
+
+MYP="geant$(replace_version_separator 3 .)"
+
+DESCRIPTION="Python bindings for Geant4"
+HOMEPAGE="http://geant4.cern.ch/"
+SRC_URI="http://geant4.cern.ch/support/source/${MYP}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="geant4"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/boost[${PYTHON_USEDEP}]
+	dev-libs/xerces-c
+	=sci-physics/geant-${PV}*"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MYP}/environments/g4py"
+
+pkg_setup() {
+	if use amd64; then
+		ARG=linux64
+	elif use x86; then
+		ARG=linux
+	else
+		die "platform unknown"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.9.5-visverbose.patch
+	epatch "${FILESDIR}"/${PN}-4.10.0-config.patch
+	epatch "${FILESDIR}"/${PN}-4.10.0-polycone.patch
+	sed -i -e "s/lib64/$(get_libdir)/g" configure || die
+	sed -i -e 's/-lG4clhep/-lCLHEP/g' config/g4py.gmk || die
+	# respect user toolchain and flags
+	sed -i \
+		-e '/^CXX.*:=/d' \
+		-e '/CXXFLAGS/s/-f\(template-depth-255\|inline-functions\|permissive\)//g' \
+		-e "/CXXFLAGS/s/-O2/${CXXFLAGS}/g" \
+		-e '/^rpathflag/s|:\($(rpath.)\)| -Wl,-rpath,\1 |g' \
+		-e "s/\$(rpathflag)/\$(LDFLAGS) \$(rpathflag)/g" \
+		config/sys/linux* || die
+	python_copy_sources
+
+	run_sed() {
+		sed -i -e "s/\(python_exe=\)python/\1${EPYTHON}/" configure || die
+		[[ ${EPYTHON} == python3* ]] && sed -i -e "s/with_python3=0/with_python3=1/" configure
+		# let Geant4 module installed into python sitedir instead of default
+		sed -i \
+			-e "/G4PY_LIBDIR  :=/cG4PY_LIBDIR  := $\(DESTDIR\)$(python_get_sitedir)/Geant4" \
+			config/install.gmk || die "sed failed on config/install.gmk"
+
+		local mfile
+		for mfile in source/python{3,}/GNUmakefile
+		do
+			sed -i \
+				-e "/install_dir :=/cinstall_dir := $\(DESTDIR\)$(python_get_sitedir)/Geant4" \
+				"${mfile}" || die "sed failed on ${mfile}"
+		done
+
+		# let g4py module installed into python sitedir instead of default
+		sed -i \
+		-e "/install_dir :=/cinstall_dir := $\(DESTDIR\)$(python_get_sitedir)/g4py" \
+			config/site-install.gmk || die "sed failed on config/site-install.gmk"
+		for mfile in {processes/emcalculator,utils/MCScore}/{python3/,}GNUmakefile python/GNUmakefile
+		do
+			sed -i \
+				-e "/install_dir :=/cinstall_dir := $\(DESTDIR\)$(python_get_sitedir)/g4py" \
+				"site-modules/${mfile}" || die "sed failed on site-modules/${mfile}"
+		done
+
+	}
+	python_foreach_impl run_in_build_dir run_sed
+}
+
+src_configure() {
+	run_configure() {
+		# not the autotools configure
+		./configure ${ARG} \
+			--prefix="${EPREFIX}/usr" \
+			--with-g4install-dir="${EPREFIX}/usr" \
+			--with-python-incdir="$(python_get_includedir)" \
+			--with-python-libdir="${EPREFIX}/usr/$(get_libdir)" \
+			--with-boost-incdir="${EPREFIX}/usr/include"  \
+			--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)" \
+			--with-boost-python-lib="boost_python-${EPYTHON#python}" \
+			--with-xercesc-incdir="${EPREFIX}/usr/include" \
+			--with-xercesc-libdir="${EPREFIX}/usr/$(get_libdir)" \
+			|| die "configure failed"
+	}
+	python_foreach_impl run_in_build_dir run_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir emake CPPVERBOSE=1
+}
+
+src_test() {
+	run_test() {
+		emake -C tests
+	}
+	python_foreach_impl run_in_build_dir run_test
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	dodoc README.md History
+	insinto /usr/share/doc/${PF}
+	use examples && doins -r examples
+}