diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2010-05-30 16:06:08 +0200 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2010-05-30 16:06:08 +0200 |
| commit | 27eb545affaf914065d6e95f9d5dc671458441fd (patch) | |
| tree | bc6429eece900b59d77e1e4b3e90e355e44a7993 /xfce-base/xfce4-session | |
| parent | xfce4-panel: Updated (diff) | |
| download | xfce-27eb545affaf914065d6e95f9d5dc671458441fd.tar.gz xfce-27eb545affaf914065d6e95f9d5dc671458441fd.tar.bz2 xfce-27eb545affaf914065d6e95f9d5dc671458441fd.zip | |
xfce4-session: Enable upower support for suspend/hibernate
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 | 8 | ||||
| -rw-r--r-- | xfce-base/xfce4-session/xfce4-session-9999.ebuild | 24 |
3 files changed, 24 insertions, 12 deletions
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest index d1df68e..80ae190 100644 --- a/xfce-base/xfce4-session/Manifest +++ b/xfce-base/xfce4-session/Manifest @@ -1,2 +1,2 @@ -EBUILD xfce4-session-9999.ebuild 1835 RMD160 ffcb4a2fbcf3cbf36642a7da14e9f83ec06017b5 SHA1 5d63ccafd8866525b5d5038ed1d4e11a2734326d SHA256 c4694763e2fe6c3c15a556bf6480628f362b2eadd1165ba8ba3f2f4102d7287f -MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 +EBUILD xfce4-session-9999.ebuild 1898 RMD160 3f4c31168e7bcac1c3c733ac40290ddae2b45821 SHA1 7076a06fb645305343b213d6c1662088f7b2ec6d SHA256 3e34ebe551b95f646cb66ed43efc1bb716488d0126a0ee2c973cb93322980a5d +MISC metadata.xml 488 RMD160 13303c4a4e3376b4d4c4286fd2cad2bf4f372111 SHA1 4672cdd944c35c440a7b1fce52f55a916f4a94c9 SHA256 34d037edfd9edf3652e1b1c1dde95cc22459a2304c7e2e2c124e0895b55bbcfe diff --git a/xfce-base/xfce4-session/metadata.xml b/xfce-base/xfce4-session/metadata.xml index 826e2ca..ae80c4e 100644 --- a/xfce-base/xfce4-session/metadata.xml +++ b/xfce-base/xfce4-session/metadata.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>xfce</herd> + <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> + </use> </pkgmetadata> diff --git a/xfce-base/xfce4-session/xfce4-session-9999.ebuild b/xfce-base/xfce4-session/xfce4-session-9999.ebuild index 1521bb6..77c4352 100644 --- a/xfce-base/xfce4-session/xfce4-session-9999.ebuild +++ b/xfce-base/xfce4-session/xfce4-session-9999.ebuild @@ -10,7 +10,7 @@ xfce4_core DESCRIPTION="Session manager for Xfce4" HOMEPAGE="http://www.xfce.org/projects/xfce4-session/" 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 policykit"# upower +IUSE="+consolekit debug fortune gnome gnome-keyring +upower" RDEPEND=">=dev-libs/dbus-glib-0.73 >=x11-libs/gtk+-2.14:2 @@ -19,12 +19,13 @@ RDEPEND=">=dev-libs/dbus-glib-0.73 >=xfce-base/libxfce4util-4.7 >=xfce-base/xfce4-panel-4.6 >=xfce-base/xfconf-4.7 - consolekit? ( sys-auth/consolekit ) + 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 ) - policykit? ( sys-auth/polkit )" - #upower? ( sys-power/upower ) + upower? ( sys-power/upower + sys-auth/polkit )" DEPEND="${RDEPEND} dev-util/intltool" @@ -34,8 +35,12 @@ pkg_setup() { $(use_enable consolekit) $(use_enable gnome) $(use_enable gnome-keyring libgnome-keyring) - $(use_enable policykit polkit)" - #$(use_enable upower) + $(use_enable upower)" + + if use consolekit || use upower; then + XFCE_CONFIG+=" --enable-polkit" + fi + DOCS="AUTHORS BUGS NEWS README TODO" } @@ -48,13 +53,14 @@ src_install() { 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 -p "${D}"/etc/xdg/autostart + rmdir "${D}"/etc/xdg/autostart fi } pkg_postinst() { - if ! use consolekit; then # && ! use upower - einfo "consolekit is disabled, you will need sudo to shutdown as user" + 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" |