gentoo resync : 28.04.2021

3 files changed, 2 insertions, 96 deletions

diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index ccc708c90253..868755c8575e 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,6 +1,4 @@
 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
+EBUILD tellico-3.3.5.ebuild 2407 BLAKE2B 32a698729174885c61f48feed3fc42707d3fd91c9d996762b42e7a3e8b0fc843037ad9fbd52cf1895a2f583d2eb08c2251771458273f37be0f698fd07ac69ce5 SHA512 d1c2eaca1a5a929d9dfd7ac3b8999850060c8a1065f388f05762579f96dfac793dd91cab4664e67956a2c8702f708ebd296f1e1c96a41527ad0f7f7729108181
 MISC metadata.xml 666 BLAKE2B 5d03d3b6466087a3fee7c12daee7824d8a995fdb8feeeb458801e56549cca5cd24794f30ba82dd0146626edc7284d02770a904400b2aae25831dca59a8c31e76 SHA512 57316bf5ca997b02babd947e54909960300e0ca0340662fdb7b151b161913ab255502aee63951c78d301071b2fd1b5cd33d5238496e3ba8e8a8956c102d4d16e
diff --git a/kde-misc/tellico/tellico-3.3.4-r1.ebuild b/kde-misc/tellico/tellico-3.3.4-r1.ebuild
deleted file mode 100644
index a27068829618..000000000000
--- a/kde-misc/tellico/tellico-3.3.4-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/${P}-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"
-
-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}"
-
-# tests need network access
-RESTRICT+=" test"
-
-PATCHES=( "${WORKDIR}/${P}-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.3.5.ebuild b/kde-misc/tellico/tellico-3.3.5.ebuild
index a421fe487c98..72088b8b961a 100644
--- a/kde-misc/tellico/tellico-3.3.5.ebuild
+++ b/kde-misc/tellico/tellico-3.3.5.ebuild
@@ -14,7 +14,7 @@ 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"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"