Drop scons-1.2.0-popen.patch, bug 507850 by Álvaro.

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

3 files changed, 66 insertions, 15 deletions

diff --git a/dev-util/scons/ChangeLog b/dev-util/scons/ChangeLog
index f829327fc1c0..6ef7c17c3f13 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.147 2014/03/19 13:46:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.148 2014/04/22 17:32:22 floppym Exp $
+
+*scons-2.3.1-r1 (22 Apr 2014)
+
+  22 Apr 2014; Mike Gilbert <floppym@gentoo.org> +scons-2.3.1-r1.ebuild:
+  Drop scons-1.2.0-popen.patch, bug 507850 by Álvaro.
 
   19 Mar 2014; Agostino Sarubbo <ago@gentoo.org> scons-2.3.0.ebuild:
   Stable for alpha, wrt bug #498868
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 0cdbcb2fd2ac..2be965e5f287 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -15,23 +15,14 @@ DIST scons-2.3.1-user.pdf 2408501 SHA256 3e2023f8dd1551963815c80f09a45658874174f
 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.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 11379 SHA256 efe114dab62b8e667fa14e1500cb90224e487746c68fa9760178c6bd5520a76c SHA512 5a98faf1c5a4bc6a92cdf5810fa808ce0c1ae9f587ffa0f9d061ec82ff0d372c8a7098cf9d32c199aa60853c6e0efbb00449d3641513a2b5550fa7f11ad6046f WHIRLPOOL 8566d1eedac6414cb9507f1f6fa321ec495b32693aa07e30b521b3aa3065d11f75c8787a5904dbb8945729d02731dfbcaa3225862f42c920a06e7fcf4c68289f
+MISC ChangeLog 11543 SHA256 fbde3be5cc232ec1c5444d4e41a12b155ab524760cf2122feef3e7b34a41aba1 SHA512 c0aad015aad46b38b59599baf415cf6d746a5003cfbb3882f6556f1da26fe14e68e05ac3488a3a4d48f9fed99970bff1cf6fa83c2350a51c0f43df5db045c593 WHIRLPOOL 8afaee823a2347c800213753250fd6df011600ee43c8a505bd881511a4d0592900f52128aa5b29db37c0815b91536a89e1e412a1412caa10e206568f3012d190
 MISC metadata.xml 533 SHA256 75dd06130ca8c5457cbc43bcf13b21ed278d34a36ab14f7663a884d1f4b4b4b2 SHA512 eb16f3b83d19d094367b3972bbe8d72bc787639847faea4e40c2d7fa59d302568f0419681594a26c48d9974ef5c7119530ba7fd30918c5a4d89b05395cd6e6d8 WHIRLPOOL 5caafc86d4d8ccc6265b323220c87b8a93e67e634123d1435e08116a71cb0ea8ede52edc172cfc0f69ac047593f2ee5fb5695551bf6863899bd5b21f1d13f13d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTKZ+nAAoJELp701BxlEWfT4sP/RUNCvAE2ret4KTzd/2K4EIT
-GZOU/Fi0PEBf9IeUJBBg3B2S6aNLEIrVo7hpOM2COFi92AwNQ4UntFqGw+6ihaXI
-L3n6RE7DO2sCc0hORX5N84VavauZ87iFP5t7SJ5I78S/XXYn2qrQtLRz0aipqIDl
-wn5BAfCkSFM+0toA6ZMC7HbEurBHPRwprbjkgH+GVZtbNLfPH6gw8H6HtWPGbLZ4
-scyiufRupAZQma05yz+KHUKK3xTw6zHaBq5nFxi3idv1CpoVuJULmnCh+3fXIvQC
-PEMO8kMIhggrwxMVvXr78B0uAsPEWh3uAW0KX3EEabhXY7n7oM5s3Rqs8HG+kK4O
-qrtqJvDO1QHG1q6qFZSZKGJIl55bbW22gz3wv6Edu4jqHfjB1pMLT+aJ60NGqMaD
-ZDolFFEexthNAQGHvh7Eo/OrQrXjBSvdMSSERauScxe3+b6li95jyXWcgp9r7hdB
-jn1rtGR1chNB5hWMss4nP+qPhGmSCa36Eop19TOJcy7B8FnK6NYRF/IouOjjKhGV
-zjivQO1Ll7r31/lGWzujYwYp/EOtnr97znRILY5puXqUp+z5nwmg4hZFZ2LG78Tp
-Lt/EyFXq0o/9j3wGPbpxJx7VxKeyDYxlk1ElfJ/zyoPVXOXzBmmizj7YCJjadW6M
-JDyoK9ZsOGhh7Mq95JIl
-=Xn2n
+iF4EAREIAAYFAlNWp6oACgkQC77qH+pIQ6TscwD/T4nSyKa0nL7lmXPXhYnTAxax
+zsydiL4mmmpXhWINjPsA/iSrw3+XRuIGnGPLQU9juOO5Sv01c80MfmqWLKlkYZBF
+=LmAe
 -----END PGP SIGNATURE-----
diff --git a/dev-util/scons/scons-2.3.1-r1.ebuild b/dev-util/scons/scons-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..6c715c75a44a
--- /dev/null
+++ b/dev-util/scons/scons-2.3.1-r1.ebuild
@@ -0,0 +1,55 @@
+# 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-r1.ebuild,v 1.1 2014/04/22 17:32:22 floppym 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}/${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}
+}