gentoo resync : 08.01.2021

4 files changed, 76 insertions, 4 deletions

diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index b891eafa3aa8..cf7621ca7fdb 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,6 @@
 DIST spectacle-20.08.3.tar.xz 1156220 BLAKE2B 3ebf54668fda63db6c1d938beedd287d7570749a6f9c6de89752d42abb7fe75687a6e3135a0fcd8f86b741a286518040627b2da0fc96ba029dfd1e1ede9a04ef SHA512 baae34ae4c7b3811e008ae8c1c2d6d6603fd39533279cc3ed79d4a38fa6cb3879ece30bc9ed1b1a5163691dcb2adea7e8cd3d655788f680feb94c38ad53610ac
-DIST spectacle-20.12.0.tar.xz 1163508 BLAKE2B 0ed2ee8025fa5ce3f536a313db77fa2c1f75b2efbfdacffd785f75c4fca6e6ee9b4cb7d032ff276b53f70774494c12e783eb84493498c0b569558536afe33756 SHA512 6ece220decca2f1fb13c0343b98f5be3cba78747e1e4eef53b44d1dd1bd11eb925ef74625b9798e2fee7ada57dc6d2f632162c70a5c4fc8193e07d09061158a2
+DIST spectacle-20.12.1.tar.xz 1163912 BLAKE2B 5ba6ff90e9f98a711eaf99b04f4bc6799a1bedf7c91c836657b51fb204cb7607ea219fc9c6b2c343b4c21ac980d42be3094e409833e81c0e1db4fa5f15cd169a SHA512 7df1907ed350d19d48e522c7a591e3d4464a60d18b9f88242713062ea9a68aa966221fd2e6c3548cf0cc325fa7a7e9ec0c3d9856edf95c2cdcf74b950f10ba60
 EBUILD spectacle-20.08.3.ebuild 1584 BLAKE2B 376e19a3c18b18179f6d3b20cea9c1826169aa6e81ff3739ba5cc25418cdec1990f2e85d68e5a0236dd03d1b2f813ee11e5edab097bc9a749e7778594a6cd87e SHA512 8eb0e28f8817101a1399d3e5e878a288a6b986bbe3b0e6939b2667f4fa8f17545cfed77814f1bba8b2e540b53243dd0ce78481a8160f575d851fb2d9867b9ab5
-EBUILD spectacle-20.12.0.ebuild 1713 BLAKE2B 7c94a712183f50021c823924a2b04f242532ab66182dddcd6765523a2afa7ec3595fe2360c5e0a6805306c9151901f07bae9770a2341069f2ad0aef25aff3b7d SHA512 984c1e3f1fce09d74ea7df58bd1698fb41bb6912bddaf40ce29e23b4c21afe8985af86b6b6196d80a5b8643e1293f5dabb864220c04c97273425ca492ba3d7ae
-MISC metadata.xml 441 BLAKE2B 82a565ee86151104ad5c24329d7649230f817d78c9fc6a393ec028d4d92cb6e8c968deba9f3f344125da283a14eaf671a6105f548eee1051290530a2d33d9143 SHA512 674c31c3c5639f6ba218f5cc9342ec5a00b944212563db07dfd223c4897a3d1f315dc7a0735be7b30d75d3706e6355f3547cd17c9ab20e7387974ff1adfe5716
+EBUILD spectacle-20.12.1-r1.ebuild 1956 BLAKE2B 2a9ceea05d9eeb09fda7c77c23c312ada1cc7dac5030b27766551772ee21bb20f907575854ffa0c0c34f24e8e08919b5139970044fc24355336f9a59335ef050 SHA512 291f5fb0c346379f978b16a2e9e27b8c5f7764f87fb9f44d392aa76622aebb3b4fe3beb334b205c53734293939c45ab9aefd17bc15e85080f3402f5226e63ce1
+EBUILD spectacle-20.12.1.ebuild 1713 BLAKE2B 39009bd94ddb6fe01e947be5c9d7b701794214b82d4034761918ade0f808b23bce8f43febc45f834ced80088be6d7385145d80bbe645f95bf16a73edc7c84b38 SHA512 c15a8e2238f9bb445c404e627aecacbf7d3106a4888dbe1cd547a70ebd01c6238994bbda443f79085495f0a9d274ae422468798d32d577f4293e1efd7561c8e3
+MISC metadata.xml 558 BLAKE2B 304071c16927d1f17fb0b30c3bc71ac9cf707a9cb06816957a8382b3eaac9083d3456b142bc3e0dc745588f14641e461c20b13840258997c85b84bbdaa5659e8 SHA512 0cc62fa4faa18491636dd37eea421cfc880e8997101420e15a876e070c6c14369063f6785d1f0474b3d79fc42860455fe4ffcb90db9f7a61e0492500d19aaa44
diff --git a/kde-apps/spectacle/metadata.xml b/kde-apps/spectacle/metadata.xml
index 661377e45a6e..bc2d96259f57 100644
--- a/kde-apps/spectacle/metadata.xml
+++ b/kde-apps/spectacle/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<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>
diff --git a/kde-apps/spectacle/spectacle-20.12.1-r1.ebuild b/kde-apps/spectacle/spectacle-20.12.1-r1.ebuild
new file mode 100644
index 000000000000..3dca38ceeac7
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-20.12.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.75.0
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Screenshot capture utility"
+HOMEPAGE="https://apps.kde.org/en/spectacle"
+
+LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+annotate kipi share"
+
+# TODO: Qt5Svg leaking from media-libs/kimageannotator
+DEPEND="
+	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	annotate? ( media-libs/kimageannotator )
+	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
+"
+
+src_prepare() {
+	ecm_src_prepare
+	# Unnecessary with >=media-libs/kimageannotator-0.4.0
+	sed -e "/find_package\s*(\s*X11/d" -e "/find_package\s*(\s*kColorPicker/d" \
+		-i CMakeLists.txt || die
+}
+
+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
+}
diff --git a/kde-apps/spectacle/spectacle-20.12.0.ebuild b/kde-apps/spectacle/spectacle-20.12.1.ebuild
index 9ea01f1bc4a4..55b8590a0d7d 100644
--- a/kde-apps/spectacle/spectacle-20.12.0.ebuild
+++ b/kde-apps/spectacle/spectacle-20.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7