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

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 8 insertions, 100 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/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)."
-}