Remove obsolete patch. Remove obsolete version, as 3.4.9 is a bugfix release. Add upstream patch for obxprop rename (bug 298660).

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

5 files changed, 109 insertions, 25 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index 364de50e93a7..36759bbc1fa0 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.181 2009/12/27 02:03:19 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.182 2009/12/30 16:32:18 yngwin Exp $
+
+*openbox-3.4.9-r1 (30 Dec 2009)
+
+  30 Dec 2009; Ben de Groot <yngwin@gentoo.org> -openbox-3.4.8.ebuild,
+  +openbox-3.4.9-r1.ebuild, +files/obxprop.patch,
+  -files/openbox-gnomesession.patch:
+  Remove obsolete patch. Remove obsolete version, as 3.4.9 is a bugfix
+  release. Add upstream patch for obxprop rename (bug 298660).
 
 *openbox-3.4.9 (27 Dec 2009)
 
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 8dc2203a1701..04e68c0e75d8 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,10 +1,9 @@
+AUX obxprop.patch 3047 RMD160 f019a2f82bdee2fdd9c81e76757253045d8357ad SHA1 b7d8bc4207b72e63a39dedfcee32dc4a45737d3c SHA256 e0da9f630bf822cccf0382d1da8ac47ef7dad478f75ec208a318064b032dba67
 AUX openbox-gnome-session-3.4.9.patch 449 RMD160 7a39d0d8ba997a6dc7c8de72edaef2ecf5c405e5 SHA1 1f9f9680ed4ca106761d24e4b38e3479c5f3a17a SHA256 0fbbf60ba8ce2503d307cf55b6467b3cf53e01d32deff1417e3afbf6397d9eb5
-AUX openbox-gnomesession.patch 1142 RMD160 002e69719937afdc06c4759b621d46b4c919cca4 SHA1 614e03777d6c01e4389c4ff13ce73f1f0aaec259 SHA256 58554bf05e6441e8bed52c9e6e4cd78d52910aebedaadce8dcc6751684d634cb
 DIST openbox-3.4.7.2.tar.gz 828190 RMD160 a5ab5f4c3db81625d512da48189e34aeeec244d8 SHA1 f34c3ec43b7e39bf57d64dbef97c35b68fea5254 SHA256 d11f2137a0fe1de6c36c999d29523ad68c05f22c5935ce8628a8cab7a2e4b000
-DIST openbox-3.4.8.tar.gz 906181 RMD160 93b8a28275261563b988ca893a3577a2297c60a9 SHA1 dae3c3d84ce896e93a52bca0d098fe37c4df4424 SHA256 2a7a9e094a59e28e397a0272c463ea908ec8d7e14d21903e8c78f4a24c186420
 DIST openbox-3.4.9.tar.gz 911596 RMD160 d70253b61c5ecfc18680e11ebdb3921feb1519c7 SHA1 afb7efc8140c327ce8ddc355b39748683469b675 SHA256 6333e5679ed59ddeddd3c79674e1b17e15c20abf245226bede9a8eeb6f4d247e
 EBUILD openbox-3.4.7.2.ebuild 1302 RMD160 55ae1e5b6272eac6578c7a1c0d4688855bc03710 SHA1 8090c2dc4f2cd89c35f4ee5bafc216517432460e SHA256 ef1e9c52c686628d99830e19f0e8f645ffbf93e29d16e8b6c08cae91b4288b85
-EBUILD openbox-3.4.8.ebuild 1346 RMD160 0679945d76ac999171edfff07b366ca0036580a2 SHA1 c777af4d95dc9407659ebcd198f61ddc17bbb577 SHA256 1e41cdd45b669516aa831a217eb248a49b2a22fe5e42d23feaeeedd948dfacb7
+EBUILD openbox-3.4.9-r1.ebuild 1730 RMD160 ed2f5d11e24fd18e04ad13284b86ca8c8e5c391b SHA1 1becdb3801689c31a74198f894abe1f71b43f237 SHA256 1b1eaf27224eadd7d6f886e50537b739884bb011b726fa8d519390588f000edc
 EBUILD openbox-3.4.9.ebuild 1419 RMD160 b63a28fcbd2c8dc5be752e9d5c9f71b4e8b65c99 SHA1 0b372c17e25abe06ad4f9a85dd5d97cd8ba47606 SHA256 fb7da81b5d70e2bccb9d772be656f87b52aeee5f3af04c1ff98fd81d0c38ac2b
-MISC ChangeLog 28544 RMD160 a727f4aa8df467cc342a0523434379b8bbbbf1ad SHA1 e4bb0e463d07425fd13d3c36cf998595356bd489 SHA256 48e7979426404b30a322e25637836323661e194a4177cd3bb2c602caf4f4d93c
+MISC ChangeLog 28870 RMD160 05aaebd3a5cf0e8139a060258e79399b759ac3ff SHA1 a0d4050e1496ea503ab5ca900bfaf0be8da8b8ef SHA256 ae05d7a82c6c95c4e62e5e09fc498fa325ab759577d56c7488e6337590cef8d6
 MISC metadata.xml 275 RMD160 fb3fd402ffdec971ebe6a0b4cd4e41e6946fa6e7 SHA1 a0325f84c22d02e6d2258bbaa26a3b36e7a3aca6 SHA256 3f69dc00aff67de9cd0277b781a9170bf85b3e7564f5cf053f5ee58dbc73d0cf
diff --git a/x11-wm/openbox/files/obxprop.patch b/x11-wm/openbox/files/obxprop.patch
new file mode 100644
index 000000000000..3171fbf71185
--- /dev/null
+++ b/x11-wm/openbox/files/obxprop.patch
@@ -0,0 +1,84 @@
+From: Dana Jansens <danakj@orodu.net>
+Date: Mon, 21 Dec 2009 14:59:28 +0000 (-0500)
+Subject: Rename obprop to obxprop (Fixes bug #4419)
+X-Git-Url: http://git.icculus.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=6d8b7bd5f7ede1803c1259f5c1b760e5dbf4dbe3;hp=1fb198410e9d3ca660d91d1049249db0f2f47732
+
+Rename obprop to obxprop (Fixes bug #4419)
+
+Avoids collision with openbabel.
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index 4b3e0b5..60c2232 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -33,7 +33,7 @@ bin_PROGRAMS = \
+ 	openbox/openbox \
+ 	tools/gdm-control/gdm-control \
+ 	tools/gnome-panel-control/gnome-panel-control \
+-	tools/obprop/obprop
++	tools/obxprop/obxprop
+
+ dist_secretbin_SCRIPTS = \
+ 	tools/xdg-autostart/xdg-autostart
+@@ -289,16 +289,16 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \
+ tools_gnome_panel_control_gnome_panel_control_SOURCES = \
+ 	tools/gnome-panel-control/gnome-panel-control.c
+
+-## obprop ##
++## obxprop ##
+
+-tools_obprop_obprop_CPPFLAGS = \
++tools_obxprop_obxprop_CPPFLAGS = \
+ 	$(GLIB_CFLAGS) \
+ 	$(X_CFLAGS)
+-tools_obprop_obprop_LDADD = \
++tools_obxprop_obxprop_LDADD = \
+ 	$(GLIB_LIBS) \
+ 	$(X_LIBS)
+-tools_obprop_obprop_SOURCES = \
+-	tools/obprop/obprop.c
++tools_obxprop_obxprop_SOURCES = \
++	tools/obxprop/obxprop.c
+
+ ## gdm-control ##
+
+diff --git a/data/rc.xml b/data/rc.xml
+index d7a31bd..eaf3df7 100644
+--- a/data/rc.xml
++++ b/data/rc.xml
+@@ -646,10 +646,10 @@
+   # this is an example with comments through out. use these to make your
+   # own rules, but without the comments of course.
+
+-  <application name="the window's _OB_NAME property (see obprop)"
+-              class="the window's _OB_CLASS property (see obprop)"
+-               role="the window's _OB_ROLE property (see obprop)"
+-               type="the window's _NET_WM_WINDOW_TYPE (see obprob)..
++  <application name="the window's _OB_NAME property (see obxprop)"
++              class="the window's _OB_CLASS property (see obxprop)"
++               role="the window's _OB_ROLE property (see obxprop)"
++               type="the window's _NET_WM_WINDOW_TYPE (see obxprob)..
+                       (if unspecified, then it is 'dialog' for child windows)">
+   # the name or the class can be set, or both. this is used to match
+   # windows when they appear. role can optionally be set as well, to
+diff --git a/tools/obprop/Makefile b/tools/obxprop/Makefile
+similarity index 100%
+rename from tools/obprop/Makefile
+rename to tools/obxprop/Makefile
+diff --git a/tools/obprop/obprop.c b/tools/obxprop/obxprop.c
+similarity index 99%
+rename from tools/obprop/obprop.c
+rename to tools/obxprop/obxprop.c
+index e288d7c..2685154 100644
+--- a/tools/obprop/obprop.c
++++ b/tools/obxprop/obxprop.c
+@@ -12,7 +12,7 @@ gint fail(const gchar *s) {
+     else
+         fprintf
+             (stderr,
+-             "Usage: obprop [OPTIONS]\n\n"
++             "Usage: obxprop [OPTIONS]\n\n"
+              "Options:\n"
+              "    --help              Display this help and exit\n"
+              "    --display DISPLAY   Connect to this X display\n"
diff --git a/x11-wm/openbox/files/openbox-gnomesession.patch b/x11-wm/openbox/files/openbox-gnomesession.patch
deleted file mode 100644
index 42b866fad489..000000000000
--- a/x11-wm/openbox/files/openbox-gnomesession.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up openbox-3.4.7.2/data/xsession/openbox-gnome-session.in.gnomesession openbox-3.4.7.2/data/xsession/openbox-gnome-session.in
---- openbox-3.4.7.2/data/xsession/openbox-gnome-session.in.gnomesession	2008-12-09 18:06:37.000000000 +0100
-+++ openbox-3.4.7.2/data/xsession/openbox-gnome-session.in	2008-12-09 19:04:14.000000000 +0100
-@@ -11,5 +11,12 @@ fi
- xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
- 
- # Run GNOME with Openbox as its window manager
--export WINDOW_MANAGER="@bindir@/openbox"
--exec gnome-session --choose-session=openbox-session "$@"
-+SESSION=$(gconftool-2 -g /desktop/gnome/session/default_session 2> /dev/null)
-+test -z "$SESSION" && SESSION="[openbox]"
-+echo "$SESSION" | grep -q openbox || SESSION="${SESSION%]},openbox]"
-+
-+OPENBOX_SESSION=$(gconftool-2 -g /desktop/gnome/session/openbox_session 2> /dev/null)
-+[ "$SESSION" != "$OPENBOX_SESSION" ] && gconftool-2 -t list --list-type=strings -s \
-+  /desktop/gnome/session/openbox_session "$SESSION" 2> /dev/null
-+
-+exec gnome-session --default-session-key /desktop/gnome/session/openbox_session "$@"
diff --git a/x11-wm/openbox/openbox-3.4.8.ebuild b/x11-wm/openbox/openbox-3.4.9-r1.ebuild
index 6d365c8d209d..a85ab5e8bb56 100644
--- a/x11-wm/openbox/openbox-3.4.8.ebuild
+++ b/x11-wm/openbox/openbox-3.4.9-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.4.8.ebuild,v 1.1 2009/12/09 01:24:02 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.4.9-r1.ebuild,v 1.1 2009/12/30 16:32:18 yngwin Exp $
 
 EAPI="2"
-inherit eutils
+inherit eutils autotools
 
 MY_P=${P/_/-}
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager."
@@ -33,6 +33,17 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-gnome-session-${PV}.patch
+
+	# The obxprop rename is scheduled for inclusion in the next release,
+	# so this upstream patch should be removed then. Fixes bug 298660.
+	mv "${S}"/tools/obprop "${S}"/tools/obxprop
+	mv "${S}"/tools/obxprop/obprop.c "${S}"/tools/obxprop/obxprop.c
+	epatch "${FILESDIR}"/obxprop.patch
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--docdir=/usr/share/doc/${PF} \