Switch optional OpenInventor to Coin3D SoXt implementation, fixing bug #473306 and bug #473396

Package-Manager: portage-2.2.01.22013-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

5 files changed, 23 insertions, 135 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index ee9b4f5244ce..18c7e677fed3 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/geant
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.74 2013/06/10 16:51:50 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.75 2013/06/17 19:01:22 bicatali Exp $
+
+  17 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> -geant-4.9.6_p02.ebuild,
+  geant-4.9.6_p02-r1.ebuild, metadata.xml:
+  Switch optional OpenInventor to Coin3D SoXt implementation, fixing bug #473306
+  and bug #473396
 
 *geant-4.9.6_p02-r1 (10 Jun 2013)
 
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 7ca19aef2cb2..2532c0dbce90 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -9,19 +9,11 @@ AUX geant-4.9.4-trajectory.patch 390 SHA256 6e4c0b2a44960411132130d379f6c9a7f867
 AUX geant-4.9.4-zlib.patch 1014 SHA256 fa7d09b2a481b9183f6f1518e2490458b616c41a90824e6d6a37ca08bddc06b5 SHA512 d345e73f5413492df3b7aa2505e651ee073bfea824c6673c7d284eef39070368bf3d17fed72544f0427977b707ad26f6374a4a8b06170a4394d53f1e638a94eb WHIRLPOOL 510a768553893604a8cbb4a2a172fe61ad60ea767d02eb39ae56b844431ff8434f8e5b03a5c46a110768ef65714808e3181de09bfc42283f13ed51a72bb6a7b8
 DIST G4ABLA.3.0.tar.gz 54909 SHA256 ff0b77be6b36204eeeba71099f6b7530edd80b79eb015994535bc4334bc821eb SHA512 905a56c142793de005dc5771509cdd8c4f98e596b95223a1a058cbf614cf48805478839eeec3a29594daf3d89c6b4d72cb33b016a596cdadc4247e452afbd526 WHIRLPOOL daa65dd65160cfa62b1a7b747702cc6cf41230f95b406e2e5e18a743524647842639e8c76906334671d00860b88139f4812c811307803bdc4260468b4c6703cb
 DIST G4EMLOW.6.19.tar.gz 14396144 SHA256 8876defe74e4c1e9d6b58b2365a9b468ac8d996fb63fa1c6ba6240e0b185845f
-DIST G4EMLOW.6.32.tar.gz 17724068 SHA256 bdb3c00af89b18c21553d79fd823110429fdcf1e83c029aa450185d9caf4a7cf SHA512 c1abc0f5e69cd29f5d3885e672937cfe4ff7ec1a37847e6def6e3dd80ba120bb10cfdd80ccfeadc9ed2c37423a87a185ef2b70f78716c8b40a48277a5c0e65fb WHIRLPOOL 5bcb17be16eddd474a3c96f305a968422ca11075683065c3bc3442289fde6b386f04552dbba4d2635ecabd86a79e558b559f0e7aab20960b1774c24291247231
 DIST G4NDL.3.14.tar.gz 58794491 SHA256 08ff1d4fb0953f2502d88f76fb9db1d4314c975564731f11c9372d0ea992cafa
-DIST G4NDL.4.2.tar.gz 303309551 SHA256 173f60a506b9176d7ff531d6a5f6195dcec74df30ffafc09644f47f979bd641b SHA512 64397c38afbca4365dfed6898220a6946f00f86c5f52ad23b3d10d0ce79504b74ac653ea398f21e1724e4370573f23a62c016490cfed26cc70745a82d9beb7c0 WHIRLPOOL 1c50cd2cf258aeb8a5d029d945eb5dcdb84399012fd693c44fcb98e2d7f4381717138e6a31919235eea268fcf54072c973858040e7e6968764d3036c84090fe7
-DIST G4NDL4.2.TS.tar.gz 128939542 SHA256 641972c6001fc8f7d4d55e428cf9237e9ae0e44ab0c4940dfbb05e657a8b9851 SHA512 8466b3bb9a604460ba713847dc59bae7cbc5af8204754eb8d46f83bc40e9bb6afff17433bb96fb76f17b4633c6dab6af88e49d30916a1b0bca18f705c18c6779 WHIRLPOOL 3074ad131888eec9e0dfd4fa018d9504437129e0a5b59df09e161970a69b6af9121ba2ac25aca1203d99b8faf831cb60dd90e217c320efd203032639d4e2fa10
 DIST G4NEUTRONXS.1.0.tar.gz 1186619 SHA256 577d28b7faa41caacb001a30384028cd5e3b7018755ab94a427ce0a7feeab365
-DIST G4NEUTRONXS.1.2.tar.gz 2221211 SHA256 9ce488505b4c3623e2d98209f708a30e3f213a1371a9110d289257a02b2d7d5c SHA512 94a71e7865c0dd4eab7b477d2cd115b3a90fd3528e7807e5ef85651e1add82b1478753c3382437b22b0ec2e774a12d2af942dffaca6c944229553b240a1594bb WHIRLPOOL 2250323bd915963b5efd92c02a946025d367d3530750b5240cbe1338b253f1dea3467b8c8cd16a9a20b70c9654005ae239863d5cfbd78dd6700b5ff17da209fc
 DIST G4PII.1.2.tar.gz 3387814 SHA256 80e680d7343ed051bcfffd910c682cfd66980cecd1c0bc435f06c6c740a6f99d
-DIST G4PII.1.3.tar.gz 4293607 SHA256 6225ad902675f4381c98c6ba25fc5a06ce87549aa979634d3d03491d6616e926 SHA512 dc458f5845948f54315477886d28fd51ea2d45f3675f45d42e8352cc5961705d920d200097dc9b55ad826ff426a655258b970ddd5a96867f706eb14e9ebbfd1a WHIRLPOOL 97c0aa7055ee6aaae30223a59f71edc11126560187cf038cd47fbe69c62b610e01f33d7b8d856aaa3f145c08d2bb4fc31047849634e57a6516dd197d6f53be79
 DIST G4PhotonEvaporation.2.1.tar.gz 7504003 SHA256 08ab657a060518c9b7aab03b17628cbb31585ee9512e0f2033f2fb0d7d9b2bc7 SHA512 ea3a2d1ceb025f595d2cdac1c77215d89c95cd314e6cb44f88f3010bdea3c6397e8310a55a82b43a235301db9a7e3fef754bb93f717e513dca97e6b8a01fdd47 WHIRLPOOL fd77105445137960b607bfe17a1357a7722bbf9af0242db6e7aeb374a779444b838b1bc7549c3a0eaaceaf6702595dc90ccea1bedda74588db8460131acb0860
-DIST G4PhotonEvaporation.2.3.tar.gz 7508401 SHA256 60449df933794aa0ad3938886c8c023e3093ff59ad6c752923390d5c550f34cb SHA512 1db97368f6579565447083a912ead17cd0fa1021d13aada4ed514e1b3245ff03509c963a064a97a1c7d5f5530ac036427c6c9e29be198976daebe8623c41e664 WHIRLPOOL a1651adbaf38132f89419b9821a1af4e741c3a058016f4946d815b5d48cd096ea057632f91142ac6d87cb38b24b1f26c664601f5838e92a03189c5227daa16c7
 DIST G4RadioactiveDecay.3.3.tar.gz 732628 SHA256 7f421d6808422f9186a8a96fc1889a54af03c80a37b9f9d1d51ab359ea0264d1
-DIST G4RadioactiveDecay.3.6.tar.gz 736879 SHA256 3502ed4be04d694115a3acf59d7a3593725a2d79f3adad0ffa135ff653f89d1d SHA512 30502587d5f1cd5e365c6803e286bcb469999642fdc56bb8f162736b31334f09aae9f96bd71ac1a664fca7a303127c10c5ffe5b460e846756977e97a5f958d51 WHIRLPOOL c991d159c952a6d59e355cd0a691a5a9a8de07bb8985cdc4797853a56c38b3f6320928a3dc1fa19d21a35be9dddc7d6901116f10bb347b2a5bcef70dbe71c06e
-DIST G4SAIDDATA.1.1.tar.gz 25800 SHA256 a38cd9a83db62311922850fe609ecd250d36adf264a88e88c82ba82b7da0ed7f SHA512 191627972dbf859e40e07ec4a63c5e7300571da6792c2588a6ad997e246c3fc41e890679aced918ba2496586da643c23884c4d9754329387e3579e52c87b6202 WHIRLPOOL d47075356db9e5589f12c03563143d1fd816e78d165785d5f37a415a8f1504be8e471064b81311f27a54cf108259dec07b0ef22fbc30374afaa4d46d7e7b648a
 DIST RealSurface.1.0.tar.gz 1257863 SHA256 3e2d2506600d2780ed903f1f2681962e208039329347c58ba1916740679020b1 SHA512 6457e1931fe1989f822493dbcb3193d97fdb37ecdc8341e953af1fb66816aa589e9d5abaa8a937e4599924c005fc32c763dd0db9af567c4c94aa07fae292be76 WHIRLPOOL 7b36a782278a663866b5676fda2ed5425c61219804aaa3fb6042455f6815e0e16a0f82445947d6e1a9585b9c09fb88fb70230bfd692f3bf10aa4ac8c43c37cae
 DIST geant321_3.21.14.dfsg-8.diff.gz 41909 SHA256 785277dab1e1d3e17d60c85f3826bc67bbd6de7e6a6d40ff7af901371c4d2ce1
 DIST geant321_3.21.14.dfsg-9.diff.gz 47589 SHA256 419bc2315e2692fe84b353d445cbae7af995d84a6a0290b7f9051ee041243d20 SHA512 fd04f42e5ca8bc7f8015bacf038a78e90ac0ebc95ab85ed65e2010a7c05aed8874057de9f28e11fefee8b6c6b983a5db8dcd8480953c185e6d45d1ca16adba01 WHIRLPOOL 6ca0e08fdf464076dda58cd26dc7c92511d82315ea58979de8201c3f8eeab6860bb136d1ebffcea23b7a53b71b5a6a894495b3153c905aa31f9260517f30e526
@@ -31,14 +23,13 @@ DIST geant4.9.6.p02.tar.gz 25480383 SHA256 cf5df83b7e2c99e6729449b32d3ecb0727b46
 EBUILD geant-3.21.14-r2.ebuild 1863 SHA256 280320afafaed437cb867022573df8db82440fe432ad65da970fb960efcd0b9a SHA512 49d0dbe37041d311f2e7f4180ae22c44855504ad93750abc442be931d916bcdae756c4de144610802bc166dd415bb032fc81aeeacab4f1b6f36b10c72392ca14 WHIRLPOOL a67420977142aa5572b9807b31ad739346b30fc8f45eedf2a69eb54b07d13845e66d1eb02f84b91bccb5c0a4e5280d8152298f705f08e5ac85f1ba54d026aaed
 EBUILD geant-3.21.14-r3.ebuild 1719 SHA256 53205b50b0d88302d5be5de4858ed392333a774dd47784f4c9f16a66855cfb6b SHA512 3b89b08be9e4659ac992d6d20cdde8d4a4d6fce84f272b2a29955c683de48300d5b702026daee964a484704a18b11606e8a72c4dcb37edd72f28d29fc6611a62 WHIRLPOOL 0898d71760e2b6e22680d7943f94382a23de3effdbd25b6e00fb883a708fda0be78d80fbdfb6f683ce4dfe8910fcea5a4418136effcad0baf99df4fc0015787b
 EBUILD geant-4.9.4_p03.ebuild 2375 SHA256 30f9299cd3e4497ef9a9e5dd67c77d48705ceef8dfb514f9a0a17b8e2bbf5da9 SHA512 e474e165bfec3de1841dfdba6770c9516327e9cfb9b69235db4b00014ffcdb070cbefac6335977c225b3a20b874bcf411ad666e782bd966692bfe734b677ed09 WHIRLPOOL 618b2f5b4ea75c5997c9b925e357003a30e2d2ee7ea1db0702f5dcf92d5d84e49602d7fe2acaecc77560443a827aa5c26b722688a00367cce88d4e6aaa05d2a5
-EBUILD geant-4.9.6_p02-r1.ebuild 2712 SHA256 9b3b9d16847eab229f1254261837a100105decfba5fe2c245b461fb20e57105d SHA512 9b9a6761ba5eb2a456b9ba3420c1d32487e38ceca98f233b86c9f3981ca2bdcbe5514f5187da6c87a8c939587acb3f6d1e097c5f7f76a1dbeb3b0ea76bbb70dd WHIRLPOOL 8af399fc9e832aa7a8e1c2fb688db08a554c3510d2a29c5764992dd410fe7e6df98c7f80a700d32fde13c9a19066516c247300ab47a961f7aa055ce9693a0db9
-EBUILD geant-4.9.6_p02.ebuild 3501 SHA256 e670778d9a66288c2949476610227bb395960ab6af54badc7b48f6e60c92cab8 SHA512 4a96820cc8ad1f2b55b57d4adce8eab23559c32df652a11fe66966fae3b1a82f55136735ebdeb4f2c03983807546d30dfb92d8cfbd2d830d734b6bd909361c7f WHIRLPOOL 831190944b9040520e3e6a8129c38fe9537afdadd638ad24ed4a30c5e574066d56932debcac79bf6a7a99330255859af9793e44e2e2c53902dbc75b1d8417d7b
-MISC ChangeLog 14718 SHA256 644c84043e20a2cb4c045302598b866be5ac310a945a8d8955d052fb6270e0c6 SHA512 96ac8ca724dcdaa45d19baa6e16c2e93820c4c919750ca6d5efe9e0459e7aa8dbf67de015d0c74af01d38901c47f236ecca2e849af5c7607aa8184f6ebfc944f WHIRLPOOL 39f6e9ab97759f724c33f3781f269327c43a4c1c31744b2c7e1cfd0432bdc095bc917e015eaef253ebdab1121a4ae0c637165aef06dee19de3435970181c4320
-MISC metadata.xml 1282 SHA256 e7090594c8ba19a806d91d8e6bc96f86cea40dd985450b0e61b32121fabc35c8 SHA512 9288e028c5c5741921715ef6f6d9ca521138145e12611d7390b95072bf41ee725ea304965ac1b8d34db5881805fbf6bc3026d8076c280cca753f600893cb17f5 WHIRLPOOL e45205873b54f324ab20226dab43e9216651736417d1c4b83bd1daaf609e0177dce200c98b5b1826d617c5f6edb6a415d83c9f28b6f405a3de5eae168cbde298
+EBUILD geant-4.9.6_p02-r1.ebuild 2758 SHA256 98348f108288b33ea69166c4988f34053e4ca9b37c9191bfb598f77de551edd8 SHA512 6a97901a30d6dc1d255a05cccbbb710c9ee17e3da404685f43d2aa7aafe1376fd42d7db2a1e67709165fdaad5f9a12daf5227ca750c5008e6ad92926d942dc08 WHIRLPOOL f4652e305b711717cdbf9e9308b740c7b2f6f7e2b5edc71deb0e88cc6b056d77e803ec026b431c47596ddf7c8a272eb554cd4e2dad6cd965ca1df809ac1d858b
+MISC ChangeLog 14941 SHA256 83378a35394429616881e628c9fa65c3fd0cd3ff65f7180d92272bf282480b6c SHA512 97efcc66a1b301bb737b295017709681439e7c80ed050a9363bfc464c709f31701dd1a46b5005d28be6e0685098c8913a070d89e6a7ce08737e408a08e84cb33 WHIRLPOOL 9ec833774ba716a26403365cab5f03b7d327439c12d04bef036181c55b062b55d13d32fad4ca59e4b7fea5dbb2dcec5abdd6374448e22fcd5b3fe01267844895
+MISC metadata.xml 1266 SHA256 c32b3d9e648ae1987a289075bd7d231ee78496dcaf4fdb6dc05631785a08d38a SHA512 4d167658d616bfd2946440a0d22a5c4a5b19f7884b6279b7aa1f18a452ae982cd566d546eab734dfd6d4ac156cb5fb592d6cad9bc84b3ee80b6d748afdbd54e1 WHIRLPOOL ffc18105c436dd2508b36e0fb14638fb0bebf7c31ff9bfa873f1a78377d4df205694ec1931e99d794b6d8ad37e503802de52e6c6b7458a3c2093f39ef0ffdd65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG2BCcACgkQ1ycZbhPLE2DmcgCfaB6AqXLfsTL4onlMPsme1pnI
-/WMAn27YOQ3rmg0spU3kEp7b5qYJyXn7
-=/I2g
+iEYEAREIAAYFAlG/XQMACgkQ1ycZbhPLE2DXtgCfdaJN9QacfXR/8X4TwcpVuLhQ
+gFgAnAlFRUiXpDn8jRa1BFwwuNFHnhQg
+=oe7V
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/geant/geant-4.9.6_p02-r1.ebuild b/sci-physics/geant/geant-4.9.6_p02-r1.ebuild
index df0179a6a414..bcbcc624e6fd 100644
--- a/sci-physics/geant/geant-4.9.6_p02-r1.ebuild
+++ b/sci-physics/geant/geant-4.9.6_p02-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.6_p02-r1.ebuild,v 1.1 2013/06/10 16:51:50 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.6_p02-r1.ebuild,v 1.2 2013/06/17 19:01:22 bicatali Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="http://geant4.cern.ch/support/source/${MYP}.tar.gz"
 LICENSE="geant4"
 SLOT="4"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+data dawn examples gdml geant3 motif opengl openinventor
+IUSE="+data dawn examples gdml geant3 inventor motif opengl
 	raytracerx qt4 static-libs vrml zlib"
 
 RDEPEND="
@@ -28,7 +28,7 @@ RDEPEND="
 	gdml? ( dev-libs/xerces-c )
 	motif? ( x11-libs/motif:0 )
 	opengl? ( virtual/opengl )
-	openinventor? ( media-libs/openinventor )
+	inventor? (	media-libs/SoXt )
 	qt4? ( dev-qt/qtgui:4 opengl? ( dev-qt/qtopengl:4 ) )
 	raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
 	zlib? ( sys-libs/zlib )"
@@ -44,19 +44,24 @@ src_configure() {
 		-DGEANT4_USE_SYSTEM_CLHEP=ON
 		-DCMAKE_INSTALL_LIBDIR="${EROOT}usr/$(get_libdir)"
 		-DGEANT4_INSTALL_DATA=OFF
-		$(use openinventor && echo "-DINVENTOR_SOXT_LIBRARY=${EROOT}usr/$(get_libdir)/libInventorXt.so")
 		$(cmake-utils_use dawn GEANT4_USE_NETWORKDAWN)
 		$(cmake-utils_use gdml GEANT4_USE_GDML)
 		$(cmake-utils_use geant3 GEANT4_USE_G3TOG4)
 		$(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 inventor GEANT4_USE_INVENTOR)
 		$(cmake-utils_use qt4 GEANT4_USE_QT)
 		$(cmake-utils_use raytracerx GEANT4_USE_RAYTRACER_X11)
 		$(cmake-utils_use vrml GEANT4_USE_NETWORKVRML)
 		$(cmake-utils_use zlib GEANT4_USE_SYSTEM_ZLIB)
 		$(cmake-utils_use_build static-libs STATIC_LIBS)
 	)
+	if use inventor; then
+		mycmakeargs+=(
+			-DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
+			-DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
+		)
+	fi
 	cmake-utils_src_configure
 }
 
diff --git a/sci-physics/geant/geant-4.9.6_p02.ebuild b/sci-physics/geant/geant-4.9.6_p02.ebuild
deleted file mode 100644
index cdb782d3b175..000000000000
--- a/sci-physics/geant/geant-4.9.6_p02.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.6_p02.ebuild,v 1.1 2013/06/05 16:14:34 bicatali Exp $
-
-EAPI=5
-
-inherit cmake-utils eutils fortran-2 versionator multilib
-
-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"
-
-NDLPV=4.2
-GEANT4_DATA="
-	G4NDL.${NDLPV}
-	G4EMLOW.6.32
-	G4RadioactiveDecay.3.6
-	G4SAIDDATA.1.1
-	G4NEUTRONXS.1.2
-	G4PII.1.3
-	G4PhotonEvaporation.2.3
-	G4ABLA.3.0
-	RealSurface.1.0"
-for d in ${GEANT4_DATA}; do
-	SRC_URI="${SRC_URI} data? ( ${SRC_COM}/${d}.tar.gz ${SRC_COM}/G4NDL${NDLPV}.TS.tar.gz )"
-done
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+data dawn examples gdml geant3 motif opengl openinventor
-	raytracerx qt4 static-libs vrml zlib"
-
-RDEPEND="
-	dev-libs/expat
-	>=sci-physics/clhep-2.1.3
-	dawn? ( media-gfx/dawn )
-	gdml? ( dev-libs/xerces-c )
-	motif? ( x11-libs/motif:0 )
-	opengl? ( virtual/opengl )
-	openinventor? ( media-libs/openinventor )
-	qt4? ( dev-qt/qtgui:4 opengl? ( dev-qt/qtopengl:4 ) )
-	raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch )
-GEANT4_DATA_DIR="/usr/share/geant4/data"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGEANT4_USE_SYSTEM_CLHEP=ON
-		-DCMAKE_INSTALL_LIBDIR="${EROOT}usr/$(get_libdir)"
-		-DGEANT4_INSTALL_DATADIR="${EROOT}${GEANT4_DATA_DIR}"
-		-DGEANT4_INSTALL_DATA=OFF
-		$(use openinventor && echo "-DINVENTOR_SOXT_LIBRARY=${EROOT}usr/$(get_libdir)/libInventorXt.so")
-		$(cmake-utils_use dawn GEANT4_USE_NETWORKDAWN)
-		$(cmake-utils_use gdml GEANT4_USE_GDML)
-		$(cmake-utils_use geant3 GEANT4_USE_G3TOG4)
-		$(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 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() {
-	# adjust clhep linking flags for system clhep
-	# binmake.gmk is only useful for legacy build systems
-	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
-
-	cmake-utils_src_install
-	if use data; then
-		einfo "Installing Geant4 data"
-		insinto ${GEANT4_DATA_DIR}
-		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
-	if use data ; then
-		sed -n "s,export \(G4.\+DATA=\"\).*\(/share/Geant.\+/data/.\+\) > /dev/null ; pwd\`,\1${EPREFIX}/usr\2,p" \
-			"${CMAKE_BUILD_DIR}/InstallTreeFiles/geant4.sh" > 99geant
-		doenvd 99geant
-	fi
-}
-
-pkg_postinst() {
-	elog "The following scripts are provided for backward compatibility:"
-	elog "$(ls -1 ${EROOT}usr/share/Geant4-${PV2}.${PV3}.*/geant4make/*sh)"
-}
diff --git a/sci-physics/geant/metadata.xml b/sci-physics/geant/metadata.xml
index abd0b46444ec..04025cfa9c28 100644
--- a/sci-physics/geant/metadata.xml
+++ b/sci-physics/geant/metadata.xml
@@ -18,8 +18,7 @@
   <flag name="gdml">Enable geometry markup language for xml</flag>
   <flag name="geant3">Add compatibility for geant321 to geant4</flag>
   <flag name="granular">Produce many small libraries instead of global ones</flag>
-  <flag name="openinventor">Add support for <pkg>media-libs/openinventor</pkg>
-  SGI toolkit</flag>
+  <flag name="inventor">Add support for Open Inventor SGI toolkit via Coin3D</flag>
   <flag name="raytracerx">Enable raytracing for physics events</flag>
   <flag name="vrml">Enable output of geant4 in vrml formats</flag>
 </use>