summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-09-06 17:25:13 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-09-06 17:25:13 +0000
commit4133f045cfb19adafb58fb4f3e60bc3e31ed9e34 (patch)
tree064084b9ca0d25c48ae7200058ea6f7484d0ee55 /xfce-base
parentCleaned ebuild for fixing bug 336177 (diff)
downloadgentoo-2-4133f045cfb19adafb58fb4f3e60bc3e31ed9e34.tar.gz
gentoo-2-4133f045cfb19adafb58fb4f3e60bc3e31ed9e34.tar.bz2
gentoo-2-4133f045cfb19adafb58fb4f3e60bc3e31ed9e34.zip
Change gnome-keyring depend to libgnome-keyring. Remove USE flags for consolekit, policykit and udev because they are not required at build-time wrt #336146 by Matthew Turnbull.
(Portage version: 2.2_rc75/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/xfce4-session/ChangeLog8
-rw-r--r--xfce-base/xfce4-session/xfce4-session-4.7.0.ebuild21
2 files changed, 14 insertions, 15 deletions
diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 36e7238cf2b7..86aa082d9bb0 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for xfce-base/xfce4-session
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.117 2010/09/05 21:59:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.118 2010/09/06 17:25:13 ssuominen Exp $
+
+ 06 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-session-4.7.0.ebuild:
+ Change gnome-keyring depend to libgnome-keyring. Remove USE flags for
+ consolekit, policykit and udev because they are not required at build-time
+ wrt #336146 by Matthew Turnbull.
*xfce4-session-4.7.0 (05 Sep 2010)
diff --git a/xfce-base/xfce4-session/xfce4-session-4.7.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.7.0.ebuild
index f282c3dfa513..ada23c577380 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.7.0.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.7.0.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.7.0.ebuild,v 1.1 2010/09/05 21:59:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.7.0.ebuild,v 1.2 2010/09/06 17:25:13 ssuominen Exp $
-EAPI=2
+EAPI=3
inherit xfconf
DESCRIPTION="Session manager for Xfce4"
@@ -12,22 +12,19 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.7/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug consolekit gnome gnome-keyring policykit udev xfce_plugins_logout"
+IUSE="debug gnome gnome-keyring xfce_plugins_logout"
RDEPEND=">=dev-libs/dbus-glib-0.73
- x11-libs/libX11
+ x11-apps/iceauth
x11-libs/libSM
>=x11-libs/libwnck-2.22
- x11-apps/iceauth
+ x11-libs/libX11
>=xfce-base/libxfce4util-4.7
>=xfce-base/libxfce4ui-4.7
>=xfce-base/xfconf-4.7
>=xfce-base/xfce-utils-4.7
- consolekit? ( sys-auth/consolekit )
gnome? ( gnome-base/gconf )
- gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 )
- policykit? ( sys-auth/polkit )
- udev? ( sys-power/upower )
+ gnome-keyring? ( gnome-base/libgnome-keyring )
xfce_plugins_logout? ( >=xfce-base/xfce4-panel-4.7.2 )"
DEPEND="${RDEPEND}
dev-util/intltool
@@ -41,10 +38,6 @@ pkg_setup() {
$(use_enable xfce_plugins_logout panel-plugin)
$(use_enable gnome)
$(use_enable gnome-keyring libgnome-keyring)
- $(xfconf_use_debug)
- --disable-hal
- $(use_enable udev upower)
- $(use_enable consolekit)
- $(use_enable policykit polkit)"
+ $(xfconf_use_debug)"
DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
}