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

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

4 files changed, 23 insertions, 52 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/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() {