From 036ac400aec42aa0411c1c614341902b9695ba6e Mon Sep 17 00:00:00 2001
From: Christoph Mende <angelos@gentoo.org>
Date: Sun, 12 Apr 2015 14:55:46 +0000
Subject: xfce4-settings: Sync with gentoo-x86

Package-Manager: portage-2.2.18
Manifest-Sign-Key: 84F20B43
---
 xfce-base/xfce4-settings/Manifest                   | 14 +++++++++-----
 xfce-base/xfce4-settings/metadata.xml               |  1 +
 xfce-base/xfce4-settings/xfce4-settings-9999.ebuild |  8 +++++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 5c4eba9..6a43b48 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,12 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD xfce4-settings-9999.ebuild 1354 SHA256 35d7ebf4c174e2a8db1b3aff68e6fa4639127c7f8fc2b15121db6460d53f5d32 SHA512 3b79d8d4b303d3b6dc6d8368eb6d37d3c84c5526e1f01f4487c4b3ffd29bfd0d4e8ac773d2f7f1ec9c6256ce020d426e047d6fa03fac19916c86a6cf6b8fbeea WHIRLPOOL af41dbcb75f21b7b234af97be6cbeedf0c44779d5212a42ef2c0afb05988937544295b2e82b34263d7b68f7547b0221d4dc871086874e3f3f2bbab38e8cc9db2
-MISC metadata.xml 391 SHA256 e12aab743d09d93de0374287e05add71330871ddafb70f9af31707241e1e2815 SHA512 61b5f4e2794713eda461738e970a8609eb357618bb260e4aa7c651a5e85680e128ad1aa2600af8cc100ebcfc493028bb8aedc09b860145b4b61fdc7dd1b5ce59 WHIRLPOOL a482a5c406cfd50f608dbaa9c4a58c60d0d0e8ab1ce07e82d9ef51c99145289e6a9b8cb1b8b419077683b08df5be6086236a069fff6527643c4be08126f7e79f
+EBUILD xfce4-settings-9999.ebuild 1446 SHA256 43c182f88bb96c9f8bc4134b77114a5bd4cc866f6a383e9d0440e8e3563a8cc8 SHA512 f6fd8dd970a6d0395e7f202c09b6843fa1ab5832883e46d1ae317c10a9ff528c06f44f1a87259e1bfff8ca084d9b1810ed992c1b30375227525da47d11051a79 WHIRLPOOL cac276ee8a299fbd2f8b72669fe76ad0a2ef609c274e70bb550ea1bbed41ac5e730bc59ba849e067224902eb296ecdca580a2eb3a3e35b741c839a18b97327f4
+MISC metadata.xml 505 SHA256 ce2bfb5c8f2b4ca75e51b1221b1eb45ce0008f3316e43fc038109122d8f9b13f SHA512 fe51a4a26d14f02521863e577546111c3af7e265ec956d97d6ee7711bff1eca7a7482679539057fb0e3b662dfb637eafa683e6eee3d9efac92c46e0c11caf855 WHIRLPOOL a2fe37b5330fc52d60e0bdad78ca6962d1755819825aa244cd6b347b580ad7bbaa7e6a3f47c5b34c7aadc00434ea6a1cfb68321b378deadb8e8209dec35b424c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlQbKGAACgkQmWq1bYTyC0O5yQD/YBvczk50je1CkiuIhyI9v02H
-oIxB59wt5TrXSX6eBfkA/0lmukcrRlVD+IZC4Aoa9EE4CDVOta7JKIAmS5pNo1gs
-=bRib
+iQEcBAEBCAAGBQJVKodyAAoJELWcuBZ1ofgw6OQH/i8eqW83PN4gL0HwI04Iv4kU
+d9JyQS+Ps2GU6amj6m+BRQ1fFzhsCOXLADjyuQYVz76xV/WtHH7Rqt0cWY3abD+/
+3dkFgSD0evXQNR76NCVclqB8Z3ilQAt2X0xYfebGstF5f3UQL96iA4xLFzrQh3/H
+u69GdCSHV2So0s6rGKOhpFrLdCpsmOWmOOEcHePYNJq9wOOHfNLim5ZIpmvwpvTC
+MSbWzxfEC9GS0yG8Bo/bogBmjpHD9cmo8JkHmUXqPh22xKEuoyV9gxfbgnMW6UU6
+Wj077wbzUtoQj1rjnbGwFceL+ogtpXl9mWRwBTg+2ZfaWE52SwxGBBO9c90/9Ng=
+=a4tp
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-settings/metadata.xml b/xfce-base/xfce4-settings/metadata.xml
index a80a932..9c387c2 100644
--- a/xfce-base/xfce4-settings/metadata.xml
+++ b/xfce-base/xfce4-settings/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <herd>xfce</herd>
   <use>
+    <flag name='libinput'>Enable libinput Xorg driver (<pkg>x11-drivers/xf86-input-libinput</pkg>) support</flag>
     <flag name='libcanberra'>Enable sound event support using <pkg>media-libs/libcanberra</pkg></flag>
     <flag name='xklavier'>Enable keyboard layout selection support using <pkg>x11-libs/libxklavier</pkg></flag>
   </use>
diff --git a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
index 1996fef..df44497 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
+# Copyright 1999-2015 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.3.ebuild,v 1.1 2014/09/16 10:52:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.12.0.ebuild,v 1.1 2015/03/08 15:06:38 mgorny Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.xfce.org/projects/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug libcanberra libnotify upower +xklavier"
+IUSE="debug libcanberra libinput libnotify upower +xklavier"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
 	>=dev-libs/glib-2.24
@@ -27,6 +27,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.100
 	>=xfce-base/libxfce4util-4.11
 	>=xfce-base/xfconf-4.10
 	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
+	libinput? ( x11-drivers/xf86-input-libinput )
 	libnotify? ( >=x11-libs/libnotify-0.7 )
 	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
 	xklavier? ( >=x11-libs/libxklavier-5 )"
@@ -40,6 +41,7 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	XFCONF=(
 		$(use_enable upower upower-glib)
+		$(use_enable libinput xorg-libinput)
 		$(use_enable libnotify)
 		$(use_enable xklavier libxklavier)
 		$(use_enable libcanberra sound-settings)
-- 
cgit v1.2.3-65-gdbad