gentoo resync : 18.05.2019

6 files changed, 63 insertions, 7 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index cf9c2b349c83..e7b8a6c7bb5a 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index e2530428191d..bc9d212bfc7c 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,6 +1,6 @@
 AUX kdiff3-0.9.98_p20170219-cli-args.patch 3620 BLAKE2B c85c377a8c5898a15233f5f4a1260dbd24c50f53869e673979c9d5ac42c2729a7cad39d066e0f4b6ae2f31687aa246c9420f1803c003168eb8e9b3bd7d43ed1b SHA512 5231791c4147a6e54d784fbb39d0088dedd22d15c77c91e293bccb42046417bb32d6354a5032f5da1daa60b3ef9a46800932092b0891c58bdbc0dd9592be7a41
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927 SHA512 847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
-DIST kdiff3-1.8.0_pre20190420.tar.gz 506141 BLAKE2B bbeacffb4fb0cc49ff17f936fa73aca4721798c212e0534ec984ee79071990c1f59cfda6d6f32758cc24fc577c7911bd10472abfb086e6e1527ee8799dd1e0dc SHA512 1923a286fff2cb884eb8f7559558e1f157afad536e7bdc47152140b420179d322d135c72e1e8be5154783d85c798e0e00ed58e7b97bb19fe41b5ee70160196f2
+DIST kdiff3-1.8.tar.xz 897716 BLAKE2B bd5ec9ad0db639905d88429204ffca88450957f052712e45168f2d4bae808f38e7fc543bcb4ff53632c018c44929364e0314ec681f3475b517d8482b9ae5cbb5 SHA512 f4d791f593eb75a4a5dbd567af31f01be0a372a4058e50e8ab34b29409cc162cab022f33c1db5527f04ae9e8f35d6b485ca7789c4cd955d745887c3439172940
 EBUILD kdiff3-0.9.98_p20170219-r1.ebuild 914 BLAKE2B 2575524af4656ebad0ca450a2ebf7039a3bd76128b14a6e9b0e9e08707ba79b4a7b328a9026ab5ebb5ac589f8539e750ce12a3a302d23e61334ba793618396ab SHA512 65821bcbcdec147a55c9b989cde2c45ea68bbf947436c890aaf3b3affc4dc0f293183f5036ac81b12e5d41e9e86cb6815edac3aff235eebaa5afa4ca93007d0c
-EBUILD kdiff3-1.8.0_pre20190420.ebuild 973 BLAKE2B 9ff4570619370b01edc208eda6b09252c5398e44da4f96dc62cf3bb88cef44562d03c76edd73e54b6831b79fd80e1645197ad582a435db3e8f859b7ea4cc8e5c SHA512 5ce91c3f2d22615e42b638b7e58d0b92c1744ff9d28e1ad18ed7502b4ece07a81efa66025fa6e91fc81b8ddcf02cdb559c1f917c54241963e05db42b6fb1c6b8
+EBUILD kdiff3-1.8.ebuild 860 BLAKE2B 9c54a0e866d30f890710800b5d6778213fab6b2d323667e04d0be782260bdf4afd631d4946900e3871d1405209be00357232bb810c047e7af866882e3eff3e87 SHA512 4d8f87b38683d19f42323f8fa6db11c0ae6c8639ce2c7705ecc397569620865f66d920d21ecef12e77aa733aa0599911eec2c37a25189e671e6c3713ab1b5db9
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/kdiff3-1.8.0_pre20190420.ebuild b/kde-misc/kdiff3/kdiff3-1.8.ebuild
index 1fe53c0bc060..85263eb39dbe 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.0_pre20190420.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=7
 
-COMMIT="5b50c4c7b0ce7d5e06287c24b6b5600b6c2d68df"
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
 HOMEPAGE="https://userbase.kde.org/KDiff3"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -35,5 +34,3 @@ RDEPEND="${DEPEND}
 	sys-apps/diffutils
 	!kde-misc/kdiff3:4
 "
-
-S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 46759017bb8e..e76fb8f55507 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,5 +1,6 @@
 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
-EBUILD tellico-3.1.4.ebuild 2561 BLAKE2B 3458f41e39a00a0d3262f6f7de3106a5d33619decec19128419fdbaad0011930a709ecffc10e1d255b8ad17ec791c262660e1a6d39f680a622acace12119bd0e SHA512 7b84360b5a8bffd95d1bb12a8c4a6c795e5fc1f2e190a01a2330e6a249bca718dd83f9c2df99f2a8acea6fd35ffd55c72620f5f9e271da9e8b501c06cb3795f1
+EBUILD tellico-3.1.4.ebuild 2608 BLAKE2B a5a2fa788fad61752733ed2c2e2181169eae4865ac7da3bfbcd213b5b3e093cf58fa939805ec624f57ae0eb73bbc11fc8956258f0d8e39afd32eec73c366c6b0 SHA512 aa9bf763266bae19ad6544806cf93d90a73fb0fa7fb0c2944db7db0d84d362788d3480a909705787b8f6cd4db1c67417b38db4912599af56f2a5c7bce9cebc9d
 MISC metadata.xml 666 BLAKE2B 5d03d3b6466087a3fee7c12daee7824d8a995fdb8feeeb458801e56549cca5cd24794f30ba82dd0146626edc7284d02770a904400b2aae25831dca59a8c31e76 SHA512 57316bf5ca997b02babd947e54909960300e0ca0340662fdb7b151b161913ab255502aee63951c78d301071b2fd1b5cd33d5238496e3ba8e8a8956c102d4d16e
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
new file mode 100644
index 000000000000..5b10e4d259a9
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.1.4-icu-64.patch
@@ -0,0 +1,57 @@
+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/tellico-3.1.4.ebuild b/kde-misc/tellico/tellico-3.1.4.ebuild
index 14a4c066ed22..c9cec88bd7e1 100644
--- a/kde-misc/tellico/tellico-3.1.4.ebuild
+++ b/kde-misc/tellico/tellico-3.1.4.ebuild
@@ -71,6 +71,7 @@ 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() {