Fixed more zlib issues. The geant3 flag is now only for unit conversion (if geant3 is needed, geant:3 has to be installed from user). The data is now fetched (building needs network) to ease maintenance and set up the proper env variables in the geant4*sh scripts. Removed a use dawn duplicate. Thanks Marek Szuba for his suggestions (bug #407517 and bug #359673). Added a message for backward compatibility (bug #360285)

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

4 files changed, 106 insertions, 7 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index ef0f36c34299..79e2e3c964fe 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sci-physics/geant
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.55 2011/12/18 07:13:04 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.56 2012/03/13 21:52:56 bicatali Exp $
+
+*geant-4.9.5-r1 (13 Mar 2012)
+
+  13 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  files/geant-4.9.4-zlib.patch, +geant-4.9.5-r1.ebuild:
+  Fixed more zlib issues. The geant3 flag is now only for unit conversion (if
+  geant3 is needed, geant:3 has to be installed from user). The data is now
+  fetched (building needs network) to ease maintenance and set up the proper
+  env variables in the geant4*sh scripts. Removed a use dawn duplicate. Thanks
+  Marek Szuba for his suggestions (bug #407517 and bug #359673). Added a
+  message for backward compatibility (bug #360285)
 
 *geant-4.9.5 (18 Dec 2011)
 *geant-4.9.4_p03 (18 Dec 2011)
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 38c4b74d470e..b50bb76c395e 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -9,7 +9,7 @@ AUX geant-4.9.4-libdir.patch 1328 RMD160 518d42f5e9263828c3f90fdbde3d1d352d4b21a
 AUX geant-4.9.4-no-benchmarks.patch 370 RMD160 759b19161b950963a04cb6bd7b7dadb918c7fd08 SHA1 8c1bec8775809e5e4655269ee136f294204151c6 SHA256 5ff40079b5669335b1701831fba3922b525d2fdd594704750111d7eaea45b693
 AUX geant-4.9.4-no-examples.patch 486 RMD160 7ef349c41d31041af9b5edfd3e82c5fbcfbbae6a SHA1 314a826f5671edbc237e7a960d8c944af3463560 SHA256 4ae8e7bc5790b5cb207d440bd3c05e81196528517af2f32c0e3483ed41d12d99
 AUX geant-4.9.4-trajectory.patch 390 RMD160 4e654e0ff42c2c1b1c2320e2deb6f8ff0f3d45e6 SHA1 2adba855b88f7461d4dc14dfa4e958c97e90c682 SHA256 6e4c0b2a44960411132130d379f6c9a7f867a656e4851ac9b1fd584685ae204c
-AUX geant-4.9.4-zlib.patch 520 RMD160 45e0c4573e009a16d89a0b86770ad0e3269ff521 SHA1 80c369c1aa8160266573361e5765939ef1b1d0e7 SHA256 f0a93436987b6e25a8774e46ff3e415ec8c166b7a207bd86c91c71e78550c50a
+AUX geant-4.9.4-zlib.patch 963 RMD160 3e4edc4c3eacb88c31d94f3b0cabccb7a0b8cbb4 SHA1 1dcef047511da7aca2e04e116b36cccb18e3ef49 SHA256 6fc50ad04fcd6b646635ca42ed2b42d26b9f46ec8bcfc5bedabb89134bb0cdfe
 DIST G4ABLA.3.0.tar.gz 54909 RMD160 5a032ee8e90d00f39b67114fe257ec47001f347b SHA1 5f38676f1650a508e49d35f9405ac96984388135 SHA256 ff0b77be6b36204eeeba71099f6b7530edd80b79eb015994535bc4334bc821eb
 DIST G4EMLOW.6.19.tar.gz 14396144 RMD160 ba67b3f1ee215966adc99661a1db4a5bf09c5511 SHA1 f63e41a43a3d0c793a04dbb6cce0bdcfeedf6889 SHA256 8876defe74e4c1e9d6b58b2365a9b468ac8d996fb63fa1c6ba6240e0b185845f
 DIST G4EMLOW.6.2.tar.gz 8389172 RMD160 fa51dbb4f0e316b0e682a05c9db4c1dc29db7218 SHA1 627ca63927064f1846aa8d7e2e5c4783fe0b9610 SHA256 1affbc66d8809db0c8e450ca83a0da744e7f5b8e912ec52e93b1f24b47cbd781
@@ -38,13 +38,14 @@ EBUILD geant-3.21.14-r2.ebuild 1885 RMD160 2022b046c7f52a4687948387cd7a084e2b0d1
 EBUILD geant-3.21.14-r3.ebuild 1719 RMD160 7158c53cb2f0e1098fd5f6d5249029fffe35cf3a SHA1 10f67d4d0c17aab06ce4f50fa3f2393a792c426b SHA256 5bb8f71e86a5f5562f0aab9f86f14937e863dffd2b9e1bb502fd5ba9a120f1b9
 EBUILD geant-4.9.2_p02.ebuild 8145 RMD160 3d1a138202fe2e3151ad684c18cec0e7a4dccbfc SHA1 d813033ebcae3ef491aae7a9a794ef63a8813d8d SHA256 02920927f1eb081a9753f7ac9c8a282d036955750796bbbd6b007fa55f6c1e26
 EBUILD geant-4.9.4_p03.ebuild 2398 RMD160 b0788b3a5e2169dcea5f373994500b21fb259026 SHA1 97bb383e9cf7631af96dc9dc9f9f09ee505318a7 SHA256 72ad2e70d0649e6dd0383273345f2099104ad0ab84ad6d3dfba25fe2cccd28c3
+EBUILD geant-4.9.5-r1.ebuild 2421 RMD160 1a7b624a386362677b0ded18119e1ce963a4c89b SHA1 b5fa4c4cf56caa831cd04cffcf393b88b7982186 SHA256 55663fed82dea85e81657fe3aac5aed9f0b314d000748075ecf53f08a78ad83a
 EBUILD geant-4.9.5.ebuild 2901 RMD160 4b1a0ea04778c3ee732fa897ff0a2e685044480e SHA1 9b930c2711cd1036ba5a67288692373e51e01f26 SHA256 3dea5b1125e8ca411e7fb95a4c7673d56ae4163ec07b8095e91948790b7d9fbd
-MISC ChangeLog 10430 RMD160 f392c7a735fb8526b05a583361ee839199afaaad SHA1 a3af007ee95e84dcfaee71e858099d87864aa3bf SHA256 e7aa52c852edd81f1895ccdc1daccfcd205182f4baf0d7ac5ecba1ecf0ec4fd2
+MISC ChangeLog 11007 RMD160 37a7d59bf4e97e45fa355ea60e316943639f7c35 SHA1 854df3a4442d95bd3147d1707f4d80e9f08508da SHA256 915c51e36a9de4147c35a3242a963194b91fb38d6273594fb196ca272580b3eb
 MISC metadata.xml 1569 RMD160 b4e64715d0d29b17b7fc46da45f4ebbff41fc380 SHA1 b30f9de8adea84a688b1343115afa304d5b0de4f SHA256 532c396760c97bbf207439e4f189679bbe02fda61d33446beeebc5f855b36f63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7tkokACgkQ1ycZbhPLE2BtmgCfYJkBXyzb4QHqpcXLK9VF3oNv
-ZicAn2bXTa9xvBeuC1lh+m9xTiUBYeKH
-=7KxO
+iEYEARECAAYFAk9fwcEACgkQ1ycZbhPLE2BI0gCfZcjAVGufFkLpmZbIeLfnTY2N
+jJoAmQH3pckLbbDWGQ4SvRAzPZqdDN1R
+=6kE1
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/geant/files/geant-4.9.4-zlib.patch b/sci-physics/geant/files/geant-4.9.4-zlib.patch
index ac7b72818be9..1aaa3e5083ed 100644
--- a/sci-physics/geant/files/geant-4.9.4-zlib.patch
+++ b/sci-physics/geant/files/geant-4.9.4-zlib.patch
@@ -18,3 +18,17 @@
      LINK_LIBRARIES
  )
  
+--- source/visualization/externals/gl2ps/sources.cmake.orig	2011-12-02 16:07:56.000000000 +0100
++++ source/visualization/externals/gl2ps/sources.cmake	2012-03-09 14:09:26.965148002 +0100
+@@ -49,9 +49,9 @@
+         G4OpenGL2PSAction.cc
+         gl2ps.cc
+     GRANULAR_DEPENDENCIES
+-        G4zlib
++        ${ZLIB_LIBRARIES}
+     GLOBAL_DEPENDENCIES
+-        G4zlib
++        ${ZLIB_LIBRARIES}
+     LINK_LIBRARIES
+         ${OPENGL_LIBRARIES}
+ )
diff --git a/sci-physics/geant/geant-4.9.5-r1.ebuild b/sci-physics/geant/geant-4.9.5-r1.ebuild
new file mode 100644
index 000000000000..f954aa483d40
--- /dev/null
+++ b/sci-physics/geant/geant-4.9.5-r1.ebuild
@@ -0,0 +1,73 @@
+# 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.1 2012/03/13 21:52:56 bicatali Exp $
+
+EAPI=4
+
+inherit cmake-utils eutils fortran-2 versionator
+
+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"
+IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor
+	raytracerx qt4 static-libs test vrml zlib"
+
+RDEPEND="virtual/fortran
+	>=sci-physics/clhep-2.1.1
+	dawn? ( media-gfx/dawn )
+	gdml? ( dev-libs/xerces-c )
+	motif? ( x11-libs/openmotif:0 )
+	openinventor? ( media-libs/openinventor )
+	raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
+	qt4? ( x11-libs/qt-gui:4 opengl? ( x11-libs/qt-opengl:4 ) )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch )
+
+src_configure() {
+	mycmakeargs=(
+		-DGEANT4_USE_SYSTEM_CLHEP=ON
+		$(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 test GEANT4_ENABLE_TESTING)
+		$(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() {
+	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
+}
+
+pkg_postinst() {
+	elog "The following scripts are provided for backward compatibility:"
+	elog "$(ls -1 ${EROOT}usr/share/Geant4-${PV2}.${PV3}.*/geant4make/*sh)"
+}