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

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

4 files changed, 27 insertions, 36 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/Manifest b/x11-misc/obconf/Manifest
index 92c586f79078..54b1016eb92d 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -11,24 +11,24 @@ EBUILD obconf-2.0.3-r1.ebuild 1089 RMD160 58089fb59e9f43ffdfed03e9561fbdc3199b0d
 EBUILD obconf-2.0.3.ebuild 977 RMD160 6b7a799895e02bf9c6d0f10e173ae55dce04ca81 SHA1 3943919d44115750c41c7a240c15ec33ee24e6f8 SHA256 0177cfd32b50145bc9e237b79ad35f52e3b3f10936fe83de56b5987e3251468d
 EBUILD obconf-2.0.3_p20110314-r1.ebuild 1520 RMD160 f1e3869bff079751058ccdcc025c789fa5a31368 SHA1 178cb4f56ead62d8225ef3203ed92a7978decc30 SHA256 2cdfabe5323d8156ed16288f8022c2b1be0e4f4aaa534cb83174aab5136ae642
 EBUILD obconf-2.0.3_p20110314.ebuild 1411 RMD160 c6cbe935f79c12f59df372471cd00db06758bddb SHA1 c62998d78f02b863e33fb87984a55cc398b7ccf3 SHA256 d0fc33dce09aad994325ffa4512e49b8bfb72709bd1298e0487e7aec0c27fddc
-EBUILD obconf-2.0.3_p20111019.ebuild 1416 RMD160 9d4c71b32e3cf423e448d8c0f3c5ca4c5e5d6fde SHA1 cf67cab4a2b3866aaca2dbcb41b8f87f6b030068 SHA256 0a9d829415d05a80caaf72e5b072c02fe46a048e28885e62fe99b3b60c3d9c04
-EBUILD obconf-9999.ebuild 1243 RMD160 a8a6c875b777d1fc5def98e90c1ae190c761c978 SHA1 4de9a3604595815346211daf6827aad589c2dda7 SHA256 f5975fdf1ecf3ab84f4c49d07ea8d56f0cb7c5636e2af9f7c8ecf6aa060eea34
-MISC ChangeLog 11058 RMD160 e3b65c2ca83374d08ca67e0ddb00f69724630330 SHA1 bb2f5efdda016a09ef3b0f9701260dbcd238bb0f SHA256 5a7b083362cfb69027ca3c5883f297d6f351a2ef502ca4536f13990b36563100
+EBUILD obconf-2.0.3_p20111019.ebuild 1150 RMD160 8f21c2f13a0febf24ca64951d81d30f68f7df562 SHA1 2c656121f1412bfdd49355ef80800eeb389a3563 SHA256 510d603f5f6b91fdd08b9ff40cae246b682d91ace889a9184b51465430832906
+EBUILD obconf-9999.ebuild 1087 RMD160 180b1202f19b1b4e576f4780643baadfa1bd781a SHA1 457850be94c6e574aba9abe74720753c7ce272f5 SHA256 2aa86a0e2fc1977d8b3042cada5259484e42c867238533139f998ca2d25dfc74
+MISC ChangeLog 11264 RMD160 b69d900d3e98b8c3435816a2705f2aa0163d5d95 SHA1 56eb0c0a002e1f9f7c2a88b15a45da0dc36b4228 SHA256 961e3fe19991bf6db9fe976273fb934aa95ac2a6ce882e1034cc5719b98fb285
 MISC metadata.xml 335 RMD160 c600d971bc8675522056f2fff821aa27afa95eb1 SHA1 20afa74ae52c0de2dbbb4a78884f84c1823ca868 SHA256 64e1c6ac1bd8e9fdc57724e9286a51bd5e9b3e8aa8f1abb1c08e4f7dc8f4e69a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPTmaFAAoJEPqDWhW0r/LC+KIP/iZkRMSqjupvRTizXq1HWchu
-vLqxLv5Z/JUoaTCTT+WoB1Ssv2/RDplPDxJF0sVQCPrpD6yNt+BxWK/vSoVtsRHg
-lxy2NLl3BfROz3riT1JePQjRNrg9104fDEX2kwSa1THlzKXwZiM4vKr8YAm8lb8e
-p4yMAwTAK141zGbavBsmp4LS04Fw9NWYCDpMBOvZBFUoSAMdoh3pThTLdgNNr9O+
-5qaygZ0ueiXjjZNtFC8vt/DeLNpoQYwlc36BGxuzsfaPdaqN/LT8HzUwKG2VDR+t
-WHwugrMA4MZp+aqrypJT9lelch0JGJg9D8NYSr23xXFnTxy7LkiwVsAlDknl9wF5
-PrwWbAcdrpn7srjGuh57WlxLpRLeakLNsA7diqA6F4RPrmg8orsuURkz2clMbE0c
-gzlj0GJYmetsibyM1pzHZ40TUcgtF8NMYh45yuhzW17Kt8bXIJ/BDhL4G5qgaXMF
-WXzawxOl7UKG1vjzRYv3HqgkdbsfqRB4RUnOLukaAStvwSP7xVFo6s8UdIxNjKFj
-SEGL/2UJyRkmGggAlFDZoWtm/JafxOl/C+4u2XD6kQCI0wuhybazrkFegW6rUIPe
-g21pDMyhG+dXV6vfVs5Jb0re5GtI/3Pa+yl0dY8ReQOib2a6cIeV1rR5quoNJ/yz
-jBFvRMNkFdRklkK4zUJr
-=0zi3
+iQIcBAEBCgAGBQJPUTVHAAoJEPqDWhW0r/LC9l4QAKyV8YCAQdElekKgPxZz46YH
+Q9Q2fG+YJJ/b0aF6VhQ3KS8jHe9/H8xkAURqk1M2RiRWd5EJHO30GfRV5cSPgyHC
+f6SXoC9jd/6oudSQ+lCv6gerN9YjCeb3zstjSqF+dysE8vM61MSTqWXZH8Edcbux
+iMGUsL+3Tng+1mIDka6Jlx3vpcz3O4rUsSIq+x+rosDziqO90qiLebIIujJoIPuf
+PtfUvlimnART0xTBstuA28xbyQ40qrsCC0gOMmsP8V/4wPYZMj9QNiwpwm74QpKs
+v7nN0SzpMmRVRWAfrrWi39sjbhrn9ruz8aMquertoJ2gTN65BJGyNzcCOKgJYPuS
+qtF9GEqOm3PfFwyYwyt4WEcHW9iIVyNf+fIaWQvVBzr5cZVszmkX29oeaA6Ij1qy
+QmfOs38COKLRaLp68iHPBMf5BP4Ly/vFaZkMpohGb01nQxMMOyEEa+7XsbAQ5UmD
+ch3nGm0tl2z2GgmKpDRfsQDkoHLzirl6ZmgjGgS6DNQSASEag5Szf4zDAuDmjadi
+iLcF6j0Ngknqs4p8TAahMdHYa8DiAwspQz+CEXYvAHpOOGqqGyQTqcZzSsS1EnJh
+ASOlpChuZR8EJ6HeykdgEaIoulU4t8xzwoFDFZHdmch7khyO2cy+s2xZWWRHvTKY
+sjcZXEvJGneofmcLjkIn
+=5+MZ
 -----END PGP SIGNATURE-----
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"
 }