diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2011-09-24 17:09:37 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2011-09-24 17:09:37 +0000 |
| commit | 6778bbb4eb6266a9f91d2bc4dcc3dc58fe986392 (patch) | |
| tree | 8cc81037942d4c2795db6480f4a4b9f45d3abaa3 /dev-util/scons | |
| parent | alpha/ia64/sparc stable wrt #376399 (diff) | |
| download | historical-6778bbb4eb6266a9f91d2bc4dcc3dc58fe986392.tar.gz historical-6778bbb4eb6266a9f91d2bc4dcc3dc58fe986392.tar.bz2 historical-6778bbb4eb6266a9f91d2bc4dcc3dc58fe986392.zip | |
Prevent the buildsystem from forcing installation into /usr/local on Darwin
Package-Manager: portage-2.2.01.19295-prefix/cvs/Darwin i386
Diffstat (limited to 'dev-util/scons')
| -rw-r--r-- | dev-util/scons/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/scons/Manifest | 10 | ||||
| -rw-r--r-- | dev-util/scons/scons-2.0.1-r1.ebuild | 4 |
3 files changed, 12 insertions, 7 deletions
diff --git a/dev-util/scons/ChangeLog b/dev-util/scons/ChangeLog index cc913a092dce..9663bb59a72a 100644 --- a/dev-util/scons/ChangeLog +++ b/dev-util/scons/ChangeLog @@ -1,6 +1,9 @@ # 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.99 2011/08/29 18:21:28 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.100 2011/09/24 17:09:37 grobian Exp $ + + 24 Sep 2011; Fabian Groffen <grobian@gentoo.org> scons-2.0.1-r1.ebuild: + Prevent the buildsystem from forcing installation into /usr/local on Darwin 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 diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest index 5c2bcf54e051..f2265bee3b77 100644 --- a/dev-util/scons/Manifest +++ b/dev-util/scons/Manifest @@ -5,14 +5,14 @@ AUX scons-1.2.0-popen.patch 1826 RMD160 33d195bffbcb2f5280d04c1742f082f82e761bdb 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 1485 RMD160 13e8aecc18d22b6f54011949ee8caf00535c1d90 SHA1 8ff018a90bb726745a539fdccec06ef6ee1b9a3a SHA256 a635d773028ab841df331b5a3f003fdaa67376682f0a089e241c39b5aaf4dac3 +EBUILD scons-2.0.1-r1.ebuild 1610 RMD160 d117dbd6d39d7bd7063f47c1b90dde99f35a0530 SHA1 1dc3fc5becadb242e4aead15d3be3da902ddb9f2 SHA256 373f96222a28485ca76ca589209ce8af06fba12464f26a24409762f9e84b7ac9 EBUILD scons-2.0.1.ebuild 1381 RMD160 a695bfbac7995d50761c8180993e08d9be744d9c SHA1 b6fd805aa6fe800c881f34f29af54415a0680c27 SHA256 aa7e36b40d0c5e4975bfb2f33d541bf05003191c907986a6670ca8ddcb7223e0 -MISC ChangeLog 5840 RMD160 024768c532b1791af292ee236cabe94e7ea13eab SHA1 2ea1259dea606120149715efd79e70d2fe52d579 SHA256 66bf2f0fce2daa87662681ad0a8114ebf324777848a74b68a06651630b0cfd07 +MISC ChangeLog 5994 RMD160 676f8aec038086793e69f747d239d83d2976ebdb SHA1 d0035c9a281c92eb5376fb19134fb8d1f80d376e SHA256 45818ef694af5ba3943350d4e88a20131c2627d5bcfe9f914de2b010b483e7fe MISC metadata.xml 638 RMD160 313c3b4020d391dd897fb124fd3ae7148e4d25f4 SHA1 2ba17518173dc79962c08f88dc495ade267e443c SHA256 8e7b7a43fc5e94c0c0d538aa07cf5e4b37bc5d9ef688bf8f7870395d2504b7cf -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (Darwin) -iEYEARECAAYFAk5b2K4ACgkQX3X2B8XHTomsbACfSxWamI71L0IWjvWWXf6dc3lD -I9sAnjGDuzBDxJfXceiS1Sm46qWlnkvX -=LChd +iEYEARECAAYFAk5+DtcACgkQX3X2B8XHTon4PACgjbC8apbRuQI/Z/d8/+oVXmnl +MjUAoJTOnVrPOBddk/lV7OXG4Dynop8M +=Vhz7 -----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 fe15a6957a62..ce6c25895505 100644 --- 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.4 2011/08/29 18:21:28 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.0.1-r1.ebuild,v 1.5 2011/09/24 17:09:37 grobian Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -33,6 +33,8 @@ src_prepare() { # 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 + # and make sure the build system doesn't "force" /usr/local/ :( + sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die } src_install () { |