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

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

1 files changed, 25 insertions, 24 deletions

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
 }