gentoo resync : 11.07.2019

7 files changed, 13 insertions, 135 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index e8ae9c57fc87..f07badbbb815 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index e0c808aac4bc..b4050613dbc6 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,8 +1,5 @@
-AUX tellico-3.1.4-empty-permissions-set.patch 906 BLAKE2B e46830a15f0f1fa05b1d94c57ecc27c06f7fe269b1eef3f2bb94c378b0d794ec43ebff9904e964741c2a35a46e7b0ea1faeccffff0dc930aa345ba16746cf1aa SHA512 49bc0ffa89049c964e92a15ed1067964ef2a66af3611929c0dc7263b7dfaae8077e0214f03f99359fe71d5c27e22853fdecc5998a4cd81231f7b30aeadce2c0b
-AUX tellico-3.1.4-icu-64.patch 2136 BLAKE2B 667903d58771f3a0b2c4b83aaa864e3ce072dec1e3106c83f835b560c3cf653342b158693ce658adc7ed56cc12515e348922eaabd7e39d353a15908a85a34401 SHA512 468873c3dd692ca85b7bdc7ecdbe755e125d669686374b998593ce5c99bf7be3e3da15656925db9f294175a1fa0811b3de26c075ebc1dc49174960acf89bd06e
-AUX tellico-3.1.4-xmloutputclosecallback-signature.patch 918 BLAKE2B 2150dd13332ea01a5524951085dfe4a7032a4cf26776af5818f4caa7764584027112b3f793e3a839ade84979aa75c1e2e7034d5baaff250b9d32c64832d2e930 SHA512 6ceda2d2a10b480539677654a2b21132c17e88a4395016fdb703c09f9ee066a93c834bc9b229730970dd35dca4a110f4c2fea19775062d404f76515fc0fbc0f0
-DIST tellico-3.1.4.tar.xz 4632792 BLAKE2B 29db598ef558fe04618843cad6a58055b5de392f34aeea4860683f04ef4ab20856fd4a01523dc13c2d68023c266de69590e843ea56f912989d57c01e0d701ee2 SHA512 d09183bee13ae9f7c6c5114b76eeeb959a184def559ae239bb880ef9be964e33878530e9c4c0d3baa6f872bf8db155dffb94592e3a857623ab131d2f28f1f139
+DIST tellico-3.2.1.tar.xz 5604632 BLAKE2B 4e0f156a315eca387b60f254df9824615aca3a917a1a256bfd3612e6babd7495e22d79234bdd92297167c323d5a3aabed253ddc38d757e41b64c289392b6e827 SHA512 ada45c66fce2e73f301e3f7d69acb20caf5ebde85ac77bd6e6f0701f55044f5f1a44f8e6ae5d6d6bd244fd6538fba88591caf70178855b6910ce5132508fba9b
 DIST tellico-3.2.tar.xz 5596028 BLAKE2B e22cd7b5f1bfb5221379b0e6c12c894314c3f04348ce8e0f82fe5707aa98d99af004486afe9266056c9650636b553e2355fa4caabe7528e60c0fd5af5df2ed9b SHA512 a24985200a70958f727bda3056de357d6cb74fc407197e9d9056573bc606cd6ffbd5bd971ef56acce3cb58f0b98865f5e89b431fe38c1d27b4dceafe49e78fdd
-EBUILD tellico-3.1.4.ebuild 2608 BLAKE2B a5a2fa788fad61752733ed2c2e2181169eae4865ac7da3bfbcd213b5b3e093cf58fa939805ec624f57ae0eb73bbc11fc8956258f0d8e39afd32eec73c366c6b0 SHA512 aa9bf763266bae19ad6544806cf93d90a73fb0fa7fb0c2944db7db0d84d362788d3480a909705787b8f6cd4db1c67417b38db4912599af56f2a5c7bce9cebc9d
-EBUILD tellico-3.2.ebuild 2465 BLAKE2B 530489b82ff5ce34ce12deb41b1a9f170fdc1bfd37b3b439675eff89a1e5ed8a7a5a5e12010e715de1546b067975075b949b9195bedef436b8c1f9ca06099ccc SHA512 d1302b7abfcf50104abb9af31963ea78bfd5629d08e777a8bfac9f6d2a90f717df43867860627b70b571ce052a2695679b5107d74d3e92c809480ade012c8f50
+EBUILD tellico-3.2.1.ebuild 2465 BLAKE2B 530489b82ff5ce34ce12deb41b1a9f170fdc1bfd37b3b439675eff89a1e5ed8a7a5a5e12010e715de1546b067975075b949b9195bedef436b8c1f9ca06099ccc SHA512 d1302b7abfcf50104abb9af31963ea78bfd5629d08e777a8bfac9f6d2a90f717df43867860627b70b571ce052a2695679b5107d74d3e92c809480ade012c8f50
+EBUILD tellico-3.2.ebuild 2463 BLAKE2B 41cf33255a9e068b3ca97c5f039aeea9bed026b8c0aee2062db5a660f321b26d0b496babab2bbb5c0e6b0981110e67442878abd894ff6575eb64db8460e202be SHA512 9d445f2364b583cf7080bf33f46b87732849edbbbbac361d24639f85cf11cf0d5838c6de94c61933f2785bae2775ddf44a7c3f8c0a541129fa3a28a7f26c854c
 MISC metadata.xml 666 BLAKE2B 5d03d3b6466087a3fee7c12daee7824d8a995fdb8feeeb458801e56549cca5cd24794f30ba82dd0146626edc7284d02770a904400b2aae25831dca59a8c31e76 SHA512 57316bf5ca997b02babd947e54909960300e0ca0340662fdb7b151b161913ab255502aee63951c78d301071b2fd1b5cd33d5238496e3ba8e8a8956c102d4d16e
diff --git a/kde-misc/tellico/files/tellico-3.1.4-empty-permissions-set.patch b/kde-misc/tellico/files/tellico-3.1.4-empty-permissions-set.patch
deleted file mode 100644
index 2cb38749f4cf..000000000000
--- a/kde-misc/tellico/files/tellico-3.1.4-empty-permissions-set.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From fd2056f2de46fa3be308ad47541f6c7ce8483c91 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Wed, 19 Dec 2018 10:24:51 +0100
-Subject: Properly pass an empty permission set
-
-Use QFileDevice::Permissions() to represent no permissions, instead of
-hardcoding 0.
----
- src/tests/imagejobtest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tests/imagejobtest.cpp b/src/tests/imagejobtest.cpp
-index ee578f8..b387e3b 100644
---- a/src/tests/imagejobtest.cpp
-+++ b/src/tests/imagejobtest.cpp
-@@ -99,7 +99,7 @@ void ImageJobTest::testNonexistant() {
- void ImageJobTest::testUnreadable() {
-   QTemporaryFile tmpFile;
-   QVERIFY(tmpFile.open());
--  QVERIFY(tmpFile.setPermissions(0));
-+  QVERIFY(tmpFile.setPermissions(QFileDevice::Permissions()));
-   QUrl u = QUrl::fromLocalFile(tmpFile.fileName());
- 
-   Tellico::ImageJob* job = new Tellico::ImageJob(u);
--- 
-cgit v1.1
-
diff --git a/kde-misc/tellico/files/tellico-3.1.4-icu-64.patch b/kde-misc/tellico/files/tellico-3.1.4-icu-64.patch
deleted file mode 100644
index 5b10e4d259a9..000000000000
--- a/kde-misc/tellico/files/tellico-3.1.4-icu-64.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 2e552aea8d2391ea3ab8afdb58caf214954a2129 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 9 May 2019 21:16:33 +0200
-Subject: [PATCH] Fix build against ICU 64.1 and later
-
-Summary:
-See also: https://unicode-org.atlassian.net/browse/ICU-20530
-
-Lots of errors of the same kind (libxml/tree.h included within extern "C"):
-
-```
-In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/bits/shared_ptr.h:52,
-                 from /usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/memory:81,
-                 from /usr/include/unicode/localpointer.h:45,
-                 from /usr/include/unicode/uenum.h:23,
-                 from /usr/include/unicode/ucnv.h:53,
-                 from /usr/include/libxml2/libxml/encoding.h:31,
-                 from /usr/include/libxml2/libxml/parser.h:810,
-                 from /usr/include/libxml2/libxml/globals.h:18,
-                 from /usr/include/libxml2/libxml/threads.h:35,
-                 from /usr/include/libxml2/libxml/xmlmemory.h:218,
-                 from /usr/include/libxml2/libxml/tree.h:1307,
-                 from /var/tmp/portage/kde-misc/tellico-9999/work/tellico-9999/src/translators/xslthandler.h:34,
-                 from /var/tmp/portage/kde-misc/tellico-9999/work/tellico-9999/src/translators/xsltimporter.cpp:26:
-/usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/bits/shared_ptr_base.h:338:3: error: template with C linkage
-   template<typename _Tp, _Lock_policy _Lp = __default_lock_policy>
-   ^~~~~~~~
-```
-
-Test Plan: Builds fine against ICU 64.2.
-
-Reviewers: #tellico
-
-Differential Revision: https://phabricator.kde.org/D21103
----
- src/translators/xslthandler.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/translators/xslthandler.h b/src/translators/xslthandler.h
-index ebbb010b..bb2112da 100644
---- a/src/translators/xslthandler.h
-+++ b/src/translators/xslthandler.h
-@@ -29,9 +29,10 @@
- #include <QHash>
- #include <QString>
- 
--extern "C" {
- // for xmlDocPtr
- #include <libxml/tree.h>
-+
-+extern "C" {
- // for xsltStyleSheetPtr
- #include <libxslt/xsltInternals.h>
- }
--- 
-2.21.0
-
diff --git a/kde-misc/tellico/files/tellico-3.1.4-xmloutputclosecallback-signature.patch b/kde-misc/tellico/files/tellico-3.1.4-xmloutputclosecallback-signature.patch
deleted file mode 100644
index 703af9c23e1e..000000000000
--- a/kde-misc/tellico/files/tellico-3.1.4-xmloutputclosecallback-signature.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 02cde6b20a3a0606aef7bf98a14ca70c7615be2c Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Wed, 19 Dec 2018 10:23:44 +0100
-Subject: Fix signature of xmlOutputCloseCallback function
-
-xmlOutputCloseCallback returns int, so adjust the closeQString callback
-to return 0 (i.e. no error).
----
- src/translators/xslthandler.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/translators/xslthandler.cpp b/src/translators/xslthandler.cpp
-index 32b3e02..3d249fd 100644
---- a/src/translators/xslthandler.cpp
-+++ b/src/translators/xslthandler.cpp
-@@ -52,9 +52,10 @@ static int writeToQString(void* context, const char* buffer, int len) {
-   return len;
- }
- 
--static void closeQString(void* context) {
-+static int closeQString(void* context) {
-   QString* t = static_cast<QString*>(context);
-   *t += QLatin1String("\n");
-+  return 0;
- }
- 
- using Tellico::XSLTHandler;
--- 
-cgit v1.1
-
diff --git a/kde-misc/tellico/tellico-3.1.4.ebuild b/kde-misc/tellico/tellico-3.2.1.ebuild
index c9cec88bd7e1..e75e9ba7649e 100644
--- a/kde-misc/tellico/tellico-3.1.4.ebuild
+++ b/kde-misc/tellico/tellico-3.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
@@ -10,12 +10,17 @@ inherit kde5
 
 DESCRIPTION="Collection manager based on KDE Frameworks"
 HOMEPAGE="http://tellico-project.org/"
-SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
+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 )"
-KEYWORDS="amd64 x86"
 IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
 
+BDEPEND="
+	sys-devel/gettext
+"
 RDEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcodecs)
@@ -59,21 +64,11 @@ RDEPEND="
 	xmp? ( >=media-libs/exempi-2 )
 	yaz? ( >=dev-libs/yaz-2:0 )
 "
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
+DEPEND="${RDEPEND}"
 
 # tests need network access
 RESTRICT+=" test"
 
-DOCS=( AUTHORS ChangeLog README )
-
-PATCHES=(
-	"${FILESDIR}/${P}-xmloutputclosecallback-signature.patch"
-	"${FILESDIR}/${P}-empty-permissions-set.patch"
-	"${FILESDIR}/${P}-icu-64.patch" # bug #685460
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
diff --git a/kde-misc/tellico/tellico-3.2.ebuild b/kde-misc/tellico/tellico-3.2.ebuild
index e75e9ba7649e..b7d5f0f2be4a 100644
--- a/kde-misc/tellico/tellico-3.2.ebuild
+++ b/kde-misc/tellico/tellico-3.2.ebuild
@@ -12,7 +12,7 @@ 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"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"