commit: 98d55dd33853c512dc2109cf75642df27edc5ff0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 1 12:01:29 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 1 12:01:29 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=98d55dd3
kde-plasma/plasma-desktop: Drop USE legacy-systray,gtk2,gtk3,qt4
Optional RDEPENDs are moving into kde-plasma/plasma-meta where they
end up in a much less complicated REQUIRED_USE, re-using USE=gtk.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
kde-plasma/plasma-desktop/metadata.xml | 3 ---
kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild | 10 +---------
kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 10 +---------
3 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/kde-plasma/plasma-desktop/metadata.xml
b/kde-plasma/plasma-desktop/metadata.xml
index 427be9b25a..65b6478522 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -7,10 +7,7 @@
</maintainer>
<use>
<flag name="appstream">Enable AppStream software metadata
support</flag>
- <flag name="gtk2">Add support for gtk+2-based applications
using legacy xembed systray icons via libappindicator.</flag>
- <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>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild
b/kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild
index b30ea480c3..a4dbc86a6a 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="KDE Plasma desktop"
KEYWORDS=""
-IUSE="appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio
+qt4 scim +semantic-desktop touchpad"
+IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop
touchpad"
COMMON_DEPEND="
$(add_frameworks_dep attica)
@@ -113,13 +113,7 @@ RDEPEND="${COMMON_DEPEND}
sys-apps/accountsservice
sys-apps/util-linux
x11-apps/setxkbmap
- legacy-systray? (
- gtk2? ( dev-libs/libappindicator:2 )
- gtk3? ( dev-libs/libappindicator:3 )
- qt4? ( dev-libs/sni-qt )
- )
pulseaudio? ( $(add_plasma_dep plasma-pa ) )
- qt4? ( kde-plasma/qguiplatformplugin_kde:4 )
!kde-apps/kcontrol
!<kde-apps/kde4-l10n-17.08.1-r1
!kde-apps/knetattach[handbook]
@@ -130,8 +124,6 @@ RDEPEND="${COMMON_DEPEND}
!kde-plasma/systemsettings:4
"
-REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray
) gtk3? ( legacy-systray )"
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package appstream AppStreamQt)
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index b30ea480c3..a4dbc86a6a 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="appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio
+qt4 scim +semantic-desktop touchpad"
+IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop
touchpad"
COMMON_DEPEND="
$(add_frameworks_dep attica)
@@ -113,13 +113,7 @@ RDEPEND="${COMMON_DEPEND}
sys-apps/accountsservice
sys-apps/util-linux
x11-apps/setxkbmap
- legacy-systray? (
- gtk2? ( dev-libs/libappindicator:2 )
- gtk3? ( dev-libs/libappindicator:3 )
- qt4? ( dev-libs/sni-qt )
- )
pulseaudio? ( $(add_plasma_dep plasma-pa ) )
- qt4? ( kde-plasma/qguiplatformplugin_kde:4 )
!kde-apps/kcontrol
!<kde-apps/kde4-l10n-17.08.1-r1
!kde-apps/knetattach[handbook]
@@ -130,8 +124,6 @@ RDEPEND="${COMMON_DEPEND}
!kde-plasma/systemsettings:4
"
-REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray
) gtk3? ( legacy-systray )"
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package appstream AppStreamQt)
