commit: 4a984e0fca133a0ab8fd896463392f7f1f7e6f07 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Dec 9 08:49:19 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Dec 9 08:49:19 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4a984e0f
kde-apps/spectacle: Drop IUSE kipi Disabling as well in 21.12, as there is no point in delaying its cleanup. Upstream commit 595695176a0b9c51d3d97a61ece9096710c1495f Bug: https://bugs.gentoo.org/828592 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/spectacle/metadata.xml | 1 - kde-apps/spectacle/spectacle-21.12.0.ebuild | 11 ++++------- kde-apps/spectacle/spectacle-21.12.49.9999.ebuild | 11 ++++------- kde-apps/spectacle/spectacle-9999.ebuild | 10 +++------- 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/kde-apps/spectacle/metadata.xml b/kde-apps/spectacle/metadata.xml index a9da67c766..e20b58af0a 100644 --- a/kde-apps/spectacle/metadata.xml +++ b/kde-apps/spectacle/metadata.xml @@ -10,7 +10,6 @@ </upstream> <use> <flag name="annotate">Enable support for screenshot annotations using <pkg>media-libs/kimageannotator</pkg></flag> - <flag name="kipi">Enable support for the KDE Image Plugin Interface</flag> <flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag> </use> </pkgmetadata> diff --git a/kde-apps/spectacle/spectacle-21.12.0.ebuild b/kde-apps/spectacle/spectacle-21.12.0.ebuild index c568e7d207..a78ad753cb 100644 --- a/kde-apps/spectacle/spectacle-21.12.0.ebuild +++ b/kde-apps/spectacle/spectacle-21.12.0.ebuild @@ -13,10 +13,10 @@ inherit ecm kde.org DESCRIPTION="Screenshot capture utility" HOMEPAGE="https://apps.kde.org/spectacle/"; -LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )" +LICENSE="LGPL-2+ handbook? ( FDL-1.3 )" SLOT="5" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="+annotate kipi share" +IUSE="+annotate share" # TODO: Qt5Svg leaking from media-libs/kimageannotator DEPEND=" @@ -47,12 +47,9 @@ DEPEND=" x11-libs/xcb-util-cursor x11-libs/xcb-util-image annotate? ( >=media-libs/kimageannotator-0.5.0 ) - kipi? ( >=kde-apps/libkipi-${PVCUT}:5= ) share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) " -RDEPEND="${DEPEND} - kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 ) -" +RDEPEND="${DEPEND}" src_prepare() { ecm_src_prepare @@ -63,8 +60,8 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_KF5Kipi=OFF $(cmake_use_find_package annotate kImageAnnotator) - $(cmake_use_find_package kipi KF5Kipi) $(cmake_use_find_package share KF5Purpose) ) ecm_src_configure diff --git a/kde-apps/spectacle/spectacle-21.12.49.9999.ebuild b/kde-apps/spectacle/spectacle-21.12.49.9999.ebuild index 9981d36065..e1f85b29ab 100644 --- a/kde-apps/spectacle/spectacle-21.12.49.9999.ebuild +++ b/kde-apps/spectacle/spectacle-21.12.49.9999.ebuild @@ -13,10 +13,10 @@ inherit ecm kde.org DESCRIPTION="Screenshot capture utility" HOMEPAGE="https://apps.kde.org/spectacle/"; -LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )" +LICENSE="LGPL-2+ handbook? ( FDL-1.3 )" SLOT="5" KEYWORDS="" -IUSE="+annotate kipi share" +IUSE="+annotate share" # TODO: Qt5Svg leaking from media-libs/kimageannotator DEPEND=" @@ -47,12 +47,9 @@ DEPEND=" x11-libs/xcb-util-cursor x11-libs/xcb-util-image annotate? ( >=media-libs/kimageannotator-0.5.0 ) - kipi? ( >=kde-apps/libkipi-${PVCUT}:5= ) share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) " -RDEPEND="${DEPEND} - kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 ) -" +RDEPEND="${DEPEND}" src_prepare() { ecm_src_prepare @@ -63,8 +60,8 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_KF5Kipi=OFF $(cmake_use_find_package annotate kImageAnnotator) - $(cmake_use_find_package kipi KF5Kipi) $(cmake_use_find_package share KF5Purpose) ) ecm_src_configure diff --git a/kde-apps/spectacle/spectacle-9999.ebuild b/kde-apps/spectacle/spectacle-9999.ebuild index 9981d36065..e660270edb 100644 --- a/kde-apps/spectacle/spectacle-9999.ebuild +++ b/kde-apps/spectacle/spectacle-9999.ebuild @@ -13,10 +13,10 @@ inherit ecm kde.org DESCRIPTION="Screenshot capture utility" HOMEPAGE="https://apps.kde.org/spectacle/"; -LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )" +LICENSE="LGPL-2+ handbook? ( FDL-1.3 )" SLOT="5" KEYWORDS="" -IUSE="+annotate kipi share" +IUSE="+annotate share" # TODO: Qt5Svg leaking from media-libs/kimageannotator DEPEND=" @@ -47,12 +47,9 @@ DEPEND=" x11-libs/xcb-util-cursor x11-libs/xcb-util-image annotate? ( >=media-libs/kimageannotator-0.5.0 ) - kipi? ( >=kde-apps/libkipi-${PVCUT}:5= ) share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) " -RDEPEND="${DEPEND} - kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 ) -" +RDEPEND="${DEPEND}" src_prepare() { ecm_src_prepare @@ -64,7 +61,6 @@ src_prepare() { src_configure() { local mycmakeargs=( $(cmake_use_find_package annotate kImageAnnotator) - $(cmake_use_find_package kipi KF5Kipi) $(cmake_use_find_package share KF5Purpose) ) ecm_src_configure
