diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2014-09-03 22:07:16 +0200 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2014-09-03 22:07:16 +0200 |
| commit | 978c6b95ea66c1acf9d51597d3babfcdc23f315d (patch) | |
| tree | 282041bf4652e64dba313754dd460948d16aa16e | |
| parent | xfce4-panel: Sync with gentoo-x86 (diff) | |
| download | xfce-978c6b95ea66c1acf9d51597d3babfcdc23f315d.tar.gz xfce-978c6b95ea66c1acf9d51597d3babfcdc23f315d.tar.bz2 xfce-978c6b95ea66c1acf9d51597d3babfcdc23f315d.zip | |
xfce4-session: Sync with gentoo-x86
Package-Manager: portage-2.2.10
Manifest-Sign-Key: 84F20B43
| -rw-r--r-- | xfce-base/xfce4-session/Manifest | 8 | ||||
| -rw-r--r-- | xfce-base/xfce4-session/xfce4-session-9999.ebuild | 13 |
2 files changed, 11 insertions, 10 deletions
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest index 179553c..fa4d1ef 100644 --- a/xfce-base/xfce4-session/Manifest +++ b/xfce-base/xfce4-session/Manifest @@ -3,12 +3,12 @@ Hash: SHA256 AUX xfce4-session-alock_support_to_xflock4.patch 367 SHA256 2be32b49b268649e509b99e8d93a3d4e57665cbe8e03693bc85f88ea088e0650 SHA512 8ee765241997cbf32c08e9597d42ee666400fb27792a8716f59aa91daba7476e1de679e4c9254653cf9b14d95fc293f22d02e99ef3288287113a72407e513975 WHIRLPOOL b4b440c393c6175c9555d4df5d3eb4e730512c41fd83d291df2817206225efabc8db752887bd3316ae7fc915158a513202fa592536b78d52c4c40bbff7aa7ae8 AUX xfce4-session-upower-0.99.patch 11987 SHA256 babd6f01c39165c3f178708096695745b3e3d8a7434c8bc762c2ee4a0883c028 SHA512 962e33bac39cea783651ff2b6b89cdaa66b4af06752acf91e6270ade3b3a2947ac903da044330d268042be9a3aa5c2508226cd21969e65bc44cda3afcc664421 WHIRLPOOL d140fc8de712f1d0c527fca4edb6df73da49bbce68d5a5ea425bef8abd9463426b90a9ca5c97c51ab9358ffc02524e6381df137926607ffbbfdbb3cdc32eb3f1 -EBUILD xfce4-session-9999.ebuild 1725 SHA256 9d08ee1ab75ea05db5f54da5cbae42db6f0eafbb82ae9336592d307a2f17a571 SHA512 86d61e605e92b0a629417921bb014f02232d242e0a9ba6108ae2f2d3a38f774660409630362d32a1cbb925e482ab03f9da24e842acad1a759702e9ac55786ade WHIRLPOOL 774d4a119316328a45fa770e7c3f1fa2498e4d3fd5f22c02816a83dbf798707ffb287db1349670541328f6fa7d6b1dd94f4c21ca24d497c56aa371249859492d +EBUILD xfce4-session-9999.ebuild 1745 SHA256 9fe6a5fed570d17f7194ec1ed1257db1aa34ef2f887d1435dd6c67e90977e171 SHA512 668fa1d6fdd4753665f273dfe58067393e8606644a906eece2cc1e384f031a2427539ca050f1dc54b500509a6be5f66320172e17ce5959912a2bd128a09e3bbb WHIRLPOOL fa788ad827a7cf3738367942887742b964a7464c6e15d26ef0a3db1801ad4a409dc4a55b44b1213cd863c144b6566849741f0ed7eeca3e8722be3b126c037081 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlOrLdAACgkQmWq1bYTyC0NT0gEApK5UHYxuxKUoF59SKFklNSIZ -25zas8uX4ygaiqaPFc0A/2IS7H37lBthg1woYhmZcgTvO36cTpF8CWnRyl9PAJGA -=OZsu +iF4EAREIAAYFAlQHdPQACgkQmWq1bYTyC0PbygD9H0IT3gYwQXsTY1eNcMYjvX0C +Brikopje3JwfXNdNyjYA/3yfQebuP+xR8ciip3hKuGKdp2S59uvJrtRFV3Dzf9zP +=5rCb -----END PGP SIGNATURE----- diff --git a/xfce-base/xfce4-session/xfce4-session-9999.ebuild b/xfce-base/xfce4-session/xfce4-session-9999.ebuild index c263fd6..7455597 100644 --- a/xfce-base/xfce4-session/xfce4-session-9999.ebuild +++ b/xfce-base/xfce4-session/xfce4-session-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.11.0-r1.ebuild,v 1.3 2014/06/02 16:39:34 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild,v 1.3 2014/07/24 10:54:57 ssuominen Exp $ EAPI=5 inherit xfconf @@ -11,7 +11,7 @@ HOMEPAGE="http://docs.xfce.org/xfce/xfce4-session/start" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="debug nls systemd udev +xscreensaver" +IUSE="debug nls systemd upower +xscreensaver" COMMON_DEPEND=">=dev-libs/dbus-glib-0.100 x11-apps/iceauth @@ -22,12 +22,12 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100 >=xfce-base/libxfce4ui-4.11 >=xfce-base/xfconf-4.10 !xfce-base/xfce-utils - udev? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) + upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) systemd? ( >=sys-auth/polkit-0.100 )" RDEPEND="${COMMON_DEPEND} x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) - !systemd? ( udev? ( sys-power/pm-utils ) ) + !systemd? ( upower? ( sys-power/pm-utils ) ) xscreensaver? ( || ( >=x11-misc/xscreensaver-5.26 gnome-extra/gnome-screensaver @@ -43,8 +43,7 @@ DEPEND="${COMMON_DEPEND} pkg_setup() { PATCHES=( "${FILESDIR}"/${PN}-alock_support_to_xflock4.patch ) - # http://bugs.gentoo.org/512084 - use udev && PATCHES+=( "${FILESDIR}"/${PN}-upower-0.99.patch ) + use upower && PATCHES+=( "${FILESDIR}"/${P}-upower-0.99.0.patch ) XFCONF=( --docdir="${EPREFIX}"/usr/share/doc/${PF} @@ -53,6 +52,8 @@ pkg_setup() { $(xfconf_use_debug) ) + use upower && XFCONF+=( --enable-upower ) + DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO ) } |