commit: 04e292a9ce1b1a59ffc1fb8288f8521d2de15d11 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Wed Apr 15 18:50:35 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Wed Apr 15 18:50:35 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=04e292a9
[kde-plasma/plasma-desktop] Add new dependencies and introduce touchpad USE flag. Upstream commit: e32784940c5f4f5161452b25804fd1b24c10f1ce Upstream commit: a6115e8f60c5f29f5c419a34f17755143972e113 Upstream commit: 1d4d84338942840c92a0fe11aa5c2ac059f63a28 Upstream commit: 4f39066b46e2babf2f0979531534dacc1773ff27 Upstream commit: 19854671e1777bcbe67669315c5f3589c3321ebf Upstream commit: cc309752f42806eca73e212fd89f3b8a580277d8 Package-Manager: portage-2.2.18 kde-plasma/plasma-desktop/metadata.xml | 3 +++ kde-plasma/plasma-desktop/plasma-desktop-5.2.95.ebuild | 11 +++++++++-- kde-plasma/plasma-desktop/plasma-desktop-5.3.49.9999.ebuild | 11 +++++++++-- kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 11 +++++++++-- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml index a23f444..58d89f8 100644 --- a/kde-plasma/plasma-desktop/metadata.xml +++ b/kde-plasma/plasma-desktop/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <herd>kde</herd> + <use> + <flag name="touchpad">Enable configuration module for synaptics-based touchpads.</flag> + </use> </pkgmetadata> diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.2.95.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.2.95.ebuild index 3ff9d89..140f32d 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.2.95.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.2.95.ebuild @@ -10,9 +10,10 @@ inherit kde5 DESCRIPTION="KDE Plasma desktop" KEYWORDS=" ~amd64" -IUSE="bluetooth +fontconfig networkmanager pulseaudio usb" +IUSE="bluetooth +fontconfig networkmanager pulseaudio touchpad usb" COMMON_DEPEND=" + $(add_plasma_dep baloo) $(add_plasma_dep breeze) $(add_plasma_dep kwin) $(add_plasma_dep oxygen) @@ -29,6 +30,8 @@ COMMON_DEPEND=" $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep kded) $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep kemoticons) $(add_frameworks_dep kglobalaccel) @@ -42,6 +45,7 @@ COMMON_DEPEND=" $(add_frameworks_dep knotifications) $(add_frameworks_dep knotifyconfig) $(add_frameworks_dep kparts) + $(add_frameworks_dep kpeople) $(add_frameworks_dep krunner) $(add_frameworks_dep kservice) $(add_frameworks_dep kwallet) @@ -57,6 +61,7 @@ COMMON_DEPEND=" dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 @@ -82,6 +87,7 @@ COMMON_DEPEND=" media-libs/libcanberra media-sound/pulseaudio ) + touchpad? ( x11-drivers/xf86-input-synaptics ) usb? ( x11-libs/libXcursor x11-libs/libXfixes @@ -89,7 +95,6 @@ COMMON_DEPEND=" ) " RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kded) $(add_plasma_dep kde-cli-tools) $(add_plasma_dep kio-extras) dev-qt/qtgraphicaleffects:5 @@ -109,6 +114,7 @@ RDEPEND="${COMMON_DEPEND} !kde-plasma/kcm-touchpad " DEPEND="${COMMON_DEPEND} + dev-libs/boost x11-proto/xproto fontconfig? ( x11-libs/libXrender ) " @@ -118,6 +124,7 @@ src_configure() { $(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) ) kde5_src_configure diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.3.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.3.49.9999.ebuild index c784f98..295260b 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.3.49.9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.3.49.9999.ebuild @@ -10,9 +10,10 @@ inherit kde5 DESCRIPTION="KDE Plasma desktop" KEYWORDS="" -IUSE="bluetooth +fontconfig networkmanager pulseaudio usb" +IUSE="bluetooth +fontconfig networkmanager pulseaudio touchpad usb" COMMON_DEPEND=" + $(add_plasma_dep baloo) $(add_plasma_dep breeze) $(add_plasma_dep kwin) $(add_plasma_dep oxygen) @@ -29,6 +30,8 @@ COMMON_DEPEND=" $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep kded) $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep kemoticons) $(add_frameworks_dep kglobalaccel) @@ -42,6 +45,7 @@ COMMON_DEPEND=" $(add_frameworks_dep knotifications) $(add_frameworks_dep knotifyconfig) $(add_frameworks_dep kparts) + $(add_frameworks_dep kpeople) $(add_frameworks_dep krunner) $(add_frameworks_dep kservice) $(add_frameworks_dep kwallet) @@ -57,6 +61,7 @@ COMMON_DEPEND=" dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 @@ -82,6 +87,7 @@ COMMON_DEPEND=" media-libs/libcanberra media-sound/pulseaudio ) + touchpad? ( x11-drivers/xf86-input-synaptics ) usb? ( x11-libs/libXcursor x11-libs/libXfixes @@ -89,7 +95,6 @@ COMMON_DEPEND=" ) " RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kded) $(add_plasma_dep kde-cli-tools) $(add_plasma_dep kio-extras) dev-qt/qtgraphicaleffects:5 @@ -109,6 +114,7 @@ RDEPEND="${COMMON_DEPEND} !kde-plasma/kcm-touchpad " DEPEND="${COMMON_DEPEND} + dev-libs/boost x11-proto/xproto fontconfig? ( x11-libs/libXrender ) " @@ -118,6 +124,7 @@ src_configure() { $(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) ) kde5_src_configure diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index c784f98..295260b 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -10,9 +10,10 @@ inherit kde5 DESCRIPTION="KDE Plasma desktop" KEYWORDS="" -IUSE="bluetooth +fontconfig networkmanager pulseaudio usb" +IUSE="bluetooth +fontconfig networkmanager pulseaudio touchpad usb" COMMON_DEPEND=" + $(add_plasma_dep baloo) $(add_plasma_dep breeze) $(add_plasma_dep kwin) $(add_plasma_dep oxygen) @@ -29,6 +30,8 @@ COMMON_DEPEND=" $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep kded) $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep kemoticons) $(add_frameworks_dep kglobalaccel) @@ -42,6 +45,7 @@ COMMON_DEPEND=" $(add_frameworks_dep knotifications) $(add_frameworks_dep knotifyconfig) $(add_frameworks_dep kparts) + $(add_frameworks_dep kpeople) $(add_frameworks_dep krunner) $(add_frameworks_dep kservice) $(add_frameworks_dep kwallet) @@ -57,6 +61,7 @@ COMMON_DEPEND=" dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 @@ -82,6 +87,7 @@ COMMON_DEPEND=" media-libs/libcanberra media-sound/pulseaudio ) + touchpad? ( x11-drivers/xf86-input-synaptics ) usb? ( x11-libs/libXcursor x11-libs/libXfixes @@ -89,7 +95,6 @@ COMMON_DEPEND=" ) " RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kded) $(add_plasma_dep kde-cli-tools) $(add_plasma_dep kio-extras) dev-qt/qtgraphicaleffects:5 @@ -109,6 +114,7 @@ RDEPEND="${COMMON_DEPEND} !kde-plasma/kcm-touchpad " DEPEND="${COMMON_DEPEND} + dev-libs/boost x11-proto/xproto fontconfig? ( x11-libs/libXrender ) " @@ -118,6 +124,7 @@ src_configure() { $(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) ) kde5_src_configure
