summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2014-06-25 22:15:28 +0200
committerChristoph Mende <angelos@gentoo.org>2014-06-25 22:15:28 +0200
commit4d36fe02e353d3f4e9a181dcfff4061b542ab429 (patch)
tree222f116bca40427839f750699e64abe3072fae72
parentthunar: Sync with gentoo-x86 (diff)
downloadxfce-4d36fe02e353d3f4e9a181dcfff4061b542ab429.tar.gz
xfce-4d36fe02e353d3f4e9a181dcfff4061b542ab429.tar.bz2
xfce-4d36fe02e353d3f4e9a181dcfff4061b542ab429.zip
xfce4-settings: Sync with gentoo-x86
Package-Manager: portage-2.2.10 Manifest-Sign-Key: 84F20B43
-rw-r--r--xfce-base/xfce4-settings/Manifest10
-rw-r--r--xfce-base/xfce4-settings/xfce4-settings-9999.ebuild6
2 files changed, 9 insertions, 7 deletions
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 6df5a05..896c75f 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,12 +1,12 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-EBUILD xfce4-settings-9999.ebuild 1314 SHA256 aaad5ef1564d0fa1fd7612a589217fe119d70136dc3ecf56865a16a9a2209486 SHA512 98f6de39fb2081f9595465abf4771f0151c6c995b6b1c12036715ab421285cbcb303cab39402a62755c8b696b9ced9d6ae9a6fc3597b8e3fbc8f44f8f0eff7fd WHIRLPOOL 9b699252ef0b692381cf6b09c4542dd230d14e5d5410767cddc0fd15c11592dba67b7f9e4217c90f083b2d3e01f05ad5558674919d4a741cc32a1cf234caa752
+EBUILD xfce4-settings-9999.ebuild 1402 SHA256 45d00b9f339a6b581752208dc3bbd6a771a9f7140aedf0425666c794fbb9ffce SHA512 28d7e55695077c73c22b0d078f1ab993ddbdb078f4ef480bceedc0980fb0888df20d0d5afc146a312016eb79e47a76db3c2dc147953ec0e12d8d0ee6117eea41 WHIRLPOOL 8713ee5bf1bdb1a71811f1e74a7c0e8c23a83c5503281b7c6ee60a1e16fa72e4305785e9cefbea3384e608ad31ec2ac61f5043d5de93ddc33a46908fe96ebc0e
MISC metadata.xml 391 SHA256 e12aab743d09d93de0374287e05add71330871ddafb70f9af31707241e1e2815 SHA512 61b5f4e2794713eda461738e970a8609eb357618bb260e4aa7c651a5e85680e128ad1aa2600af8cc100ebcfc493028bb8aedc09b860145b4b61fdc7dd1b5ce59 WHIRLPOOL a482a5c406cfd50f608dbaa9c4a58c60d0d0e8ab1ce07e82d9ef51c99145289e6a9b8cb1b8b419077683b08df5be6086236a069fff6527643c4be08126f7e79f
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
-iF4EAREIAAYFAlMxw1oACgkQmWq1bYTyC0PeuwEAvwe/dUJvXV9o6OPZyk9jv28Q
-veGXmbq+EjPdTjkT5TAA/3W1/8pcTI9frO5/ODkGiOWQVsA/qUuBOjNIT5Nn5IYX
-=uLqr
+iF4EAREIAAYFAlOrLZ0ACgkQmWq1bYTyC0P4sgD+PQV+3xoh+JvhyyN83XmWS5H6
+whmuvpXUi23vXFd6wLkA+wRR3rG+/ce7qNJZ9FFgVN2yghjx6z32kW/qDxPDdEnN
+=djq4
-----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
index 80acc90..dcbaef5 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-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-settings/xfce4-settings-4.11.2.ebuild,v 1.1 2014/03/11 15:11:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.11.2-r1.ebuild,v 1.1 2014/05/31 19:13:04 ssuominen Exp $
EAPI=5
inherit xfconf
@@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.100
>=xfce-base/xfconf-4.10
libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
libnotify? ( >=x11-libs/libnotify-0.7 )
- udev? ( >=sys-power/upower-0.9.8 )
+ udev? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
xklavier? ( >=x11-libs/libxklavier-5 )"
DEPEND="${RDEPEND}
dev-util/intltool
@@ -38,6 +38,8 @@ DEPEND="${RDEPEND}
x11-proto/xproto"
pkg_setup() {
+ PATCHES=( "${FILESDIR}"/${P}-upower-0.99.patch )
+
XFCONF=(
$(use_enable udev upower-glib)
$(use_enable libnotify)