commit:     18ba7a52aa42a36d3acb79aa41cc16ba275d29ff
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 19:37:23 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 19:37:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=18ba7a52

[kde-plasma/plasma-desktop] Add optional support for legacy systray icons.

Package-Manager: portage-2.2.20

 kde-plasma/plasma-desktop/metadata.xml                  |  3 +++
 kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild   | 17 ++++++++++++++++-
 .../plasma-desktop/plasma-desktop-5.3.49.9999.ebuild    | 17 ++++++++++++++++-
 kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild    | 17 ++++++++++++++++-
 4 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/kde-plasma/plasma-desktop/metadata.xml 
b/kde-plasma/plasma-desktop/metadata.xml
index 58d89f8..c047284 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -3,6 +3,9 @@
 <pkgmetadata>
        <herd>kde</herd>
        <use>
+               <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="legacy-systray">Add support for applications using 
legacy xembed systray icons.</flag>
                <flag name="touchpad">Enable configuration module for 
synaptics-based touchpads.</flag>
        </use>
 </pkgmetadata>

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild
index 1a4213a..ffb95c9 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS="~amd64"
-IUSE="+fontconfig pulseaudio +qt4 touchpad usb"
+IUSE="+fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad usb"
 
 COMMON_DEPEND="
        $(add_plasma_dep baloo)
@@ -96,6 +96,11 @@ RDEPEND="${COMMON_DEPEND}
        $(add_plasma_dep oxygen)
        sys-apps/accountsservice
        x11-apps/setxkbmap
+       legacy-systray? (
+               gtk2? ( dev-libs/libappindicator:2 )
+               gtk3? ( dev-libs/libappindicator:3 )
+               qt4? ( dev-libs/sni-qt )
+       )
        qt4? ( kde-base/qguiplatformplugin_kde )
        !kde-apps/kcontrol
        !kde-base/attica
@@ -116,6 +121,16 @@ DEPEND="${COMMON_DEPEND}
        fontconfig? ( x11-libs/libXrender )
 "
 
+REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray 
) gtk3? ( legacy-systray )"
+
+pkg_setup() {
+       if has_version net-im/skype && use legacy-systray && use amd64; then
+               einfo
+               elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype 
is a 32-bit binary."
+               einfo
+       fi
+}
+
 src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_find_package fontconfig Fontconfig)

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 2d06f38..1ae0def 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,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS=""
-IUSE="+fontconfig pulseaudio +qt4 touchpad usb"
+IUSE="+fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad usb"
 
 COMMON_DEPEND="
        $(add_plasma_dep baloo)
@@ -96,6 +96,11 @@ RDEPEND="${COMMON_DEPEND}
        $(add_plasma_dep oxygen)
        sys-apps/accountsservice
        x11-apps/setxkbmap
+       legacy-systray? (
+               gtk2? ( dev-libs/libappindicator:2 )
+               gtk3? ( dev-libs/libappindicator:3 )
+               qt4? ( dev-libs/sni-qt )
+       )
        qt4? ( kde-base/qguiplatformplugin_kde )
        !kde-apps/kcontrol
        !kde-base/attica
@@ -116,6 +121,16 @@ DEPEND="${COMMON_DEPEND}
        fontconfig? ( x11-libs/libXrender )
 "
 
+REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray 
) gtk3? ( legacy-systray )"
+
+pkg_setup() {
+       if has_version net-im/skype && use legacy-systray && use amd64; then
+               einfo
+               elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype 
is a 32-bit binary."
+               einfo
+       fi
+}
+
 src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_find_package fontconfig Fontconfig)

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 2d06f38..1ae0def 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 pulseaudio +qt4 touchpad usb"
+IUSE="+fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad usb"
 
 COMMON_DEPEND="
        $(add_plasma_dep baloo)
@@ -96,6 +96,11 @@ RDEPEND="${COMMON_DEPEND}
        $(add_plasma_dep oxygen)
        sys-apps/accountsservice
        x11-apps/setxkbmap
+       legacy-systray? (
+               gtk2? ( dev-libs/libappindicator:2 )
+               gtk3? ( dev-libs/libappindicator:3 )
+               qt4? ( dev-libs/sni-qt )
+       )
        qt4? ( kde-base/qguiplatformplugin_kde )
        !kde-apps/kcontrol
        !kde-base/attica
@@ -116,6 +121,16 @@ DEPEND="${COMMON_DEPEND}
        fontconfig? ( x11-libs/libXrender )
 "
 
+REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray 
) gtk3? ( legacy-systray )"
+
+pkg_setup() {
+       if has_version net-im/skype && use legacy-systray && use amd64; then
+               einfo
+               elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype 
is a 32-bit binary."
+               einfo
+       fi
+}
+
 src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_find_package fontconfig Fontconfig)

Reply via email to