Use Python 2 (bug #308271).

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

3 files changed, 47 insertions, 16 deletions

diff --git a/app-admin/kedpm/ChangeLog b/app-admin/kedpm/ChangeLog
index aa6acea31ab6..957964b90ef8 100644
--- a/app-admin/kedpm/ChangeLog
+++ b/app-admin/kedpm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/kedpm
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/kedpm/ChangeLog,v 1.15 2007/01/09 20:50:55 dev-zero Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/kedpm/ChangeLog,v 1.16 2011/04/06 17:59:12 arfrever Exp $
+
+  06 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  kedpm-0.4.0-r1.ebuild:
+  Use Python 2 (bug #308271).
 
   09 Jan 2007; Tiziano Müller <dev-zero@gentoo.org> -kedpm-0.4.0.ebuild,
   kedpm-0.4.0-r1.ebuild:
diff --git a/app-admin/kedpm/Manifest b/app-admin/kedpm/Manifest
index 3d2cb8b42609..364d151c5e84 100644
--- a/app-admin/kedpm/Manifest
+++ b/app-admin/kedpm/Manifest
@@ -1,6 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kedpm.desktop 483 RMD160 06e2ffc73a9aa5092b9ebe254305f5f838210cd4 SHA1 48b60afaa50b2e063eafa3573b78b008eed76108 SHA256 517a1d32843edf99d907099c30b5078cd2810024a0391a3fb78aebdc9bf649df
 AUX setup-doc.patch 627 RMD160 f0da5cfb8631a6e40b9fb292ba22cce153861774 SHA1 b6237e144ed8cc294b407c57a1705f1d23f607ed SHA256 cb0b73448dae528d0aad0795213fd85a24e9f85db45a267bfac1b77b7f08259c
 DIST kedpm-0.4.0.tar.gz 61636 RMD160 7b37c06c93151a7177505c4dd796c33d5d1c77bb SHA1 449b733718918ad5d7c782e85c70c1a43873109f SHA256 f1dfb44a990110fddf132c9841f40aa2b9848ade4be56957a8a572574dc2fc28
-EBUILD kedpm-0.4.0-r1.ebuild 1124 RMD160 c96dee8c8831a3045ccf697f77562868640f2cf3 SHA1 624c7e8847ebd357613aa5214f8b09a397423ffa SHA256 ed36c7942a58343aab6438578cad93f14aba4c486e29a42983319ea538007059
-MISC ChangeLog 1876 RMD160 3c1ce18e3a9d432baa7a31b0a8ef754b852cb143 SHA1 b54e2a27b8c209c083996c8cabbe13980512178f SHA256 ce70471a28057cc243311c36aab7f39123b874d56c40047e9a4301fb0b73e9c8
+EBUILD kedpm-0.4.0-r1.ebuild 1219 RMD160 05375af980dc7d1e3a085e9751a0d1721d385cc4 SHA1 1323d667fd0720d8e19348d5817be585c93f3129 SHA256 fca4c4be8b4bf20f2f8ca7efd55f2c5674bdab0c7070785ada1b540bcd7fb3ab
+MISC ChangeLog 2005 RMD160 0cd5893af207abdf18a36009024d805fab83c0d7 SHA1 eccef3be15e4583fb57098be329c3d9d6306bd4c SHA256 05e5cf813363b0b5e100e8e7a3a65fc7fa3acef5fefda45f29e6cbf65fee722b
 MISC metadata.xml 362 RMD160 87d8f64f90666f5a334d32498ca6bbb0defc3488 SHA1 89f51ea654ec0596efa52d3d4c510e04a5efe019 SHA256 edee739f15b00778d6692698a66ae5e66c51fe7d8ff995a8018195b0804db20b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNnKn/AAoJENgZr6v6gHY0WBcP/iP+66GhqmAMR48Glv20xmTG
+Vma+V/4ZzaG0L1lZZZvvZEAry36VgEEjriTJ2h0C6HT4fPMfqeWATGzOeoSAaQoz
+8XHnQ2MIpVRbOWa/cLeVUOf/zsXQlqEvkXZrhEdvfnHadZJyE/PrVhVFtJSQPx4v
+722a95NPCMQn03HL3uag2ozlLC0HDuF1filX/du/CD3TUUS8QSmK3972xobTXFR5
+70Ji8S6CrobGK058Wf7BLyvGijxepm+ORbTXGpFpzn1n08GDeVOY6jQg+8u/1ZB4
+Iko41NBn7gacaVOhNKOnCHeAjp2yacZMHR0hJoNRrAf7+cOeZ2FPycYV6yhc3Bj8
+QWDru2ieHuIehYj91haU1t49WcbwOEsfc3Rhhm+xo1h+cLZ5YWHB2iHWDmeTxHvu
+rNjasBcFHJTvyNCksxSP0f1V24Knaf3yBYfMFeJjHjpUa3HsgjjLgWIKCmn7aatf
+WojoPxpHHLSzUZtupYphVLB1S6x53TYquWEHjKUL0dmlvItB54lW7a+lJgvaqQh8
+m5Jm3uEDerEsNs8QgeEiQI+cqs/BFfuls/siZx4G1/YXq8bhhHmVQHDSFlssoSYm
+582F8N9JzlutslV/tmWeUTgP6+tquxzMnqp09zj4kwh+kUvMewIRSSADSvjyxxbA
+YG2e3uYITJwKQdRdpiPY
+=gwzq
+-----END PGP SIGNATURE-----
diff --git a/app-admin/kedpm/kedpm-0.4.0-r1.ebuild b/app-admin/kedpm/kedpm-0.4.0-r1.ebuild
index 8c70866d0a47..8b8121e5b49f 100644
--- a/app-admin/kedpm/kedpm-0.4.0-r1.ebuild
+++ b/app-admin/kedpm/kedpm-0.4.0-r1.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/kedpm/kedpm-0.4.0-r1.ebuild,v 1.2 2007/01/09 20:50:55 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/kedpm/kedpm-0.4.0-r1.ebuild,v 1.3 2011/04/06 17:59:12 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit distutils eutils
 
@@ -13,14 +16,18 @@ SLOT="0"
 KEYWORDS="x86 ppc amd64"
 IUSE="gtk"
 
-DEPEND=">=sys-apps/sed-4"
-RDEPEND="dev-python/pycrypto
+DEPEND="dev-python/pycrypto
 	gtk? ( >=dev-python/pygtk-2 )"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS CHANGES NEWS"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
 
+src_prepare() {
 	# We want documentation to install in /usr/share/doc/kedpm
 	# not in /usr/share/kedpm as in original setup.py.
 	epatch "${FILESDIR}/setup-doc.patch"
@@ -30,13 +37,13 @@ src_unpack() {
 	use gtk || sed -i -e 's/"gtk"  # default/"cli"  # default/' scripts/kedpm
 }
 
+src_test() {
+	PYTHONPATH="build/lib" "$(PYTHON)" run_tests || die "Tests failed"
+}
+
 src_install() {
-	DOCS="AUTHORS CHANGES NEWS"
 	distutils_src_install
+
 	# menu item
 	domenu "${FILESDIR}/${PN}.desktop"
 }
-
-src_test() {
-	./run_tests || die "tests failed"
-}