gentoo resync : 15.01.2020

4 files changed, 11 insertions, 151 deletions

diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 8da56ea8f3bf..da9a5d9ad90e 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,6 +1,3 @@
-AUX tellico-3.2.1-missing-header.patch 1196 BLAKE2B 757bfca5c2edd2fb41903a8ff1961ad200347a97ff589ceed3e4c84a061e527a69f19367ad3111a63a0bd222795bf5d478cacaf9e372fb1b5fb76b0cc66f2b73 SHA512 22ce1aa6d5ab3fcd5e9b427e8950e31afc5ebe02de30ca961c03a79a0bf967b5049cb77d6d3a08e5635c00d10c6d51ac3d02887bbb5fd81fc7adb2f3ec3e303b
-DIST tellico-3.2.1.tar.xz 5604632 BLAKE2B 4e0f156a315eca387b60f254df9824615aca3a917a1a256bfd3612e6babd7495e22d79234bdd92297167c323d5a3aabed253ddc38d757e41b64c289392b6e827 SHA512 ada45c66fce2e73f301e3f7d69acb20caf5ebde85ac77bd6e6f0701f55044f5f1a44f8e6ae5d6d6bd244fd6538fba88591caf70178855b6910ce5132508fba9b
 DIST tellico-3.2.3.tar.xz 5589552 BLAKE2B e22f0344ccd879694976bc00fa6bcb52e3b878d4ef92c05b9b9a62ab74b1e84cd4b649682a55ee4a1b2da4678676abe8f1da5591f57dbd7db156b5e5bd0b9dd1 SHA512 4b2e524607d79638730b86d67e4af0e69294ae0e5e87ca971cf5319e32eee9597b0825149babbf7e0c9a78fd42a1e34fa82eff64c4e22ca61dd478afa95b58a7
-EBUILD tellico-3.2.1.ebuild 2516 BLAKE2B 84b1943c2d8fd608642252e75408ae827edda5e273597265982f3422c2994a580a1f6436f8873ddccab46f5719a92e9cd4be22ca254c46bbdf6f66f5b49e2ba3 SHA512 53c16b74327a9c800a817712553be35a1ab11306cb0a0774f403f9b859b99deb9facd5c701998c6d91169a845f0228d62838622b1771a8efc0db1c48ecc349aa
-EBUILD tellico-3.2.3.ebuild 2317 BLAKE2B 7a2671840e53a5cc95ab37414a5a1f4e063333e00f9208a2c94db2a2142a0e894f09252800f065f35ca114e9d6b30bbce533530b4350d2b6a0c50793387137cf SHA512 67c8942dafd3607ff5a36565eadaf3dd03e68188cda457a1af7561cff9a4ad4f157ced04ea108c09c1f08aa24c924ec7593035f0626dd626a01c6473e60b921e
+EBUILD tellico-3.2.3.ebuild 2267 BLAKE2B d2970f9230f76a7743106d14f5623a1865e70b73fd951b8d93b6eb7a613a0af3ef48068fb5702a4045e7676344cb0f998af02f920ab491369e5010d396eb43e4 SHA512 da92f0567c722eb5f1d3041d6541b3454db65376e8db77cee3cc52b294aaaad1260d8414e9b934f986ad3ad516885d29143e8ccf9b4230b1460b099d82e3c56c
 MISC metadata.xml 666 BLAKE2B 5d03d3b6466087a3fee7c12daee7824d8a995fdb8feeeb458801e56549cca5cd24794f30ba82dd0146626edc7284d02770a904400b2aae25831dca59a8c31e76 SHA512 57316bf5ca997b02babd947e54909960300e0ca0340662fdb7b151b161913ab255502aee63951c78d301071b2fd1b5cd33d5238496e3ba8e8a8956c102d4d16e
diff --git a/kde-misc/tellico/files/tellico-3.2.1-missing-header.patch b/kde-misc/tellico/files/tellico-3.2.1-missing-header.patch
deleted file mode 100644
index cff61fcdb614..000000000000
--- a/kde-misc/tellico/files/tellico-3.2.1-missing-header.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 43851a0a655a3a961f289087bdea989aa32cc028 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Sun, 21 Jul 2019 09:21:16 +0200
-Subject: Fix build with Qt 5.13
-
-(cherry picked from commit 43e6bbb4721adc83d8b2a77bd51d9efaf7aefd6b)
----
- src/gui/datewidget.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp
-index 724370e..e6502bb 100644
---- a/src/gui/datewidget.cpp
-+++ b/src/gui/datewidget.cpp
-@@ -35,6 +35,7 @@
- #include <QPushButton>
- #include <QHBoxLayout>
- #include <QFrame>
-+#include <QDate>
- #include <QEvent>
- #include <QMenu>
- #include <QWidgetAction>
--- 
-cgit v1.1
-
-From d3c56eca11cd059d4348ab6696822c23d85af61a Mon Sep 17 00:00:00 2001
-From: Robby Stephenson <robby@periapsis.org>
-Date: Sun, 21 Jul 2019 19:17:35 -0400
-Subject: Fix apparent build problem on Jenkins
-
----
- src/mainwindow.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index d8348e8..8250c56 100644
---- a/src/mainwindow.cpp
-+++ b/src/mainwindow.cpp
-@@ -108,6 +108,7 @@
- #include <QMimeType>
- #include <QMenuBar>
- #include <QFileDialog>
-+#include <QMetaMethod>
- 
- #include <unistd.h>
- 
--- 
-cgit v1.1
diff --git a/kde-misc/tellico/tellico-3.2.1.ebuild b/kde-misc/tellico/tellico-3.2.1.ebuild
deleted file mode 100644
index 1cd59e71c253..000000000000
--- a/kde-misc/tellico/tellico-3.2.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Collection manager based on KDE Frameworks"
-HOMEPAGE="http://tellico-project.org/"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
-
-BDEPEND="
-	sys-devel/gettext
-"
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-perl/Text-BibTeX-0.780.0-r1
-	cddb? ( $(add_kdeapps_dep libkcddb) )
-	discid? ( dev-libs/libcdio:= )
-	pdf? ( app-text/poppler[qt5] )
-	scanner? ( $(add_kdeapps_dep libksane) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	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=( "${FILESDIR}"/${P}-missing-header.patch )
-
-# tests need network access
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
-		$(cmake-utils_use_find_package cddb KF5Cddb)
-		$(cmake-utils_use_find_package discid CDIO)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package scanner KF5Sane)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package taglib Taglib)
-		-DENABLE_WEBCAM=$(usex v4l)
-		$(cmake-utils_use_find_package xmp Exempi)
-		$(cmake-utils_use_find_package yaz Yaz)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-misc/tellico/tellico-3.2.3.ebuild b/kde-misc/tellico/tellico-3.2.3.ebuild
index 5070732abf47..238ff1f2d72e 100644
--- a/kde-misc/tellico/tellico-3.2.3.ebuild
+++ b/kde-misc/tellico/tellico-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
@@ -74,15 +74,15 @@ RESTRICT+=" test"
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
-		$(cmake-utils_use_find_package cddb KF5Cddb)
-		$(cmake-utils_use_find_package discid CDIO)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package scanner KF5Sane)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package taglib Taglib)
+		$(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-utils_use_find_package xmp Exempi)
-		$(cmake-utils_use_find_package yaz Yaz)
+		$(cmake_use_find_package xmp Exempi)
+		$(cmake_use_find_package yaz Yaz)
 	)
 
 	ecm_src_configure