Migrate to distutils-r1.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

3 files changed, 74 insertions, 3 deletions

diff --git a/dev-util/scons/ChangeLog b/dev-util/scons/ChangeLog
index ed876dffec19..93a63a9b179d 100644
--- a/dev-util/scons/ChangeLog
+++ b/dev-util/scons/ChangeLog
@@ -1,6 +1,11 @@
 # 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.126 2012/10/07 14:40:20 grobian Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.127 2013/02/06 12:22:06 mgorny Exp $
+
+*scons-2.2.0-r1 (06 Feb 2013)
+
+  06 Feb 2013; Michał Górny <mgorny@gentoo.org> +scons-2.2.0-r1.ebuild:
+  Migrate to distutils-r1.
 
   07 Oct 2012; Fabian Groffen <grobian@gentoo.org> scons-2.2.0.ebuild:
   Setup a valid path, EPREFIX does NOT end in /
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index d63566be263d..ca42a38941e5 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -12,6 +15,16 @@ 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-r1.ebuild 1805 SHA256 5cbab5de766b028a429a9fd1196f0c38039f0738a3e9ccf66aee3ccb534e9cb3 SHA512 fde56d17090974f09a1c28fb024ac0d35550ff6ac82059025f52f8abf8a141698de6eaf3431be20c905c56397a1ffe7330040bb77fc58a0a945d34db716381bf WHIRLPOOL f7169c00d30634d047fc5a5d84fb90d001797d4d85509a0c525b12d7860eb5dee9b128a1eb23db3f4748f20cf2fa684eb7c7366dbbd437e8b2596d56968cbe88
 EBUILD scons-2.2.0.ebuild 1604 SHA256 8d12c879500ebf0b97583131a1454a3cbc0d559a2b807eecf00b0e88d82dc9a8 SHA512 4ebb3cff36d89d907421a193138df2ded203fc7ab86df79987664cdaa11da312c8f41f232c7514844e15cf1b61fca7a68d2b19854556a0ed762fb7fbbfd58044 WHIRLPOOL dbd5ad1aeaae72543fa138d64f043ddc0e8a5bc0985b9fd879518001d6bd1741f75de3ebb6666faef48fcb88d4eb82c0aa2f0dac2115920689155b4ecd74556b
-MISC ChangeLog 8881 SHA256 2abe9a0886b3abdf088572d87cd1cc09ac59986a274df6e7a1ac299f5b3848bb SHA512 603ce8cc3cf4d13c107f5b05c9cfa711491b7365df965ce5eb5f2be9c343188f03121cf7b87ed0d0719f5e37f3ad625138763270b95523f7ab0ae6dd7af10e38 WHIRLPOOL 3504529223275d6c2574c0081bc13731cfb80b2088ec94d513468f406b5564e9d154b6dbfc1c0cbde04e101d568e9743435c5ea54306491690699591ee2650b5
+MISC ChangeLog 9013 SHA256 dae323cd816f36278efbf3e093a4f9790b333b1a2090a9cbc42aba3b5400a17f SHA512 0d7a84ea60e0d3dc76930fe27dcd88f4eafe4d0018805c976c87cb4cbfc69f9cbaabb61042a2c86484952ed33d1e4fab320aea153904147690b95e6dc1a65388 WHIRLPOOL 786301bab9b271cabadef31fb498a6e16927ead6c984e2c84f0ccb980f062b563cb6385fa81c8161995a07035106b0b5d57432119c0ad6aae10e26d05058ed5d
 MISC metadata.xml 533 SHA256 75dd06130ca8c5457cbc43bcf13b21ed278d34a36ab14f7663a884d1f4b4b4b2 SHA512 eb16f3b83d19d094367b3972bbe8d72bc787639847faea4e40c2d7fa59d302568f0419681594a26c48d9974ef5c7119530ba7fd30918c5a4d89b05395cd6e6d8 WHIRLPOOL 5caafc86d4d8ccc6265b323220c87b8a93e67e634123d1435e08116a71cb0ea8ede52edc172cfc0f69ac047593f2ee5fb5695551bf6863899bd5b21f1d13f13d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iJwEAQEIAAYFAlESSvQACgkQfXuS5UK5QB38DAP6A4TrmYED0ppnsmnJHI/z8FqL
+d48ooDYl/8rb8BhjwJG8ViaQlZcdcOxuK5QteSwn1lybkp4PNyxhoKbpkK/KtTby
+Mp2n2+Mc4diVSq2CQnfnB/yH9K7sWNMHMP0LWBgLqfhQZhy0VkrztaT9ZmrNdGCy
+hm68cyo8SdHnvT9vxTs=
+=ihIC
+-----END PGP SIGNATURE-----
diff --git a/dev-util/scons/scons-2.2.0-r1.ebuild b/dev-util/scons/scons-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..63e5b416ee6e
--- /dev/null
+++ b/dev-util/scons/scons-2.2.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/02/06 12:22:06 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,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 ~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"
+
+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
+
+	# Build system does not use build_scripts properly.
+	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
+	python_doscript "${ED}"usr/bin/scons{,ign,-time}
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}