Version bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 74 insertions, 15 deletions

diff --git a/dev-util/scons/ChangeLog b/dev-util/scons/ChangeLog
index 74af862ef174..bdb9f8079973 100644
--- a/dev-util/scons/ChangeLog
+++ b/dev-util/scons/ChangeLog
@@ -1,6 +1,11 @@
 # 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.144 2014/03/14 10:15:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.145 2014/03/18 18:11:51 radhermit Exp $
+
+*scons-2.3.1 (18 Mar 2014)
+
+  18 Mar 2014; Tim Harder <radhermit@gentoo.org> +scons-2.3.1.ebuild:
+  Version bump.
 
   14 Mar 2014; Agostino Sarubbo <ago@gentoo.org> scons-2.3.0.ebuild:
   Stable for ppc64, wrt bug #498868
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index bbb2c9c60d00..e4565a74a7a8 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -16,28 +16,26 @@ DIST scons-2.2.0.tar.gz 591836 SHA256 f7fcd11a7af7ec13d587a2f7cf14a92e3223eea64b
 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.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-r1.ebuild 1872 SHA256 736e96cc78dcd5e587fa858629bdfb816db791ffca2035a26440f624bf99ddf3 SHA512 49b9fde006a630d94c8ef44be89be7a9da1e5c32325dbcee55e28c479b7c1b0c5c1df32b569a5c3cd93d56636f3304b77230bfd6c79b1335e0001825b8016e9a WHIRLPOOL 8a02f298b08b88f10817a196e436a396f497b6b9e7277076e3bfc854b848639e3e45d9a7bffe6d72a4268062a62a54d71f4ba7368f8a8237d5d7e2107dce596c
 EBUILD scons-2.2.0.ebuild 1610 SHA256 c57e94ac7b805b42d94ba9e427b927401dbbf8956e8780a3f1a4b1b8d161c484 SHA512 67cc0bb8203faef66f7c7381996af7fff6d758646e6080f7e69a15ca4bdc43c11cdb70658c1cb542416649a89e1a94204d7be338d7788921a577ec5e82fc2f11 WHIRLPOOL 24fc5502a5692ee7e0dd6d7861c87e74ec552220941d4936130fc2fca578a7653f3757327dfe76bcab8421013ec3b029f8d8e1cd1fbd1d1d3bae56c11b62f420
 EBUILD scons-2.3.0.ebuild 1874 SHA256 196d4a22b5a09b56e5333056983dd5b4296cfb10b4baa7766e853de27c786aae SHA512 ca8338df8a959da0b4b3efbeedaefe4fd766c1857108e21f6bd7ebf0d678c489724197788e13e0c43cdd6a349569ccaf14149d93ea05ecf1c2f916054f769f87 WHIRLPOOL b3d15dcbf3c671d9457b3cbaafef5f68c17a8e0415a29d5852272042a8f6ecc5fd311dc5171c671dbeaf2a2fb863334505a52fa8aed4e318781f7cef2dbb1c44
-MISC ChangeLog 11002 SHA256 7fa0c5b1dcb0d5b981188748f40c9e4aa0070f709288833becf39636420ae062 SHA512 c8a79a74a22e191263c5fd144453bbf2ada486bb4dc6eec8695e9ffd64370b7cff505d7be356aea49ef4c30d427c169a89d3c5b82ae2cf9e4278dec99d0f1195 WHIRLPOOL 26220f8b1e444f14263cc0729d9423a2ad53649d0736003fea2f4759ae37bbe9204b4d8a0c84fe8840fa2a03d6ab8d614663f509447ded891a2640b8961f760f
+EBUILD scons-2.3.1.ebuild 1887 SHA256 bd3830f523decd43c1efdd3007915b9cf2e81a99b4ba0204f9cdd007a1cf8da1 SHA512 15ac70493d8ea67600a7a4ef3c0e541b873d6feb686f01395357318658e30f924998b94a960a3fd10c81479279ccb6c3261642671ef3b4676e4936f798e532ba WHIRLPOOL 95c2ab997423a833ee674e730b009ab6d652715ce9c641989558727b5df3a1a7c3fb7aa07c98d15499de1ec8b5ba3da1c94fe1263f72115bad913563accbd214
+MISC ChangeLog 11123 SHA256 9e7058d0cdb3531ef2f27253c4e4316c9df015148ab9a2ce42154a25b7e6090d SHA512 cc668c9a431457d865b948aaef417a8c2fa7467d809f32fc07d862b65cc1aaed02b27714362371e6f1353bb59a153cb168ae5e6d417cfd96fe35beb9c2af9568 WHIRLPOOL 49a850328df27ac3100c322759925aca812f380f992b94ac13f4e37d89ccb06a17e5581e99663c2ddfc60c7dee43f79f427cb57d902ac4f66649c8d5cd8aa0e6
 MISC metadata.xml 533 SHA256 75dd06130ca8c5457cbc43bcf13b21ed278d34a36ab14f7663a884d1f4b4b4b2 SHA512 eb16f3b83d19d094367b3972bbe8d72bc787639847faea4e40c2d7fa59d302568f0419681594a26c48d9974ef5c7119530ba7fd30918c5a4d89b05395cd6e6d8 WHIRLPOOL 5caafc86d4d8ccc6265b323220c87b8a93e67e634123d1435e08116a71cb0ea8ede52edc172cfc0f69ac047593f2ee5fb5695551bf6863899bd5b21f1d13f13d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTItbBAAoJELp701BxlEWfNpMP/114oQSFU7W0jkzwry3LPPbr
-9uhNVR3afecMKmLixVUTuIggtHnYITRAYNVOnHfkfwsnIKLbltmLdVv1hWyCpFIE
-ZKynOqzuFH2dOq3WRPdXoP8ui5IfhYhWg80rrKUAanCBgZNHDNerHZv4Ujr9eski
-96afvyR04eg/OtJcPKRcIWFPQawkP8f9tBxBxpPWdxVBN9J5gkRwEVCIvI2PXxPP
-wHqdODNxmWomBpHRPYq9dc+7kOwnKcAq9XuL6wgyF7z4uaUHmapigN5ougZBL1YP
-krFPqf5afNc76aM8qRYvRaRQSdDDUvQU4WCmtSe95m5sNt23vgjqpA1YbuCi3CtV
-aoMd/B1JAsrmZcP7dKW52Lklr7IvE2bBrW+hs8eLrnl0xcMQc+ZGa2ssJWUvLzU/
-3LUSL+Q7peNV0bR+PuKvgzrlLje58OL49FNZsnT5DNMr6HIpIXtoBB1gxZT/kigk
-2w0XhBdEP6mw3Ms15uRV7+34IQwCbXqzoPIgLHRcxpiFbJgdIfgyBX1kM2ZaNqM5
-3Zgib1/itLM8MwthjdfJLpab7pjbGZLw+S4iAwsPd93Y+srsgbS8EvOX63vkLAx7
-8gqlSwq00O1o5UCdfsfXEfzde9s6v13+tfH/CXdHELxF/ztuLsDyase81soX67lV
-ODSOeqi8TXG8Dh7ROWAN
-=fMGt
+iQEcBAEBCAAGBQJTKIxqAAoJEEqz6FtPBkyj6jsH+wXScf4PvFIfqWMczynaNCCe
+9/Pr1HASKwYQkck7MarpzQD7SE8BRaRMXFFwk49DdiCmOjJFomv3blyCbg58rBUE
+Bd0U7Nph0CG06JRPWjM7gir73UHBdyY8bnEIhH39BYy18eb+2jSkwObZ/WidPxSX
+d7z9ZQwShZqgQN4ek+lpZiQ1Jz3PaGUSwA4rnDzg9mg6ODhfl0fjdVjpNqopPqag
+HDFuwDymRrt/HkwOQpRR2T7bLOfrLsevVCGHJhvg8uxmdazpjzhakO8GjyUAkJLk
+lyzYhzRE3oTdU1PEHzUbKD5d7mrklAt+FeVen0QBUf1WEYdYeCQONyhDZCT45mE=
+=VgGY
 -----END PGP SIGNATURE-----
diff --git a/dev-util/scons/scons-2.3.1.ebuild b/dev-util/scons/scons-2.3.1.ebuild
new file mode 100644
index 000000000000..fcaa2d2b9d20
--- /dev/null
+++ b/dev-util/scons/scons-2.3.1.ebuild
@@ -0,0 +1,56 @@
+# 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.1.ebuild,v 1.1 2014/03/18 18:11:51 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+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 ~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() {
+	local PATCHES=(
+		"${FILESDIR}/scons-1.2.0-popen.patch"
+		"${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
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--standard-lib \
+		--no-version-script \
+		--install-data "${EPREFIX}"/usr/share
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Build system does not use build_scripts properly.
+	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
+	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
+}