gentoo resync : 22.12.2021

3 files changed, 2 insertions, 96 deletions

diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 25eff8a3254b..b0d1d7c0ca64 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,5 +1,3 @@
-DIST tellico-3.4.1.tar.xz 5832916 BLAKE2B 64696eb988e4dfacf5b16ff35142a7069a78c1cdc5889dc12b24483991109ef0cba806db8baca6d58ac6c76a8afc4f8fdbd8a0f170c7ace9c83bc5ef222bb386 SHA512 b73ae82acd2eb3c4cd1f4e0534da693a0868dc5bb706e103da1b9227d47770fc879cf97a529b6cb080160c78cb41d9728f91b09c9952814dec4d98fca970e8c2
 DIST tellico-3.4.2.tar.xz 6596324 BLAKE2B d5ad47c90e0dfec4e1b2d1f79373bf941b813a07064c1d557c6b25ea7ca79b8d278c282edb2cd0a35990eb67d2f35b411bddc0b12c475ab2af89c584b55537e0 SHA512 0163877b07873fbb40dec19e20c6db614949026bba9d56a1c0adf5e616c9babb79875d5ade21a8f4b2a56875ff0f18706e521f409b6c67bac6681ee7abd79d8c
-EBUILD tellico-3.4.1.ebuild 2377 BLAKE2B 5d038e37a8fe64732a2e375efc1243430fa7958ba0b3106c3a6e231eb48563db032e9dc3119324a4901875649b97e8ab9bbcf103d2abfc60c19db951d2e04984 SHA512 3f4ce5162dc108f05b31cb2b14741b7e2b66b78685fbb6e0a80754da9333d3f2ade924bae929028da9e69b719fbdbd4494c86daef35b948fb108843507151be9
-EBUILD tellico-3.4.2.ebuild 2379 BLAKE2B 0dae0ee5c6071c83329bbc0cd799681930c3055d986f39ebb84f79fcc42bfb23ddda64b70f0f8d2417818227e2415a406a0f41215c6b9204f2842dcfac4de0cf SHA512 d320ab2bc8d1c308f54cb7a452078a7bc04cde2089d684113a7114564b5627eb774ab0dce52cb721902fab9d5136161f4153434167271fd367aeb49f3e06d277
+EBUILD tellico-3.4.2.ebuild 2377 BLAKE2B 5d038e37a8fe64732a2e375efc1243430fa7958ba0b3106c3a6e231eb48563db032e9dc3119324a4901875649b97e8ab9bbcf103d2abfc60c19db951d2e04984 SHA512 3f4ce5162dc108f05b31cb2b14741b7e2b66b78685fbb6e0a80754da9333d3f2ade924bae929028da9e69b719fbdbd4494c86daef35b948fb108843507151be9
 MISC metadata.xml 848 BLAKE2B 2271f519fdce29593205788f1266281389b59e9e94c6aac4b01b3256ebd1de6bd6f8127bc677a0731a20e6b3eac9b05aac08458f95d456ab7ef67fcfe968cf80 SHA512 831ffa08dda8e734060bba1599b94599b7194363076700c179c3f0472e2d590254043b9046d837574e90024da41c7bcb8a9806fc7ad2e70f86468660246495e9
diff --git a/kde-misc/tellico/tellico-3.4.1.ebuild b/kde-misc/tellico/tellico-3.4.1.ebuild
deleted file mode 100644
index e191324dd2b0..000000000000
--- a/kde-misc/tellico/tellico-3.4.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="5"
-IUSE="bibtex cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
-
-# tests need network access
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-qt/qtcharts:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport: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
-	bibtex? ( >=dev-perl/Text-BibTeX-0.780.0-r1 )
-	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}"
-BDEPEND="
-	sys-devel/gettext
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
-		-DENABLE_BTPARSE=$(usex bibtex)
-		$(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.2.ebuild b/kde-misc/tellico/tellico-3.4.2.ebuild
index 516863dba370..e191324dd2b0 100644
--- a/kde-misc/tellico/tellico-3.4.2.ebuild
+++ b/kde-misc/tellico/tellico-3.4.2.ebuild
@@ -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 )"