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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 29 insertions, 81 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/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
 }