From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0DEAC138D0E for ; Fri, 10 Jul 2015 18:54:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 729A3141F8; Fri, 10 Jul 2015 18:51:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E35C7141F8 for ; Fri, 10 Jul 2015 18:51:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEE90340845 for ; Fri, 10 Jul 2015 18:51:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD4AD742 for ; Fri, 10 Jul 2015 18:51:43 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1436554377.c73f20a3a34b6e799e672486a17fe9f4e05ff979.johu@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-9999.ebuild X-VCS-Directories: kde-plasma/plasma-desktop/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: c73f20a3a34b6e799e672486a17fe9f4e05ff979 X-VCS-Branch: master Date: Fri, 10 Jul 2015 18:51:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 014422f4-8a96-45b1-aa6a-80e5adeb4955 X-Archives-Hash: 5b8847713132cb45c83d731fb0b8da1d commit: c73f20a3a34b6e799e672486a17fe9f4e05ff979 Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Jul 7 19:29:19 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Fri Jul 10 18:52:57 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c73f20a3 [kde-plasma/plasma-desktop] USE=usb -> evdev Keeps kcm_input optional through USE=evdev (and re-adjusts DEPENDs) Package-Manager: portage-2.2.20 kde-plasma/plasma-desktop/metadata.xml | 1 + kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 12 ++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml index c047284..fc5d9f1 100644 --- a/kde-plasma/plasma-desktop/metadata.xml +++ b/kde-plasma/plasma-desktop/metadata.xml @@ -3,6 +3,7 @@ kde + Enable configuration module for desktop input devices. Add support for gtk+2-based applications using legacy xembed systray icons via libappindicator. Add support for gtk+3-based applications using legacy xembed systray icons via libappindicator. Add support for applications using legacy xembed systray icons. diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index df144d2..c33c819 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -10,7 +10,7 @@ inherit kde5 DESCRIPTION="KDE Plasma desktop" KEYWORDS="" -IUSE="+fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad usb" +IUSE="+evdev +fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad" COMMON_DEPEND=" $(add_plasma_dep baloo) @@ -66,10 +66,10 @@ COMMON_DEPEND=" dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 - x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi + x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig @@ -83,11 +83,6 @@ COMMON_DEPEND=" media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) - usb? ( - x11-libs/libXcursor - x11-libs/libXfixes - virtual/libusb:0 - ) " RDEPEND="${COMMON_DEPEND} $(add_plasma_dep breeze) @@ -117,6 +112,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} dev-libs/boost x11-proto/xproto + evdev? ( x11-drivers/xf86-input-evdev ) fontconfig? ( x11-libs/libXrender ) " @@ -132,9 +128,9 @@ pkg_setup() { src_configure() { local mycmakeargs=( + $(cmake-utils_use_find_package evdev) $(cmake-utils_use_find_package fontconfig Fontconfig) $(cmake-utils_use_find_package pulseaudio PulseAudio) - $(cmake-utils_use_find_package usb USB) $(cmake-utils_use_find_package touchpad Synaptics) )