Version bump. Adding patch submitted by Matt Michalowski to fix bug 291965.

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

5 files changed, 27 insertions, 56 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index ca403baf24dc..364de50e93a7 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.180 2009/12/09 01:24:02 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.181 2009/12/27 02:03:19 yngwin Exp $
+
+*openbox-3.4.9 (27 Dec 2009)
+
+  27 Dec 2009; Ben de Groot <yngwin@gentoo.org> -openbox-3.4.8_rc1.ebuild,
+  -openbox-3.4.8_rc1-r1.ebuild, +openbox-3.4.9.ebuild,
+  +files/openbox-gnome-session-3.4.9.patch:
+  Version bump. Adding patch submitted by Matt Michalowski to fix bug
+  291965.
 
 *openbox-3.4.8 (09 Dec 2009)
 
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index b3446140c5ff..8dc2203a1701 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,10 +1,10 @@
+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-rc1.tar.gz 798177 RMD160 9313005f229a57dbf75552e342478df41e51bfcc SHA1 527f8b09fd1c87037be9a65d187b411840fe5f43 SHA256 2e983f219782f4d69e8f6b0f445d0be39b7a8b9001888882e33fffbf3eaf38e8
 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.8_rc1-r1.ebuild 1421 RMD160 ce3f1274880ac18b8d35eb317e57a46cec59f207 SHA1 a8f6161eb3a2577e7854d096787d8eed26125cd0 SHA256 0bb537710b1d0a081cf3766b6aa0302962d8f01013b9b1582d6b20a6918c9b36
-EBUILD openbox-3.4.8_rc1.ebuild 1351 RMD160 8df5fd644a88124107bb9c61b959b9f178fadfdd SHA1 8821f253557c68a00505b1344941038c216cc488 SHA256 15d2090d843c97360bbd0e782afad746b4cee25905e50eacabde92c8deabf4b9
-MISC ChangeLog 28259 RMD160 6adc6b6de9fd176f864b69c5c606bf1fc6c71ddc SHA1 8ea4bfab196bb46ecb6eaba2d0e04058888c6569 SHA256 cbe42b5169f56f986d4dab8268771a590075f920377a631c93b158a8a157710f
+EBUILD openbox-3.4.9.ebuild 1419 RMD160 b63a28fcbd2c8dc5be752e9d5c9f71b4e8b65c99 SHA1 0b372c17e25abe06ad4f9a85dd5d97cd8ba47606 SHA256 fb7da81b5d70e2bccb9d772be656f87b52aeee5f3af04c1ff98fd81d0c38ac2b
+MISC ChangeLog 28544 RMD160 a727f4aa8df467cc342a0523434379b8bbbbf1ad SHA1 e4bb0e463d07425fd13d3c36cf998595356bd489 SHA256 48e7979426404b30a322e25637836323661e194a4177cd3bb2c602caf4f4d93c
 MISC metadata.xml 275 RMD160 fb3fd402ffdec971ebe6a0b4cd4e41e6946fa6e7 SHA1 a0325f84c22d02e6d2258bbaa26a3b36e7a3aca6 SHA256 3f69dc00aff67de9cd0277b781a9170bf85b3e7564f5cf053f5ee58dbc73d0cf
diff --git a/x11-wm/openbox/files/openbox-gnome-session-3.4.9.patch b/x11-wm/openbox/files/openbox-gnome-session-3.4.9.patch
new file mode 100644
index 000000000000..044de98e5913
--- /dev/null
+++ b/x11-wm/openbox/files/openbox-gnome-session-3.4.9.patch
@@ -0,0 +1,12 @@
+--- data/xsession/openbox-gnome-session.in.orig	2009-12-27 02:43:49.000000000 +0100
++++ data/xsession/openbox-gnome-session.in	2009-12-27 02:48:03.000000000 +0100
+@@ -18,6 +18,9 @@
+ MAJOR=$(echo $VER | cut -d . -f 1)
+ MINOR=$(echo $VER | cut -d . -f 2)
+ 
++# use gnome menus (gentoo bug #291965)
++export XDG_MENU_PREFIX=gnome-
++
+ # run GNOME with Openbox as its window manager
+ 
+ if test $MAJOR -lt 2 || (test $MAJOR = 2 && test $MINOR -le 22); then
diff --git a/x11-wm/openbox/openbox-3.4.8_rc1.ebuild b/x11-wm/openbox/openbox-3.4.8_rc1.ebuild
deleted file mode 100644
index 3a2e07aa96f2..000000000000
--- a/x11-wm/openbox/openbox-3.4.8_rc1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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_rc1.ebuild,v 1.4 2009/03/16 13:06:56 armin76 Exp $
-
-EAPI="2"
-inherit eutils
-
-MY_P=${P/_/-}
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager."
-HOMEPAGE="http://icculus.org/openbox/"
-SRC_URI="http://icculus.org/openbox/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="nls startup-notification xinerama"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=dev-libs/libxml2-2.0
-	>=media-libs/fontconfig-2
-	x11-libs/libXft
-	x11-libs/libXrandr
-	x11-libs/libXt
-	>=x11-libs/pango-1.8[X]
-	nls? ( sys-devel/gettext )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable nls) \
-		$(use_enable startup-notification)
-}
-
-src_install() {
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/openbox-session" > "${D}/etc/X11/Sessions/${PN}"
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/x11-wm/openbox/openbox-3.4.8_rc1-r1.ebuild b/x11-wm/openbox/openbox-3.4.9.ebuild
index 7bf01fd44213..0f081196de38 100644
--- a/x11-wm/openbox/openbox-3.4.8_rc1-r1.ebuild
+++ b/x11-wm/openbox/openbox-3.4.9.ebuild
@@ -1,6 +1,6 @@
 # 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_rc1-r1.ebuild,v 1.1 2009/11/06 01:09:42 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.4.9.ebuild,v 1.1 2009/12/27 02:03:19 yngwin Exp $
 
 EAPI="2"
 inherit eutils
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-gnomesession.patch"
+	epatch "${FILESDIR}"/${PN}-gnome-session-${PV}.patch
 }
 
 src_configure() {