Version bump (fixes bug #361413).

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

3 files changed, 70 insertions, 7 deletions

diff --git a/dev-util/scons/ChangeLog b/dev-util/scons/ChangeLog
index 9663bb59a72a..17c1cf82e544 100644
--- a/dev-util/scons/ChangeLog
+++ b/dev-util/scons/ChangeLog
@@ -1,6 +1,11 @@
 # 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.100 2011/09/24 17:09:37 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.101 2011/10/02 06:09:30 radhermit Exp $
+
+*scons-2.1.0 (02 Oct 2011)
+
+  02 Oct 2011; Tim Harder <radhermit@gentoo.org> +scons-2.1.0.ebuild:
+  Version bump (fixes bug #361413).
 
   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
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index f2265bee3b77..951497323ab0 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX scons-1.2.0-popen.patch 1826 RMD160 33d195bffbcb2f5280d04c1742f082f82e761bdb SHA1 ba24a0b73f6671d8ec4a44c31691a98b6dba080f SHA256 84a3bc1ba70fe60cc483d0186703b303daeb7bed246f21e3db9227c255afd312
 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
+DIST scons-2.1.0-user.html 948436 RMD160 2b688d01f4fea0faf98a2e9d11aa78d3ee7702b0 SHA1 07031f1c5a6be4c426ef59a832f936d00b570d8c SHA256 8021b9c7ec06330ad4616ec118ce7bbd70cf2f1ff0edfc91dd9e11d638e9927f
+DIST scons-2.1.0-user.pdf 2117035 RMD160 b055bd2e2251d5797817bcc82dc0fe01dcd5157d SHA1 fcac377dd6d7774d9de47318a1e39f1f238b6033 SHA256 101e39f1adc94179dabb787d92e723426a23a3e4a3ca21d382f6d1530cf6316a
+DIST scons-2.1.0.tar.gz 574666 RMD160 281f6833de8b4fbbeaac4eb11e2d2d48ce54d96f SHA1 69c4bddfcca498e25dcc29a462042907fc93b243 SHA256 4139ed14f60dd2ebcd47c59984d14705636180eb27b3d1b2949489e514b1921d
 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 5994 RMD160 676f8aec038086793e69f747d239d83d2976ebdb SHA1 d0035c9a281c92eb5376fb19134fb8d1f80d376e SHA256 45818ef694af5ba3943350d4e88a20131c2627d5bcfe9f914de2b010b483e7fe
+EBUILD scons-2.1.0.ebuild 1616 RMD160 9fdbe716ea39ace413bb8e1a233d9be2bc701de3 SHA1 39b1ab06a828d96a98684d0e3d0d768407b90223 SHA256 13da2b3b39555161fbf98cbea290a548468cadbc0c5d2524f82e4d02bbf9f1cf
+MISC ChangeLog 6131 RMD160 6b7ed68a078f3c693b7d65784a3cfc340eee9950 SHA1 4b92fdd6d03ad0aaf3686d74b9c4a6e493fc2cd5 SHA256 f17394b57cfdb5becbe9a7e78f6ad09b9b14268788c4b7baf843a4a227838970
 MISC metadata.xml 638 RMD160 313c3b4020d391dd897fb124fd3ae7148e4d25f4 SHA1 2ba17518173dc79962c08f88dc495ade267e443c SHA256 8e7b7a43fc5e94c0c0d538aa07cf5e4b37bc5d9ef688bf8f7870395d2504b7cf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (Darwin)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5+DtcACgkQX3X2B8XHTon4PACgjbC8apbRuQI/Z/d8/+oVXmnl
-MjUAoJTOnVrPOBddk/lV7OXG4Dynop8M
-=Vhz7
+iQEcBAEBCgAGBQJOiAAfAAoJEEqz6FtPBkyjPWwH/3M8mwGQVMAjFbc632p9VOgt
+uqmlphHj5axFmr5vYNH/tccIQPoSduJfVuy7XrVxSrT73nClKKlfUIUkMa/OxbDP
+zz78s5j8ClInzbtMO8SmbIRQNQLEHe6Ji0XNATu86RkKXS14PZrqVPDDxZOcRouD
+zM9SQg0S0ZA4I3/Gu61iSyeP7ZRua+SpTTx0PmDzkCvct7DfGI/zBR3n6r68Rk1Y
+DG2DZ7bnNILB4f9Vnn8fsJr10Evyfsm588LoKdUaPM/mQDWtyqSswvdtbick5eHT
+E06XWAfIlxfyaxsGZm+UHwJh6dsbdAtt7P9YDEBDwyimUNGDgQ7tm7OMWgLwMM0=
+=se2O
 -----END PGP SIGNATURE-----
diff --git a/dev-util/scons/scons-2.1.0.ebuild b/dev-util/scons/scons-2.1.0.ebuild
new file mode 100644
index 000000000000..f96cd6a5b2d1
--- /dev/null
+++ b/dev-util/scons/scons-2.1.0.ebuild
@@ -0,0 +1,50 @@
+# 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.1.0.ebuild,v 1.1 2011/10/02 06:09:30 radhermit Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.4"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+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 ~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"
+
+DEPEND=""
+RDEPEND=""
+
+DOCS="CHANGES.txt RELEASE.txt"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/scons-1.2.0-popen.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
+
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins "${DISTDIR}"/${P}-user.{pdf,html}
+	fi
+}