gentoo resync : 08.10.2021

3 files changed, 7 insertions, 102 deletions

diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index eed39c4a20ab..f3f491ed9f5c 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,6 +1,3 @@
-DIST tellico-3.3.4-no-khtml.patch.xz 7944 BLAKE2B 8dd11c68a3ecdaf706860aca466fb4a2afc6018578025ae3c3050656be213889dad676cca25e6ab4634e097443e81278d527b6d9602abc85e92525e6436dcf32 SHA512 f4d84043fac034113f69bf12e500a1413c908c530a077f4caf06f5ce69902ce17b71723aa253572678b41043d7a8a031d9c5b563e59e4979e5dd50df2f0ea29d
-DIST tellico-3.3.5.tar.xz 5664868 BLAKE2B 8870fa4885a38aafdcdc8821c0416db6f89a57d2bc6266b9ee60cecb5cce3c3bece8ce472175bfb0ed3751b27306699425f4083dff29968a4888a2153bdc1c26 SHA512 3ee030befd22d87d7e429c4161c5253e9134729f5258768cd6a73006db5f64b0d61626be6d1cce04d6c57e57d8ca37361add98f551cf519594f61baa0fe051a1
 DIST tellico-3.4.1.tar.xz 5832916 BLAKE2B 64696eb988e4dfacf5b16ff35142a7069a78c1cdc5889dc12b24483991109ef0cba806db8baca6d58ac6c76a8afc4f8fdbd8a0f170c7ace9c83bc5ef222bb386 SHA512 b73ae82acd2eb3c4cd1f4e0534da693a0868dc5bb706e103da1b9227d47770fc879cf97a529b6cb080160c78cb41d9728f91b09c9952814dec4d98fca970e8c2
-EBUILD tellico-3.3.5-r1.ebuild 2408 BLAKE2B 313f45c532306fb4e6165c6e6456b13bcf514920558c5dd481035705b5d5a8246266070ef787a0adfdb9508f860839669432b14ca8bfb774761a9e9be9afb242 SHA512 b63198e841ada9a2e132477f35434ee5ae1a3105d6e8ecc90bf9a299a7bdc6544ec7eff6e06f14f48f860125f2b18be1306c460a6032ddef032aeb8a1e989856
-EBUILD tellico-3.4.1.ebuild 2381 BLAKE2B faddb7bcdf9047daa750402daf137f06ada634b0b07f2a5a6952487f10bf2fe05206a1cd7a5d40bc4d26e6e8021ce8f94482b5736303efa5e255e6e35dfd5f06 SHA512 d6250b02756ffb6e85c3ff71c93ceafd3f1bfcebbf37fba2d64678113f0e479dafb9fa4e95c61e8fe86905df10cfeb8252b6e6fa2f5023ce659dcc27c9738a65
+EBUILD tellico-3.4.1.ebuild 2377 BLAKE2B 5d038e37a8fe64732a2e375efc1243430fa7958ba0b3106c3a6e231eb48563db032e9dc3119324a4901875649b97e8ab9bbcf103d2abfc60c19db951d2e04984 SHA512 3f4ce5162dc108f05b31cb2b14741b7e2b66b78685fbb6e0a80754da9333d3f2ade924bae929028da9e69b719fbdbd4494c86daef35b948fb108843507151be9
 MISC metadata.xml 848 BLAKE2B 2271f519fdce29593205788f1266281389b59e9e94c6aac4b01b3256ebd1de6bd6f8127bc677a0731a20e6b3eac9b05aac08458f95d456ab7ef67fcfe968cf80 SHA512 831ffa08dda8e734060bba1599b94599b7194363076700c179c3f0472e2d590254043b9046d837574e90024da41c7bcb8a9806fc7ad2e70f86468660246495e9
diff --git a/kde-misc/tellico/tellico-3.3.5-r1.ebuild b/kde-misc/tellico/tellico-3.3.5-r1.ebuild
deleted file mode 100644
index eb7e18bf8679..000000000000
--- a/kde-misc/tellico/tellico-3.3.5-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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
-}
diff --git a/kde-misc/tellico/tellico-3.4.1.ebuild b/kde-misc/tellico/tellico-3.4.1.ebuild
index b135fa60b84e..e191324dd2b0 100644
--- a/kde-misc/tellico/tellico-3.4.1.ebuild
+++ b/kde-misc/tellico/tellico-3.4.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
@@ -13,7 +13,7 @@ HOMEPAGE="https://tellico-project.org/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="https://tellico-project.org/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
@@ -21,11 +21,8 @@ SLOT="5"
 IUSE="bibtex cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
 
 # tests need network access
-RESTRICT+=" test"
+RESTRICT="test"
 
-BDEPEND="
-	sys-devel/gettext
-"
 RDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
@@ -72,6 +69,9 @@ RDEPEND="
 	yaz? ( >=dev-libs/yaz-2:0= )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+"
 
 src_configure() {
 	local mycmakeargs=(