commit:     f20e29ce68aae40c5532f23fa97fdeb512289535
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 09:59:08 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 10:34:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20e29ce

kde-misc/kio-gdrive: Drop IUSE=kaccounts

Google Account authentication is currently broken at runtime without
kaccounts integration, and qtkeychain backend code is getting increasingly
crusty with build broken in >=22.07.80 as well. Reported upstream and
option disabled until fixed there.

This gets rid of REQUIRED_USE and makes this logically sound to be hidden
behind IUSE=webengine within kdenetwork-meta because of
kde-apps/kaccounts-providers hard-depending on dev-qt/qtwebengine.

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=439639
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=456975

Bug: https://bugs.gentoo.org/782505
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...io-gdrive-22.04.3.ebuild => kio-gdrive-22.04.3-r1.ebuild} | 12 ++++--------
 kde-misc/kio-gdrive/metadata.xml                             |  1 -
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/kde-misc/kio-gdrive/kio-gdrive-22.04.3.ebuild 
b/kde-misc/kio-gdrive/kio-gdrive-22.04.3-r1.ebuild
similarity index 73%
rename from kde-misc/kio-gdrive/kio-gdrive-22.04.3.ebuild
rename to kde-misc/kio-gdrive/kio-gdrive-22.04.3-r1.ebuild
index ba640924c51e..95142c9693b9 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-22.04.3.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-22.04.3-r1.ebuild
@@ -11,33 +11,30 @@ KFMIN=5.92.0
 QTMIN=5.15.4
 inherit ecm gear.kde.org
 
-DESCRIPTION="KIO Slave for Google Drive service"
+DESCRIPTION="KIO worker for Google Drive service"
 HOMEPAGE="https://apps.kde.org/kio_gdrive/";
 
 LICENSE="GPL-2+"
 SLOT="5"
 KEYWORDS="amd64 arm64 ~ppc64 ~x86"
-IUSE="+kaccounts +share"
-
-REQUIRED_USE="share? ( kaccounts )"
+IUSE="+share"
 
 COMMON_DEPEND="
        >=dev-qt/qtgui-${QTMIN}:5
        >=dev-qt/qtwidgets-${QTMIN}:5
+       >=kde-apps/kaccounts-integration-20.08.3:5
        >=kde-apps/libkgapi-19.08.0:5
        >=kde-frameworks/kcoreaddons-${KFMIN}:5
        >=kde-frameworks/ki18n-${KFMIN}:5
        >=kde-frameworks/kio-${KFMIN}:5
        >=kde-frameworks/knotifications-${KFMIN}:5
-       kaccounts? ( >=kde-apps/kaccounts-integration-20.08.3:5 )
-       !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
        share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
        >=dev-qt/qtnetwork-${QTMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
-       kaccounts? ( >=kde-apps/kaccounts-providers-20.08.3:5 )
+       >=kde-apps/kaccounts-providers-20.08.3:5
 "
 BDEPEND="dev-util/intltool"
 
@@ -45,7 +42,6 @@ DOCS=( README.md )
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake_use_find_package kaccounts KAccounts)
                $(cmake_use_find_package share KF5Purpose)
        )
        ecm_src_configure

diff --git a/kde-misc/kio-gdrive/metadata.xml b/kde-misc/kio-gdrive/metadata.xml
index 35ead628e97b..8213019cba2d 100644
--- a/kde-misc/kio-gdrive/metadata.xml
+++ b/kde-misc/kio-gdrive/metadata.xml
@@ -9,7 +9,6 @@
                <bugs-to>https://bugs.kde.org/</bugs-to>
        </upstream>
        <use>
-               <flag name="kaccounts">Use 
<pkg>kde-apps/kaccounts-integration</pkg> backend (default) instead of 
<pkg>dev-libs/qtkeychain</pkg></flag>
                <flag name="share">Enable support for a share menu using 
<pkg>kde-frameworks/purpose</pkg></flag>
        </use>
 </pkgmetadata>

Reply via email to