commit: 288a8bb2abb705f4477a4643f2fc742fcaeeb2f4 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 09:59:08 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=288a8bb2
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> kde-misc/kio-gdrive/kio-gdrive-22.07.80.ebuild | 12 ++++-------- kde-misc/kio-gdrive/kio-gdrive-22.08.49.9999.ebuild | 12 ++++-------- kde-misc/kio-gdrive/kio-gdrive-9999.ebuild | 12 ++++-------- kde-misc/kio-gdrive/metadata.xml | 1 - 4 files changed, 12 insertions(+), 25 deletions(-) diff --git a/kde-misc/kio-gdrive/kio-gdrive-22.07.80.ebuild b/kde-misc/kio-gdrive/kio-gdrive-22.07.80.ebuild index 21aa8cc5dc..740dc483b0 100644 --- a/kde-misc/kio-gdrive/kio-gdrive-22.07.80.ebuild +++ b/kde-misc/kio-gdrive/kio-gdrive-22.07.80.ebuild @@ -10,33 +10,30 @@ KFMIN=5.96.0 QTMIN=5.15.5 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" @@ -44,7 +41,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/kio-gdrive-22.08.49.9999.ebuild b/kde-misc/kio-gdrive/kio-gdrive-22.08.49.9999.ebuild index 643b575427..be4b1af705 100644 --- a/kde-misc/kio-gdrive/kio-gdrive-22.08.49.9999.ebuild +++ b/kde-misc/kio-gdrive/kio-gdrive-22.08.49.9999.ebuild @@ -10,33 +10,30 @@ KFMIN=5.96.0 QTMIN=5.15.5 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="" -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" @@ -44,7 +41,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/kio-gdrive-9999.ebuild b/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild index 643b575427..be4b1af705 100644 --- a/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild +++ b/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild @@ -10,33 +10,30 @@ KFMIN=5.96.0 QTMIN=5.15.5 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="" -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" @@ -44,7 +41,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 35ead628e9..8213019cba 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>
