diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2010-09-30 15:51:45 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2010-09-30 15:51:45 +0000 |
commit | d1c7be179d2caf40f04cb97e6c62f09ec26840b7 (patch) | |
tree | 3ecbf3f120aec0ac6372b6979ae3f930ad99c879 /gnome-base | |
parent | Respect LDFLAGS. Bug #339200 (diff) | |
download | gentoo-2-d1c7be179d2caf40f04cb97e6c62f09ec26840b7.tar.gz gentoo-2-d1c7be179d2caf40f04cb97e6c62f09ec26840b7.tar.bz2 gentoo-2-d1c7be179d2caf40f04cb97e6c62f09ec26840b7.zip |
Allow use of upower in place of devicekit-power. Clean up old revisions.
(Portage version: 2.2_rc88/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/gdm/ChangeLog | 7 | ||||
-rw-r--r-- | gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch | 50 | ||||
-rw-r--r-- | gnome-base/gdm/gdm-2.20.10-r3.ebuild | 240 | ||||
-rw-r--r-- | gnome-base/gdm/gdm-2.26.1.ebuild | 204 | ||||
-rw-r--r-- | gnome-base/gdm/gdm-2.28.2-r1.ebuild | 7 |
5 files changed, 11 insertions, 497 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index 1cc209ac0703..8e69aa3fbc81 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/gdm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.325 2010/09/11 18:47:25 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.326 2010/09/30 15:51:45 eva Exp $ + + 30 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> + -gdm-2.20.10-r3.ebuild, -gdm-2.26.1.ebuild, + -files/gdm-2.26.1-libxklavier4.patch, gdm-2.28.2-r1.ebuild: + Allow use of upower in place of devicekit-power. Clean up old revisions. 11 Sep 2010; Joseph Jezak <josejx@gentoo.org> gdm-2.20.11.ebuild: Marked ppc for bug #324077. diff --git a/gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch b/gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch deleted file mode 100644 index 6f665b7660cc..000000000000 --- a/gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 90267c7f7afc73b27193632ec4af2c5360fab85a Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 21 Jul 2009 00:56:37 +0200 -Subject: [PATCH] Add support for libxklavier-4 - ---- - configure.ac | 10 +++++++--- - gui/simple-greeter/gdm-layouts.c | 4 ++++ - 2 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d4a44d5..068e45c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -114,9 +114,13 @@ AC_ARG_ENABLE([libxklavier], - have_libxklavier=no - if test "x$enable_libxklavier" = "xyes"; then - PKG_CHECK_MODULES(LIBXKLAVIER, -- libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION, -- have_libxklavier=yes, -- have_libxklavier=no) -+ libxklavier >= 4, -+ [AC_DEFINE(HAVE_XKL_4, [1], [lixklavier-4 support]) -+ have_libxklavier=yes], -+ [PKG_CHECK_MODULES(LIBXKLAVIER, -+ libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION, -+ have_libxklavier=yes, -+ have_libxklavier=no)]) - if test "x$have_libxklavier" = "xyes" ; then - AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier]) - fi -diff --git a/gui/simple-greeter/gdm-layouts.c b/gui/simple-greeter/gdm-layouts.c -index dc35094..97e1e08 100644 ---- a/gui/simple-greeter/gdm-layouts.c -+++ b/gui/simple-greeter/gdm-layouts.c -@@ -52,7 +52,11 @@ init_xkl (void) - engine = xkl_engine_get_instance (GDK_DISPLAY ()); - xkl_engine_backup_names_prop (engine); - config_registry = xkl_config_registry_get_instance (engine); -+#if HAVE_XKL_4 -+ xkl_config_registry_load (config_registry, FALSE); -+#else - xkl_config_registry_load (config_registry); -+#endif - - initial_config = xkl_config_rec_new (); - if (!xkl_config_rec_get_from_backup (initial_config, engine)) { --- -1.6.3.3 - diff --git a/gnome-base/gdm/gdm-2.20.10-r3.ebuild b/gnome-base/gdm/gdm-2.20.10-r3.ebuild deleted file mode 100644 index c7a73697714c..000000000000 --- a/gnome-base/gdm/gdm-2.20.10-r3.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.10-r3.ebuild,v 1.3 2010/07/20 15:33:19 jer Exp $ - -EAPI="2" - -inherit eutils pam gnome2 - -DESCRIPTION="GNOME Display Manager" -HOMEPAGE="http://www.gnome.org/projects/gdm/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" - -IUSE_LIBC="elibc_glibc" -IUSE="accessibility afs branding +consolekit dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC" - -# Name of the tarball with gentoo specific files -GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1" - -SRC_URI="${SRC_URI} - mirror://gentoo/${GDM_EXTRA}.tar.bz2 - branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )" - -RDEPEND=">=dev-libs/glib-2.12 - >=x11-libs/gtk+-2.6 - >=x11-libs/pango-1.3 - >=gnome-base/libglade-2 - >=gnome-base/libgnomecanvas-2 - >=gnome-base/librsvg-1.1.1 - >=dev-libs/libxml2-2.4.12 - >=media-libs/libart_lgpl-2.3.11 - x11-libs/gksu - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXext - x11-apps/sessreg - x11-libs/libXdmcp - xinerama? ( x11-libs/libXinerama ) - consolekit? ( - sys-auth/consolekit - dev-libs/dbus-glib ) - accessibility? ( x11-libs/libXevie ) - afs? ( net-fs/openafs sys-libs/lwp ) - dmx? ( x11-libs/libdmx ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) - pam? ( virtual/pam ) - !pam? ( elibc_glibc? ( sys-apps/shadow ) ) - remote? ( gnome-extra/zenity ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - >=x11-misc/xdg-utils-1.0.2-r3" -DEPEND="${RDEPEND} - dmx? ( x11-proto/dmxproto ) - xinerama? ( x11-proto/xineramaproto ) - app-text/docbook-xml-dtd:4.1.2 - sys-devel/gettext - x11-proto/inputproto - >=dev-util/intltool-0.35 - >=dev-util/pkgconfig-0.19 - >=app-text/scrollkeeper-0.1.4 - >=app-text/gnome-doc-utils-0.3.2" -PDEPEND="pam? ( >=sys-auth/pambase-20090430[consolekit=,gnome-keyring=] )" - -DOCS="AUTHORS ChangeLog NEWS README TODO" - -pkg_setup() { - G2CONF="${G2CONF} - --with-prefetch - --sysconfdir=/etc/X11 - --localstatedir=/var - --with-xdmcp=yes - --with-pam-prefix=/etc - SOUND_PROGRAM=/usr/bin/gdmplay - $(use_enable accessibility xevie) - $(use_enable ipv6) - $(use_enable remote secureremote) - $(use_with consolekit console-kit) - $(use_with dmx) - $(use_with selinux) - $(use_with tcpd tcp-wrappers) - $(use_with xinerama)" - - if use pam; then - G2CONF="${G2CONF} --enable-authentication-scheme=pam" - else - G2CONF="${G2CONF} --enable-console-helper=no" - if use elibc_glibc ; then - G2CONF="${G2CONF} --enable-authentication-scheme=shadow" - else - G2CONF="${G2CONF} --enable-authentication-scheme=crypt" - fi - fi - - enewgroup gdm - enewuser gdm -1 -1 /var/lib/gdm gdm -} - -src_prepare() { - gnome2_src_prepare - - # remove unneeded linker directive for selinux (#41022) - epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch" - - # Add gksu to gdmsetup menu entry - epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch" - - # Fix parallel install, bug #217037 - epatch "${FILESDIR}/${PN}-2.20.9-parallel-make.patch" - - # Make custom session work, bug #216984 - epatch "${FILESDIR}/${PN}-2.20.10-custom-session.patch" - - # ssh-agent handling must be done at xinitrc.d, bug #220603 - epatch "${FILESDIR}/${PN}-2.20.10-xinitrc-ssh-agent.patch" - - # Fix wrong DESKTOP_SESSION set if ${HOME}/.dmrc is not found or - # does not contain any relevant data and autologin enabled, bug #281442 - epatch "${FILESDIR}/${P}-desktop-session-dmrc-autologin.patch" - - # Fix 24 hour combo box in gdmsetup, bug #301151 - # patch imported from ubuntu mirrors - epatch "${FILESDIR}/${P}-gdmsetup-24hr-combo.patch" -} - -src_install() { - gnome2_src_install - - local gentoodir="${WORKDIR}/${GDM_EXTRA}" - - # gdm-binary should be gdm to work with our init (#5598) - rm -f "${D}/usr/sbin/gdm" - dosym /usr/sbin/gdm-binary /usr/sbin/gdm - - # our x11's scripts point to /usr/bin/gdm - dosym /usr/sbin/gdm-binary /usr/bin/gdm - - # log, etc. - keepdir /var/log/gdm - keepdir /var/gdm - - fowners root:gdm /var/gdm - fperms 1770 /var/gdm - - # add a custom xsession .desktop by default (#44537) - exeinto /etc/X11/dm/Sessions - doexe "${gentoodir}/custom.desktop" - - # add xinitrc.d scripts - exeinto /etc/X11/xinit/xinitrc.d - doexe "${FILESDIR}/49-keychain" || die "doexe 1 failed" - doexe "${FILESDIR}/50-ssh-agent" || die "doexe 2 failed" - - # install XDG_DATA_DIRS gdm changes - echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm - doenvd 99xdg-gdm || die "doenvd failed" - - # add a custom sound playing script (#248253) - dobin "${gentoodir}/gdmplay" || die "dobin failed" - - # avoid file collision, bug #213118 - rm -f "${D}/usr/share/xsessions/gnome.desktop" - - # We replace the pam stuff by our own - rm -rf "${D}/etc/pam.d" - - if use pam ; then - use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* - - dopamd "${gentoodir}"/pam.d/* - dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup" - fi - - # use graphical greeter local - dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \ - /usr/share/gdm/defaults.conf - - # list available users - dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf - dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf - - # Fix old X11R6 paths - dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf - - # Use Clearlooks as default theme, bug #268496 - dosed "s:#GtkTheme=Default:GtkTheme=Clearlooks:" /usr/share/gdm/defaults.conf - - # Move Gentoo theme in - if use branding ; then - mv "${WORKDIR}"/gentoo-* "${D}/usr/share/gdm/themes" - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - - elog "To make GDM start at boot, edit /etc/conf.d/xdm" - elog "and then execute 'rc-update add xdm default'." - - elog "GDM has changed the location of its configuration file. Please" - elog "edit /etc/X11/gdm/custom.conf. The factory defaults are located" - elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}" - - elog "See README.install for more information about the change." - - if use gnome-keyring; then - elog "For autologin to unlock your keyring, you need to set an empty" - elog "password on your keyring. Use app-crypt/seahorse for that." - fi - - if [ -f "/etc/X11/gdm/gdm.conf" ]; then - elog "You had /etc/X11/gdm/gdm.conf which is the old configuration" - elog "file. It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16" - mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16 - fi - - # Soft restart, assumes Gentoo defaults for file locations - # Do restart after gdm.conf move above - FIFOFILE=/var/gdm/.gdmfifo - PIDFILE=/var/run/gdm.pid - - if [ -w ${FIFOFILE} ] ; then - if [ -f ${PIDFILE} ] ; then - if kill -0 `cat ${PIDFILE}`; then - (echo;echo SOFT_RESTART) >> ${FIFOFILE} - fi - fi - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [ "$(rc-config list default | grep xdm)" != "" ] ; then - elog "To remove GDM from startup please execute" - elog "'rc-update del xdm default'" - fi -} diff --git a/gnome-base/gdm/gdm-2.26.1.ebuild b/gnome-base/gdm/gdm-2.26.1.ebuild deleted file mode 100644 index 6232215fd01e..000000000000 --- a/gnome-base/gdm/gdm-2.26.1.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.26.1.ebuild,v 1.7 2010/05/22 16:20:59 armin76 Exp $ - -EAPI="2" - -inherit eutils pam gnome2 autotools - -DESCRIPTION="GNOME Display Manager" -HOMEPAGE="http://www.gnome.org/projects/gdm/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sh ~sparc ~x86" - -IUSE_LIBC="elibc_glibc" -IUSE="accessibility +consolekit debug ipv6 gnome-keyring policykit selinux tcpd test xinerama +xklavier $IUSE_LIBC" - -# Name of the tarball with gentoo specific files -GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1" - -SRC_URI="${SRC_URI} - mirror://gentoo/${PN}-2.26-gentoo-patches.tar.bz2 - mirror://gentoo/${GDM_EXTRA}.tar.bz2" - -RDEPEND=">=dev-libs/dbus-glib-0.74 - >=dev-libs/glib-2.15.4 - >=x11-libs/gtk+-2.10.0 - >=x11-libs/pango-1.3 - >=gnome-base/libglade-2 - >=gnome-base/gconf-2.6.1 - >=gnome-base/gnome-panel-2 - >=gnome-base/gnome-session-2.26 - xklavier? ( >=x11-libs/libxklavier-3.5 ) - x11-libs/libXft - app-text/iso-codes - - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXext - x11-apps/sessreg - x11-libs/libXdmcp - virtual/pam - consolekit? ( - sys-auth/consolekit - >=sys-apps/hal-0.5.12_rc1-r1[consolekit] ) - - accessibility? ( x11-libs/libXevie ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) - policykit? ( - >=sys-auth/policykit-0.8 - >=gnome-extra/policykit-gnome-0.8 ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) - - !gnome-extra/fast-user-switch-applet" -DEPEND="${RDEPEND} - test? ( >=dev-libs/check-0.9.4 ) - xinerama? ( x11-proto/xineramaproto ) - app-text/docbook-xml-dtd:4.1.2 - sys-devel/gettext - x11-proto/inputproto - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.19 - >=app-text/scrollkeeper-0.1.4 - >=app-text/gnome-doc-utils-0.3.2" -PDEPEND=">=sys-auth/pambase-20090430[consolekit=,gnome-keyring=]" - -DOCS="AUTHORS ChangeLog NEWS README TODO" - -pkg_setup() { - # PAM is the only auth scheme supported - # even though configure lists shadow and crypt - # they don't have any corresponding code - G2CONF="${G2CONF} - --disable-schemas-install - --localstatedir=/var - --with-xdmcp=yes - --enable-authentication-scheme=pam - --with-pam-prefix=/etc - SOUND_PROGRAM=/usr/bin/gdmplay - $(use_with accessibility xevie) - $(use_enable debug) - $(use_enable ipv6) - $(use_enable xklavier libxklavier) - $(use_enable policykit polkit) - $(use_with consolekit console-kit) - $(use_with selinux) - $(use_with tcpd tcp-wrappers) - $(use_with xinerama)" - - enewgroup gdm - enewuser gdm -1 -1 /var/lib/gdm gdm -} - -src_prepare() { - gnome2_src_prepare - - # remove unneeded linker directive for selinux (#41022) - epatch "${WORKDIR}/${PN}-2.26.1-selinux-remove-attr.patch" - - # Make it daemonize so that the boot process can continue (#236701) - epatch "${WORKDIR}/${PN}-2.26.1-fix-daemonize-regression.patch" - - # Fix VT grab problem causing GDM to grab VT2 instead of 7 (#261339) - epatch "${WORKDIR}/${PN}-2.26.1-broken-VT-detection.patch" - - # Make custom session work, bug #. - epatch "${WORKDIR}/${PN}-2.26.1-custom-session.patch" - - # ssh-agent handling must be done at xinitrc.d - epatch "${WORKDIR}/${PN}-2.26.1-xinitrc-ssh-agent.patch" - - # Fix libxklavier automagic support - epatch "${WORKDIR}/${PN}-2.26.1-automagic-libxklavier-support.patch" - - # Fix libxklavier-4 support - epatch "${FILESDIR}/${PN}-2.26.1-libxklavier4.patch" - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf -} - -src_install() { - gnome2_src_install - - local gentoodir="${WORKDIR}/${GDM_EXTRA}" - - # gdm-binary should be gdm to work with our init (#5598) - rm -f "${D}/usr/sbin/gdm" - dosym /usr/sbin/gdm-binary /usr/sbin/gdm - - # our x11's scripts point to /usr/bin/gdm - dosym /usr/sbin/gdm-binary /usr/bin/gdm - - # log, etc. - keepdir /var/log/gdm - keepdir /var/gdm - - fowners root:gdm /var/gdm - fperms 1770 /var/gdm - - # add a custom xsession .desktop by default (#44537) - exeinto /etc/X11/dm/Sessions - doexe "${gentoodir}/custom.desktop" || die "doexe 1 failed" - - # add xinitrc.d scripts - exeinto /etc/X11/xinit/xinitrc.d - doexe "${FILESDIR}/49-keychain" || die "doexe 2 failed" - doexe "${FILESDIR}/50-ssh-agent" || die "doexe 3 failed" - - # install XDG_DATA_DIRS gdm changes - echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm - doenvd 99xdg-gdm || die "doenvd failed" - - # add a custom sound playing script (#248253) - dobin "${gentoodir}/gdmplay" - - # avoid file collision, bug #213118 - rm -f "${D}/usr/share/xsessions/gnome.desktop" - - # We replace the pam stuff by our own - rm -rf "${D}/etc/pam.d" - - use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* - - dopamd "${gentoodir}"/pam.d/* - dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup" -} - -pkg_postinst() { - gnome2_pkg_postinst - - ewarn - ewarn "This is an EXPERIMENTAL release, please bear with its bugs and" - ewarn "visit us on #gentoo-desktop if you have problems." - ewarn - - elog "To make GDM start at boot, edit /etc/conf.d/xdm" - elog "and then execute 'rc-update add xdm default'." - elog "If you already have GDM running, you will need to restart it." - - if use gnome-keyring; then - elog "For autologin to unlock your keyring, you need to set an empty" - elog "password on your keyring. Use app-crypt/seahorse for that." - fi - - if [ -f "/etc/X11/gdm/gdm.conf" ]; then - elog "You had /etc/X11/gdm/gdm.conf which is the old configuration" - elog "file. It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16" - mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16 - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then - elog "To remove GDM from startup please execute" - elog "'rc-update del xdm default'" - fi -} diff --git a/gnome-base/gdm/gdm-2.28.2-r1.ebuild b/gnome-base/gdm/gdm-2.28.2-r1.ebuild index 5d16c615c1b1..a97114dc14e9 100644 --- a/gnome-base/gdm/gdm-2.28.2-r1.ebuild +++ b/gnome-base/gdm/gdm-2.28.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.28.2-r1.ebuild,v 1.4 2010/05/22 16:20:59 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.28.2-r1.ebuild,v 1.5 2010/09/30 15:51:45 eva Exp $ EAPI="2" @@ -25,7 +25,7 @@ SRC_URI="${SRC_URI} # FIXME: gdm has a strange behaviour on reboot (from runlevel), especially when xdm tries to stop it (its blocks). # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug 295686 -RDEPEND=">=sys-apps/devicekit-power-008 +RDEPEND=" >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.15.4 >=x11-libs/gtk+-2.10.0 @@ -36,6 +36,9 @@ RDEPEND=">=sys-apps/devicekit-power-008 >=gnome-base/gnome-panel-2 >=gnome-base/gnome-session-2.28 >=x11-misc/xdg-utils-1.0.2-r3 + || ( + sys-power/upower + >=sys-apps/devicekit-power-008 ) app-text/iso-codes |