gentoo resync : 06.04.2022

8 files changed, 4 insertions, 179 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index e5b1f885b28e..0e738e7aa09c 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 6bac04eccd14..99955d87b7e0 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,5 +1,3 @@
-DIST kdiff3-1.9.4.tar.xz 1057404 BLAKE2B 6aa24ce63f7731040dedca4c8c27890d88de1b1e1dba3b2ca778d294ce7480d96d9bd5f282ddfdb918d6b5a93adec92efc3977f44f2e735190a6df8acb5df150 SHA512 76555eb9253c4cb96d32de01126a4547adb3424997034f0d9aed50cc4df87cb15c038a12f8620a491a968b47a3ea5eafcb0f53978aca4300ca319677bb2b9e63
 DIST kdiff3-1.9.5.tar.xz 1057524 BLAKE2B ef55ce58880d8611747929214bbc2e5d718d51d71915a327d711a828c20d91ce515fa37522ad79e3beca3616770b2cad9fc066814e5d7234e06af73ae22a4d77 SHA512 4c9629b2a8bc506a5b224a566cf2ef9b733d78fc3185d69988ed387621039a3f91472b02344377a254b3f19771bea5ce3355b0fd866402594eb63fd940a68c41
-EBUILD kdiff3-1.9.4.ebuild 1043 BLAKE2B 7bfe779e5bce02578e7d15101840c4f55aa710c992aa0a6ffa16fd3e6ec6274a115610f3fd80b2c881395610058131a069d325bda79fd8113032714f0e6465e8 SHA512 9d890e20d196a937b5e6ec574480f1b125b7ae723df2eaa2a6062275a18e9a344d78d9c0cb2bc0df33c185874e5cbfb7738fcdf12b685b58e28bec18dffbd796
-EBUILD kdiff3-1.9.5.ebuild 1045 BLAKE2B be5673e6bc3c6a50509c486250ff0e3395554d01201f7744b32b1312cc401ab5b273b26df4b25944d4e30f53c4ad9ca7f675c1ac6bb74b164edd2b74e8387e82 SHA512 d04b2e29fdfcc615745a2b53724a80834d477bc4091b5ec188ab77ac4a6e14be2ab9b50bfdf5eb658abe60469a7b5b0c939a8c0ccdca8d96fe34e436b91a3e93
+EBUILD kdiff3-1.9.5.ebuild 1043 BLAKE2B 05dcff3f5c5c1e61119092eca5612335398ae4c2ec4abe389870db1be822bb5f2c7c3770244f9f274354b7c53c91d6824839d50647f739d99761ee0315a747d8 SHA512 cc171ac6c166a47474228ddff4fa1a8832de9de342a881a288cbdd19dd31abb5c13b804c39b76fba966df96f0370b6e70d7d71afd682a7bd7ff6951f7c09320b
 MISC metadata.xml 431 BLAKE2B 6848facdd79d1805d96f6b9c8b8fadd673ac7884eb14b31c854e7043d8474ef2702ca0b43b6ddb235ea70a25b41b5ad93a2616d5ce2b87a53a53bcd4c42839e1 SHA512 7f2f61311bf3f8f926d2f6538e3f693ffbc059068062e6c5313d4b48c0ad4e8155f9ccda52f79e65ffdcd529002c9b29f84dcf6b612e3984db9444177509bd0c
diff --git a/kde-misc/kdiff3/kdiff3-1.9.4.ebuild b/kde-misc/kdiff3/kdiff3-1.9.4.ebuild
deleted file mode 100644
index c9768a871e94..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.9.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.82.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/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=""
-
-COMMON_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/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/diffutils
-"
diff --git a/kde-misc/kdiff3/kdiff3-1.9.5.ebuild b/kde-misc/kdiff3/kdiff3-1.9.5.ebuild
index 2a6d26eb50f4..d225cdcfffc7 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.5.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.5.ebuild
@@ -15,7 +15,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=""
 
 COMMON_DEPEND="
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index e7e4803a9ee5..fb45af16118d 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,6 +1,3 @@
-AUX tellico-3.4.3-taglib-ifdef.patch 896 BLAKE2B d76b7a129bf69014a1cc2e103c23412da85b3ec49a6edca910ba699afb99ca86283b3e31e0b977b363ac846552407781c317e77fa9027770accf6981f1ad98d6 SHA512 4f3c389f94142d5003e422f7017fe6f6616a3098309f2ce654a195db31951a0f22cd194586191740bb92f29ea88a319e0d0e8ac778bfbd8e7545b8fe357e2c2a
-DIST tellico-3.4.3.tar.xz 6598384 BLAKE2B bbf121bd95974916b914ce63138d71521c6d04d93214945ce3a7340e242024614e2a264af0d36a99186d1ceed96da951112d1ed6fb195465871128736a3c261e SHA512 bf50d60e3647e12804b4bae488adc593ac541aae8c03815a751603fd940686cdbaa16497213d9240983aabdf6b8e0b05419be9cf960425694f21e3c38c39ddfc
 DIST tellico-3.4.4.tar.xz 6600432 BLAKE2B 4bac2df68284c9beb9ddbdbcf5824ac22d4a56066c371d7eaea962b81307f96d7ceba1fd446a4f640867a314c357c13d16a2e167356701241007e5a682ecb60b SHA512 6c9f16217ce5ff2d944d3eea3a5f5641b9717cd7d85835fd8b9559e90f6e920046085e8c9e14734d2ffa0a96ee6b8b241e0ccf1739aa2469af7e1bb88667f1d4
-EBUILD tellico-3.4.3.ebuild 2428 BLAKE2B 774d05059f4d2f3b0230d227e341d7b1738ca3f36abcd3372fd0c547d75a60d9f316013924257e57e9ad81575c0c1b14d91b781681e57cee18cbb9df1d25d8fa SHA512 d389685e8262d225413a8fd9f51e510dd4faccef03433eadcfc5aca43560d5cebe3ace505b32fb0bc7e19800c62a4c7246f12938813c68171f204041e48068b4
-EBUILD tellico-3.4.4.ebuild 2379 BLAKE2B 4bba7301177b70bc4b6df094ee0665961009affe9f85b078a72a2f8360ed7abc2e63d462168c11464def98565b3b4fdeea44797d4240af69f3d0171d2dc649ab SHA512 b7b6777e215971c3a78b613528bcf21c8b9bae657cc73579c0f9e6c4812f6640994954380765c731d59b54501cd50cd7bba768cbf0334b26d6f08cef9bed9f05
+EBUILD tellico-3.4.4.ebuild 2377 BLAKE2B 941d028fc4cb72b7d02b2d7b31b3293e76e2270667eea2fb485c389bebe436545ed2f3475084801cd9ac10f1a8b6bf4f88afd77b36b32022f6b689b4d5e5fbc4 SHA512 ba884faafc6bb6adcd18cc64941c4f61e00316a0ce03099f4c4312febae7a1239dbc6d63921c7739e0fedf06706f0421a0fdbb1360d25355c0b1d0c2b655f512
 MISC metadata.xml 848 BLAKE2B 2271f519fdce29593205788f1266281389b59e9e94c6aac4b01b3256ebd1de6bd6f8127bc677a0731a20e6b3eac9b05aac08458f95d456ab7ef67fcfe968cf80 SHA512 831ffa08dda8e734060bba1599b94599b7194363076700c179c3f0472e2d590254043b9046d837574e90024da41c7bcb8a9806fc7ad2e70f86468660246495e9
diff --git a/kde-misc/tellico/files/tellico-3.4.3-taglib-ifdef.patch b/kde-misc/tellico/files/tellico-3.4.3-taglib-ifdef.patch
deleted file mode 100644
index 94986ea3003d..000000000000
--- a/kde-misc/tellico/files/tellico-3.4.3-taglib-ifdef.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9d450037f708cc2300d2767e5171bb08e48077a9 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sat, 8 Jan 2022 20:35:37 +0100
-Subject: [PATCH] Fix build without HAVE_TAGLIB
-
-Gentoo-bug: https://bugs.gentoo.org/830806
-
-CCBUG: 446551
----
- src/translators/audiofileimporter.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/translators/audiofileimporter.cpp b/src/translators/audiofileimporter.cpp
-index 2b3372f4..a18ed14a 100644
---- a/src/translators/audiofileimporter.cpp
-+++ b/src/translators/audiofileimporter.cpp
-@@ -57,6 +57,7 @@
- #include <QVBoxLayout>
- #include <QApplication>
- 
-+#ifdef HAVE_TAGLIB
- namespace {
-   bool hasValue(const TagLib::PropertyMap& pmap, const char* key) {
-     const TagLib::String keyString(key);
-@@ -70,6 +71,7 @@ namespace {
-             QString();
-   }
- }
-+#endif
- 
- using Tellico::Import::AudioFileImporter;
- 
--- 
-2.34.1
-
diff --git a/kde-misc/tellico/tellico-3.4.3.ebuild b/kde-misc/tellico/tellico-3.4.3.ebuild
deleted file mode 100644
index db4205d4695f..000000000000
--- a/kde-misc/tellico/tellico-3.4.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 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
-"
-
-PATCHES=( "${FILESDIR}/${P}-taglib-ifdef.patch" )
-
-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.4.ebuild b/kde-misc/tellico/tellico-3.4.4.ebuild
index a83ef948cde1..5ae2ebe86576 100644
--- a/kde-misc/tellico/tellico-3.4.4.ebuild
+++ b/kde-misc/tellico/tellico-3.4.4.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 )"