Revbump fixing python-2.5, DEPEND, and misc fixes. Thanks to Patrick Lauer and John. Fixes bug #150610

Package-Manager: portage-2.1.2.7

9 files changed, 214 insertions, 16 deletions

diff --git a/x11-wm/plwm/Manifest b/x11-wm/plwm/Manifest
index d368fdb2cede..ac4f61292b22 100644
--- a/x11-wm/plwm/Manifest
+++ b/x11-wm/plwm/Manifest
@@ -1,20 +1,37 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX plwm-2.5-destdir.patch 1365 RMD160 639542e327918f3c6cb27aab0d1728a4815e7826 SHA1 8fa826718e0a4beafb4dd1bcb1c0a25c5325da5c SHA256 dad1e7295ec52f8cfb0756929d1a627d74e78d0f1adf16c84f0ddbbb4df4e3b7
+MD5 e5a359b895e133c961b783c7c15b765f files/plwm-2.5-destdir.patch 1365
+RMD160 639542e327918f3c6cb27aab0d1728a4815e7826 files/plwm-2.5-destdir.patch 1365
+SHA256 dad1e7295ec52f8cfb0756929d1a627d74e78d0f1adf16c84f0ddbbb4df4e3b7 files/plwm-2.5-destdir.patch 1365
+AUX plwm-2.5-python2.5.patch 690 RMD160 8b59d9deb79738c8abbe482017a8292b1224b14d SHA1 c9e3e4dd5b116a7944758cb0aafc0b149f587c59 SHA256 da54e4fca516526e94d62c407f3d57b190030f879a1ee96d47666f5d71dfde55
+MD5 04535c62962c4463f30a06b7a60cce8e files/plwm-2.5-python2.5.patch 690
+RMD160 8b59d9deb79738c8abbe482017a8292b1224b14d files/plwm-2.5-python2.5.patch 690
+SHA256 da54e4fca516526e94d62c407f3d57b190030f879a1ee96d47666f5d71dfde55 files/plwm-2.5-python2.5.patch 690
+AUX plwm-2.6_alpha-python2.5.patch 694 RMD160 10c3a9806aa1037c04da1edec36094519be5f84b SHA1 aa9bf591788de3f74542aa0cdce0ca79522ef683 SHA256 353ec618e4445c09601bcda145b5e4928fd52634254010efb229719333ede289
+MD5 55e0f45fa3cd1e49568759d9d6958858 files/plwm-2.6_alpha-python2.5.patch 694
+RMD160 10c3a9806aa1037c04da1edec36094519be5f84b files/plwm-2.6_alpha-python2.5.patch 694
+SHA256 353ec618e4445c09601bcda145b5e4928fd52634254010efb229719333ede289 files/plwm-2.6_alpha-python2.5.patch 694
 AUX plwm-2.6_alpha.patch 651 RMD160 fa885a02bfaa2636c695a3aa122d87fc36353e42 SHA1 870e4b9ba2bf28e937e3c541a62b5891dba8253a SHA256 d2ac9af5f917b8f660634bdd16fbd8d7bd71e2358b636ecb0fdc5e3a7cc8a68b
 MD5 503ec2d8bf0ff6a0e1c88a8f453fbdcc files/plwm-2.6_alpha.patch 651
 RMD160 fa885a02bfaa2636c695a3aa122d87fc36353e42 files/plwm-2.6_alpha.patch 651
 SHA256 d2ac9af5f917b8f660634bdd16fbd8d7bd71e2358b636ecb0fdc5e3a7cc8a68b files/plwm-2.6_alpha.patch 651
 DIST PLWM-2.6a.tar.gz 452944 RMD160 ab6c5f9cbc8e5240535a176b7a1c97d89341aa0d SHA1 cf6de5a14174a16b675e1827b10e7b06a70fcedc SHA256 adf7a01f6717235e6ab872f2bcca3d30b10bab31e48aab2afc0cd4c37644d293
 DIST plwm-2.5.tar.gz 127248 RMD160 a2c17b83f2d73d4b96ab30c8470031dd816d66bc SHA1 818c07454571f5b528b1fcb7025edaaf4889d347 SHA256 c1fc72f3dd7959743655c2fb2025faf598d1c5b0d75812282b4bb548aedd14de
+EBUILD plwm-2.5-r1.ebuild 1047 RMD160 7e81f17ab7701d1753c6bc497cdf77a64ceb3414 SHA1 c23310798168a314b380f6f6cf1942325a3c319d SHA256 52c4aa612916794c3b7d3403b0434b94c29700d83a276510db2789d8aab703a1
+MD5 ac46486c0eee40d906bd002701cd7526 plwm-2.5-r1.ebuild 1047
+RMD160 7e81f17ab7701d1753c6bc497cdf77a64ceb3414 plwm-2.5-r1.ebuild 1047
+SHA256 52c4aa612916794c3b7d3403b0434b94c29700d83a276510db2789d8aab703a1 plwm-2.5-r1.ebuild 1047
 EBUILD plwm-2.5.ebuild 905 RMD160 37a162c10d139f6c8f9ea77d72b893924ee9faa5 SHA1 56557679e531a0f641481bcdf42e999d0b7cf876 SHA256 ecffd85fabd25ab8e8b3c4e1322a3dc3a1e7eeebb7a0d0a2cf7779a9bbbf86ee
 MD5 eab73355cbcc183d5603bcaa7a734a21 plwm-2.5.ebuild 905
 RMD160 37a162c10d139f6c8f9ea77d72b893924ee9faa5 plwm-2.5.ebuild 905
 SHA256 ecffd85fabd25ab8e8b3c4e1322a3dc3a1e7eeebb7a0d0a2cf7779a9bbbf86ee plwm-2.5.ebuild 905
-EBUILD plwm-2.6_alpha.ebuild 1238 RMD160 1b638e36f3cbf834578a8fb49f0727ced7309393 SHA1 5ef6e884bda72c7d4aa997e4f154fdf55b5d6cf8 SHA256 4ca1103bae6f1349bb52d962135c0765bca933d6801e6a46da95b9d0fb2dd96c
-MD5 cec0406d23311ae74f4a820b0b67c84d plwm-2.6_alpha.ebuild 1238
-RMD160 1b638e36f3cbf834578a8fb49f0727ced7309393 plwm-2.6_alpha.ebuild 1238
-SHA256 4ca1103bae6f1349bb52d962135c0765bca933d6801e6a46da95b9d0fb2dd96c plwm-2.6_alpha.ebuild 1238
+EBUILD plwm-2.6_alpha-r1.ebuild 1322 RMD160 2d3b5d886b929c1d8677fe102341474dd341c076 SHA1 a854e5dba62e7246edc0227e2b28de51859f9089 SHA256 25ef977c69eefa3ab48004cc5110242794e37269a17c4259a03f1ba1af4d739e
+MD5 6f737fb79c399c692283c8ca8bc75928 plwm-2.6_alpha-r1.ebuild 1322
+RMD160 2d3b5d886b929c1d8677fe102341474dd341c076 plwm-2.6_alpha-r1.ebuild 1322
+SHA256 25ef977c69eefa3ab48004cc5110242794e37269a17c4259a03f1ba1af4d739e plwm-2.6_alpha-r1.ebuild 1322
+EBUILD plwm-2.6_alpha.ebuild 1238 RMD160 6a314ec1d9b11c1c7b94ff43eae9e5cb8cb15a0d SHA1 1cd2fc06be1bc281389e0c61dadd4ca9f84a604d SHA256 732dc57cf770f1f24b3fb7895488914a77ccddab9134a5703a3520e6cc4cb8bc
+MD5 8e4cf0c506e8b8a1396396e59c7cee07 plwm-2.6_alpha.ebuild 1238
+RMD160 6a314ec1d9b11c1c7b94ff43eae9e5cb8cb15a0d plwm-2.6_alpha.ebuild 1238
+SHA256 732dc57cf770f1f24b3fb7895488914a77ccddab9134a5703a3520e6cc4cb8bc plwm-2.6_alpha.ebuild 1238
 MISC ChangeLog 1149 RMD160 1d0779f570c7b7dd9041e4a322c03b9383ebf7f6 SHA1 45fb281d222b5d011568e9721617cd2b9cdd453a SHA256 24458dc72a25ff6afe16a663b2bd1951b24f1120e953de54d9450b1f2a4d22ec
 MD5 fb0f8fd21852f0a124c79f4c7da39029 ChangeLog 1149
 RMD160 1d0779f570c7b7dd9041e4a322c03b9383ebf7f6 ChangeLog 1149
@@ -26,13 +43,12 @@ SHA256 dc8084c9b3bccf5993bc0c5415548dedee0f748ee05882d987c136eaf986314b metadata
 MD5 2b643e8dfbc24945c83136dc509d68a1 files/digest-plwm-2.5 226
 RMD160 adbd03bcfc29a3fb6734525b69045c658df574fa files/digest-plwm-2.5 226
 SHA256 c4d9198357fdf122254b3774306eef9cf4602827bcbc80dccfe69f59405acdd5 files/digest-plwm-2.5 226
+MD5 2b643e8dfbc24945c83136dc509d68a1 files/digest-plwm-2.5-r1 226
+RMD160 adbd03bcfc29a3fb6734525b69045c658df574fa files/digest-plwm-2.5-r1 226
+SHA256 c4d9198357fdf122254b3774306eef9cf4602827bcbc80dccfe69f59405acdd5 files/digest-plwm-2.5-r1 226
 MD5 e0142757f08d7a9416b724affe75488d files/digest-plwm-2.6_alpha 229
 RMD160 eadb8559b452cba9073cfe9b296b607be8218390 files/digest-plwm-2.6_alpha 229
 SHA256 398b4e68aa6bd1b678d2bca21229363f9f793344ebf6cbb38db2e7ceac0ad2d6 files/digest-plwm-2.6_alpha 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF3TD9vSApE0uP4UsRApJuAJ9soQED+egD44hlsd02C/Yl9FyW1QCeNxuL
-X6Wl5lCa47xQO/U762yrZsU=
-=Ro5l
------END PGP SIGNATURE-----
+MD5 e0142757f08d7a9416b724affe75488d files/digest-plwm-2.6_alpha-r1 229
+RMD160 eadb8559b452cba9073cfe9b296b607be8218390 files/digest-plwm-2.6_alpha-r1 229
+SHA256 398b4e68aa6bd1b678d2bca21229363f9f793344ebf6cbb38db2e7ceac0ad2d6 files/digest-plwm-2.6_alpha-r1 229
diff --git a/x11-wm/plwm/files/digest-plwm-2.5-r1 b/x11-wm/plwm/files/digest-plwm-2.5-r1
new file mode 100644
index 000000000000..fb06e63df65d
--- /dev/null
+++ b/x11-wm/plwm/files/digest-plwm-2.5-r1
@@ -0,0 +1,3 @@
+MD5 a8615ddbc746e93d5c396ee8f3a87d48 plwm-2.5.tar.gz 127248
+RMD160 a2c17b83f2d73d4b96ab30c8470031dd816d66bc plwm-2.5.tar.gz 127248
+SHA256 c1fc72f3dd7959743655c2fb2025faf598d1c5b0d75812282b4bb548aedd14de plwm-2.5.tar.gz 127248
diff --git a/x11-wm/plwm/files/digest-plwm-2.6_alpha-r1 b/x11-wm/plwm/files/digest-plwm-2.6_alpha-r1
new file mode 100644
index 000000000000..f91c27b20af5
--- /dev/null
+++ b/x11-wm/plwm/files/digest-plwm-2.6_alpha-r1
@@ -0,0 +1,3 @@
+MD5 09dedbeea97db78a454ce0a90beac503 PLWM-2.6a.tar.gz 452944
+RMD160 ab6c5f9cbc8e5240535a176b7a1c97d89341aa0d PLWM-2.6a.tar.gz 452944
+SHA256 adf7a01f6717235e6ab872f2bcca3d30b10bab31e48aab2afc0cd4c37644d293 PLWM-2.6a.tar.gz 452944
diff --git a/x11-wm/plwm/files/plwm-2.5-destdir.patch b/x11-wm/plwm/files/plwm-2.5-destdir.patch
new file mode 100644
index 000000000000..8bcd01511731
--- /dev/null
+++ b/x11-wm/plwm/files/plwm-2.5-destdir.patch
@@ -0,0 +1,33 @@
+diff -ur plwm-2.5.orig/Makefile.in plwm-2.5/Makefile.in
+--- plwm-2.5.orig/Makefile.in	2007-06-29 13:30:28.000000000 +0200
++++ plwm-2.5/Makefile.in	2007-06-29 14:07:42.000000000 +0200
+@@ -24,19 +24,16 @@
+ all:
+ 
+ install:
+-	-$(INSTALL) -d $(bindir)
+-	-$(INSTALL) -d $(PLWM_PATH)
+-	$(INSTALL) -m 644 $(PLWM_MODULES) $(PLWM_PATH)
+-	echo >> $(PLWM_PATH)/__init__.py
+-	echo "__version__ = '$(VERSION)'" >> $(PLWM_PATH)/__init__.py
+-	echo >> $(PLWM_PATH)/__init__.py
+-
+-# Compile .pyc and .pyo-files
+-	$(PYTHON) -c 'import sys; sys.path.insert(0, "$(PYTHON_SITE_PATH)"); import plwm.xlibpath; from plwm import *'
+-	$(PYTHON) -O -c 'import sys; sys.path.insert(0, "$(PYTHON_SITE_PATH)"); import plwm.xlibpath; from plwm import *'
+-	./install-plwm.sh "$(PLWM)" $(bindir)/plwm
+-	./install-plwm.sh "$(WMM)" $(bindir)/wmm
+-	./install-plwm.sh "$(INSPECT_PLWM)" $(bindir)/inspect_plwm
++	-$(INSTALL) -d $(DESTDIR)$(bindir)
++	-$(INSTALL) -d $(DESTDIR)$(PLWM_PATH)
++	$(INSTALL) -m 644 $(PLWM_MODULES) $(DESTDIR)$(PLWM_PATH)
++	echo >> $(DESTDIR)$(PLWM_PATH)/__init__.py
++	echo "__version__ = '$(VERSION)'" >> $(DESTDIR)$(PLWM_PATH)/__init__.py
++	echo >> $(DESTDIR)$(PLWM_PATH)/__init__.py
++
++	./install-plwm.sh "$(PLWM)" $(DESTDIR)$(bindir)/plwm
++	./install-plwm.sh "$(WMM)" $(DESTDIR)$(bindir)/wmm
++	./install-plwm.sh "$(INSPECT_PLWM)" $(DESTDIR)$(bindir)/inspect_plwm
+ 
+ clean:
+ 
diff --git a/x11-wm/plwm/files/plwm-2.5-python2.5.patch b/x11-wm/plwm/files/plwm-2.5-python2.5.patch
new file mode 100644
index 000000000000..334ac94850eb
--- /dev/null
+++ b/x11-wm/plwm/files/plwm-2.5-python2.5.patch
@@ -0,0 +1,21 @@
+diff -ur plwm-2.5.orig/plwm/inspect.py plwm-2.5/plwm/inspect.py
+--- plwm-2.5.orig/plwm/inspect.py	2007-06-29 13:30:28.000000000 +0200
++++ plwm-2.5/plwm/inspect.py	2007-06-29 14:36:43.000000000 +0200
+@@ -23,7 +23,7 @@
+ import sys
+ import traceback
+ import struct
+-import whrandom
++import random
+ import cStringIO
+ 
+ InspectFileEventType = event.new_event_type()
+@@ -75,7 +75,7 @@
+ 	# portnumber in a property on screen 0
+ 
+ 	addr, port = self.inspect_socket.getsockname()
+-	self.inspect_cookie = whrandom.randint(0, 0x7ffffffe)
++	self.inspect_cookie = random.randint(0, 0x7ffffffe)
+ 	
+ 	self.default_screen.root.change_property(self.PLWM_INSPECT_SERVER,
+ 					     self.PLWM_INSPECT_SERVER,
diff --git a/x11-wm/plwm/files/plwm-2.6_alpha-python2.5.patch b/x11-wm/plwm/files/plwm-2.6_alpha-python2.5.patch
new file mode 100644
index 000000000000..af22a96504a9
--- /dev/null
+++ b/x11-wm/plwm/files/plwm-2.6_alpha-python2.5.patch
@@ -0,0 +1,21 @@
+diff -ur PLWM-2.6a.orig/plwm/inspect.py PLWM-2.6a/plwm/inspect.py
+--- PLWM-2.6a.orig/plwm/inspect.py	2007-06-29 14:40:54.000000000 +0200
++++ PLWM-2.6a/plwm/inspect.py	2007-06-29 14:41:25.000000000 +0200
+@@ -23,7 +23,7 @@
+ import sys
+ import traceback
+ import struct
+-import whrandom
++import random
+ import cStringIO
+ 
+ InspectFileEventType = event.new_event_type()
+@@ -75,7 +75,7 @@
+ 	# portnumber in a property on screen 0
+ 
+ 	addr, port = self.inspect_socket.getsockname()
+-	self.inspect_cookie = whrandom.randint(0, 0x7ffffffe)
++	self.inspect_cookie = random.randint(0, 0x7ffffffe)
+ 	
+ 	self.default_screen.root.change_property(self.PLWM_INSPECT_SERVER,
+ 					     self.PLWM_INSPECT_SERVER,
diff --git a/x11-wm/plwm/plwm-2.5-r1.ebuild b/x11-wm/plwm/plwm-2.5-r1.ebuild
new file mode 100644
index 000000000000..f6d1ce3469e9
--- /dev/null
+++ b/x11-wm/plwm/plwm-2.5-r1.ebuild
@@ -0,0 +1,46 @@
+# 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.5-r1.ebuild,v 1.1 2007/06/29 13:53:58 coldwind Exp $
+
+NEED_PYTHON="2.2"
+
+inherit eutils python
+
+DESCRIPTION="Python classes for, and an implementation of, a window manager."
+HOMEPAGE="http://plwm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/plwm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ppc x86"
+IUSE=""
+
+DEPEND=">=dev-python/python-xlib-0.12"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-destdir.patch"
+	epatch "${FILESDIR}/${P}-python2.5.patch"
+}
+
+src_compile() {
+	econf || die "econf failed"
+	emake || die "emake failed"
+	emake -C doc || die "emake -C doc failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	doinfo doc/*.info* || die "doinfo failed"
+	dodoc README NEWS ONEWS examples/* || die "dodoc failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}
diff --git a/x11-wm/plwm/plwm-2.6_alpha-r1.ebuild b/x11-wm/plwm/plwm-2.6_alpha-r1.ebuild
new file mode 100644
index 000000000000..316b61e57e29
--- /dev/null
+++ b/x11-wm/plwm/plwm-2.6_alpha-r1.ebuild
@@ -0,0 +1,55 @@
+# 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.1 2007/06/29 13:53:58 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"
+}
+
+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.6_alpha.ebuild b/x11-wm/plwm/plwm-2.6_alpha.ebuild
index 550f2c534ef8..40bf6a508520 100644
--- a/x11-wm/plwm/plwm-2.6_alpha.ebuild
+++ b/x11-wm/plwm/plwm-2.6_alpha.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.ebuild,v 1.5 2004/06/24 23:44:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/plwm-2.6_alpha.ebuild,v 1.6 2007/06/29 13:53:58 coldwind Exp $
 
 inherit distutils eutils