| 1 |
commit: 98d55dd33853c512dc2109cf75642df27edc5ff0 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 1 12:01:29 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 1 12:01:29 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=98d55dd3 |
| 7 |
|
| 8 |
kde-plasma/plasma-desktop: Drop USE legacy-systray,gtk2,gtk3,qt4 |
| 9 |
|
| 10 |
Optional RDEPENDs are moving into kde-plasma/plasma-meta where they |
| 11 |
end up in a much less complicated REQUIRED_USE, re-using USE=gtk. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 14 |
|
| 15 |
kde-plasma/plasma-desktop/metadata.xml | 3 --- |
| 16 |
kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild | 10 +--------- |
| 17 |
kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 10 +--------- |
| 18 |
3 files changed, 2 insertions(+), 21 deletions(-) |
| 19 |
|
| 20 |
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml |
| 21 |
index 427be9b25a..65b6478522 100644 |
| 22 |
--- a/kde-plasma/plasma-desktop/metadata.xml |
| 23 |
+++ b/kde-plasma/plasma-desktop/metadata.xml |
| 24 |
@@ -7,10 +7,7 @@ |
| 25 |
</maintainer> |
| 26 |
<use> |
| 27 |
<flag name="appstream">Enable AppStream software metadata support</flag> |
| 28 |
- <flag name="gtk2">Add support for gtk+2-based applications using legacy xembed systray icons via libappindicator.</flag> |
| 29 |
- <flag name="gtk3">Add support for gtk+3-based applications using legacy xembed systray icons via libappindicator.</flag> |
| 30 |
<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag> |
| 31 |
- <flag name="legacy-systray">Add support for applications using legacy xembed systray icons.</flag> |
| 32 |
<flag name="mouse">Enable mouse KCM</flag> |
| 33 |
<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag> |
| 34 |
<flag name="touchpad">Enable touchpad KCM</flag> |
| 35 |
|
| 36 |
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 |
| 37 |
index b30ea480c3..a4dbc86a6a 100644 |
| 38 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild |
| 39 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild |
| 40 |
@@ -10,7 +10,7 @@ inherit kde5 |
| 41 |
|
| 42 |
DESCRIPTION="KDE Plasma desktop" |
| 43 |
KEYWORDS="" |
| 44 |
-IUSE="appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad" |
| 45 |
+IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad" |
| 46 |
|
| 47 |
COMMON_DEPEND=" |
| 48 |
$(add_frameworks_dep attica) |
| 49 |
@@ -113,13 +113,7 @@ RDEPEND="${COMMON_DEPEND} |
| 50 |
sys-apps/accountsservice |
| 51 |
sys-apps/util-linux |
| 52 |
x11-apps/setxkbmap |
| 53 |
- legacy-systray? ( |
| 54 |
- gtk2? ( dev-libs/libappindicator:2 ) |
| 55 |
- gtk3? ( dev-libs/libappindicator:3 ) |
| 56 |
- qt4? ( dev-libs/sni-qt ) |
| 57 |
- ) |
| 58 |
pulseaudio? ( $(add_plasma_dep plasma-pa ) ) |
| 59 |
- qt4? ( kde-plasma/qguiplatformplugin_kde:4 ) |
| 60 |
!kde-apps/kcontrol |
| 61 |
!<kde-apps/kde4-l10n-17.08.1-r1 |
| 62 |
!kde-apps/knetattach[handbook] |
| 63 |
@@ -130,8 +124,6 @@ RDEPEND="${COMMON_DEPEND} |
| 64 |
!kde-plasma/systemsettings:4 |
| 65 |
" |
| 66 |
|
| 67 |
-REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )" |
| 68 |
- |
| 69 |
src_configure() { |
| 70 |
local mycmakeargs=( |
| 71 |
$(cmake-utils_use_find_package appstream AppStreamQt) |
| 72 |
|
| 73 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
| 74 |
index b30ea480c3..a4dbc86a6a 100644 |
| 75 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
| 76 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
| 77 |
@@ -10,7 +10,7 @@ inherit kde5 |
| 78 |
|
| 79 |
DESCRIPTION="KDE Plasma desktop" |
| 80 |
KEYWORDS="" |
| 81 |
-IUSE="appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad" |
| 82 |
+IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad" |
| 83 |
|
| 84 |
COMMON_DEPEND=" |
| 85 |
$(add_frameworks_dep attica) |
| 86 |
@@ -113,13 +113,7 @@ RDEPEND="${COMMON_DEPEND} |
| 87 |
sys-apps/accountsservice |
| 88 |
sys-apps/util-linux |
| 89 |
x11-apps/setxkbmap |
| 90 |
- legacy-systray? ( |
| 91 |
- gtk2? ( dev-libs/libappindicator:2 ) |
| 92 |
- gtk3? ( dev-libs/libappindicator:3 ) |
| 93 |
- qt4? ( dev-libs/sni-qt ) |
| 94 |
- ) |
| 95 |
pulseaudio? ( $(add_plasma_dep plasma-pa ) ) |
| 96 |
- qt4? ( kde-plasma/qguiplatformplugin_kde:4 ) |
| 97 |
!kde-apps/kcontrol |
| 98 |
!<kde-apps/kde4-l10n-17.08.1-r1 |
| 99 |
!kde-apps/knetattach[handbook] |
| 100 |
@@ -130,8 +124,6 @@ RDEPEND="${COMMON_DEPEND} |
| 101 |
!kde-plasma/systemsettings:4 |
| 102 |
" |
| 103 |
|
| 104 |
-REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )" |
| 105 |
- |
| 106 |
src_configure() { |
| 107 |
local mycmakeargs=( |
| 108 |
$(cmake-utils_use_find_package appstream AppStreamQt) |
Archives