diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2011-06-17 17:37:18 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2011-06-17 17:37:18 +0000 |
| commit | ad4ddf1859bd381c5e9af522e88ae7ecba3c6415 (patch) | |
| tree | efbcfd10ee93afcc1d8fd569c623e1ba9ed3a74f /x11-misc | |
| parent | Stable for HPPA (bug #371849). (diff) | |
| download | gentoo-2-ad4ddf1859bd381c5e9af522e88ae7ecba3c6415.tar.gz gentoo-2-ad4ddf1859bd381c5e9af522e88ae7ecba3c6415.tar.bz2 gentoo-2-ad4ddf1859bd381c5e9af522e88ae7ecba3c6415.zip | |
Add LXDE wrapper needed for obconf to find the config file on LXDE environment. Bug #369555
(Portage version: 2.1.9.49/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/obconf/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/obconf/files/obconf-lxde | 3 | ||||
| -rw-r--r-- | x11-misc/obconf/metadata.xml | 3 | ||||
| -rw-r--r-- | x11-misc/obconf/obconf-2.0.3_p20110314.ebuild | 12 |
4 files changed, 22 insertions, 3 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/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" } |