Fix hardcoded paths to refer to those from the Prefix first, by Asfand Yar Qazi,...

Package-Manager: portage-2.2.01.19074-prefix/cvs/Darwin i386

diff --git a/dev-util/scons/ChangeLog b/dev-util/scons/ChangeLog
index 82a1b9c033d95b654c50ae035cf8edfaf32e1567..cc913a092dce6e40d2fee15f98843ed34ce0ee50 100644 (file)
--- a/dev-util/scons/ChangeLog
+++ b/dev-util/scons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/scons
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.98 2011/08/24 16:35:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.99 2011/08/29 18:21:28 grobian Exp $
+
+  29 Aug 2011; Fabian Groffen <grobian@gentoo.org> scons-2.0.1-r1.ebuild:
+  Fix hardcoded paths to refer to those from the Prefix first, by Asfand Yar
+  Qazi, bug #361061
 
   24 Aug 2011; Markos Chandras <hwoarang@gentoo.org> scons-2.0.1-r1.ebuild:
   Set PYTHON_MODNAME. Patch by Arfrever.

diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 124e555034fc176adb2ffa93f3cfac2fd30f6549..5c2bcf54e051bf4f5c3f5a4d02a85330cd35eac9 100644 (file)
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,28 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX scons-1.2.0-popen.patch 1826 RMD160 33d195bffbcb2f5280d04c1742f082f82e761bdb SHA1 ba24a0b73f6671d8ec4a44c31691a98b6dba080f SHA256 84a3bc1ba70fe60cc483d0186703b303daeb7bed246f21e3db9227c255afd312
 DIST scons-2.0.1-user.html 820975 RMD160 6ddf70a7ed0403816ae5e1f42f95a71d144770cc SHA1 acfd3d24797d9e5ddde2155158fe6bd2c706f7e7 SHA256 3016ff013d8422bdbb98b39d1810f8c707c59b66ace38d3b81421466053c83b5
 DIST scons-2.0.1-user.pdf 1841747 RMD160 178da2a01782443a497bc158ae7c5a3423ff82dc SHA1 b91906f3446a6b81325af6985eeca27db71db4da SHA256 2fbd518c51d9221cdfba98145c047726960c681233c0802641aeb90fc62450c7
 DIST scons-2.0.1.tar.gz 559293 RMD160 c191a1b49e1b91a5121fb5cac7ccf28379474a8a SHA1 f9183f1b29cb94b48bb3175608831276e60b8fc5 SHA256 0a8151da41c4a26c776c84f44f747ce03e093d43be3e83b38c14a76ab3256762
-EBUILD scons-2.0.1-r1.ebuild 1219 RMD160 232c66e12cd4423a34d7120b3a53f4cec64f59b3 SHA1 4d7285568bdc3a2043a17de942a6c33a0a48ecc2 SHA256 8e9959df4186dfdfe695cea26d44ccc647443b74ac3685de53682824389c6a94
+EBUILD scons-2.0.1-r1.ebuild 1485 RMD160 13e8aecc18d22b6f54011949ee8caf00535c1d90 SHA1 8ff018a90bb726745a539fdccec06ef6ee1b9a3a SHA256 a635d773028ab841df331b5a3f003fdaa67376682f0a089e241c39b5aaf4dac3
 EBUILD scons-2.0.1.ebuild 1381 RMD160 a695bfbac7995d50761c8180993e08d9be744d9c SHA1 b6fd805aa6fe800c881f34f29af54415a0680c27 SHA256 aa7e36b40d0c5e4975bfb2f33d541bf05003191c907986a6670ca8ddcb7223e0
-MISC ChangeLog 5669 RMD160 09f4690f4fac5ce900e90e681e58f9d6df75e2ca SHA1 a98f8a9774826f738e3f56ea72ff849b32df2b28 SHA256 7a0e03097c4860d9517c0bb732819c176d57d51d1ddabf86bf17305fcd695666
+MISC ChangeLog 5840 RMD160 024768c532b1791af292ee236cabe94e7ea13eab SHA1 2ea1259dea606120149715efd79e70d2fe52d579 SHA256 66bf2f0fce2daa87662681ad0a8114ebf324777848a74b68a06651630b0cfd07
 MISC metadata.xml 638 RMD160 313c3b4020d391dd897fb124fd3ae7148e4d25f4 SHA1 2ba17518173dc79962c08f88dc495ade267e443c SHA256 8e7b7a43fc5e94c0c0d538aa07cf5e4b37bc5d9ef688bf8f7870395d2504b7cf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iQIcBAEBCgAGBQJOVSg5AAoJEPqDWhW0r/LC3rUQAJJMmQHIFqT0SG1LJxtV4vIP
-M4tgCFs0QlNciUUN7u1fOhMfx1eqQu4I6tJ+mnQEVf/uf4fux69ecnUgAa67ITCR
-Ms7mClPS71g/jj3ZV+o4ZN3UkB9ycLEaVXpukOsuh1pgMM94XPbc4559zu2CHPZS
-CgfqfcymKJGB5k5pQC9YTyajd5OrPN7b17z7QIxyGz0f5VHE+cIznFh/84/If9ob
-9MXl4Eg00b/taYyLzwrGeotDl4VDwj6nLh6T7Q4aNEmH5Lo1b64fygoJZ9cI+XIv
-rjck05KfhLsddh7ztkJlCEyei7bfZBn+J+6P6IYpuBRWtqrZ4Rw3n+ihtDH2+qRf
-95HqK36kjnPmB8G0VbJPOnfLIkd/0AoKcFAWR9GEcx8w10GZFshEyzKv1jBooSO2
-xsSMOwZ1S8MTYIsp0vojo22JL7WcwJI1o/zFWes8uZ6OQ+NrbCKI4gw0pHOoGw/e
-8k/Lihe5qDKPSuqshUn2+ElFos4je8cwYlenTvLkaz4QIFE3NDrbxF7yn7iersMH
-RXy5kGNxmCdRqW4nh3GL/J8Pa0zrzBtoklnFp4KUBxy1wUD1eG29rkn8TAVbBlAL
-R558MezjS1gZpUiZVfHRwowGd4wd+txIyYzAOIVXWlpOspumJR7+ASVOQhM5N7sI
-/5whhc9sI8PlSwJOXAn0
-=rU9g
+iEYEARECAAYFAk5b2K4ACgkQX3X2B8XHTomsbACfSxWamI71L0IWjvWWXf6dc3lD
+I9sAnjGDuzBDxJfXceiS1Sm46qWlnkvX
+=LChd
 -----END PGP SIGNATURE-----

diff --git a/dev-util/scons/scons-2.0.1-r1.ebuild b/dev-util/scons/scons-2.0.1-r1.ebuild
index 0d4ab41cb675ac81fcf5224a05d89c33a4bb9fc2..fe15a6957a621800c6acd382d3192512f7f5c400 100644 (file)
--- a/dev-util/scons/scons-2.0.1-r1.ebuild
+++ b/dev-util/scons/scons-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.0.1-r1.ebuild,v 1.3 2011/08/24 16:35:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.0.1-r1.ebuild,v 1.4 2011/08/29 18:21:28 grobian Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND=""
@@ -30,6 +30,9 @@ PYTHON_MODNAME="SCons"
 src_prepare() {
        distutils_src_prepare
        epatch "${FILESDIR}/scons-1.2.0-popen.patch"
+
+       # https://bugs.gentoo.org/show_bug.cgi?id=361061
+       sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}usr/local/bin:${EPREFIX}opt/bin:${EPREFIX}bin:${EPREFIX}usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
 }
 
 src_install () {