From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7D36B158086 for ; Thu, 9 Dec 2021 09:28:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C2152BC049; Thu, 9 Dec 2021 09:28:42 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1BEFB2BC005 for ; Thu, 9 Dec 2021 09:28:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B2CB4343439 for ; Thu, 9 Dec 2021 09:28:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 448C4206 for ; Thu, 9 Dec 2021 09:28:36 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1639039759.4a984e0fca133a0ab8fd896463392f7f1f7e6f07.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/spectacle/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/spectacle/metadata.xml kde-apps/spectacle/spectacle-21.12.0.ebuild kde-apps/spectacle/spectacle-21.12.49.9999.ebuild kde-apps/spectacle/spectacle-9999.ebuild X-VCS-Directories: kde-apps/spectacle/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4a984e0fca133a0ab8fd896463392f7f1f7e6f07 X-VCS-Branch: master Date: Thu, 9 Dec 2021 09:28:36 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f4e9ecbf-a5f3-42dc-bae3-b9c225cd8a48 X-Archives-Hash: 870a8507a31462078502c2d3b94f4312 commit: 4a984e0fca133a0ab8fd896463392f7f1f7e6f07 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Dec 9 08:49:19 2021 +0000 Commit: Andreas Sturmlechner gentoo 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 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 @@ Enable support for screenshot annotations using media-libs/kimageannotator - Enable support for the KDE Image Plugin Interface Enable support for a share menu using kde-frameworks/purpose 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