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 | cef21582bcad76c1c3c3b2a4dee6d203ecc47534 (patch) | |
tree | 9a424c0bcc12975e13c701d90ba5e5512ba81691 /sci-physics | |
parent | Add epatch_user as provided by tetromino on bug #425070. (diff) | |
download | historical-cef21582bcad76c1c3c3b2a4dee6d203ecc47534.tar.gz historical-cef21582bcad76c1c3c3b2a4dee6d203ecc47534.tar.bz2 historical-cef21582bcad76c1c3c3b2a4dee6d203ecc47534.zip |
replace sed hacks with configure provided libdir
Package-Manager: portage-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/Manifest | 4 | ||||
-rw-r--r-- | sci-physics/geant-python/geant-python-4.9.5.ebuild | 21 |
3 files changed, 8 insertions, 22 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/Manifest b/sci-physics/geant-python/Manifest index c7898faa2373..cb585deba0ff 100644 --- a/sci-physics/geant-python/Manifest +++ b/sci-physics/geant-python/Manifest @@ -3,7 +3,7 @@ AUX geant-python-4.9.5-vis-fix.patch 1458 RMD160 4801f01c440b937ad51535cc9134ee1 AUX geant-python-4.9.5-visverbose.patch 557 RMD160 752266b165007dc61dfe3e6e21804dca63c59754 SHA1 e2691a1bd095741de558e61771b9b8992c77a2fb SHA256 0955cd39ce1f8e842e2804370359a4e367b14f4791a40fd653918c32884bed8a DIST geant4.9.5.p01.tar.gz 28466803 RMD160 42249229a97c2eaf5ed2471a93608a1d0daa38e1 SHA1 b1b938f735a8b966621704cc77448c786777dd01 SHA256 451f8c4a29bb0dc4b923d59d77535a657f0f8a30dc6c8ef639c8b1ebdb26a10e DIST geant4.9.5.tar.gz 28458437 RMD160 24e78b5243aa9ec47a48bbcb6d2afb4d9fe22dbf SHA1 846b48e82c1709d77a8f490fd12b039acc1d0cf9 SHA256 b6b31752319805052fb765f89ca38a23fb299a0a5bf900daeacd1950d6c9a597 -EBUILD geant-python-4.9.5.ebuild 2529 RMD160 e2a0ccb1c2d12100acf71d079d3940e88c737856 SHA1 05c1519b12e6a9962ecdec2d46ff1e7ae93e9726 SHA256 805178408454b3cb7a18e14cf6e02a1a5fc5cfaa2e72f48932819cb57a7929d2 +EBUILD geant-python-4.9.5.ebuild 1679 RMD160 30a58d4e86a12e677120267aee4aea40f2a7b5a5 SHA1 ea11250404e5f19985433a671646efd14284eaa1 SHA256 042979ad996ecae1441296c9ab51b8827f873e9ccfb48f3bff7dc78dd75c3678 EBUILD geant-python-4.9.5_p01.ebuild 2551 RMD160 9b2bc43172a66a8771e5a408ed5f7caa0d3e4a00 SHA1 dd4a008749652cc94eaa0802dc10880aceb31742 SHA256 ed802828d7ded1628c7f269d694089a36846ed7db4e924164428e96f5457df73 -MISC ChangeLog 936 RMD160 328cfe5496e2baa14e8b923095f2cd75b08ee9eb SHA1 f7b7e41cbee543fd8c0018f509d988510bcbf697 SHA256 706b342ebe984b01d30690ab87d6a111369b1bbddc928a1ab0eb455bd4766a28 +MISC ChangeLog 1060 RMD160 ed50d4d4f732d5fb49ce721c75ebe9485b330c8f SHA1 3321111793738720180ff3525e37e779ce9229de SHA256 bbbf917c638e3c8238147189572f3f67fb0febbced1a8d961f1b41c62335df4a MISC metadata.xml 240 RMD160 efd4ab46b75a4f49cf759c1af44f74b7d952dfc2 SHA1 7180d1a98e53900396070713396ca66eebb913c4 SHA256 f3269ca94d60315f7e3ebf8aa24ed69d2d2c53473707c76586834f76e8ce27e3 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" \ |