gentoo resync : 25.08.2020

4 files changed, 44 insertions, 13 deletions

diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index addf50a958ea..a6775691a0f2 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,5 +1,6 @@
-DIST tellico-3.2.3.tar.xz 5589552 BLAKE2B e22f0344ccd879694976bc00fa6bcb52e3b878d4ef92c05b9b9a62ab74b1e84cd4b649682a55ee4a1b2da4678676abe8f1da5591f57dbd7db156b5e5bd0b9dd1 SHA512 4b2e524607d79638730b86d67e4af0e69294ae0e5e87ca971cf5319e32eee9597b0825149babbf7e0c9a78fd42a1e34fa82eff64c4e22ca61dd478afa95b58a7
+AUX tellico-3.3.1-kf-5.72-findtaglib.patch 914 BLAKE2B 106852573d04d61d19dafb4b9156052f000c1b2547bab846420a8e563e0ad55f4fcde8f029de36f74983d0708647738c2fb462128c2806396a2cc0980237ce96 SHA512 32afc5f3959532ea387aaec93089f721bb4f274062c82c819fb3d78d5f2db041f2380b2d329e06b469801b2e82b7a21a38c17eef9f61277fd91d4ecce19a44b4
 DIST tellico-3.3.1.tar.xz 5619068 BLAKE2B 5b70f42102c2dbb349f343146edb30e94d73b891f7b95fcba87cc19ea6228a62273f9f0321c32037a62cb2cffa2ec61108db519b3387968d2a0ebd1ca332bfd7 SHA512 12d49aba8c99cd16e426ac0144fa7343c5b1348a8c9a0892f30ff274f0e98f9ad7819c03c4ecdd0dc2f826377468ebdab1996828e992fcd293c7ffe4f844ab74
-EBUILD tellico-3.2.3.ebuild 2274 BLAKE2B 8e8e349acda8333b06c48e343cf441437961894c84c8d0a36e8f50da118835f8bbf85b2e08091f2822fbf232142930fac60d1ff1f12abcee23551e2c8dc7d01c SHA512 ebcc4734e81cb790e98fccf5fcb344b7fae5c6c1a0174a0201786c11c6e1da1f293400af2c0d39dced149fdafdb05c93ab44940b14956263f7c4641f43605cb0
-EBUILD tellico-3.3.1.ebuild 2276 BLAKE2B c4b8a113e598a8c19eefb94a8a3630483bba2c964bf9a0e440f72438fa30488e99cd34d3582f1457568b8dc97f2983e5892b9f350e7279a91541ab307c72a2c0 SHA512 a9803f077c989d4aa80e54fa594615e6b87e65d9c6a4f90a325cb619dc9b3b23bc980a40c6c3b25f9806fc2a514b8292728e1fd7c4e8b8225fd99f59e628c9a8
+DIST tellico-3.3.2.tar.xz 5623808 BLAKE2B 2c709a40799f53d8431cc4eeab5d33242e9f967fa9af02c05675730fdb9b249b05c7af17ab8269fec0b53e3d4ad6144213f060aa4b2c32e27bca93bd905d7828 SHA512 4e304553e58ea3cfcc8aabdbe86ea2b1b52edb6d4f690d0f9e5c5c6de152dac25889a7beea3394eac711ef2195efe1bf1f3fd48bf57aece923ed47b975d664d8
+EBUILD tellico-3.3.1.ebuild 2331 BLAKE2B ae0662da93b1ba2aec53aefb282901a61cf6402cf92b37f4e32feeed0531b180a731415bb94517e5e284e0bcc83c0a62837fcbae20ad9b8bac12492fe4fbe8e8 SHA512 66317ea638e63e6ae8ced0d7c8c57b7fecc630a6dbb4688dc2095ad69360f0660f85de7f5246cc27a6acff678681b936efef44c77624d2ad03b98170513c2bf9
+EBUILD tellico-3.3.2.ebuild 2276 BLAKE2B c4b8a113e598a8c19eefb94a8a3630483bba2c964bf9a0e440f72438fa30488e99cd34d3582f1457568b8dc97f2983e5892b9f350e7279a91541ab307c72a2c0 SHA512 a9803f077c989d4aa80e54fa594615e6b87e65d9c6a4f90a325cb619dc9b3b23bc980a40c6c3b25f9806fc2a514b8292728e1fd7c4e8b8225fd99f59e628c9a8
 MISC metadata.xml 666 BLAKE2B 5d03d3b6466087a3fee7c12daee7824d8a995fdb8feeeb458801e56549cca5cd24794f30ba82dd0146626edc7284d02770a904400b2aae25831dca59a8c31e76 SHA512 57316bf5ca997b02babd947e54909960300e0ca0340662fdb7b151b161913ab255502aee63951c78d301071b2fd1b5cd33d5238496e3ba8e8a8956c102d4d16e
diff --git a/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch b/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch
new file mode 100644
index 000000000000..5d77a9816ba0
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch
@@ -0,0 +1,28 @@
+From 1051b34db65a45a4fd5f12cad0eebc27325a2be3 Mon Sep 17 00:00:00 2001
+From: Jonathan Riddell <jr@jriddell.org>
+Date: Fri, 19 Jun 2020 15:35:08 +0100
+Subject: [PATCH] switch order of cmake modules so it gives priority to the
+ local copy which will be the one it expects.  fixes build failure on KDE neon
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 00ee0035..5b96f25b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,8 +20,8 @@ endif(POLICY CMP0063)
+ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
+-                      ${ECM_MODULE_PATH}
+-                      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
++                      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
++                      ${ECM_MODULE_PATH})
+ 
+ #include(ECMAddTests)
+ #include(ECMMarkNonGuiExecutable)
+-- 
+GitLab
+
diff --git a/kde-misc/tellico/tellico-3.3.1.ebuild b/kde-misc/tellico/tellico-3.3.1.ebuild
index f39a4200a144..17945c0039b0 100644
--- a/kde-misc/tellico/tellico-3.3.1.ebuild
+++ b/kde-misc/tellico/tellico-3.3.1.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 )"
@@ -71,6 +71,8 @@ DEPEND="${RDEPEND}"
 # tests need network access
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-kf-5.72-findtaglib.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
diff --git a/kde-misc/tellico/tellico-3.2.3.ebuild b/kde-misc/tellico/tellico-3.3.2.ebuild
index b176e576cc48..f39a4200a144 100644
--- a/kde-misc/tellico/tellico-3.2.3.ebuild
+++ b/kde-misc/tellico/tellico-3.3.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 )"
@@ -24,6 +24,14 @@ 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/qtwidgets:5
+	dev-qt/qtxml:5
 	kde-frameworks/karchive:5
 	kde-frameworks/kcodecs:5
 	kde-frameworks/kcompletion:5
@@ -48,14 +56,6 @@ RDEPEND="
 	kde-frameworks/kxmlgui:5
 	kde-frameworks/solid:5
 	kde-frameworks/sonnet:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-perl/Text-BibTeX-0.780.0-r1
 	cddb? ( kde-apps/libkcddb:5 )
 	discid? ( dev-libs/libcdio:= )
 	pdf? ( app-text/poppler[qt5] )