From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 12F32138D02 for ; Mon, 29 Jun 2015 19:38:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6EB7E09AD; Mon, 29 Jun 2015 19:37:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3EC40E09AD for ; Mon, 29 Jun 2015 19:37:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BD1DF340961 for ; Mon, 29 Jun 2015 19:37:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DD70733 for ; Mon, 29 Jun 2015 19:37:54 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1435606643.18ba7a52aa42a36d3acb79aa41cc16ba275d29ff.mrueg@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-desktop/metadata.xml kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild kde-plasma/plasma-desktop/plasma-desktop-5.3.49.9999.ebuild kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild X-VCS-Directories: kde-plasma/plasma-desktop/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: 18ba7a52aa42a36d3acb79aa41cc16ba275d29ff X-VCS-Branch: master Date: Mon, 29 Jun 2015 19:37:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cb39a894-c3fb-4110-9fa3-de3a743576f8 X-Archives-Hash: df52d7ac3b71dc3a6cd0f8f536452328 commit: 18ba7a52aa42a36d3acb79aa41cc16ba275d29ff Author: Manuel Rüger gentoo org> AuthorDate: Mon Jun 29 19:37:23 2015 +0000 Commit: Manuel Rüger gentoo 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 @@ kde + Add support for gtk+2-based applications using legacy xembed systray icons via libappindicator. + Add support for gtk+3-based applications using legacy xembed systray icons via libappindicator. + Add support for applications using legacy xembed systray icons. Enable configuration module for synaptics-based touchpads. 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)