gentoo resync : 03.03.2021

6 files changed, 96 insertions, 44 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 320307613367..5f19bd7de9eb 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index ed987fc84d76..3738093a279a 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,6 +1,4 @@
 AUX kdiff3-1.8.3-hidpi.patch 5069 BLAKE2B 3b62e3e06a5704e1bf2b49472ffa5b4bdcc985733cf0ea3ca77e62ffd90bb9a9c17a0997a81b91c376bcd9a967ffc3458a26951f4381e8d16d0330fa62bf3ff6 SHA512 207767a8375b3ccffdfb0c222992e2556e8fd1449b2bca8f6ec771d6c83bea296973b0c76085ec4b8333527c7c9f4ddb50f6dbb016206a3bf139232d21784389
-DIST kdiff3-1.8.4.tar.xz 1040492 BLAKE2B 4598a5db318821af085c19983f17260969220bf7352fc961b8e49237c6818b5f723cebac8190ceb591f2cd3ad54b52b9f7bb91be91ce90c399ad959398e64f1e SHA512 100632f7656e53f567faec8efea1aba132916e7b6c9569b2bacb7da1081f1dd126e27825663fb860f3d40cb205cf3c1817dd28ea560b9e650b5002e3d89dd9d8
 DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415 SHA512 5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
-EBUILD kdiff3-1.8.4.ebuild 1060 BLAKE2B 7821c38937bee4dbf00f78447eb6e5ab4cd2d3fe85f5d833b9e3bb7a5a9516ae97b843187e251f33caf6e47ba8f361d347b371bfe4d7f7cdef5e4bb522bccd5a SHA512 c922f4cffbbea168471530e6c43492a1d22ce55f1e5e05ce6874187f163113e6304cf45eda768318868a696d4385bbda235d55d383ac9b0425b4a12494ed6949
-EBUILD kdiff3-1.8.5.ebuild 1062 BLAKE2B d86491bd12bdaf47a7e9af73edb168ac609579f4526f66690e68b8778c9a08cc64b808e75dda00fb7179ff74dcd1a600b47a8246b47426e13d74b99fd40e0dc2 SHA512 5cde71163b04f4b1d976ed27cfecdb35c460d31602a49d052a1c097aa377acc5bdbf85bf844171bd5f3e9f4879ca5baaee1d996db24c49b245377e07a06a7fad
+EBUILD kdiff3-1.8.5.ebuild 1060 BLAKE2B 90af39a2d93a2b80970e8375688b367bcfe4f1e7b9f01c8f1dd7fcc2c65f8d45a874d87bf8d5149536c2f59d50b74a123736ee47173b18d8d9e7bd01b86be3bf SHA512 c4e4f500c6016a456e89a3b2656267d56b6839ace4e4804d68af26cce6ca3a01ef88775ed1f23c7805e9fdd70414ef0afe9c7777376ac220122e757181af5c84
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild b/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
deleted file mode 100644
index 7f4a90ae3b4f..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/en/kdiff3 https://userbase.kde.org/KDiff3"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	sys-apps/diffutils
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8.3-hidpi.patch" )
diff --git a/kde-misc/kdiff3/kdiff3-1.8.5.ebuild b/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
index ec84fcba2ce1..c9625b834e80 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 7cd911ebc5f6..ccc708c90253 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,4 +1,6 @@
 DIST tellico-3.3.4-no-khtml.patch.xz 7944 BLAKE2B 8dd11c68a3ecdaf706860aca466fb4a2afc6018578025ae3c3050656be213889dad676cca25e6ab4634e097443e81278d527b6d9602abc85e92525e6436dcf32 SHA512 f4d84043fac034113f69bf12e500a1413c908c530a077f4caf06f5ce69902ce17b71723aa253572678b41043d7a8a031d9c5b563e59e4979e5dd50df2f0ea29d
 DIST tellico-3.3.4.tar.xz 5627840 BLAKE2B ef6b038d929b641c121137296fb16d5dbed84a0d7181dac62ea3b99c3df05c37ecbfd91848e518445562b1f7eef332dcfedd0aaa4f8940566909b31059bc7ae1 SHA512 182ada8a83d80ff59a7fad5d82a6331976d707e8923eee98c5137a03dd6a3c8ee23a3ad4eb2e6b9b018e06bc9ac7a0da37bea4fa68e29712a5567eca6a88908d
+DIST tellico-3.3.5.tar.xz 5664868 BLAKE2B 8870fa4885a38aafdcdc8821c0416db6f89a57d2bc6266b9ee60cecb5cce3c3bece8ce472175bfb0ed3751b27306699425f4083dff29968a4888a2153bdc1c26 SHA512 3ee030befd22d87d7e429c4161c5253e9134729f5258768cd6a73006db5f64b0d61626be6d1cce04d6c57e57d8ca37361add98f551cf519594f61baa0fe051a1
 EBUILD tellico-3.3.4-r1.ebuild 2393 BLAKE2B 7d2395254ebf1de3e93f8c921503f9a23c82cda7e453578d5860f52860ceb7834d57550ab14d7e524967fe5c12b148644703e00d7a4e884a11524dc70aa539d9 SHA512 c5de99feeb7040070b437aa2adf1eb27f15faa5ef8471314eaf02be7dcc0ea229e7a872140530d434e6b0e82032081c93560b72a89ff40f23360ea82e3efe098
+EBUILD tellico-3.3.5.ebuild 2409 BLAKE2B b83a326ec27c2e9b46a9da1f3c2c90ba439c3e0af72c1bfca3e2d2316c56678d81e86014bbda2da59c271fe2018aac6720006d68d328a22646a31a769a77f29b SHA512 992afe04cb3c83e70eb5da4fe0f4187195d8f86b4252e82d8905524dc8800898aba3c814981eaaa20c75effb03228bcdf0aa5e71c6610e7355b360fff6ac268c
 MISC metadata.xml 666 BLAKE2B 5d03d3b6466087a3fee7c12daee7824d8a995fdb8feeeb458801e56549cca5cd24794f30ba82dd0146626edc7284d02770a904400b2aae25831dca59a8c31e76 SHA512 57316bf5ca997b02babd947e54909960300e0ca0340662fdb7b151b161913ab255502aee63951c78d301071b2fd1b5cd33d5238496e3ba8e8a8956c102d4d16e
diff --git a/kde-misc/tellico/tellico-3.3.5.ebuild b/kde-misc/tellico/tellico-3.3.5.ebuild
new file mode 100644
index 000000000000..a421fe487c98
--- /dev/null
+++ b/kde-misc/tellico/tellico-3.3.5.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Collection manager based on KDE Frameworks"
+HOMEPAGE="https://tellico-project.org/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="https://tellico-project.org/files/${P}.tar.xz
+		https://dev.gentoo.org/~asturm/distfiles/${PN}-3.3.4-no-khtml.patch.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="5"
+IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
+
+# tests need network access
+RESTRICT+=" test"
+
+BDEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-perl/Text-BibTeX-0.780.0-r1
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	kde-frameworks/karchive:5
+	kde-frameworks/kcodecs:5
+	kde-frameworks/kcompletion:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kconfigwidgets:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kcrash:5
+	kde-frameworks/kguiaddons:5
+	kde-frameworks/kiconthemes:5
+	kde-frameworks/kitemmodels:5
+	kde-frameworks/ki18n:5
+	kde-frameworks/kjobwidgets:5
+	kde-frameworks/kio:5
+	kde-frameworks/knewstuff:5
+	kde-frameworks/kparts:5
+	kde-frameworks/kservice:5
+	kde-frameworks/ktextwidgets:5
+	kde-frameworks/kwallet:5
+	kde-frameworks/kwidgetsaddons:5
+	kde-frameworks/kwindowsystem:5
+	kde-frameworks/kxmlgui:5
+	kde-frameworks/solid:5
+	kde-frameworks/sonnet:5
+	cddb? ( kde-apps/libkcddb:5 )
+	discid? ( dev-libs/libcdio:= )
+	pdf? ( app-text/poppler[qt5] )
+	scanner? ( kde-apps/libksane:5 )
+	semantic-desktop? ( kde-frameworks/kfilemetadata:5 )
+	taglib? ( >=media-libs/taglib-1.5 )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	xmp? ( >=media-libs/exempi-2 )
+	yaz? ( >=dev-libs/yaz-2:0 )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${WORKDIR}/${PN}-3.3.4-no-khtml.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
+		$(cmake_use_find_package cddb KF5Cddb)
+		$(cmake_use_find_package discid CDIO)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package scanner KF5Sane)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package taglib Taglib)
+		-DENABLE_WEBCAM=$(usex v4l)
+		$(cmake_use_find_package xmp Exempi)
+		$(cmake_use_find_package yaz Yaz)
+	)
+
+	ecm_src_configure
+}