| 1 |
commit: 18ba7a52aa42a36d3acb79aa41cc16ba275d29ff |
| 2 |
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 29 19:37:23 2015 +0000 |
| 4 |
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 29 19:37:23 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=18ba7a52 |
| 7 |
|
| 8 |
[kde-plasma/plasma-desktop] Add optional support for legacy systray icons. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20 |
| 11 |
|
| 12 |
kde-plasma/plasma-desktop/metadata.xml | 3 +++ |
| 13 |
kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild | 17 ++++++++++++++++- |
| 14 |
.../plasma-desktop/plasma-desktop-5.3.49.9999.ebuild | 17 ++++++++++++++++- |
| 15 |
kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 17 ++++++++++++++++- |
| 16 |
4 files changed, 51 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml |
| 19 |
index 58d89f8..c047284 100644 |
| 20 |
--- a/kde-plasma/plasma-desktop/metadata.xml |
| 21 |
+++ b/kde-plasma/plasma-desktop/metadata.xml |
| 22 |
@@ -3,6 +3,9 @@ |
| 23 |
<pkgmetadata> |
| 24 |
<herd>kde</herd> |
| 25 |
<use> |
| 26 |
+ <flag name="gtk2">Add support for gtk+2-based applications using legacy xembed systray icons via libappindicator.</flag> |
| 27 |
+ <flag name="gtk3">Add support for gtk+3-based applications using legacy xembed systray icons via libappindicator.</flag> |
| 28 |
+ <flag name="legacy-systray">Add support for applications using legacy xembed systray icons.</flag> |
| 29 |
<flag name="touchpad">Enable configuration module for synaptics-based touchpads.</flag> |
| 30 |
</use> |
| 31 |
</pkgmetadata> |
| 32 |
|
| 33 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild |
| 34 |
index 1a4213a..ffb95c9 100644 |
| 35 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild |
| 36 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild |
| 37 |
@@ -10,7 +10,7 @@ inherit kde5 |
| 38 |
|
| 39 |
DESCRIPTION="KDE Plasma desktop" |
| 40 |
KEYWORDS="~amd64" |
| 41 |
-IUSE="+fontconfig pulseaudio +qt4 touchpad usb" |
| 42 |
+IUSE="+fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad usb" |
| 43 |
|
| 44 |
COMMON_DEPEND=" |
| 45 |
$(add_plasma_dep baloo) |
| 46 |
@@ -96,6 +96,11 @@ RDEPEND="${COMMON_DEPEND} |
| 47 |
$(add_plasma_dep oxygen) |
| 48 |
sys-apps/accountsservice |
| 49 |
x11-apps/setxkbmap |
| 50 |
+ legacy-systray? ( |
| 51 |
+ gtk2? ( dev-libs/libappindicator:2 ) |
| 52 |
+ gtk3? ( dev-libs/libappindicator:3 ) |
| 53 |
+ qt4? ( dev-libs/sni-qt ) |
| 54 |
+ ) |
| 55 |
qt4? ( kde-base/qguiplatformplugin_kde ) |
| 56 |
!kde-apps/kcontrol |
| 57 |
!kde-base/attica |
| 58 |
@@ -116,6 +121,16 @@ DEPEND="${COMMON_DEPEND} |
| 59 |
fontconfig? ( x11-libs/libXrender ) |
| 60 |
" |
| 61 |
|
| 62 |
+REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )" |
| 63 |
+ |
| 64 |
+pkg_setup() { |
| 65 |
+ if has_version net-im/skype && use legacy-systray && use amd64; then |
| 66 |
+ einfo |
| 67 |
+ elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary." |
| 68 |
+ einfo |
| 69 |
+ fi |
| 70 |
+} |
| 71 |
+ |
| 72 |
src_configure() { |
| 73 |
local mycmakeargs=( |
| 74 |
$(cmake-utils_use_find_package fontconfig Fontconfig) |
| 75 |
|
| 76 |
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 |
| 77 |
index 2d06f38..1ae0def 100644 |
| 78 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.3.49.9999.ebuild |
| 79 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.3.49.9999.ebuild |
| 80 |
@@ -10,7 +10,7 @@ inherit kde5 |
| 81 |
|
| 82 |
DESCRIPTION="KDE Plasma desktop" |
| 83 |
KEYWORDS="" |
| 84 |
-IUSE="+fontconfig pulseaudio +qt4 touchpad usb" |
| 85 |
+IUSE="+fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad usb" |
| 86 |
|
| 87 |
COMMON_DEPEND=" |
| 88 |
$(add_plasma_dep baloo) |
| 89 |
@@ -96,6 +96,11 @@ RDEPEND="${COMMON_DEPEND} |
| 90 |
$(add_plasma_dep oxygen) |
| 91 |
sys-apps/accountsservice |
| 92 |
x11-apps/setxkbmap |
| 93 |
+ legacy-systray? ( |
| 94 |
+ gtk2? ( dev-libs/libappindicator:2 ) |
| 95 |
+ gtk3? ( dev-libs/libappindicator:3 ) |
| 96 |
+ qt4? ( dev-libs/sni-qt ) |
| 97 |
+ ) |
| 98 |
qt4? ( kde-base/qguiplatformplugin_kde ) |
| 99 |
!kde-apps/kcontrol |
| 100 |
!kde-base/attica |
| 101 |
@@ -116,6 +121,16 @@ DEPEND="${COMMON_DEPEND} |
| 102 |
fontconfig? ( x11-libs/libXrender ) |
| 103 |
" |
| 104 |
|
| 105 |
+REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )" |
| 106 |
+ |
| 107 |
+pkg_setup() { |
| 108 |
+ if has_version net-im/skype && use legacy-systray && use amd64; then |
| 109 |
+ einfo |
| 110 |
+ elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary." |
| 111 |
+ einfo |
| 112 |
+ fi |
| 113 |
+} |
| 114 |
+ |
| 115 |
src_configure() { |
| 116 |
local mycmakeargs=( |
| 117 |
$(cmake-utils_use_find_package fontconfig Fontconfig) |
| 118 |
|
| 119 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
| 120 |
index 2d06f38..1ae0def 100644 |
| 121 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
| 122 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
| 123 |
@@ -10,7 +10,7 @@ inherit kde5 |
| 124 |
|
| 125 |
DESCRIPTION="KDE Plasma desktop" |
| 126 |
KEYWORDS="" |
| 127 |
-IUSE="+fontconfig pulseaudio +qt4 touchpad usb" |
| 128 |
+IUSE="+fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad usb" |
| 129 |
|
| 130 |
COMMON_DEPEND=" |
| 131 |
$(add_plasma_dep baloo) |
| 132 |
@@ -96,6 +96,11 @@ RDEPEND="${COMMON_DEPEND} |
| 133 |
$(add_plasma_dep oxygen) |
| 134 |
sys-apps/accountsservice |
| 135 |
x11-apps/setxkbmap |
| 136 |
+ legacy-systray? ( |
| 137 |
+ gtk2? ( dev-libs/libappindicator:2 ) |
| 138 |
+ gtk3? ( dev-libs/libappindicator:3 ) |
| 139 |
+ qt4? ( dev-libs/sni-qt ) |
| 140 |
+ ) |
| 141 |
qt4? ( kde-base/qguiplatformplugin_kde ) |
| 142 |
!kde-apps/kcontrol |
| 143 |
!kde-base/attica |
| 144 |
@@ -116,6 +121,16 @@ DEPEND="${COMMON_DEPEND} |
| 145 |
fontconfig? ( x11-libs/libXrender ) |
| 146 |
" |
| 147 |
|
| 148 |
+REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )" |
| 149 |
+ |
| 150 |
+pkg_setup() { |
| 151 |
+ if has_version net-im/skype && use legacy-systray && use amd64; then |
| 152 |
+ einfo |
| 153 |
+ elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary." |
| 154 |
+ einfo |
| 155 |
+ fi |
| 156 |
+} |
| 157 |
+ |
| 158 |
src_configure() { |
| 159 |
local mycmakeargs=( |
| 160 |
$(cmake-utils_use_find_package fontconfig Fontconfig) |
Archives