diff options
author | Christoph Mende <angelos@gentoo.org> | 2011-02-20 20:33:28 +0100 |
---|---|---|
committer | Christoph Mende <angelos@gentoo.org> | 2011-02-20 20:33:28 +0100 |
commit | 25591de44619e886dc67754c53e746d7adbde04f (patch) | |
tree | 0236468f22174e4f38421af31cc42667553d8a6e /xfce-base/xfce4-session | |
parent | xfce4-panel: Updated (diff) | |
download | xfce-25591de44619e886dc67754c53e746d7adbde04f.tar.gz xfce-25591de44619e886dc67754c53e746d7adbde04f.tar.bz2 xfce-25591de44619e886dc67754c53e746d7adbde04f.zip |
xfce4-session: Updated
Diffstat (limited to 'xfce-base/xfce4-session')
-rw-r--r-- | xfce-base/xfce4-session/Manifest | 4 | ||||
-rw-r--r-- | xfce-base/xfce4-session/metadata.xml | 6 | ||||
-rw-r--r-- | xfce-base/xfce4-session/xfce4-session-9999.ebuild | 83 |
3 files changed, 36 insertions, 57 deletions
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest index 70b6ac9..a0f1984 100644 --- a/xfce-base/xfce4-session/Manifest +++ b/xfce-base/xfce4-session/Manifest @@ -1,2 +1,2 @@ -EBUILD xfce4-session-9999.ebuild 1930 RMD160 f432685aaaa97f70f612d536dfa0139b2257bcdb SHA1 1e8123184a9acb0594a7ffaa42c07761c609b8e0 SHA256 301b6d693a41001490a24a615a8adec79cb4ca501677678918d4161bf48ae3c5 -MISC metadata.xml 488 RMD160 13303c4a4e3376b4d4c4286fd2cad2bf4f372111 SHA1 4672cdd944c35c440a7b1fce52f55a916f4a94c9 SHA256 34d037edfd9edf3652e1b1c1dde95cc22459a2304c7e2e2c124e0895b55bbcfe +EBUILD xfce4-session-9999.ebuild 1371 RMD160 dfb08a5d34fd26959a1f5cbc8963eddff6e83d66 SHA1 e2a70cf2269de9d668ee7ce77fd6c94990ec1787 SHA256 93d257b5ecac7b054fa7411ae2ce28be8083de01662e406bb5259bf45d9ca2e1 +MISC metadata.xml 383 RMD160 049a1744087cae9a2a03c9ca56e633d58ab2ffca SHA1 50d552356fc81ca21b5f6c5b783cb27740fbf1af SHA256 b6892076cf5c492bac83081bb3900e77f35c528505e51f8019f20a576062ad03 diff --git a/xfce-base/xfce4-session/metadata.xml b/xfce-base/xfce4-session/metadata.xml index ae80c4e..8ce5197 100644 --- a/xfce-base/xfce4-session/metadata.xml +++ b/xfce-base/xfce4-session/metadata.xml @@ -3,9 +3,7 @@ <pkgmetadata> <herd>xfce</herd> <use> - <flag name="consolekit">Use consolekit for shutdown/reboot</flag> - <flag name="fortune">Install tips and tricks app (xfce4-tips), adds dependency on games-misc/fortune-mod</flag> - <flag name="gnome-keyring">Support for storing your password.</flag> - <flag name="upower">Use upower for suspend/hibernate</flag> + <flag name="consolekit">Enable authentication support using <pkg>sys-auth/consolekit</pkg></flag> + <flag name="gnome-keyring">Enable password storage support using <pkg>gnome-base/gnome-keyring</pkg></flag> </use> </pkgmetadata> diff --git a/xfce-base/xfce4-session/xfce4-session-9999.ebuild b/xfce-base/xfce4-session/xfce4-session-9999.ebuild index a555d39..1ae1bf9 100644 --- a/xfce-base/xfce4-session/xfce4-session-9999.ebuild +++ b/xfce-base/xfce4-session/xfce4-session-9999.ebuild @@ -1,69 +1,50 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=2 +EAPI=3 inherit xfce4 xfce4_core -DESCRIPTION="Session manager for Xfce4" +DESCRIPTION="Xfce's session manager" HOMEPAGE="http://www.xfce.org/projects/xfce4-session/" + +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="+consolekit debug fortune gnome gnome-keyring +upower" +IUSE="consolekit debug gnome-keyring policykit udev +xfce_plugins_logout" -RDEPEND=">=dev-libs/dbus-glib-0.73 - >=x11-libs/gtk+-2.14:2 +COMMON_DEPEND=">=dev-libs/dbus-glib-0.88 + x11-apps/iceauth + x11-libs/libSM >=x11-libs/libwnck-2.22 - >=xfce-base/libxfce4ui-4.7 - >=xfce-base/libxfce4util-4.7 - >=xfce-base/xfce4-panel-4.6 - >=xfce-base/xfconf-4.7 - consolekit? ( sys-auth/consolekit - sys-auth/polkit ) - fortune? ( games-misc/fortune-mod ) - gnome? ( >=gnome-base/gconf-2.4 ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 ) - upower? ( sys-power/upower - sys-auth/polkit )" -DEPEND="${RDEPEND} - dev-util/intltool" + x11-libs/libX11 + >=xfce-base/libxfce4util-4.8 + >=xfce-base/libxfce4ui-4.8 + >=xfce-base/xfconf-4.8 + >=xfce-base/xfce-utils-4.8 + gnome-keyring? ( gnome-base/libgnome-keyring ) + xfce_plugins_logout? ( >=xfce-base/xfce4-panel-4.8 )" +RDEPEND="${COMMON_DEPEND} + consolekit? ( sys-auth/consolekit ) + policykit? ( sys-auth/polkit ) + udev? ( sys-power/upower )" +DEPEND="${COMMON_DEPEND} + dev-util/intltool + sys-devel/gettext" pkg_setup() { - XFCE_CONFIG+=" --disable-dependency-tracking + XFCE_CONFIG+=" + --docdir=${EPREFIX}/usr/share/doc/${PF} + --disable-dependency-tracking + --disable-static + $(use_enable xfce_plugins_logout panel-plugin) + $(use_enable gnome-keyring libgnome-keyring) --disable-hal - --enable-panel-plugin + $(use_enable udev upower) $(use_enable consolekit) - $(use_enable gnome) - $(use_enable gnome-keyring libgnome-keyring) - $(use_enable upower)" - - if use consolekit || use upower; then - XFCE_CONFIG+=" --enable-polkit" - fi + $(use_enable policykit polkit)" DOCS="AUTHORS BUGS NEWS README TODO" } - -src_install() { - xfce4_src_install - - if ! use fortune; then - # Wipe away unusable xfce4-tips - rm -Rf "${D}"/usr/share/xfce4/tips - rm -f "${D}"/usr/bin/xfce4-tips \ - "${D}"/usr/lib/debug/usr/bin/xfce4-tips.debug \ - "${D}"/etc/xdg/autostart/xfce4-tips-autostart.desktop - rmdir "${D}"/etc/xdg/autostart - fi -} - -pkg_postinst() { - if ! use consolekit || ! use upower; then - einfo "consolekit or upower is disabled, you will need sudo to" - einfo "shutdown/suspend as user." - einfo "Please add the following to your sudoers file:" - einfo "myuser myhost=${EPREFIX}/usr/libexec/xfsm-shutdown-helper" - einfo "Where myuser is your user and myhost your hostname" - fi -} |