[gentoo-commits] proj/kde-sunset:master commit in: kde-plasma/kdeplasma-addons/

[gentoo-commits] proj/kde-sunset:master commit in: kde-plasma/kdeplasma-addons/

[Andreas Sturmlechner]

commit:     fa17cd1a653ea9fd552f19bb248fb568bf063d55
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 15:15:20 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 19:05:30 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=fa17cd1a

kde-plasma/kdeplasma-addons: Depend on app-crypt/qca:2-qt4

- Drop IUSE=fcitx (no ~arm keyword and no-op flag)
- Drop IUSE=oauth (no ~arm keyword on app-i18n/fcitx)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild      | 13 +++++--------
 kde-plasma/kdeplasma-addons/metadata.xml                    |  4 +---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
index 4832f268..77490142 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,25 +9,22 @@ inherit flag-o-matic kde4-base
 DESCRIPTION="Extra Plasma applets and engines"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="attica debug desktopglobe eigen exif fcitx ibus json oauth +pim
-qalculate qwt scim"
+IUSE="attica debug desktopglobe eigen exif ibus json +pim qalculate qwt scim"
 
 RESTRICT=test
 # tests hang
 
 # krunner is only needed to generate dbus interface for lancelot
 COMMON_DEPEND="
-	app-crypt/qca:2[qt4(+)]
+	app-crypt/qca:2-qt4
 	kde-plasma/krunner:4
 	kde-plasma/plasma-workspace:4
 	x11-misc/shared-mime-info
 	attica? ( dev-libs/libattica )
 	desktopglobe? ( $(add_kdeapps_dep marble) )
 	exif? ( $(add_kdeapps_dep libkexiv2) )
-	fcitx? ( app-i18n/fcitx[dbus(+)] )
 	ibus? ( app-i18n/ibus )
 	json? ( dev-libs/qjson )
-	oauth? ( dev-libs/qoauth:0 )
 	pim? ( $(add_kdeapps_dep kdepimlibs) )
 	qalculate? ( sci-libs/libqalculate )
 	qwt? ( x11-libs/qwt:5 )
@@ -37,20 +34,20 @@ DEPEND="${COMMON_DEPEND}
 	eigen? ( dev-cpp/eigen:2 )
 "
 RDEPEND="${COMMON_DEPEND}
-	app-crypt/qca:2[ssl]
+	app-crypt/qca:2-qt4[ssl]
 "
 
 src_configure() {
 	local mycmakeargs=(
 		-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
 		-DWITH_Nepomuk=OFF
+		-DWITH_QtOAuth=OFF
 		$(cmake-utils_use_with attica LibAttica)
 		$(cmake-utils_use_with desktopglobe Marble)
 		$(cmake-utils_use_find_package eigen Eigen2)
 		$(cmake-utils_use_with exif Kexiv2)
 		$(cmake-utils_use_build ibus)
 		$(cmake-utils_use_with json QJSON)
-		$(cmake-utils_use_with oauth QtOAuth)
 		$(cmake-utils_use_with pim KdepimLibs)
 		$(cmake-utils_use_with qalculate)
 		$(cmake-utils_use_with qwt)

diff --git a/kde-plasma/kdeplasma-addons/metadata.xml b/kde-plasma/kdeplasma-addons/metadata.xml
index 6fff8e0c..3effc37c 100644
--- a/kde-plasma/kdeplasma-addons/metadata.xml
+++ b/kde-plasma/kdeplasma-addons/metadata.xml
@@ -4,12 +4,10 @@
 	<!-- maintainer-needed -->
 	<use>
 		<flag name="attica">Enable support for <pkg>dev-libs/libattica</pkg></flag>
-		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
 		<flag name="desktopglobe">Enable Desktop Globe wallpaper using <pkg>kde-apps/marble</pkg></flag>
 		<flag name="eigen">Build Mandelbrot wallpaper plugin using <pkg>dev-cpp/eigen</pkg> using SLOT 2</flag>
-		<flag name="fcitx">Use fcitx input method via <pkg>app-i18n/fcitx</pkg></flag>
+		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
 		<flag name="json">Enable JSON support via <pkg>dev-libs/qjson</pkg></flag>
-		<flag name="oauth">Enable OAuth support via <pkg>dev-libs/qoauth</pkg></flag>
 		<flag name="pim">KDE PIM integration via <pkg>kde-apps/kdepimlibs</pkg></flag>
 		<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
 		<flag name="qwt">Enable applets that use <pkg>x11-libs/qwt</pkg> SLOT 5</flag>