From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-975782-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id DAF591396D0
	for <garchives@archives.gentoo.org>; Sat, 30 Sep 2017 05:38:40 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 43CCDE0824;
	Sat, 30 Sep 2017 05:38:40 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 0E056E0824
	for <gentoo-commits@lists.gentoo.org>; Sat, 30 Sep 2017 05:38:40 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 8101C3417D7
	for <gentoo-commits@lists.gentoo.org>; Sat, 30 Sep 2017 05:38:38 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 46F2B746E
	for <gentoo-commits@lists.gentoo.org>; Sat, 30 Sep 2017 05:38:37 +0000 (UTC)
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org>
Message-ID: <1506749909.dc0f837bde48f0a6fe4d4e0de1a1c05aa89711e9.kensington@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-plasma/plasma-desktop/metadata.xml kde-plasma/plasma-desktop/plasma-desktop-5.10.95.ebuild kde-plasma/plasma-desktop/plasma-desktop-5.11.49.9999.ebuild kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
X-VCS-Directories: kde-plasma/plasma-desktop/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: dc0f837bde48f0a6fe4d4e0de1a1c05aa89711e9
X-VCS-Branch: master
Date: Sat, 30 Sep 2017 05:38:37 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: adbc9e3f-fceb-4d97-bd8a-27d1cd84edfc
X-Archives-Hash: 62fe0611d1924ec1e6b4aba65262ef16

commit:     dc0f837bde48f0a6fe4d4e0de1a1c05aa89711e9
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 05:33:12 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 05:38:29 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dc0f837b

kde-plasma/plasma-desktop: introduce touchpad and mouse USE flags to replace INPUT_DEVICES="..."

Since INPUT_DEVICES is being switched to libinput by default, we were running
into issues with people missing the mouse and touchpad KCMs.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 kde-plasma/plasma-desktop/metadata.xml                       |  2 ++
 kde-plasma/plasma-desktop/plasma-desktop-5.10.95.ebuild      | 11 +++++------
 kde-plasma/plasma-desktop/plasma-desktop-5.11.49.9999.ebuild | 11 +++++------
 kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild         | 11 +++++------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index 69e075f507..427be9b25a 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -11,6 +11,8 @@
 		<flag name="gtk3">Add support for gtk+3-based applications using legacy xembed systray icons via libappindicator.</flag>
 		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
 		<flag name="legacy-systray">Add support for applications using legacy xembed systray icons.</flag>
+		<flag name="mouse">Enable mouse KCM</flag>
 		<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
+		<flag name="touchpad">Enable touchpad KCM</flag>
 	</use>
 </pkgmetadata>

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.10.95.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.10.95.ebuild
index 026fe01841..6ece0c5e40 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.10.95.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.10.95.ebuild
@@ -10,8 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="appstream +fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics
-ibus legacy-systray pulseaudio +qt4 scim +semantic-desktop"
+IUSE="appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep attica)
@@ -87,7 +86,6 @@ COMMON_DEPEND="
 		x11-libs/libxcb
 		x11-libs/xcb-util-keysyms
 	)
-	input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
 	pulseaudio? (
 		dev-libs/glib:2
 		media-libs/libcanberra
@@ -95,12 +93,13 @@ COMMON_DEPEND="
 	)
 	scim? ( app-i18n/scim )
 	semantic-desktop? ( $(add_frameworks_dep baloo) )
+	touchpad? ( x11-drivers/xf86-input-synaptics )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 	x11-proto/xproto
 	fontconfig? ( x11-libs/libXrender )
-	input_devices_evdev? ( x11-drivers/xf86-input-evdev )
+	mouse? ( x11-drivers/xf86-input-evdev )
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep breeze)
@@ -141,11 +140,11 @@ src_configure() {
 		$(cmake-utils_use_find_package appstream AppStreamQt)
 		$(cmake-utils_use_find_package fontconfig Fontconfig)
 		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package input_devices_evdev Evdev)
-		$(cmake-utils_use_find_package input_devices_synaptics Synaptics)
+		$(cmake-utils_use_find_package mouse Evdev)
 		$(cmake-utils_use_find_package pulseaudio PulseAudio)
 		$(cmake-utils_use_find_package scim SCIM)
 		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package touchpad Synaptics)
 	)
 
 	kde5_src_configure

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.11.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.11.49.9999.ebuild
index 2e358f0300..86d83e5fd7 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.11.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.11.49.9999.ebuild
@@ -10,8 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS=""
-IUSE="appstream +fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics
-ibus legacy-systray pulseaudio +qt4 scim +semantic-desktop"
+IUSE="appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep attica)
@@ -87,7 +86,6 @@ COMMON_DEPEND="
 		x11-libs/libxcb
 		x11-libs/xcb-util-keysyms
 	)
-	input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
 	pulseaudio? (
 		dev-libs/glib:2
 		media-libs/libcanberra
@@ -95,12 +93,13 @@ COMMON_DEPEND="
 	)
 	scim? ( app-i18n/scim )
 	semantic-desktop? ( $(add_frameworks_dep baloo) )
+	touchpad? ( x11-drivers/xf86-input-synaptics )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 	x11-proto/xproto
 	fontconfig? ( x11-libs/libXrender )
-	input_devices_evdev? ( x11-drivers/xf86-input-evdev )
+	mouse? ( x11-drivers/xf86-input-evdev )
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep breeze)
@@ -141,11 +140,11 @@ src_configure() {
 		$(cmake-utils_use_find_package appstream AppStreamQt)
 		$(cmake-utils_use_find_package fontconfig Fontconfig)
 		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package input_devices_evdev Evdev)
-		$(cmake-utils_use_find_package input_devices_synaptics Synaptics)
+		$(cmake-utils_use_find_package mouse Evdev)
 		$(cmake-utils_use_find_package pulseaudio PulseAudio)
 		$(cmake-utils_use_find_package scim SCIM)
 		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package touchpad Synaptics)
 	)
 
 	kde5_src_configure

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 2e358f0300..86d83e5fd7 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -10,8 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS=""
-IUSE="appstream +fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics
-ibus legacy-systray pulseaudio +qt4 scim +semantic-desktop"
+IUSE="appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep attica)
@@ -87,7 +86,6 @@ COMMON_DEPEND="
 		x11-libs/libxcb
 		x11-libs/xcb-util-keysyms
 	)
-	input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
 	pulseaudio? (
 		dev-libs/glib:2
 		media-libs/libcanberra
@@ -95,12 +93,13 @@ COMMON_DEPEND="
 	)
 	scim? ( app-i18n/scim )
 	semantic-desktop? ( $(add_frameworks_dep baloo) )
+	touchpad? ( x11-drivers/xf86-input-synaptics )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 	x11-proto/xproto
 	fontconfig? ( x11-libs/libXrender )
-	input_devices_evdev? ( x11-drivers/xf86-input-evdev )
+	mouse? ( x11-drivers/xf86-input-evdev )
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep breeze)
@@ -141,11 +140,11 @@ src_configure() {
 		$(cmake-utils_use_find_package appstream AppStreamQt)
 		$(cmake-utils_use_find_package fontconfig Fontconfig)
 		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package input_devices_evdev Evdev)
-		$(cmake-utils_use_find_package input_devices_synaptics Synaptics)
+		$(cmake-utils_use_find_package mouse Evdev)
 		$(cmake-utils_use_find_package pulseaudio PulseAudio)
 		$(cmake-utils_use_find_package scim SCIM)
 		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package touchpad Synaptics)
 	)
 
 	kde5_src_configure