summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2012-10-07 14:40:20 +0000
committerFabian Groffen <grobian@gentoo.org>2012-10-07 14:40:20 +0000
commitdbb882e77b2e66f87ad8a7e8ae3dfb2d444493a7 (patch)
treeb4b89f87c11efe7848755b42ab2f7a89eb19f793 /dev-util
parentDrop ebeep, bug #403911 by Petr Gregor (diff)
downloadhistorical-dbb882e77b2e66f87ad8a7e8ae3dfb2d444493a7.tar.gz
historical-dbb882e77b2e66f87ad8a7e8ae3dfb2d444493a7.tar.bz2
historical-dbb882e77b2e66f87ad8a7e8ae3dfb2d444493a7.zip
Setup a valid path, EPREFIX does NOT end in /
Package-Manager: portage-2.2.01.21165-prefix/cvs/Darwin i386
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/scons/ChangeLog5
-rw-r--r--dev-util/scons/Manifest14
-rw-r--r--dev-util/scons/scons-2.2.0.ebuild4
3 files changed, 8 insertions, 15 deletions
diff --git a/dev-util/scons/ChangeLog b/dev-util/scons/ChangeLog
index 7baf84fe203a..ed876dffec19 100644
--- a/dev-util/scons/ChangeLog
+++ b/dev-util/scons/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/scons
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.125 2012/09/29 18:40:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.126 2012/10/07 14:40:20 grobian Exp $
+
+ 07 Oct 2012; Fabian Groffen <grobian@gentoo.org> scons-2.2.0.ebuild:
+ Setup a valid path, EPREFIX does NOT end in /
29 Sep 2012; Raúl Porcel <armin76@gentoo.org> scons-2.2.0.ebuild:
alpha/ia64/sparc stable wrt #434294
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index f3398bd70b85..d63566be263d 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX scons-1.2.0-popen.patch 1826 SHA256 84a3bc1ba70fe60cc483d0186703b303daeb7bed246f21e3db9227c255afd312 SHA512 de295b2211f4fbea9a33f55eb944d8f076699ac55601169af1151a51eb1bd70ece4cd6b1b589e280ac85ff700880d7e1d9ebb0face1ae96683d50d470e938f81 WHIRLPOOL bf9c3511474e1f2e14f1492ff440248a6ba8ee4bdecf003b2d16796dd444e51873dd8545428abb87e9fd0694d050fe8964eda983520c9138391d5f369035d1a6
AUX scons-2.1.0-jython.patch 427 SHA256 f973254e500325334c44f7db86daec87954aa47287c8aa92146a91ed172eb97a SHA512 5ffe6ee08e2dbf7dfb92e67a2b4ac75a5566a34680dbe86eae749c67709e8ddf585ddbd4549c0151c022567f171240c329cc546ce3d0bfb76efd2c8bd6f185e1 WHIRLPOOL 3316c6f83c5792cbc4e58d721a57df972eba0dcc90a0bea4fcc0222affd014662b11b06cc6699d4e6fa1bc41468318b82b33f47a6e4d20a5ff7194fde79e5173
DIST scons-2.0.1-user.html 820975 SHA256 3016ff013d8422bdbb98b39d1810f8c707c59b66ace38d3b81421466053c83b5 SHA512 4b952c2fb903bafe7b8ab811689adf108294eddb00f58962b53ad14c6708be12e5d3f4b865dad98e92a220960143f86fb0956aff9d82366a33c96ce102925327 WHIRLPOOL c9ac18c6c2e8a6398f64df4d107166e7a2cdb3d5e596d01eb702c1a9efca1a6194af318a7a243ca0ba7e7bab91e957c1ac0108969436c72ff9501ce1a2f549b3
@@ -15,13 +12,6 @@ DIST scons-2.2.0.tar.gz 591836 SHA256 f7fcd11a7af7ec13d587a2f7cf14a92e3223eea64b
EBUILD scons-2.0.1-r1.ebuild 1626 SHA256 8ba6151dd34ca541bf9ced9b758e4e28a17b33117c48cb95a6c91d8df4fc20be SHA512 560fb5aeac9e7ae3a869b265fe2d5faa84a4e97ad4feb22e9600f62856fe602ccfe1b54fe544be7f7c54c50bbc465a5e93f55bcf80f0e44c6e2bb547c488b42e WHIRLPOOL 069822da7d91ad20be3c249c872d57375101b692df1d639d195e7efbbd9c8de1a5ef59a3f9aa4fdebf0e48cf50c725b72ce42f161ebd9db673a2cf18e7ffa234
EBUILD scons-2.0.1.ebuild 1429 SHA256 6f9c7ce2c48c38a462625965c23e48a89e3254e8ab6b91d7d51b9fd2ff653f83 SHA512 68b35354fd64e1aadd40a1215fe8d1ed85f9d3939fadd4880114336ac7e09abf5a33e26e6e56ad07d4ca4c9a043e04367e94c249d5e432c4b56b3ab283c5d2c6 WHIRLPOOL b38483c4324fb715a5aa5e1065a22961cd19157d8b09e9a6b527aed71192eb03b16edf23adc4aa1f3c2059135b33f790f7537298b58992d6c1e4c5bea7f80871
EBUILD scons-2.1.0.ebuild 1660 SHA256 72e9708d5d4a94aea0709eb39b12e844ab22d457315850325075ee813db6da57 SHA512 0d845f1a90b23d9a154e6c2794f4bb1a8d4d50dffd65033f1d3736ec041b4d81a4c2ab486e3fbed14624876bc1dd953669723323eae70eaba3e3d9e48d111a63 WHIRLPOOL 265aeafd1b7dd62a21f71ffab7b1da1a0451c298fa20ccbead8f62000af968e635a9b27289e506912a3e5ff0d77d8cd85f95ec23f4cb7c48cc54353e969abd47
-EBUILD scons-2.2.0.ebuild 1600 SHA256 e87eeae960fa78039a95092d1f279d900dd83f065b626e9d1cba4eb627905e34 SHA512 5e7a731404b9ec6c94e7b9a048bb1cf558b627d5c86092c15e1f470e1a4ce0a7ba722656e1167f3ffd26ac1179cccee5590e8febe5353fbfa181aae8cb8344f9 WHIRLPOOL f39a6dad9a655740d0047a11da4a9159bdbce8a8442da143db8d285b398716d18dd526ce41dfebaeadb909f283d8c435345b8ab5a4e68e21260cb795ed62ed30
-MISC ChangeLog 8761 SHA256 881d8f2f19de9a8f08fe71257562b1849313c142a4fcfa06ec7743f1a4c3f509 SHA512 3933f4690969d1438fb69d651caef2fb79657009e8825ec6ae6844d86b70f4e79afe0a198de067172738b8ad9d41899ff0484eb865bff1bc28e47723aa6e1a46 WHIRLPOOL 01ff36bedc68cda7fbb5a1d60c42b93879e021353d90b62cd5385b9595ae6f1e83e8bb494151fa457f1ebf48e7db829c55a9320125fc9495582189f42337fe18
+EBUILD scons-2.2.0.ebuild 1604 SHA256 8d12c879500ebf0b97583131a1454a3cbc0d559a2b807eecf00b0e88d82dc9a8 SHA512 4ebb3cff36d89d907421a193138df2ded203fc7ab86df79987664cdaa11da312c8f41f232c7514844e15cf1b61fca7a68d2b19854556a0ed762fb7fbbfd58044 WHIRLPOOL dbd5ad1aeaae72543fa138d64f043ddc0e8a5bc0985b9fd879518001d6bd1741f75de3ebb6666faef48fcb88d4eb82c0aa2f0dac2115920689155b4ecd74556b
+MISC ChangeLog 8881 SHA256 2abe9a0886b3abdf088572d87cd1cc09ac59986a274df6e7a1ac299f5b3848bb SHA512 603ce8cc3cf4d13c107f5b05c9cfa711491b7365df965ce5eb5f2be9c343188f03121cf7b87ed0d0719f5e37f3ad625138763270b95523f7ab0ae6dd7af10e38 WHIRLPOOL 3504529223275d6c2574c0081bc13731cfb80b2088ec94d513468f406b5564e9d154b6dbfc1c0cbde04e101d568e9743435c5ea54306491690699591ee2650b5
MISC metadata.xml 533 SHA256 75dd06130ca8c5457cbc43bcf13b21ed278d34a36ab14f7663a884d1f4b4b4b2 SHA512 eb16f3b83d19d094367b3972bbe8d72bc787639847faea4e40c2d7fa59d302568f0419681594a26c48d9974ef5c7119530ba7fd30918c5a4d89b05395cd6e6d8 WHIRLPOOL 5caafc86d4d8ccc6265b323220c87b8a93e67e634123d1435e08116a71cb0ea8ede52edc172cfc0f69ac047593f2ee5fb5695551bf6863899bd5b21f1d13f13d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlBnQLMACgkQuQc30/atMkADBACghXJ3Pp0Sl8T+OcjOkPAJ8cUZ
-etQAnjIrcNXtmGXBJr8GLA9bE3XVIr+e
-=ccfS
------END PGP SIGNATURE-----
diff --git a/dev-util/scons/scons-2.2.0.ebuild b/dev-util/scons/scons-2.2.0.ebuild
index 78ba76abcebd..38c6c8957e43 100644
--- a/dev-util/scons/scons-2.2.0.ebuild
+++ b/dev-util/scons/scons-2.2.0.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/dev-util/scons/scons-2.2.0.ebuild,v 1.8 2012/09/29 18:40:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.2.0.ebuild,v 1.9 2012/10/07 14:40:20 grobian Exp $
EAPI="4"
PYTHON_DEPEND="2:2.5"
@@ -30,7 +30,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-2.1.0-jython.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
+ 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
}