gentoo resync : 09.06.2018

3 files changed, 66 insertions, 1 deletions

diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index b069bb046e2a..3d90416f729a 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,5 +1,6 @@
+AUX kcoreaddons-5.46.0-kformattest.patch 3537 BLAKE2B 8f662df8a950c6cd102dc18c67c18628ac1318d1a76a076af08e0e7d6dc7aa92b502196d209b0e544c67ab83bd6cfa6b86098f305b9bbd8f10cd7f6cfdab9d6b SHA512 8cd914a542f5ba35857f8378b28413649fe27761d4a000589972b8ec25d1effda8e4f7d9e07c04f9e168af1d892051b263b8b61da42cb6b7be6a7643c2c31729
 DIST kcoreaddons-5.43.0.tar.xz 355784 BLAKE2B dd76abee04ba0e3772b1e1c8b03192ad3ae2768e1ef54059cffdf0fbac5e1d75d31495951ebf37470823121b4dfef9dca19246c44ba31b2751589820361e1607 SHA512 895a6b3547f78f5222a16be71c8fe8865b922e2d9b2a8fedf322c7df607ccdb6b4fd3928470dc5cef385eaf13c37a5d1dcbd959afc326afb48b8636cb4a4b77b
 DIST kcoreaddons-5.46.0.tar.xz 350224 BLAKE2B dee0f20b3f35a1f787f263e080a0e4641222b4a9e7f3a8eca736b97a4688ecfa30f26c3040cb655bdb47852381a6810dec712f8a426181bb24b680270a41e6bb SHA512 3c12462729a163fc7ab5a49ea9473b94d44ad4276243d65bcbe10a28fe6c1c4a9996bdf09c4f03b0083b4dff97e1719eb1aaf8b7d8dc882d4f66de61e7ef416a
 EBUILD kcoreaddons-5.43.0.ebuild 729 BLAKE2B 37c862eae2a91b817843435b50c3d90db529584f05b38dea876173dadda8721ad691fd83e5cb05d283d2a6541b12d7f28cab6438f9b35126ab8a71fb091b991a SHA512 22cf03b4cdd444a1829584a84efe5984caf8cd5aeb31c4b249173bfc19d91f448e20da2366eab5c94c8a2375af35e73cdcea3afcba1ef2cc1d0fb85abf82ab88
-EBUILD kcoreaddons-5.46.0.ebuild 731 BLAKE2B 055f5add0ea3bfd79aa2955aabeb9ea891a82715cf9611884ae07e13ec4ca4f5d8d94e141e91423add3a4d35db2025da22d57b16300b7ca996c20927f28071a3 SHA512 a0559e6e94b565853bba672dbacbdf961fe43f938ad3add4d0dac9b95a6bb5759a2c66bd5e71fb41aa0476bcedfeb6479063e123407d872b6d58b76301776eec
+EBUILD kcoreaddons-5.46.0.ebuild 873 BLAKE2B 3c0480db378ae21111958c90e7b096f038edce33a9843cc0c64910badae73a3e9add9ba7595bfb39cd79bb5027f3456cd17470ba50df56a8c5fcb613f175b788 SHA512 92e14d36fa59ac9d58dc81458ec919e2da2a418990c59c9f82181548c768688e846d386ea63d2429a4a3fcc3be4de761fe011ecbcdcc57cf0c327aecac822b2e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch b/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch
new file mode 100644
index 000000000000..64031659fdda
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch
@@ -0,0 +1,56 @@
+From: Maximiliano Curia <maxy@gnuservers.com.ar>
+Date: Tue, 15 May 2018 13:06:53 +0200
+Subject: fix kformattest plural forms
+
+---
+ autotests/kformattest.cpp | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/autotests/kformattest.cpp b/autotests/kformattest.cpp
+index 15080be..6cc3c52 100644
+--- a/autotests/kformattest.cpp
++++ b/autotests/kformattest.cpp
+@@ -248,8 +248,8 @@ void KFormatTest::formatDecimalDuration()
+ {
+     KFormat format(QLocale::c());
+ 
+-    QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 millisecond(s)"));
+-    QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 millisecond(s)"));
++    QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 milliseconds"));
++    QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 milliseconds"));
+     QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 10), QStringLiteral("1.01 seconds"));
+     QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 1, 3), QStringLiteral("1.001 seconds"));
+     QCOMPARE(format.formatDecimalDuration(1 * MSecsInMinute + 10 * MSecsInSecond), QStringLiteral("1.17 minutes"));
+@@ -264,22 +264,22 @@ void KFormatTest::formatSpelloutDuration()
+ {
+     KFormat format(QLocale::c());
+ 
+-    QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 second(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(60000), QStringLiteral("1 minute(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(300000), QStringLiteral("5 minute(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(3600000), QStringLiteral("1 hour(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(18000000), QStringLiteral("5 hour(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute(s) and 15 second(s)"));
++    QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second"));
++    QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 seconds"));
++    QCOMPARE(format.formatSpelloutDuration(60000), QStringLiteral("1 minute"));
++    QCOMPARE(format.formatSpelloutDuration(300000), QStringLiteral("5 minutes"));
++    QCOMPARE(format.formatSpelloutDuration(3600000), QStringLiteral("1 hour"));
++    QCOMPARE(format.formatSpelloutDuration(18000000), QStringLiteral("5 hours"));
++    QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute and 15 seconds"));
+     // Problematic case #1 (there is a reference to this case on kformat.cpp)
+-    QCOMPARE(format.formatSpelloutDuration(119999), QStringLiteral("2 minute(s)"));
++    QCOMPARE(format.formatSpelloutDuration(119999), QStringLiteral("2 minutes"));
+     // This case is strictly 2 hours, 15 minutes and 59 seconds. However, since the range is
+     // pretty high between hours and seconds, formatSpelloutDuration always omits seconds when there
+     // are hours in scene.
+-    QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hour(s) and 15 minute(s)"));
++    QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hours and 15 minutes"));
+     // This case is strictly 1 hour and 10 seconds. For the same reason, formatSpelloutDuration
+     // detects that 10 seconds is just garbage compared to 1 hour, and omits it on the result.
+-    QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour(s)"));
++    QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour"));
+ }
+ 
+ void KFormatTest::formatRelativeDate()
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild
index 4e70e58a430e..1848371366c2 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild
@@ -19,6 +19,14 @@ DEPEND="${RDEPEND}
 	nls? ( $(add_qt_dep linguist-tools) )
 "
 
+src_prepare() {
+	# bug 650280
+	has_version '<dev-qt/qtcore-5.10.0:5' && \
+		eapply "${FILESDIR}/${P}-kformattest.patch"
+
+	kde5_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-D_KDE4_DEFAULT_HOME_POSTFIX=4