Add LXDE wrapper needed for obconf to find the config file on LXDE environment. Bug #369555

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

5 files changed, 41 insertions, 11 deletions

diff --git a/x11-misc/obconf/ChangeLog b/x11-misc/obconf/ChangeLog
index 9088a3078c10..15cc1b0a3c82 100644
--- a/x11-misc/obconf/ChangeLog
+++ b/x11-misc/obconf/ChangeLog
@@ -1,6 +1,11 @@
 # 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.79 2011/04/25 14:36:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/ChangeLog,v 1.80 2011/06/17 17:37:18 hwoarang Exp $
+
+  17 Jun 2011; Markos Chandras <hwoarang@gentoo.org>
+  obconf-2.0.3_p20110314.ebuild, +files/obconf-lxde, metadata.xml:
+  Add LXDE wrapper needed for obconf to find the config file on LXDE
+  environment. Bug #369555
 
   25 Apr 2011; Raúl Porcel <armin76@gentoo.org> obconf-2.0.3-r1.ebuild:
   sparc stable wrt #358543
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index 8364363db69a..1acb8d76d94b 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,19 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX obconf-2.0.3-hardened.patch 273 RMD160 d86bbce7a76b89f8c73e7618aa423cb8ac92dc86 SHA1 455ac0d2e54f48b0d684f13db8940e542bd058d2 SHA256 00e6bba8e2f4409f7480757107266f679b71729870a9ecd9b0fb4fefcfd2ec4f
+AUX obconf-lxde 81 RMD160 987052393e4d276592015b73ac8c6de3ae2ad0a6 SHA1 2d76cffcc18aef37f15478b790a8f9d1723c9b3a SHA256 e9e0db36b47f55a6e8c68a7375082ea540b05b7863a901124956d13c5504f97b
 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 1144 RMD160 7987d5688e52006fa99e775972970cbd57d4377b SHA1 e27da4363a883d05278891e7baf62fb071d39f5c SHA256 33d8a32fc05c8d9a7b01b7d8dd3a72e1ef850829cf44d0f10fc54f0bc40bdda7
+EBUILD obconf-2.0.3_p20110314.ebuild 1409 RMD160 075ceff80004aba391f470e224803a2a487b1083 SHA1 03626a5a255a250579f137ff4be80f63d903b29a SHA256 61b49902bfe8cd33a5f60b1ef429905833113be5cf4243c14c73b1a00d4d53f0
 EBUILD obconf-9999.ebuild 1085 RMD160 afda86c7f1f2da610831d3ddbc78c99abe63f705 SHA1 8126b2b5394cdd3a3b493af08cad5b81cc3309ae SHA256 38d2a435dd1ae1dc3e7cfc0e1864059e9f4bfc09f17a62d694d99bef3e357ff9
-MISC ChangeLog 9111 RMD160 e9dd2fd44e3d08f50bd1648a5b71de17aab7c476 SHA1 19f81bf530c079bfd857d57f84f56f92c4a2bc13 SHA256 c8ea9ae20c785471b66632c3b131bcf153a0a182246495ad56d54fb4fc548911
-MISC metadata.xml 264 RMD160 92eb765340aae0bcbece64a41a2d40deb25830ac SHA1 a971dcfe83de5a7ff2b35a4c2f086bdd37e36461 SHA256 073600319f379a7cfb95014eae81fa6a8bcf0e95263994791756030be3338e8d
+MISC ChangeLog 9329 RMD160 6bfc7244b1d4e9dacada9783d32fcefa7a13803a SHA1 87ed8cc3d9d6f71c145c34e3d935dd87046e7fd2 SHA256 08ce6e3d78d325373fde7c63155ea169f5bc6792325732fd517c0959a37f565f
+MISC metadata.xml 335 RMD160 c600d971bc8675522056f2fff821aa27afa95eb1 SHA1 20afa74ae52c0de2dbbb4a78884f84c1823ca868 SHA256 64e1c6ac1bd8e9fdc57724e9286a51bd5e9b3e8aa8f1abb1c08e4f7dc8f4e69a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk21hwsACgkQuQc30/atMkCXSACffCQL9F8UxGdt4I23GnGegTFt
-iicAoMKeFbia421xIUV28vPPTuxTla3p
-=Hmcd
+iQIcBAEBCgAGBQJN+5DWAAoJEPqDWhW0r/LC5QoQALP4ZlsO1gkvMRDwZc5Vxbet
+Xhjz3xfTf6W30uPAPqh6d33XhEuy9R0r+cI10l5Pv2QXTd6zZ8ZlOtnFeijeBnPt
+WA7EK8T+3uLLt+VunfOs+O3ekeeEgOXuBFTO0dGSWB3BShZzNkw5VNPCa39xxKT8
+Nwd+33WGOv8lHk39iBmIA/8JdqYJG5MSdwVxOHtK5gUX5wnSTkf9rfPrCewcvTun
+el7Nba6I6vTInrMgDOyuanU3ZmrB+oAN4SFuShfzq8D+BcWdz8YG055a7QId4nYb
+TPLX2Ml1duhlLLf2ASC1gcu44bpcBqNApTnHTCt0YL38c2T+7iUG0VrfoWI3jmZ8
+jEbgydRqI3Ionc5B2DmCNG1fX4aZI2gaVKTd9aTQPTK/lUGV6kFe/ravZFA4lrtZ
+Qz0dRD36ODspZDfNyvcDkHWZ2X8fb5vIGmrxPNoY/LCk6i6dukSoT4PYJe86746h
+ZbNGLVGoWAOmPyjI/caDZZ6Yt7ZpUoziwUe4FJblvXV/ZRbQlYOPcHHWE+iXYKoO
+s2Y8jiV3orZio8m1Riq0ruqix7rFxzxtzbjSjl2webUbwKNA35GziLNn8JfLakfa
+j2ouRnvHDX4fit5xGnH1Yvw3f1e+jilwJ257hlXz+N48cTUiWjRwZ2+D1nLRNtpe
+EaTezY2s1cFoFTdnlBp3
+=DMFj
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/obconf/files/obconf-lxde b/x11-misc/obconf/files/obconf-lxde
new file mode 100644
index 000000000000..438e22b9defd
--- /dev/null
+++ b/x11-misc/obconf/files/obconf-lxde
@@ -0,0 +1,3 @@
+#!/bin/bash
+# Gentoo bug: 369555
+obconf  --config-file ${OBCONF_DIR}/lxde-rc.xml
diff --git a/x11-misc/obconf/metadata.xml b/x11-misc/obconf/metadata.xml
index 17a61fed5bf0..d1e72070f9fa 100644
--- a/x11-misc/obconf/metadata.xml
+++ b/x11-misc/obconf/metadata.xml
@@ -6,4 +6,7 @@
   	<email>hwoarang@gentoo.org</email>
 	<name>Markos Chandras</name>
   </maintainer>
+<use>
+<flag name='lxde'>Add wrapper for LXDE environment</flag>
+</use>
 </pkgmetadata>
diff --git a/x11-misc/obconf/obconf-2.0.3_p20110314.ebuild b/x11-misc/obconf/obconf-2.0.3_p20110314.ebuild
index f83d3b15660d..a81775478e25 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.6 2011/03/29 13:05:12 angelos Exp $
+# $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 $
 
 EAPI=2
 inherit autotools fdo-mime
@@ -12,7 +12,7 @@ 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="nls"
+IUSE="lxde nls"
 
 RDEPEND="gnome-base/libglade:2.0
 	x11-libs/gtk+:2
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}
 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
 	eautopoint
 	eautoreconf
 }
@@ -36,6 +40,10 @@ src_configure() {
 
 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"
 }