Force Python 2.x wrt #317043 by Arfrever Frehtes Taifersar Arahesis.

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

4 files changed, 31 insertions, 85 deletions

diff --git a/x11-wm/plwm/ChangeLog b/x11-wm/plwm/ChangeLog
index c662d17b1ea8..f4593856ced2 100644
--- a/x11-wm/plwm/ChangeLog
+++ b/x11-wm/plwm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/plwm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/ChangeLog,v 1.14 2010/01/01 21:41:57 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/ChangeLog,v 1.15 2010/06/13 15:02:01 ssuominen Exp $
+
+  13 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> plwm-2.7_rc1.ebuild:
+  Force Python 2.x wrt #317043 by Arfrever Frehtes Taifersar Arahesis.
 
 *plwm-2.7_rc1 (01 Jan 2010)
 
diff --git a/x11-wm/plwm/Manifest b/x11-wm/plwm/Manifest
index 45af3de75908..ff148ff5ee72 100644
--- a/x11-wm/plwm/Manifest
+++ b/x11-wm/plwm/Manifest
@@ -5,11 +5,9 @@ AUX plwm-2.6_alpha-pep0263.patch 690 RMD160 6aa146eaf0e6a59199f04042cd151453108a
 AUX plwm-2.6_alpha-python2.5.patch 694 RMD160 10c3a9806aa1037c04da1edec36094519be5f84b SHA1 aa9bf591788de3f74542aa0cdce0ca79522ef683 SHA256 353ec618e4445c09601bcda145b5e4928fd52634254010efb229719333ede289
 AUX plwm-2.6_alpha.patch 651 RMD160 fa885a02bfaa2636c695a3aa122d87fc36353e42 SHA1 870e4b9ba2bf28e937e3c541a62b5891dba8253a SHA256 d2ac9af5f917b8f660634bdd16fbd8d7bd71e2358b636ecb0fdc5e3a7cc8a68b
 AUX plwm-2.7_rc1-pep0263.patch 653 RMD160 9f2e39a69db926338b09efcfa242470221b62d7e SHA1 f14375064795844969a1ba0f8390f090dc77de32 SHA256 a603a854f811d12d6cf4ebd731b411484cef10d61ebe63b6b25f591ae83132f3
-DIST PLWM-2.6a.tar.gz 452944 RMD160 ab6c5f9cbc8e5240535a176b7a1c97d89341aa0d SHA1 cf6de5a14174a16b675e1827b10e7b06a70fcedc SHA256 adf7a01f6717235e6ab872f2bcca3d30b10bab31e48aab2afc0cd4c37644d293
 DIST PLWM-2.7rc1.tar.gz 343570 RMD160 8e63216cc6b5ee00a1f3f12ef0d87951612acbfc SHA1 71c5a8e76fccd85ba0fd98764c0f0c25768f44ea SHA256 789fbd6229ad63ee9b2d939e27d049282dca45315d8e22debad56636a3b0a305
 DIST plwm-2.5.tar.gz 127248 RMD160 a2c17b83f2d73d4b96ab30c8470031dd816d66bc SHA1 818c07454571f5b528b1fcb7025edaaf4889d347 SHA256 c1fc72f3dd7959743655c2fb2025faf598d1c5b0d75812282b4bb548aedd14de
 EBUILD plwm-2.5-r1.ebuild 1088 RMD160 74ac3a2ea11bab8b768fcc0c5324ed4d737c5ebe SHA1 b1a01519339c847dcf2b63b717abdea77a147657 SHA256 f6b591eb2a5a955b9ab03656ead6b5e48e9f0630e26ba56dafea8db9be3bf1f3
-EBUILD plwm-2.6_alpha-r1.ebuild 1363 RMD160 bde9e5961b5d4cc1c64f126e7e491b96d88cb5e5 SHA1 0bb1a1acab35bc3d088ccd9c96955e302d02a76b SHA256 d427e6f622a8792aa5d6aedccbaed334c173686cb52bf3ad8a4cd0ef59f5b090
-EBUILD plwm-2.7_rc1.ebuild 1224 RMD160 b8178cd4b81315280fa9fbc9dbd307f8f7944c62 SHA1 e5b47cad7998d78984f0ddbf578c04fc08d2d84f SHA256 e14ba6b2a9027bad7845ed286a7e10f1db8e25b51fc0e368335d954dbb444d02
-MISC ChangeLog 2016 RMD160 de00af60e4247229c6b64fd6ffe9effc2424a395 SHA1 68f946b36edd5fac6954ef0731c2dbae85a10f1c SHA256 f063cfa3b1d38e1004a97f2ac30fa6d52ff39e9b101248539302772ac12edb86
+EBUILD plwm-2.7_rc1.ebuild 1119 RMD160 da43aa29f1c7def99e54be6c13093ea6da3b89ec SHA1 fc5776030bdab1f681405b48e0f6de737a0f3cdd SHA256 0a34afc78bbe547bbea6b37707541e6108c72a8ccf1f046df807f0dee6166957
+MISC ChangeLog 2169 RMD160 e1111512b54edcb1eded851cfd27d49087759a17 SHA1 0f5bbaef7a0ced67b84ed358ff3c4871e2efeca0 SHA256 769334876dadb38fa1f1892a7e0fda5ad9ae86f146b165ad3e08339e5cc8c3d4
 MISC metadata.xml 359 RMD160 ab601f50159a35eea1d6da34b8b625db7f155086 SHA1 1ef235e3a3678b7d5e8e678f3dd42a701ba55cd6 SHA256 dc8084c9b3bccf5993bc0c5415548dedee0f748ee05882d987c136eaf986314b
diff --git a/x11-wm/plwm/plwm-2.6_alpha-r1.ebuild b/x11-wm/plwm/plwm-2.6_alpha-r1.ebuild
deleted file mode 100644
index 8e194ea3fc83..000000000000
--- a/x11-wm/plwm/plwm-2.6_alpha-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/plwm-2.6_alpha-r1.ebuild,v 1.2 2007/08/27 13:44:50 coldwind Exp $
-
-NEED_PYTHON="2.2"
-
-inherit distutils eutils
-
-MY_P="PLWM-${PV/_alpha/a}"
-DESCRIPTION="Python classes for, and an implementation of, a window manager."
-HOMEPAGE="http://plwm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/plwm/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-python/python-xlib-0.12"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Patch from upstream to make it usable again
-	epatch "${FILESDIR}/${P}.patch"
-
-	epatch "${FILESDIR}/${P}-python2.5.patch"
-	epatch "${FILESDIR}/${P}-pep0263.patch"
-}
-
-src_install() {
-	distutils_src_install
-
-	# do same as old version and make a plwm 'executable'
-	# which is examplewm.py
-	cp examples/examplewm.py examples/plwm
-	dobin examples/plwm || die "dobin failed"
-	rm examples/plwm
-
-	# install utils (inspect_plwm, wmm)
-	dobin utils/*.py || die "dobin failed"
-
-	make -C doc || die "make info docs failed"
-	doinfo doc/*.info* || die "doinfo failed"
-
-	dodoc NEWS ONEWS INSTALL || die "dodoc failed"
-
-	docinto examples
-	dodoc examples/* || die "dodoc failed"
-
-	docinto utils
-	dodoc utils/ChangeLog || die "dodoc failed"
-}
diff --git a/x11-wm/plwm/plwm-2.7_rc1.ebuild b/x11-wm/plwm/plwm-2.7_rc1.ebuild
index b20ff81079df..519aeea70b75 100644
--- a/x11-wm/plwm/plwm-2.7_rc1.ebuild
+++ b/x11-wm/plwm/plwm-2.7_rc1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/plwm-2.7_rc1.ebuild,v 1.1 2010/01/01 21:41:57 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/plwm-2.7_rc1.ebuild,v 1.2 2010/06/13 15:02:01 ssuominen Exp $
 
-NEED_PYTHON="2.2"
+EAPI=3
+PYTHON_DEPEND="2"
 
 inherit distutils eutils
 
-MY_P="PLWM-${PV/_/}"
+MY_P=PLWM-${PV/_}
 
 DESCRIPTION="Python classes for, and an implementation of, a window manager."
 HOMEPAGE="http://plwm.sourceforge.net/"
@@ -14,40 +15,40 @@ SRC_URI="mirror://sourceforge/plwm/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=""
 RDEPEND=">=dev-python/python-xlib-0.14"
+DEPEND="sys-apps/texinfo"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-pep0263.patch"
+pkg_setup() {
+	python_set_active_version 2
 }
 
-src_install() {
-	distutils_src_install
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pep0263.patch
+	python_convert_shebangs -r 2 examples/examplewm.py utils/*.py
+	distutils_src_prepare
+}
 
-	# do same as old version and make a plwm 'executable'
-	# which is examplewm.py
-	cp examples/examplewm.py examples/plwm
-	dobin examples/plwm || die "dobin failed"
-	rm examples/plwm
+src_compile() {
+	distutils_src_compile
+	emake -C doc || die
+}
 
-	# install utils (inspect_plwm, wmm)
-	dobin utils/*.py || die "dobin failed"
+src_install() {
+	distutils_src_install
 
-	make -C doc || die "make info docs failed"
-	doinfo doc/*.info* || die "doinfo failed"
+	newbin examples/examplewm.py plwm || die
+	dobin utils/*.py || die
 
-	dodoc NEWS ONEWS INSTALL || die "dodoc failed"
+	doinfo doc/*.info || die
 
+	dodoc {,O}NEWS || die
 	docinto examples
-	dodoc examples/* || die "dodoc failed"
-
+	dodoc examples/* || die
 	docinto utils
-	dodoc utils/ChangeLog || die "dodoc failed"
+	dodoc utils/ChangeLog || die
 }