Fix for openinventor to use SGI OpenInventor in portage instead of SoXt, bug #408187

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

4 files changed, 13 insertions, 112 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index 79e2e3c964fe..26db72ffb834 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/geant
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.57 2012/03/16 21:03:59 bicatali Exp $
+
+  16 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> -geant-4.9.5.ebuild,
+  geant-4.9.5-r1.ebuild:
+  Fix for openinventor to use SGI OpenInventor in portage instead of SoXt, bug
+  #408187
 
 *geant-4.9.5-r1 (13 Mar 2012)
 
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index b50bb76c395e..50b4fba37ab8 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -13,19 +13,13 @@ AUX geant-4.9.4-zlib.patch 963 RMD160 3e4edc4c3eacb88c31d94f3b0cabccb7a0b8cbb4 S
 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
-DIST G4EMLOW.6.23.tar.gz 15960390 RMD160 84529979894ed5e35ade27201fee67884d7b381d SHA1 25c65e6e42b7e259f739bf6e1689e67509a346c2 SHA256 6452215d9a0acbd35c71eed47f3581fd0276d7088b1a1a8588c003d9072aed3e
 DIST G4NDL.3.13.tar.gz 57034762 RMD160 243b206170d996c7b562a86e388ff4d5f8d11764 SHA1 4acc412a2f29a7a8f84ac50aeb7331c8ed2889ae SHA256 e994b873032b3d1c0bcc2679275c43354d3e1cd5091da76c8fcd4826536f17a3
 DIST G4NDL.3.14.tar.gz 58794491 RMD160 8393b5e0301526ec747da133b6972c70b8c44210 SHA1 dc8b7a5fa0fcd06a85071c1b09730de6d04362d3 SHA256 08ff1d4fb0953f2502d88f76fb9db1d4314c975564731f11c9372d0ea992cafa
-DIST G4NDL.4.0.tar.gz 400001140 RMD160 602d209009ee93d792cb67fe592aa37de6bab7c2 SHA1 889e8ee3b348c649427725b8e12212bdca48b78e SHA256 cef4fab143d8dcb8eae4c6e5c095af01d735bb36334b9958e00e30bcec9827ed
 DIST G4NEUTRONXS.1.0.tar.gz 1186619 RMD160 c8ddf1d50e7fdbc3d53959bb45bb84615467f96d SHA1 9904ffccc3053cf6d48441e6a1e55fa1a3360766 SHA256 577d28b7faa41caacb001a30384028cd5e3b7018755ab94a427ce0a7feeab365
-DIST G4NEUTRONXS.1.1.tar.gz 1247160 RMD160 a4cd8791219f0df856da39295e7f913a537bde1a SHA1 58b9a22584962cfc935e60d34b3b920b1bcd10df SHA256 d477a377aee229bf9d75d3c9cc4b7cd48b414285a246449e4e44a72bf037472b
 DIST G4PII.1.2.tar.gz 3387814 RMD160 6f7553941ce2130c7f463a2ec7613c801792ccfb SHA1 65e72c1507370c0cdbc2505bb02083e04fd5667c SHA256 80e680d7343ed051bcfffd910c682cfd66980cecd1c0bc435f06c6c740a6f99d
-DIST G4PII.1.3.tar.gz 4293607 RMD160 313a2615903b0682b8aabc344bedde82c345704b SHA1 020fb5abb8dc9d4dfc073c22025b998de1482738 SHA256 6225ad902675f4381c98c6ba25fc5a06ce87549aa979634d3d03491d6616e926
 DIST G4PhotonEvaporation.2.1.tar.gz 7504003 RMD160 be5e5ef9db4b85f916017561cc2dfbc5a1b226d7 SHA1 56937f579e2134259963093ca735afc2b5a6ec5c SHA256 08ab657a060518c9b7aab03b17628cbb31585ee9512e0f2033f2fb0d7d9b2bc7
-DIST G4PhotonEvaporation.2.2.tar.gz 7704178 RMD160 8efc16c40b4755d209f83f31f2d251bbef52ccb8 SHA1 9f598fed6c53f18a5525d38d8ec0c5bec8009aa4 SHA256 9db02ef8e5b065c1b7f7d1becd1b72dde2b8fc617bcedde97788040418f239c0
 DIST G4RadioactiveDecay.3.2.tar.gz 761070 RMD160 1f797977c0c66722f4b032ac546c26eaa8a9f14a SHA1 45e706e46a33e08b1706f069d15e8c2145f3410e SHA256 31dc70aa59cb86ef0dbaf96c639e0541b7569d4fc98f92064ecdc8bc4b9c839b
 DIST G4RadioactiveDecay.3.3.tar.gz 732628 RMD160 065769a13b45dd335a6c6bd3b265c6d0370dcf96 SHA1 877a31ddf673729aad5b5f5892333495a1803784 SHA256 7f421d6808422f9186a8a96fc1889a54af03c80a37b9f9d1d51ab359ea0264d1
-DIST G4RadioactiveDecay.3.4.tar.gz 732861 RMD160 378c237cd5857b4205980815a3c47cdb654506d4 SHA1 8c6ec693fe1e145d6c55bae28e7fd9da748c8e87 SHA256 1ecfb477ca3c3966dd128193d8e11e24d6c3dc29cc188c8c9b0b21b941f9c30c
 DIST PhotonEvaporation.2.0.tar.gz 7506068 RMD160 24d46b08b2ffeca5b3be186baffb650b99accc97 SHA1 df3b4994c7248da7a226c186be747c4b823d34fa SHA256 5aac0ce683ca23274a7736c8e8911d8cf32d2bf33aab33a9a23126664762d61d
 DIST RealSurface.1.0.tar.gz 1257863 RMD160 030513fe340e0cccbfe0b9ae9acb3ba6b5291ebb SHA1 9b4bd95c647dc702458eeaf89ebf62c5885e2ece SHA256 3e2d2506600d2780ed903f1f2681962e208039329347c58ba1916740679020b1
 DIST geant321_3.21.14.dfsg-8.diff.gz 41909 RMD160 4edbe5d3dd93a78198fa2d2d83770c8b85eee4de SHA1 39f48c4263f543b74eee6095c11f5ade9798f253 SHA256 785277dab1e1d3e17d60c85f3826bc67bbd6de7e6a6d40ff7af901371c4d2ce1
@@ -38,14 +32,13 @@ 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 11007 RMD160 37a7d59bf4e97e45fa355ea60e316943639f7c35 SHA1 854df3a4442d95bd3147d1707f4d80e9f08508da SHA256 915c51e36a9de4147c35a3242a963194b91fb38d6273594fb196ca272580b3eb
+EBUILD geant-4.9.5-r1.ebuild 2520 RMD160 3423ffc3dd3f7c3fac2874f0387a99d15a2ea22b SHA1 d53c7831c42aa6deb4bfd7bc66429b88e00d8e77 SHA256 f2175bc2825683a06bf8f2ee7a52e337acf40df9367611383e3a62c6e721785f
+MISC ChangeLog 11198 RMD160 a56180afd929dcb8bf7ef60332a676e92ca8206c SHA1 2d40a1acf58d16b88df88885b50c9e1746420a96 SHA256 bc16f855ad12d9a157aaff91e466b4b2ca48613e1a36350b15341af3966fd024
 MISC metadata.xml 1569 RMD160 b4e64715d0d29b17b7fc46da45f4ebbff41fc380 SHA1 b30f9de8adea84a688b1343115afa304d5b0de4f SHA256 532c396760c97bbf207439e4f189679bbe02fda61d33446beeebc5f855b36f63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9fwcEACgkQ1ycZbhPLE2BI0gCfZcjAVGufFkLpmZbIeLfnTY2N
-jJoAmQH3pckLbbDWGQ4SvRAzPZqdDN1R
-=6kE1
+iEYEARECAAYFAk9jqsgACgkQ1ycZbhPLE2BrFgCcCjqRKeX43gc5L7go3dDnL66b
+qlgAnjEI3bmWcZ3kfzFEQULShp9Ampmv
+=Da2t
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/geant/geant-4.9.5-r1.ebuild b/sci-physics/geant/geant-4.9.5-r1.ebuild
index f954aa483d40..88b06bd0049b 100644
--- a/sci-physics/geant/geant-4.9.5-r1.ebuild
+++ b/sci-physics/geant/geant-4.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5-r1.ebuild,v 1.2 2012/03/16 21:03:59 bicatali Exp $
 
 EAPI=4
 
@@ -39,6 +39,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch )
 src_configure() {
 	mycmakeargs=(
 		-DGEANT4_USE_SYSTEM_CLHEP=ON
+		$(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)
diff --git a/sci-physics/geant/geant-4.9.5.ebuild b/sci-physics/geant/geant-4.9.5.ebuild
deleted file mode 100644
index 16c998e18f01..000000000000
--- a/sci-physics/geant/geant-4.9.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2011 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.ebuild,v 1.1 2011/12/18 07:13:04 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_COM="http://geant4.cern.ch/support/source"
-SRC_URI="${SRC_COM}/${MYP}.tar.gz"
-GEANT4_DATA="
-	G4NDL.4.0
-	G4EMLOW.6.23
-	G4RadioactiveDecay.3.4
-	G4NEUTRONXS.1.1
-	G4PII.1.3
-	G4PhotonEvaporation.2.2
-	G4ABLA.3.0
-	RealSurface.1.0"
-for d in ${GEANT4_DATA}; do
-	SRC_URI="${SRC_URI} data? ( ${SRC_COM}/${d}.tar.gz )"
-done
-
-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 )
-	geant3? ( sci-physics/geant:3 )
-	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
-		-DCMAKE_SKIP_RPATH=ON
-		$(cmake-utils_use dawn GEANT4_USE_NETWORKDAWN)
-		$(cmake-utils_use gdml GEANT4_USE_GDML)
-		$(cmake-utils_use geant3 GEANT4_USE_GEANT3TOGEANT4)
-		$(cmake-utils_use granular GEANT4_BUILD_GRANULAR_BUILD)
-		$(cmake-utils_use dawn GEANT4_USE_NETWORKDAWN)
-		$(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
-	if use data; then
-		einfo "Installing Geant4 data"
-		insinto /usr/share/geant4/data
-		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
-	[[ -e ReleaseNotes/Patch${mypv}-1.txt ]] && \
-		dodoc ReleaseNotes/Patch${mypv}-*.txt
-	use examples && doins -r examples
-}
-
-pkg_postinst() {
-	elog "Users need to define the G4WORKDIR variable (\$HOME/geant4 is normally used)."
-}