Force Python 2.x wrt #317009.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-misc/dsx/ChangeLog b/x11-misc/dsx/ChangeLog
index 1c9c01fbc62269763afecd8a799546545269ba0c..26ed8159a83921ecfb45eb91e1e325d7058f718b 100644 (file)
--- a/x11-misc/dsx/ChangeLog
+++ b/x11-misc/dsx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/dsx
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dsx/ChangeLog,v 1.7 2007/07/22 02:52:01 coldwind Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dsx/ChangeLog,v 1.8 2010/06/06 10:05:59 ssuominen Exp $
+
+  06 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> dsx-0.1.ebuild:
+  Force Python 2.x wrt #317009.
 
   22 Jul 2007; Santiago M. Mola <coldwind@gentoo.org> dsx-0.1.ebuild:
   virtual/x11 removed.

diff --git a/x11-misc/dsx/Manifest b/x11-misc/dsx/Manifest
index 6f86c21f0ff9aaecfd53c426a2089f733142049e..d37136ce25e8a2a8d2c5d25ae65a1d4b379ce725 100644 (file)
--- a/x11-misc/dsx/Manifest
+++ b/x11-misc/dsx/Manifest
@@ -1,4 +1,4 @@
 AUX dsx-0.1 2218 RMD160 a0d9f2b3bbfd4e9d56057e8a4cc83748c1e51853 SHA1 9360b08369e65e37ef0a6ca6a10c031483ac8110 SHA256 4d1835e19ed1f10edbe56e1d39e06ba51f6653f9ca9f3e680b61766f31ba05bb
-EBUILD dsx-0.1.ebuild 457 RMD160 1811a62717cb99007648dd793d14cf6cc381fb46 SHA1 991ea892c65fb15cf09f7a56957a8393fdafab08 SHA256 395089510804d2c269c24440255c8ff444d05b366507847c65a16fd3261f1889
-MISC ChangeLog 945 RMD160 86247743468f842813c298c320fa463258ce8faa SHA1 5172e88fec2e38fa70cc3fbdc897e54bcb6a5b46 SHA256 1516d1b2633a1137d536bfacb7d2746bccd91d58df8ecc7099cb75e3deae8508
+EBUILD dsx-0.1.ebuild 638 RMD160 dcd6f5a9debd6055302fa6aaabe2d7fe38798602 SHA1 bc543410a2f2617f99b29c11a96e94305563713f SHA256 69102b72274f3f9602c7452e7d165a0681a888d8a0768df4d8fbccced422a401
+MISC ChangeLog 1049 RMD160 98bc8b9fb62ef5473ebcb3758db074bdbbb60e44 SHA1 177a50adb46f966f607daa3d640bef297df9e5b1 SHA256 69be9327783bae36dce2ebe86be4d423e93a8650b3f7c136a573aa59bbdf195b
 MISC metadata.xml 165 RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc SHA1 87fed26b774e4dd2226bea04c4bcc8ba39fcc4c3 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec

diff --git a/x11-misc/dsx/dsx-0.1.ebuild b/x11-misc/dsx/dsx-0.1.ebuild
index d0c996c5ef1640dddd8f9ddbbb011056f91d2b84..84b2defdf685c06ab983e188290aa1131d1f624f 100644 (file)
--- a/x11-misc/dsx/dsx-0.1.ebuild
+++ b/x11-misc/dsx/dsx-0.1.ebuild
@@ -1,19 +1,33 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dsx/dsx-0.1.ebuild,v 1.7 2007/07/22 02:52:01 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dsx/dsx-0.1.ebuild,v 1.8 2010/06/06 10:05:59 ssuominen Exp $
+
+EAPI=2
+PYTHON_DEPEND="2"
+
+inherit python
 
 DESCRIPTION="command line selection of your X desktop environment"
-HOMEPAGE="none"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
+RDEPEND="x11-apps/xinit"
 DEPEND=""
-RDEPEND="x11-apps/xinit
-       >=dev-lang/python-2.1"
+
+pkg_setup() {
+       python_set_active_version 2
+}
+
+src_prepare() {
+       cp "${FILESDIR}"/${P} "${T}"
+       python_convert_shebangs -r 2 "${T}"
+}
 
 src_install() {
-       newbin "${FILESDIR}/${P}" dsx
+       newbin "${T}"/${P} dsx
 }