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

(Portage version: 2.1.2.7)

8 files changed, 184 insertions, 2 deletions

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