summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2011-08-05 15:53:50 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2011-08-05 15:53:50 +0000
commit53191053f22b900b019786570889cb77b156a852 (patch)
tree99e5b7de057c18877c74da5c15f53836fda7aaa4
parentVersion bumps. (diff)
downloadgentoo-2-53191053f22b900b019786570889cb77b156a852.tar.gz
gentoo-2-53191053f22b900b019786570889cb77b156a852.tar.bz2
gentoo-2-53191053f22b900b019786570889cb77b156a852.zip
Sync with 2.0.3_p* ebuilds
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
-rw-r--r--x11-misc/obconf/ChangeLog5
-rw-r--r--x11-misc/obconf/obconf-9999.ebuild13
2 files changed, 14 insertions, 4 deletions
diff --git a/x11-misc/obconf/ChangeLog b/x11-misc/obconf/ChangeLog
index 58168be6c542..b8616708bd9e 100644
--- a/x11-misc/obconf/ChangeLog
+++ b/x11-misc/obconf/ChangeLog
@@ -1,6 +1,9 @@
# 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.82 2011/06/18 10:51:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/ChangeLog,v 1.83 2011/08/05 15:53:50 hwoarang Exp $
+
+ 05 Aug 2011; Markos Chandras <hwoarang@gentoo.org> obconf-9999.ebuild:
+ Sync with 2.0.3_p* ebuilds
*obconf-2.0.3_p20110314-r1 (18 Jun 2011)
diff --git a/x11-misc/obconf/obconf-9999.ebuild b/x11-misc/obconf/obconf-9999.ebuild
index d335cce99c31..cc0c6fba9308 100644
--- a/x11-misc/obconf/obconf-9999.ebuild
+++ b/x11-misc/obconf/obconf-9999.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-9999.ebuild,v 1.7 2011/03/29 13:05:12 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-9999.ebuild,v 1.8 2011/08/05 15:53:50 hwoarang Exp $
EAPI="2"
@@ -14,17 +14,21 @@ EGIT_REPO_URI="git://git.openbox.org/dana/obconf.git"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="nls"
+IUSE="lxde nls"
RDEPEND="gnome-base/libglade:2.0
x11-libs/gtk+:2
x11-libs/startup-notification
- >=x11-wm/openbox-3.4.2"
+ >x11-wm/openbox-3.5.0"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
dev-util/pkgconfig"
src_prepare() {
+ if use lxde; then
+ sed -i -e "/^Exec/s:obconf.*$:obconf-lxde:" ${PN}.desktop || die
+ fi
+ epatch "${FILESDIR}"/${PN}-2.0.3_p20110314-config-path.patch
eautopoint
eautoreconf
}
@@ -35,6 +39,9 @@ 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"
}