diff options
| author |   Benda XU <heroxbd@gentoo.org> | 2012-07-12 02:13:34 +0000 |
|---|---|---|
| committer | Benda XU <heroxbd@gentoo.org> | 2012-07-12 02:13:34 +0000 |
| commit | 0053e3d306baac5eab8ea6b71898dbae8564e5ac (patch) | |
| tree | b0446a1f3a032e28fb0ce6fbd2a89d102a1bb16c /sci-physics | |
| parent | Add epatch_user as provided by tetromino on bug #425070. (diff) | |
| download | gentoo-2-0053e3d306baac5eab8ea6b71898dbae8564e5ac.tar.gz gentoo-2-0053e3d306baac5eab8ea6b71898dbae8564e5ac.tar.bz2 gentoo-2-0053e3d306baac5eab8ea6b71898dbae8564e5ac.zip | |
replace sed hacks with configure provided libdir
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'sci-physics')
| -rw-r--r-- | sci-physics/geant-python/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-physics/geant-python/geant-python-4.9.5.ebuild | 21 |
2 files changed, 6 insertions, 20 deletions
diff --git a/sci-physics/geant-python/ChangeLog b/sci-physics/geant-python/ChangeLog index ed1d191e0bda..9d5d5ceb094f 100644 --- a/sci-physics/geant-python/ChangeLog +++ b/sci-physics/geant-python/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-physics/geant-python # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-python/ChangeLog,v 1.5 2012/05/21 04:54:59 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-python/ChangeLog,v 1.6 2012/07/12 02:13:34 heroxbd Exp $ + + 12 Jul 2012; Benda Xu <heroxbd@gentoo.org> geant-python-4.9.5.ebuild: + replace sed hacks with configure provided libdir 21 May 2012; Benda Xu <heroxbd@gentoo.org> +files/geant-python-4.9.5-vis-fix.patch, geant-python-4.9.5.ebuild: diff --git a/sci-physics/geant-python/geant-python-4.9.5.ebuild b/sci-physics/geant-python/geant-python-4.9.5.ebuild index 71d0c1cf3146..176358254280 100644 --- a/sci-physics/geant-python/geant-python-4.9.5.ebuild +++ b/sci-physics/geant-python/geant-python-4.9.5.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-python/geant-python-4.9.5.ebuild,v 1.2 2012/05/21 04:49:12 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-python/geant-python-4.9.5.ebuild,v 1.3 2012/07/12 02:13:34 heroxbd Exp $ EAPI=4 @@ -29,24 +29,6 @@ src_prepare() { # fix the visManager wrapper epatch "${FILESDIR}"/${PN}-4.9.5-vis-fix.patch - - # let Geant4 module installed into python sitedir instead of default - sed -i "/G4PY_LIBDIR :=/cG4PY_LIBDIR := $\(DESTDIR\)$(python_get_sitedir)/Geant4" \ - config/install.gmk || die "sed failed on config/install.gmk" - for mfile in source/python{3,}/GNUmakefile - do - sed -i "/install_dir :=/cinstall_dir := $\(DESTDIR\)$(python_get_sitedir)/Geant4" \ - "${mfile}" || die "sed failed on ${mfile}" - done - - # let g4py module installed into python sitedir instead of default - sed -i "/install_dir :=/cinstall_dir := $\(DESTDIR\)$(python_get_sitedir)/g4py" \ - config/site-install.gmk || die "sed failed on config/site-install.gmk" - for mfile in {processes/emcalculator,utils/MCScore}/{python3/,}GNUmakefile python/GNUmakefile - do - sed -i "/install_dir :=/cinstall_dir := $\(DESTDIR\)$(python_get_sitedir)/g4py" \ - "site-modules/${mfile}" || die "sed failed on site-modules/${mfile}" - done } src_configure() { @@ -64,6 +46,7 @@ src_configure() { ./configure ${ARG} \ --prefix="${EPREFIX}/usr" \ + --libdir="${ED}/$(python_get_sitedir)" \ --with-g4-incdir="${EPREFIX}/usr/include/Geant4" \ --with-g4-libdir="${EPREFIX}/usr/lib" \ --with-clhep-incdir="${EPREFIX}/usr/include" \ |