gentoo resync : 15.12.2017

5 files changed, 8 insertions, 61 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 8b4d539acdea..2961840ed711 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,10 +1,9 @@
-AUX kio-5.37.0-tests.patch 1399 BLAKE2B 4f489f5a6321a73b6a01df33c2cb8deaca2c72940c040c7c7e301cf654039f1c94d0eea4e76e581bfc525c2565eea13dfb863e0d1e2cbf10408e49da151b129d SHA512 a894886d400719ef8b11e83454be55406e2cd677da8cdbfd822e5155945198f54c4b2aed8c92b702fa7c8f858020c5e7c481719317513735c9538f0da5963221
 AUX kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch 2506 BLAKE2B 404ce0e81484a20d1841812096830748fffb9bafda15b4146e6c924eaedd3b07ae5f20221f505fdd576a5c3a60e660f82b1edcf698b2f1654fd0c2d14c8a0b79 SHA512 1e39632a67ba8244f992c4a22df837452a09ae0134693066414eeded90c4b8cdf684129d1594e1c7dc5a1cfc445246284dcf1f28006939c2974577691584afbb
 AUX kio-5.40.0-mkpath-qt-5.9.3.patch 2481 BLAKE2B 7c98a58dfaa7f86cf83179f2615d54fa0c1ef81a226a6533a2c6d0a7c3247ca9414ee7a9863664411f51f4433152f1df6e076402463010f27e9cd656bea036fa SHA512 c8207d96555ddeddc6e8d387fb59d33d2a7a34fc068f6ad9ee30f92b16007d5f53696fcc83e8a3686af6314e127f6556088f418b16759f9a1eea812adce0cd46
 AUX kio-5.40.0-testtrash-qt-5.9.3.patch 1311 BLAKE2B 98bf9667d64e1f408adcde47e05d26c8774459679cd3ad67948dd4a245225ce9cef4c1030aaaa01cb3303d7589bd97565860df7bbe329578bb298282c771c184 SHA512 4761fbb0f7d5034dc66717c2578b095fdb6b85241c5e05fc0ab166c75aae9ddd1d9b3aaa0b9628a44c13cc6f4cfcdb0aa348f3e1c97b7780e53567a1392c11ef
-DIST kio-5.37.0.tar.xz 3084204 SHA256 49448ebcfe182805f8f9cd40c1e2c8e686578cc2e7fa3688204d5ca4e182ac5b SHA512 42b2cbf6cbc414a0b69fdb36984d13574b1aee033170761dc55835cace44abead82f387f8afb35d8a82ee93a1909854ef43cff29d45c5881c4b13ca8862d2a64 WHIRLPOOL 649b16ebf5708d410d826a70726a9fdfd3668e00784246e7cb4d193b1951525e821046121886580bc16004280170277ac0344d1ee18afb91722e095118b1ccd6
 DIST kio-5.40.0.tar.xz 3100424 BLAKE2B 27f69f10febc327d1f935e2b8f3c24dc8b64e85ef35830841f99fdefb6238f590dc8a1284bd0896d6e0e2eb86f123e6788ebd277ca208df18312e8ac475221dc SHA512 e35a7fed3c38f91c056d5ac04b4839ebbf199e4509187e997d6d8a217175a9dc442c7beacccf333ec092c0d110f8f008144293364006888f25b570d697c10bed
-EBUILD kio-5.37.0.ebuild 1948 BLAKE2B bbfec08de5c047c423f1fc227a1be8b3cfc5dabc6a8437c75c13b1803c29a795f36cfd27d44bfad5a3c6614ad11b2c54cdab880a4288ed540a3fe2e8efc3df71 SHA512 214a136ca904777793d39ad7d88ac9e60df3a253dcb76aea6782b27a4caee9f9581e64d1ddc9793887152661b875092efe09587199e24171bbdf6259f762416c
-EBUILD kio-5.40.0-r2.ebuild 2006 BLAKE2B d6f87e1f3d217046df97f120f0a4b386bb23f81760ac4fbb34fbb805822618a924f625fc93c18b19c3198da7d65d6563dd5cdb45b4c4005ebebbbe3372fe2d1b SHA512 b4cbdd9493cb46a23ef4d59220d5aff698083d240480b37b80d32d7407ee72266eccf0d3aaf708dc819e66b8aa8986f41c663753fa4963aeae927f3d0235665f
-EBUILD kio-5.40.0-r3.ebuild 2050 BLAKE2B 92572802968b2b03199a80868ba356409875058894bdcb4e41b6b553ae56e9424568e238a6e5dda2783d0880c5c14fa7f24953e41da4b3ff609edfce42cd0f4c SHA512 ea7784ee9e4379a41e8ce3cff4ae661fc12579aaf2cac155ddc464448b7c710e911f297947734331cbc87f2b90e11e91340e5cf23438884b422834b13ccfd541
+DIST kio-5.41.0.tar.xz 3108068 BLAKE2B ca8fb4827908b6ba00dc7558f48e60fddf93049fdedf8001b02ca096ee93773fc43167d8c5ec1a5c8d060190dcdf3dc0b11044a26e33309fcd44a068720a3611 SHA512 8f7072bf6268bf07c0c1266cdbee58aacdf43721d193aaa7574c683a4339de3d9701977c8bdd604f301d11393b8d2031e0b90e9ccc42a2c5e62050f41bc04216
+EBUILD kio-5.40.0-r2.ebuild 2005 BLAKE2B 8849f9ede7a542713e46ad795497caecbaef2a58e94620dbda4e8c0ea855ab0abac3b74fa76fec4c966275fc3fc04874fc951d6ae7df696bf3719fac329f2561 SHA512 06df2a3eeb312bff1fc7938a6b2796b7413112d92fc926471a777a05ef71374cad06e54c882684f86ddb2c84a9a6c1fa4ed44f838a05ba2e5cab915c896d7c63
+EBUILD kio-5.40.0-r3.ebuild 2049 BLAKE2B 1ada218376a92f1c844609293957423ca0bf1965fe3bf597d9809882795fc743e8acfc9132a3821a64e11d7ad6341f33078c4466a420337ecfbd3a13a44faf98 SHA512 91eb82ca9b5c9b2f82991a22b667957ee16101082c40a699338a47f0a28dbd54d0fdfffaafc606ac5d7b051072f9db8316b0c42ce2c103fd6660ce5f53982d23
+EBUILD kio-5.41.0.ebuild 1896 BLAKE2B 05402887a0107b41fa23472b55e58f9f2420051e61c010745cfebb9dc1257808c12bbf1aed6ca0e9619c597450a56dace4d23da8e1b4256b0a64e48c90e843f2 SHA512 594849f0a48a4c6f3b8cb3255e9dca8f9e1fd4e798125a026f101d05a8779d5782aec991e68a1fa6447f758e5b63c15a8677458b48c8d666e8a1c3ccc161355c
 MISC metadata.xml 389 BLAKE2B e0f1cc136204ab865eef4b3051c40b136fb2659f402148b8f7e48b80bd9c7156f0811a7fe80bda4a16ccf671e69d076afc6179dae6d34db695672534a0b9de5f SHA512 ae0874c02b207fad481d7f26a01186787d39e015dca650c4515b419f5d703ead48dd3250e3d0dc5d23660be9afe33e226d393c4d88246eba7e313763e6546820
diff --git a/kde-frameworks/kio/files/kio-5.37.0-tests.patch b/kde-frameworks/kio/files/kio-5.37.0-tests.patch
deleted file mode 100644
index 4fdb08fc0288..000000000000
--- a/kde-frameworks/kio/files/kio-5.37.0-tests.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit dec4afb4145b1c9ccfe3474e26a86716f597910d
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Tue Aug 8 22:33:08 2017 +0200
-
-    Use ecm_add_test and benefit from BUILD_TESTING awareness
-    
-    Reviewers: #frameworks, kfunk
-    
-    Reviewed By: kfunk
-    
-    Subscribers: kfunk
-    
-    Tags: #frameworks
-    
-    Differential Revision: https://phabricator.kde.org/D7213
-
-diff --git a/src/ioslaves/trash/tests/CMakeLists.txt b/src/ioslaves/trash/tests/CMakeLists.txt
-index 7adba49b..514fd79c 100644
---- a/src/ioslaves/trash/tests/CMakeLists.txt
-+++ b/src/ioslaves/trash/tests/CMakeLists.txt
-@@ -11,21 +11,16 @@ set(testtrash_SRCS
-     ${CMAKE_CURRENT_SOURCE_DIR}/../kiotrashdebug.cpp
- )
- 
--add_executable(testtrash ${testtrash_SRCS})
--ecm_mark_as_test(testtrash)
--add_test(NAME testtrash COMMAND testtrash)
--
--target_link_libraries(testtrash
--   KF5::I18n
--   Qt5::DBus
--   KF5::KIOCore
--   KF5::Solid
--   Qt5::Test
--)
- if(APPLE)
--    target_link_libraries(testtrash "-framework DiskArbitration -framework CoreFoundation")
-+    set(testtrash_APPLE_LIBS "-framework DiskArbitration -framework CoreFoundation")
- endif(APPLE)
--ecm_mark_nongui_executable(testtrash)
-+
-+include(ECMAddTests)
-+
-+ecm_add_test(${testtrash_SRCS}
-+    TEST_NAME testtrash
-+    LINK_LIBRARIES KF5::I18n Qt5::DBus KF5::KIOCore KF5::Solid Qt5::Test ${testtrash_APPLE_LIBS}
-+)
- 
- ### next target ###
- 
diff --git a/kde-frameworks/kio/kio-5.40.0-r2.ebuild b/kde-frameworks/kio/kio-5.40.0-r2.ebuild
index b0b6cd7af7e1..263762f96148 100644
--- a/kde-frameworks/kio/kio-5.40.0-r2.ebuild
+++ b/kde-frameworks/kio/kio-5.40.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing transparent file and data management"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 RDEPEND="
diff --git a/kde-frameworks/kio/kio-5.40.0-r3.ebuild b/kde-frameworks/kio/kio-5.40.0-r3.ebuild
index 24c8fe1a8e1c..e850e493306a 100644
--- a/kde-frameworks/kio/kio-5.40.0-r3.ebuild
+++ b/kde-frameworks/kio/kio-5.40.0-r3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing transparent file and data management"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 RDEPEND="
diff --git a/kde-frameworks/kio/kio-5.37.0.ebuild b/kde-frameworks/kio/kio-5.41.0.ebuild
index 94736a72d073..4c595b88b638 100644
--- a/kde-frameworks/kio/kio-5.37.0.ebuild
+++ b/kde-frameworks/kio/kio-5.41.0.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=6
 
-KDE_TEST="forceoptional-recursive"
+KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework providing transparent file and data management"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 RDEPEND="
@@ -62,8 +62,6 @@ PDEPEND="
 	$(add_frameworks_dep kded)
 "
 
-PATCHES=( "${FILESDIR}/${P}-tests.patch" )
-
 # tests hang
 RESTRICT+=" test"