Revbump with patch to fix compatibility with LXDE

(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

4 files changed, 84 insertions, 3 deletions

diff --git a/x11-misc/obconf/ChangeLog b/x11-misc/obconf/ChangeLog
index 6c0739111385..58168be6c542 100644
--- a/x11-misc/obconf/ChangeLog
+++ b/x11-misc/obconf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/obconf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/ChangeLog,v 1.81 2011/06/17 17:45:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/ChangeLog,v 1.82 2011/06/18 10:51:19 hwoarang Exp $
+
+*obconf-2.0.3_p20110314-r1 (18 Jun 2011)
+
+  18 Jun 2011; Markos Chandras <hwoarang@gentoo.org>
+  +obconf-2.0.3_p20110314-r1.ebuild,
+  +files/obconf-2.0.3_p20110314-config-path.patch:
+  Revbump with patch to fix compatibility with LXDE
 
   17 Jun 2011; Markos Chandras <hwoarang@gentoo.org> files/obconf-lxde:
   Fix lxde wrapper
diff --git a/x11-misc/obconf/files/obconf-2.0.3_p20110314-config-path.patch b/x11-misc/obconf/files/obconf-2.0.3_p20110314-config-path.patch
new file mode 100644
index 000000000000..cc981609a459
--- /dev/null
+++ b/x11-misc/obconf/files/obconf-2.0.3_p20110314-config-path.patch
@@ -0,0 +1,14 @@
+Index: work/src/tree.c
+===================================================================
+--- work.orig/src/tree.c
++++ work/src/tree.c
+@@ -91,7 +91,8 @@ void tree_apply()
+     gboolean err;
+ 
+     if (obc_config_file)
+-        p = g_strdup(obc_config_file);
++        p = g_build_filename(obt_paths_config_home(paths), "openbox",
++                             obc_config_file, NULL);
+     else
+         p = g_build_filename(obt_paths_config_home(paths), "openbox",
+                              "rc.xml", NULL);
diff --git a/x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild b/x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild
new file mode 100644
index 000000000000..4ca0a32fc993
--- /dev/null
+++ b/x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild,v 1.1 2011/06/18 10:51:19 hwoarang Exp $
+
+EAPI=2
+inherit autotools fdo-mime eutils
+
+DESCRIPTION="ObConf is a tool for configuring the Openbox window manager."
+HOMEPAGE="http://icculus.org/openbox/index.php/ObConf:About"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="lxde nls"
+
+RDEPEND="gnome-base/libglade:2.0
+	x11-libs/gtk+:2
+	x11-libs/startup-notification
+	>=x11-wm/openbox-3.5.0_pre20110313"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# need --config-file switch when used on LXDE environment
+	if use lxde; then
+		sed -i -e "/^Exec/s:obconf.*$:obconf-lxde:" ${PN}.desktop || die
+	fi
+	# Make sure the correct path is appended to the config file
+	epatch "${FILESDIR}"/${P}-config-path.patch
+	eautopoint
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	# add wrapper for lxde environment. Bug #369555
+	if use lxde; then
+		dobin "${FILESDIR}"/${PN}-lxde || die
+	fi
+	dodoc AUTHORS CHANGELOG README || die "dodoc failed"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/x11-misc/obconf/obconf-2.0.3_p20110314.ebuild b/x11-misc/obconf/obconf-2.0.3_p20110314.ebuild
index a81775478e25..b75bea045d1e 100644
--- a/x11-misc/obconf/obconf-2.0.3_p20110314.ebuild
+++ b/x11-misc/obconf/obconf-2.0.3_p20110314.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-2.0.3_p20110314.ebuild,v 1.7 2011/06/17 17:37:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-2.0.3_p20110314.ebuild,v 1.8 2011/06/18 10:51:19 hwoarang Exp $
 
 EAPI=2
 inherit autotools fdo-mime
@@ -42,7 +42,7 @@ src_install() {
 	emake DESTDIR="${D}" install || die
 	# add wrapper for lxde environment. Bug #369555
 	if use lxde; then
-		dobin ${FILESDIR}/${PN}-lxde || die
+		dobin "${FILESDIR}"/${PN}-lxde || die
 	fi
 	dodoc AUTHORS CHANGELOG README || die "dodoc failed"
 }