Move arm64 keyword forward and drop old version.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 12 insertions, 57 deletions

diff --git a/dev-util/scons/ChangeLog b/dev-util/scons/ChangeLog
index 6ef7c17c3f13..808c026f1bd4 100644
--- a/dev-util/scons/ChangeLog
+++ b/dev-util/scons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/scons
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.148 2014/04/22 17:32:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.149 2014/04/22 17:35:40 floppym Exp $
+
+  22 Apr 2014; Mike Gilbert <floppym@gentoo.org> -scons-2.2.0.ebuild,
+  scons-2.3.0.ebuild:
+  Move arm64 keyword forward and drop old version.
 
 *scons-2.3.1-r1 (22 Apr 2014)
 
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 2be965e5f287..350852bf786c 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -4,25 +4,21 @@ 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
 AUX scons-install-scripts.patch 746 SHA256 0cffda0fe6912a41e78fc2f209824bb7eb7453ab6e83f518cb1033093457ed80 SHA512 3d15660f955c3e46ea36a7b6b17dc4522601d0c673ec5aec716a6fc30ca0b9af285d540084378227178d45c371f386d0b3ac7861c37f53be0e344b2ca025fe18 WHIRLPOOL 36be6c43fea6b40777f43693573c187e98e4d3999bf5298ac83f012142554e1106e6d102e3213eebd694513337a56b1e0d2de98444bf91cc41a6917005e5a6d1
-DIST scons-2.2.0-user.html 1004490 SHA256 f1064c656b56c38d0a797c25f600660b5cf272c4c1731477c70014699897f72a SHA512 5d2ee993a08207f0c0f73e7729b97a202d6fb92d5746415e06e62337640889d591e2faef0bb5ff43cb748682913821c8c830fa4578d2ffc9dd95e0299eb17cbe WHIRLPOOL c1fcf3eb8750cb5c3f30234bc5beb617d6dd2760e919e88eb53d3daa4217fcd2b665c46c78fe9ea388c8b6ef249505322e3855adc5146a44d4a5ad75c6eff553
-DIST scons-2.2.0-user.pdf 2264392 SHA256 9367c6a8ef24e663b29823e4984c441e74de5ca1aba846be79236e3a973dce96 SHA512 6572ed266cc80f8542adbc5f8448a3ce8e3340ca5e3e8f1a2b25db2e871f27fd00f269a4f90a6c71649208633e8b221cd71c8e5d87477e41dfcf3ffc40cd3729 WHIRLPOOL ba09c02a337188dd84fae23b1afd6864c4b8afad70df68c69548792ccf0f0bae85d10404e7c94fc58b317d705296fa1fbe7f63992a0087e533813a47fe5df81d
-DIST scons-2.2.0.tar.gz 591836 SHA256 f7fcd11a7af7ec13d587a2f7cf14a92e3223eea64bf078454a9856ec0ab465b9 SHA512 b1910c2faf9bf888e32f90c567a5c3fe4b7066f48a3457639570868f02075e9d3ef20d0315d5bab5940576987bacdaa0f675aaf8f5bdb1efb1a0806cb0153738 WHIRLPOOL 661bfd6e6b77fe0b5dfba113a9c733183b524000e60ce8034f7f0f5a78f27ff3cd73831cc58cdb2e9b737ff3507a367e9445a69f372e6d4de4717cb314055df8
 DIST scons-2.3.0-user.html 1006588 SHA256 64b52ed0ccad52ee7d57188934ee4326ddd8dd387d8283445367265084be8db4 SHA512 42dd7604548aa2f859c8fad8ea802e69a2e139b5a53804a0d855868d056194497653a7124d46a25eba6cdb6339dc16288311faefe8f5240dfa1c210260f27e6c WHIRLPOOL 6f5a164621e5a46f1ab256f6a4db192a9b1bda0de292859b7fc22f1feb31e1c47ca0281ee558b49d807b1224cd89028b4b6799a5abcd125cd440a1e9e00c817f
 DIST scons-2.3.0-user.pdf 2268686 SHA256 9b8eb3ed9ad40b375628417d39823042939c8f52f32d0f76c796107870a98c11 SHA512 ae94950bec28d88f83d01590db18ce776146d20dcfa756b0ce2f582f4c729c75eb4f7c57584f624bb653fb43dbf34c972f6a0dcc36aa1b338403885e2d177798 WHIRLPOOL 41dd9909f0b110f2dfd9369ac3f44b5b6a3ff5ae99d3caabb3aa0a92084b92d4b03c45923a8e52cfe18a4ca4f0184e4ddaa57545a6cac6a9ade42f748bc1d8f3
 DIST scons-2.3.0.tar.gz 599514 SHA256 9442069999cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b SHA512 a7e88bb70b8b269337689fb4afd9563359f6ace37857bbd9824c9e40e43cac8b1e00468d8652bb9b46e410f6b161cb8c9006dd1fd9265756be153846a5e0fd65 WHIRLPOOL 948cc117fe40ab36f3862fab8322268dcb95ecbcde0397d684f31f5deedbbcff3f880d7af336710f237031df350eddcde81a044133b7b61bf5088c4c62ec70cf
 DIST scons-2.3.1-user.html 1234565 SHA256 17e617d5b5f7e43e70966c78148976f7e81bd2b5eb1530f447e3e8bc0cdaf86f SHA512 4b74a5099e23ec5d1e2714e6a0957697b703bbea3d7d0229d8925a5061c24ee1ae7bc2476e5e66fe4cacee5819c03e313d40b80b76e4ee6b7ccb65d4a461e5de WHIRLPOOL 39d7b70b743f410aac95880c533470bf967f534ef79cadc0ab925f3e9126200eaf8f4390729e3638d3a27ba133346f61e8ff510207eef6eef25355fa06a54cd1
 DIST scons-2.3.1-user.pdf 2408501 SHA256 3e2023f8dd1551963815c80f09a45658874174fc6373bb4918f8291f1b622478 SHA512 07ff05308e202541ae1c6538b94641fb0401da15c419854d51f855b177d71021938856307fc12e84db02bee720e2589a9ed2a2c725fd4e0c88fd111ea0862ed2 WHIRLPOOL b4b42e83b2f1ba7c584bdb06eeb3d868ce878c3295d490b4d60b9250c20b7eb55e63c8bde42eaa4c57a432b74a845de034ccbfb0d5fb51f7af72de8137acb7f9
 DIST scons-2.3.1.tar.gz 499037 SHA256 091ab468f8e6084c30f3ae9fd48828e3884021401cfef4b713d13161ba120201 SHA512 207fd0df949d1130afecc168a3b643fee2a17c53c3f9704260bbd2e462fdf24fd6606d7269ceaa664d5b5989cac34d6b9a5a460dfd0d6b69e651cfd85a0d45d2 WHIRLPOOL 8c828ca32bd03fe4cdd768a22ec97740b7fe165692f2c101c73e4fc96884642f80a7ba5531402638b415b8b9250dc12cad3337d0d087a391314aa2b6a564077a
-EBUILD scons-2.2.0.ebuild 1610 SHA256 c57e94ac7b805b42d94ba9e427b927401dbbf8956e8780a3f1a4b1b8d161c484 SHA512 67cc0bb8203faef66f7c7381996af7fff6d758646e6080f7e69a15ca4bdc43c11cdb70658c1cb542416649a89e1a94204d7be338d7788921a577ec5e82fc2f11 WHIRLPOOL 24fc5502a5692ee7e0dd6d7861c87e74ec552220941d4936130fc2fca578a7653f3757327dfe76bcab8421013ec3b029f8d8e1cd1fbd1d1d3bae56c11b62f420
-EBUILD scons-2.3.0.ebuild 1873 SHA256 248485349f3eb255fff60015153d9d686c703d3c2f674b9a5518fd23e88de1c8 SHA512 fbe68e15c09c7a1c94fbc0c4569942f2e2a3f31855f580761654c2d11c47f72d5aacc7660bd8b5aedd27c0e5eae260f959828d01208c722434d3997354c0c651 WHIRLPOOL 4c6f893a5b6829d2b877d05008d712ee52d7df6fae610dad4338f1790507212dfecda818cee62ed4a5e802d8117236a0825b4e0f7c1631971b0be08076f15ebd
+EBUILD scons-2.3.0.ebuild 1876 SHA256 fbe1927690b6defb3ae0b49754653200484cfaa9b51d225647609c5686739af8 SHA512 a346742956d10e6528d4a1807a1b0211bb47f7a746d92660f8ba18b0d6a4438e5b418a4cadaf99988bc22b688cfcb18a043f66eb18c448c215b13bbbc0555ee2 WHIRLPOOL cf84aa21f67d11e12e7df69db1a9bb0d8d6c02c399d3d0a4e454f919acca51f8aa1a80d32cf3d2f510595111662de4fa90c63c604b583386ed44a7853e081d50
 EBUILD scons-2.3.1-r1.ebuild 1848 SHA256 fb6359010a3fa4dd444e480905d13d82cd4d839b444eb941e4346f062579da78 SHA512 ae25e2a522ec5c060075a7afc3ed60b05af20346451893f34a2ca2d2a435a7a5727f588d1c04022350e6333c52bf10172512fc43f29546bd92aff23c8a322ef2 WHIRLPOOL 5175583904decf1cffde13f889f35d95034da480201f16298db711221aa425ddedb27be124379d6718327e5ba74c9f362f414faac3337033eecc7668d927b696
 EBUILD scons-2.3.1.ebuild 1887 SHA256 bd3830f523decd43c1efdd3007915b9cf2e81a99b4ba0204f9cdd007a1cf8da1 SHA512 15ac70493d8ea67600a7a4ef3c0e541b873d6feb686f01395357318658e30f924998b94a960a3fd10c81479279ccb6c3261642671ef3b4676e4936f798e532ba WHIRLPOOL 95c2ab997423a833ee674e730b009ab6d652715ce9c641989558727b5df3a1a7c3fb7aa07c98d15499de1ec8b5ba3da1c94fe1263f72115bad913563accbd214
-MISC ChangeLog 11543 SHA256 fbde3be5cc232ec1c5444d4e41a12b155ab524760cf2122feef3e7b34a41aba1 SHA512 c0aad015aad46b38b59599baf415cf6d746a5003cfbb3882f6556f1da26fe14e68e05ac3488a3a4d48f9fed99970bff1cf6fa83c2350a51c0f43df5db045c593 WHIRLPOOL 8afaee823a2347c800213753250fd6df011600ee43c8a505bd881511a4d0592900f52128aa5b29db37c0815b91536a89e1e412a1412caa10e206568f3012d190
+MISC ChangeLog 11687 SHA256 f992a583683d134df00b3851269246fbc75a181566339c8d851ef6ea4f29152f SHA512 b8971a26d6594eb2cb28953503e5b98e44842b610843d903c93a71f33711ac06612bc01b7f5a47e1b9b67af5c7cc38ec7b9f1938acbf1434e04137990775d72e WHIRLPOOL 70afe635c075fcd27c9b67d5f42a8c8a006317edffe159d2a69a4f080a7cec1ae52b2ff9b72078babf8a3422feea9dbcaa12ffe4516905f68be1370d031912c2
 MISC metadata.xml 533 SHA256 75dd06130ca8c5457cbc43bcf13b21ed278d34a36ab14f7663a884d1f4b4b4b2 SHA512 eb16f3b83d19d094367b3972bbe8d72bc787639847faea4e40c2d7fa59d302568f0419681594a26c48d9974ef5c7119530ba7fd30918c5a4d89b05395cd6e6d8 WHIRLPOOL 5caafc86d4d8ccc6265b323220c87b8a93e67e634123d1435e08116a71cb0ea8ede52edc172cfc0f69ac047593f2ee5fb5695551bf6863899bd5b21f1d13f13d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNWp6oACgkQC77qH+pIQ6TscwD/T4nSyKa0nL7lmXPXhYnTAxax
-zsydiL4mmmpXhWINjPsA/iSrw3+XRuIGnGPLQU9juOO5Sv01c80MfmqWLKlkYZBF
-=LmAe
+iF4EAREIAAYFAlNWqG0ACgkQC77qH+pIQ6SoAAD8CAD+d6xh646rqn1t18Wka3AY
+Yl+tt545o/1KSqKGskEBAI3vi0EU7CehVT1cg5cjUbSC2gSKIh7yAXf+d/xaWL+n
+=nmte
 -----END PGP SIGNATURE-----
diff --git a/dev-util/scons/scons-2.2.0.ebuild b/dev-util/scons/scons-2.2.0.ebuild
deleted file mode 100644
index 55c01ce832ef..000000000000
--- a/dev-util/scons/scons-2.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 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.10 2014/01/21 00:27:05 vapier Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="threads(+)"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
-PYTHON_MODNAME="SCons"
-
-inherit distutils eutils
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 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"
-
-DOCS="CHANGES.txt RELEASE.txt"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}/scons-1.2.0-popen.patch"
-	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
-	# and make sure the build system doesn't "force" /usr/local/ :(
-	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
-}
-
-src_install () {
-	distutils_src_install \
-		--standard-lib \
-		--no-version-script \
-		--install-data "${EPREFIX}"/usr/share
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-2.3.0.ebuild b/dev-util/scons/scons-2.3.0.ebuild
index b8101f9dcdc5..f4e1629c5da9 100644
--- a/dev-util/scons/scons-2.3.0.ebuild
+++ b/dev-util/scons/scons-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.3.0.ebuild,v 1.15 2014/03/19 13:46:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.3.0.ebuild,v 1.16 2014/04/22 17:35:40 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 python_prepare_all() {