Use Python 2.

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/dev-util/scons/ChangeLog b/dev-util/scons/ChangeLog
index ff0b784b463d4cfbd588c6013c60379837592ade..b3e3d27d4980b09fabe606b6952709121645f467 100644 (file)
--- a/dev-util/scons/ChangeLog
+++ b/dev-util/scons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/scons
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.77 2010/05/19 20:40:14 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.78 2010/06/25 23:05:57 arfrever Exp $
+
+  25 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  scons-1.3.0_p20100501.ebuild:
+  Use Python 2.
 
 *scons-1.3.0_p20100501 (19 May 2010)
 

diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 4764f0ee6f2777249125417740e28e7111fe9902..98ae48da5f5ae7efd31cbd5d26530e300f1e28de 100644 (file)
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX scons-1.2.0-links.patch 991 RMD160 f12673b29464ce1cf95bf0f0903a6364fcd322fb SHA1 a12efc0e34b7acafe93e37b154cec454eec9d067 SHA256 a0cce0038c7efbba26e8d148e7f41db54d780d5ca1c0dd0d8b2711bc26cc4c7f
 AUX scons-1.2.0-popen.patch 1826 RMD160 33d195bffbcb2f5280d04c1742f082f82e761bdb SHA1 ba24a0b73f6671d8ec4a44c31691a98b6dba080f SHA256 84a3bc1ba70fe60cc483d0186703b303daeb7bed246f21e3db9227c255afd312
 DIST scons-0.97.tar.gz 439523 RMD160 31af35ef62fe56a4faf291a4d6cb73de5a17d81f SHA1 732980f0f4dba7cba32fffca0b533497ef751afc SHA256 195df54afedd60767e55393187df0f1e7e0ddb3a46347a5ee82d5050f964c3ba
@@ -18,17 +15,6 @@ EBUILD scons-0.97.ebuild 1152 RMD160 02d0d8d36c3aaaef181a1bdeb0aeb87e43a209fa SH
 EBUILD scons-1.0.0.ebuild 1147 RMD160 1f6554d27b7b324c4f09c0951ea69f111af4d84b SHA1 d84b82f82e89108694184f1e4136be82ee939ad7 SHA256 11463fc84ef40e0f903f7f0deca41b8cdb44e071ba12a8a15df9606cea04354b
 EBUILD scons-1.2.0-r1.ebuild 1215 RMD160 27d626c95bfa93194d65445ddec8db4eddcd76e6 SHA1 54d2f4e68e654f08e09717063a25aadde8226ee4 SHA256 ac2f6b8c59a7f4c3b195a521ce55f64e412665780e0879d541a2286b7e26add8
 EBUILD scons-1.2.0_p20091224.ebuild 1263 RMD160 d7bd619e59f3979b74a8d19fea5d69b1fb65bc41 SHA1 b2ebaaf56a63706ad08aa8a4ddc768c93aa7a666 SHA256 929db5393f537b67814cc188be68302992b1f8085b6b62845ef417725f8a4bb3
-EBUILD scons-1.3.0_p20100501.ebuild 1296 RMD160 61e8e693b2c67fa32697043e9203ee64809483b8 SHA1 d548fbbf3be2f74221c1936bb04c411c28cff884 SHA256 0b28c2f80c52a8747135407fec868c28dbcd77923f81c4642909858679987f4e
-MISC ChangeLog 3167 RMD160 d55f555b431a66f28603c453bc184499ef06b97a SHA1 6068752bbec9722718b70fa430bf68aed952bfa2 SHA256 4bf6f0f788a070005c79066865518acb29fc68c31d281e4f35d2115aaa2239cc
+EBUILD scons-1.3.0_p20100501.ebuild 1431 RMD160 7badaf8e25febc5e6ef905de7d71e442c2dcece1 SHA1 5f7067d2e62352663dab670196918825c372a9d9 SHA256 139808c67a082bdf2bd8649d62312f08825ed3099ec95e515bf662d522de2264
+MISC ChangeLog 3289 RMD160 97369fc47ad3959fc0c9ccfa2528711e9ba8d51b SHA1 f8117d157ba35c59bf0ced5f5dfdbd2c3bebc9cc SHA256 8570a938ad3285919a9c64f0610e8cadca8366115124f7a14e897c66b6a95b80
 MISC metadata.xml 638 RMD160 313c3b4020d391dd897fb124fd3ae7148e4d25f4 SHA1 2ba17518173dc79962c08f88dc495ade267e443c SHA256 8e7b7a43fc5e94c0c0d538aa07cf5e4b37bc5d9ef688bf8f7870395d2504b7cf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQEcBAEBAgAGBQJL9Ey0AAoJEBZyv1r2qA5GMPIH+wdeXTlkNpMJc2hfcShGGjnG
-m9GVXEydsBsDB+NsoDVnIJF3+EcmEE78+DX/pahY7+iRxOvD/a6WNgfrByykVPW6
-ZByg0fxBMFwDtqmDHOPcmXxGu5FPQbLcAkBoXzFq+Qwd4uIejMgy0cid3NOXwM36
-MSYJ2Zk19uS34Xq9LalCItaRd2ovgukpcqPJ4Zd+vb30X17RidB2QDy07mhYsgBV
-3zUalhULQZhDqqCB6nSAeQUtPSZ11zS7qcjuD1PFlDJZTvQmT8iTVpX4KkV7RxZk
-xj1HUZfKCVgx61L4tfZ0yBsrgbauDjIpHJAkrwjkKimSeobi1QkroIhqNqFcqEA=
-=2cnc
------END PGP SIGNATURE-----

diff --git a/dev-util/scons/scons-1.3.0_p20100501.ebuild b/dev-util/scons/scons-1.3.0_p20100501.ebuild
index a62d35925099191b479bc61fa84bdc4a62d0e74d..febbea3f96fd93ebf4213d4fc6a20681644e05f4 100644 (file)
--- a/dev-util/scons/scons-1.3.0_p20100501.ebuild
+++ b/dev-util/scons/scons-1.3.0_p20100501.ebuild
@@ -1,40 +1,54 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-1.3.0_p20100501.ebuild,v 1.1 2010/05/19 20:40:14 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-1.3.0_p20100501.ebuild,v 1.2 2010/06/25 23:05:57 arfrever Exp $
 
-EAPI=2
+EAPI="3"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads"
 
-inherit eutils distutils
+inherit distutils eutils
 
 MY_PV="${PV/_p/.d}"
 DOC_PV="${PV/_p*/}"
 
 DESCRIPTION="Extensible Python-based build utility"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz
-       doc? ( http://www.scons.org/doc/${DOC_PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-                  http://www.scons.org/doc/${DOC_PV}/HTML/${PN}-user.html -> ${P}-user.html )"
-
 HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz
+       doc? (
+               http://www.scons.org/doc/${DOC_PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+               http://www.scons.org/doc/${DOC_PV}/HTML/${PN}-user.html -> ${P}-user.html
+       )"
 
-SLOT="0"
 LICENSE="MIT"
+SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="doc"
-DEPEND=">=dev-lang/python-2.5[threads]"
-RDEPEND="${DEPEND}"
-DOCS="RELEASE.txt CHANGES.txt"
+
+DEPEND=""
+RDEPEND=""
+
+DOCS="CHANGES.txt RELEASE.txt"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
+pkg_setup() {
+       python_set_active_version 2
+       python_pkg_setup
+}
+
 src_prepare() {
-       epatch "${FILESDIR}"/scons-1.2.0-popen.patch
+       distutils_src_prepare
+       epatch "${FILESDIR}/scons-1.2.0-popen.patch"
 }
 
 src_install () {
        distutils_src_install
-       # move man pages from /usr/man to /usr/share/man
+       python_convert_shebangs -r 2 "${ED}"
+
+       # Move man pages from /usr/man to /usr/share/man
        dodir /usr/share
-       mv "${D}"/usr/man "${D}"/usr/share
+       mv "${ED}usr/man" "${ED}usr/share"
+
        if use doc; then
                insinto /usr/share/doc/${PF}
                doins "${DISTDIR}"/${P}-user.{pdf,html}