From 161f72f44886def035a3c7435dc8769195bdd496 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Mon, 10 Jun 2013 16:51:50 +0000 Subject: Split installation of all data into a new package sci-physics/geant-data, also fixing bug #472550 (Portage version: 2.2.01.21938-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) --- sci-physics/geant/ChangeLog | 9 +++- sci-physics/geant/geant-4.9.6_p01.ebuild | 84 ----------------------------- sci-physics/geant/geant-4.9.6_p02-r1.ebuild | 79 +++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 85 deletions(-) delete mode 100644 sci-physics/geant/geant-4.9.6_p01.ebuild create mode 100644 sci-physics/geant/geant-4.9.6_p02-r1.ebuild (limited to 'sci-physics') diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog index d121ead97d20..ee9b4f5244ce 100644 --- a/sci-physics/geant/ChangeLog +++ b/sci-physics/geant/ChangeLog @@ -1,6 +1,13 @@ # 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.73 2013/06/05 16:14:34 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.74 2013/06/10 16:51:50 bicatali Exp $ + +*geant-4.9.6_p02-r1 (10 Jun 2013) + + 10 Jun 2013; Sébastien Fabbro + +geant-4.9.6_p02-r1.ebuild, -geant-4.9.6_p01.ebuild: + Split installation of all data into a new package sci-physics/geant-data, also + fixing bug #472550 *geant-4.9.6_p02 (05 Jun 2013) diff --git a/sci-physics/geant/geant-4.9.6_p01.ebuild b/sci-physics/geant/geant-4.9.6_p01.ebuild deleted file mode 100644 index 33b46bfcb804..000000000000 --- a/sci-physics/geant/geant-4.9.6_p01.ebuild +++ /dev/null @@ -1,84 +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_p01.ebuild,v 1.2 2013/03/02 23:26:38 hwoarang 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_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 - 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 ) - -src_configure() { - local mycmakeargs=( - -DGEANT4_USE_SYSTEM_CLHEP=ON - -DCMAKE_INSTALL_LIBDIR="${EROOT}usr/$(get_libdir)" - $(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) - $(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 "s,-lG4clhep,-lCLHEP," config/binmake.gmk || die "sed failed" - - 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 - 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/geant-4.9.6_p02-r1.ebuild b/sci-physics/geant/geant-4.9.6_p02-r1.ebuild new file mode 100644 index 000000000000..df0179a6a414 --- /dev/null +++ b/sci-physics/geant/geant-4.9.6_p02-r1.ebuild @@ -0,0 +1,79 @@ +# 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 $ + +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_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 + 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}" +PDEPEND="data? ( ~sci-physics/geant-data-${PV} )" + +S="${WORKDIR}/${MYP}" + +PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch ) + +src_configure() { + local mycmakeargs=( + -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 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 + 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)" +} -- cgit v1.2.3-65-gdbad