Remove lxde useflag. Thanks to SN(Enlik) <slawomir.nizio@sabayon.org> for testing. Bug #406097

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

3 files changed, 11 insertions, 20 deletions

diff --git a/x11-misc/obconf/ChangeLog b/x11-misc/obconf/ChangeLog
index 39c4f3ada955..94b521c04827 100644
--- a/x11-misc/obconf/ChangeLog
+++ b/x11-misc/obconf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/obconf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/ChangeLog,v 1.93 2012/02/29 17:55:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/ChangeLog,v 1.94 2012/03/02 21:01:54 hwoarang Exp $
+
+  02 Mar 2012; Markos Chandras <hwoarang@gentoo.org>
+  obconf-2.0.3_p20111019.ebuild, obconf-9999.ebuild:
+  Remove lxde useflag. Thanks to SN(Enlik) <slawomir.nizio@sabayon.org> for
+  testing. Bug #406097
 
   29 Feb 2012; Markos Chandras <hwoarang@gentoo.org>
   obconf-2.0.3_p20111019.ebuild:
diff --git a/x11-misc/obconf/obconf-2.0.3_p20111019.ebuild b/x11-misc/obconf/obconf-2.0.3_p20111019.ebuild
index ef96011373ca..0c74bc47a32d 100644
--- a/x11-misc/obconf/obconf-2.0.3_p20111019.ebuild
+++ b/x11-misc/obconf/obconf-2.0.3_p20111019.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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_p20111019.ebuild,v 1.2 2012/02/29 17:55:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-2.0.3_p20111019.ebuild,v 1.3 2012/03/02 21:01:54 hwoarang Exp $
 
 EAPI=2
 inherit autotools fdo-mime eutils
@@ -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="lxde nls"
+IUSE="nls"
 
 RDEPEND="gnome-base/libglade:2.0
 	x11-libs/gtk+:2
@@ -25,10 +25,6 @@ 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
 }
@@ -40,10 +36,6 @@ 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"
 }
 
diff --git a/x11-misc/obconf/obconf-9999.ebuild b/x11-misc/obconf/obconf-9999.ebuild
index 78e53756ee35..e408b5b50b12 100644
--- a/x11-misc/obconf/obconf-9999.ebuild
+++ b/x11-misc/obconf/obconf-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-9999.ebuild,v 1.11 2011/09/20 22:30:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-9999.ebuild,v 1.12 2012/03/02 21:01:54 hwoarang Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ EGIT_REPO_URI="git://git.openbox.org/dana/obconf.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="lxde nls"
+IUSE="nls"
 
 RDEPEND="gnome-base/libglade:2.0
 	x11-libs/gtk+:2
@@ -25,9 +25,6 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	if use lxde; then
-		sed -i -e "/^Exec/s:obconf.*$:obconf-lxde:" ${PN}.desktop || die
-	fi
 	eautopoint
 	eautoreconf
 }
@@ -38,9 +35,6 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	if use lxde; then
-		dobin "${FILESDIR}"/${PN}-lxde || die
-	fi
 	dodoc AUTHORS CHANGELOG README || die "dodoc failed"
 }