Revbump with patch to fix compatibility with LXDE

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

5 files changed, 101 insertions, 18 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/Manifest b/x11-misc/obconf/Manifest
index e06edac3f3eb..8911fbfba33d 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -2,29 +2,31 @@
 Hash: SHA512
 
 AUX obconf-2.0.3-hardened.patch 273 RMD160 d86bbce7a76b89f8c73e7618aa423cb8ac92dc86 SHA1 455ac0d2e54f48b0d684f13db8940e542bd058d2 SHA256 00e6bba8e2f4409f7480757107266f679b71729870a9ecd9b0fb4fefcfd2ec4f
+AUX obconf-2.0.3_p20110314-config-path.patch 512 RMD160 d57184f08fcdd67ada28e918a5ab321b5503ffc8 SHA1 ad5f8eb9900606de45b57eddfe46994467ec271c SHA256 d4e17234a29e133ac6cecc63cd56fb26e494ecd544ab12c0069dda1ab6e49f0b
 AUX obconf-lxde 65 RMD160 55efc54f0330401ba162218161862c23d43f9bf0 SHA1 4fb55d21b39081857e6511dc78d030a32ed3f5a0 SHA256 1aabcf2066aabbfa052672979504d3eb99b56b9e5bcc959f07dca308bfe9ef2d
 DIST obconf-2.0.3.tar.gz 267589 RMD160 6d6d48c16e78bc8ac48382719e692505845c6286 SHA1 40c22a2b0e884016592558b9119afcafcac674ec SHA256 f6c1cdac2667fc8b49513b7f21ef935851b594b9d8577aa86da105cce8fc3c1c
 DIST obconf-2.0.3_p20110314.tar.gz 109522 RMD160 95e41bd1d4004f9860644a6dbae9d21dcaa44f8a SHA1 5732647bbc78f3cf24741c340446176f98514a2a SHA256 3de18f493bcb05e95a8e26fb6cc4fb195932c742f22093240311b127d6114554
 EBUILD obconf-2.0.3-r1.ebuild 1089 RMD160 58089fb59e9f43ffdfed03e9561fbdc3199b0dd2 SHA1 80fe96ce28190cf65dd5b4d4f2c692dff26d8fad SHA256 8d63aeee4ecead4d069cbe03dab10dab67a94502a15b83e499300dd93a5821fb
 EBUILD obconf-2.0.3.ebuild 977 RMD160 6b7a799895e02bf9c6d0f10e173ae55dce04ca81 SHA1 3943919d44115750c41c7a240c15ec33ee24e6f8 SHA256 0177cfd32b50145bc9e237b79ad35f52e3b3f10936fe83de56b5987e3251468d
-EBUILD obconf-2.0.3_p20110314.ebuild 1409 RMD160 075ceff80004aba391f470e224803a2a487b1083 SHA1 03626a5a255a250579f137ff4be80f63d903b29a SHA256 61b49902bfe8cd33a5f60b1ef429905833113be5cf4243c14c73b1a00d4d53f0
+EBUILD obconf-2.0.3_p20110314-r1.ebuild 1527 RMD160 65c0b84a25c3050ce3a6c601ec6f2b54331ac8da SHA1 31226cada53574bf80889cb6a5585682842502bf SHA256 e64a073269e5180068293726a110296537e6f3aa1e3b576e4fe51be92fd62cb8
+EBUILD obconf-2.0.3_p20110314.ebuild 1411 RMD160 c6cbe935f79c12f59df372471cd00db06758bddb SHA1 c62998d78f02b863e33fb87984a55cc398b7ccf3 SHA256 d0fc33dce09aad994325ffa4512e49b8bfb72709bd1298e0487e7aec0c27fddc
 EBUILD obconf-9999.ebuild 1085 RMD160 afda86c7f1f2da610831d3ddbc78c99abe63f705 SHA1 8126b2b5394cdd3a3b493af08cad5b81cc3309ae SHA256 38d2a435dd1ae1dc3e7cfc0e1864059e9f4bfc09f17a62d694d99bef3e357ff9
-MISC ChangeLog 9421 RMD160 3e882a34ba14250a877dd5c5b5bd6ec84494b378 SHA1 01cd902469ca2880d1909f3a899fa23f40162726 SHA256 ded4172d637ecae3ac4bb6ea7bf0c9568b5c87cd79fd027ff31beb4e7603f884
+MISC ChangeLog 9657 RMD160 24a87e1f1c3c373dd22e43ef54832d2c40ae14b1 SHA1 c66e46cbce57ff3d659a5b62495c6e4e1f68f4ac SHA256 763f044906c4eb383bc2286feff3eeebcabec2cfcaba0a80c003af36f5903341
 MISC metadata.xml 335 RMD160 c600d971bc8675522056f2fff821aa27afa95eb1 SHA1 20afa74ae52c0de2dbbb4a78884f84c1823ca868 SHA256 64e1c6ac1bd8e9fdc57724e9286a51bd5e9b3e8aa8f1abb1c08e4f7dc8f4e69a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN+5JUAAoJEPqDWhW0r/LCxf0P/0VdrOiKRsjEuk9+b/PvcsvU
-HI6RErHxDaIC1XRLZHP8wwSCpjlptt9GCqhmJB5F4wmIR/vMeHkcOuurnGoTep3/
-3jy8nuxvYuuYgIkRGSLe6Jg/cUPpajSTv+Hld+W9xem7afTJIpmxVYKlPG39T/j9
-ks5JDqejiJvPURWhE+P4brmgGiLfEtBjl0va7SW+Yzr9cOA9vdTKRqh7HrVGF2kV
-rgmw59L0C/p9ul8SZtJ+m29qFaoyVWL0Pf6lw/dn6hcFw7zmvLinn3qbqz8xQG5K
-cmQxAsS7GNUdvA8sJnDHUK3IGlOD/4WzX4oF2Hu26ma1n9QJMiDA8ljA3Yr9iBSu
-L4y1Wf7My2MarXHRWkr0pzN2jBcITESZCJn3cX5HLKLWwCaRu2RbQQaEq0V1rbyi
-ieKg/HE6QDuopB5VDcFnobVtUn3tOXZ3ZXGCLorYQL4NQnC1pskhrAp/Y1+dRrwk
-UaC1MXLTnWiV6dV01GekPgAdxCVNMZWFQPtTv69kTwb/d+88QtgFIzgbpDuHeRj9
-ZdUbv0D94IyPN5NR7/3EkrD1a7bjw/ds1GTTTPVjZsjyhd0+Lvt0Lc03+U/QDQ4B
-tN28ievkyZhh1IGxxv94iET0IjIuqOyLPP1vmuvQ+eMHIdVTAbgWrx83Q2khy7FE
-XtYBfgpAnsNRbrjN8kbV
-=Hw2I
+iQIcBAEBCgAGBQJN/ILdAAoJEPqDWhW0r/LCy5IP/0ke+6Iay/x7dEMkgVKMpiBy
+AngTlRdQSQNnIKumWiT1eKjItnNj3OEvMah3qNpha4x1PeW4lcyfyLVnWzHiVC0J
+fnvfBmDhH7sZi0hFOGps5aBt7B2u3yL1Q4xbotzadYZ0A8tStMcwuF2w+R3nGqYI
+inHZWQZT4kqYSgSf9Nh7/OZQnGP8R9/WHaFZemrgy5Bjs9zfO2JwPROxIwc4YrIU
+jCn/4M7EEhSPFIPfaY4drfnwlSDvyBA7wxkn7QAkMJPFXkMJkVABonXIPDi6Xsza
+dEGCRzTeFBilWkZDN6cxF6UTq/xnmMwWx/LpMQM19qoETR4zJ9eEwTjwdL8rCDLf
+8jt5N0p4imkgYm0K9G57DgEfvB7ZnwciU1mRvLX4/bRU0TuL5CMswudx/zWgQWy/
+kS4etWvzQIEJ+K+M703u59oxY3OIVjaFUaI41tuGZsKGiGqEv9dD6xEMPl0CGQpr
+FMJyfrGT3RrYokZg2LYx/PE7aZGqzKLQtiiV+v+EcHbPP+SRe7C6qsrgH+LRPUaM
+1UuTZz4vDVmohGEBwsCoWEiyjAVCWzf3LkgNWxZZLpkvIyrhsg09CYT7cT3QZlnb
+uSKW65Ta+mguQv+CHPHDPoMCZ9qnOeCqgAhLvV2Sw66/Gf4IktQSu3ya5gyK7ooV
+FOSfqPIEYaSAjML7f7fd
+=rL0p
 -----END PGP SIGNATURE-----
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"
 }