gentoo resync : 13.10.2019

7 files changed, 4 insertions, 43 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 859eea7e3f1d..dd946c8067ab 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 53e2ec3ebd68..b15707343a7b 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,4 +1,3 @@
-AUX discover-5.15.5-tests.patch 1208 BLAKE2B 287a2e6ac59f012577df87ea3358514813c958e085a6aaac552add865671bf02cbaba8bc770234b5e647c02d7f097c8749d8053a8e463d5605449686a03ad6b0 SHA512 a51541e75d056c1ea6cfa16a20aca221bb56ae8a940601ea4b1d4b5431366b807d5bf6832733a86028dae9901a4eca8aaf89929ffac896bcfc5fb20eec55d914
 DIST discover-5.16.5.tar.xz 10453308 BLAKE2B 03d497f9dd1685a356081bf43228c5859d80c40f3b45616e9919f6b3a50e193ca608a14e3175168c77d9b5e234e34ab4eb97c2294a366e47328044bdea98b231 SHA512 69fcfc9f8576dc5933f4e0c36ac25c518e2cd41158c5c171f760a4cd883018a6dd01ffa8984c80e5002830d6b9d706abbb7cedf3d2144317e482404bb821055e
 EBUILD discover-5.16.5.ebuild 1651 BLAKE2B 4c219c7744eb168fe5579252b91e6fe93cc34baadb5380d0e5c208e32dfa72988b200b6742bc991b880ff9d7c5d71d4e2f62d78b536d8ccfd8fe288e18035f60 SHA512 dfb64f708a743d666754be397b2f682716b4e4c95b70db2cb78749d4370ae75d0e9c9dab034461a14430b507d948a2367f38421275c9429fa5ceebee909cb71f
 MISC metadata.xml 364 BLAKE2B 4ed8b5937febc1af9515c186ab7eefbfb7d7520c8befc9a6397e6bc69bb355715e1a1b536909a7966962d0791a7a272c5591facee0901256862322d2d984a4f0 SHA512 27da3a4431c2f81e442980f8044f93276f7c4e005d5fc2dc92ebc6ec008fa25a441b03185426587f6357da764262c305cbbf998de2fe6c82b3f56a903d88e15b
diff --git a/kde-plasma/discover/files/discover-5.15.5-tests.patch b/kde-plasma/discover/files/discover-5.15.5-tests.patch
deleted file mode 100644
index 131a63b1e942..000000000000
--- a/kde-plasma/discover/files/discover-5.15.5-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 03653a7d75ba8b24e28bc3adf5348ea3d0faf2b0 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 16 May 2019 19:39:44 +1000
-Subject: [PATCH] Port knsbackendtest to ecm_add_test
-
-Reviewers: #plasma, apol
-
-Reviewed By: apol
-
-Subscribers: asturmlechner, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D21239
----
- libdiscover/backends/KNSBackend/tests/CMakeLists.txt | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/libdiscover/backends/KNSBackend/tests/CMakeLists.txt b/libdiscover/backends/KNSBackend/tests/CMakeLists.txt
-index 4fabe5ec..e64eb8ca 100644
---- a/libdiscover/backends/KNSBackend/tests/CMakeLists.txt
-+++ b/libdiscover/backends/KNSBackend/tests/CMakeLists.txt
-@@ -1,11 +1,3 @@
- include_directories(..)
- 
--add_executable(knsbackendtest KNSBackendTest.cpp)
--add_test(knsbackendtest knsbackendtest)
--ecm_mark_as_test(knsbackendtest)
--target_link_libraries(knsbackendtest
--    Discover::Common
--    
--    Qt5::Test Qt5::Core
--    KF5::NewStuff KF5::Attica
--)
-+ecm_add_test(KNSBackendTest.cpp TEST_NAME knsbackendtest LINK_LIBRARIES Discover::Common Qt5::Core Qt5::Test KF5::Attica KF5::NewStuff)
--- 
-2.21.0
-
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 486c80167f0c..3af3363e6546 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,5 +1,5 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 DIST kscreenlocker-5.16.5.tar.xz 122872 BLAKE2B 0a25fcad963696394de880b2dcf8263cc8d8bfaf9ab7ff70aaae497cb46f47574dcc180568967ae05ee95b9a818f5e66e243f35cfcfe29756632bef12ad56d18 SHA512 ce7cef6ca4bcd94f716b70df26691dc70b7709421d56827ef2e355a3350af71779168cf17c0437e53ef0fc930f20590a7e7ffa5f11ea01d3a4f2f25e1fa00549
-EBUILD kscreenlocker-5.16.5.ebuild 2135 BLAKE2B a14c5c11963076d1a03a4fbf1ba8985e102cf9c4e6e6b0b2b7f304e25d36c508d591e2926dd407478bb76618236a3e070b1a4c286bad0b9c15b52a8b44307311 SHA512 32322bdf390d97b2d110423055e4232e15fdaea889c30e9d84b808edab65f0e6515c110e9a9d8842fee2f94a55db25bc182ca14ab2c5439b4046156b15553e59
+EBUILD kscreenlocker-5.16.5.ebuild 2136 BLAKE2B 10f918df9df18f8607cecebb88f5a4050c3698f8a5d04d482d6c80e7b85c3c54240e87b99aae27fd6c3cb4417611fd4d8fbe6a7044ec80e60c0f4cf1b9a5fc5b SHA512 b34745f4184cc3eb52d7266b5e6fd8d682ef366a43b8230a76fb20d9b5dc89ff6560fde431236a7af79f7af8a669adf49271d28071f27c0c3fe2be5961a7e829
 MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.16.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.16.5.ebuild
index be1138d93235..380d1385adf5 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.16.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.16.5.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	x11-libs/libxcb
 	x11-libs/xcb-util-keysyms
 	consolekit? ( sys-auth/consolekit )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	seccomp? ( sys-libs/libseccomp )
 "
 DEPEND="${RDEPEND}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 20e26377b39e..f032e50fabca 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,3 +1,3 @@
 DIST kwallet-pam-5.16.5.tar.xz 19512 BLAKE2B dc053b8b02d44a3b94fe16d50b03bf91718392bdce60e69b956e5a84406012b567f4216b08b4d05c215cfa0e9e16c7537b60420a80bf501402a7cf302b853d9b SHA512 6a3c09b645a193bd5164525c6ca0c807a0adc141566db7436101784fef8def79e121c599a837dac32393f8e5ab2c33a9473a29013d07bd64e6a8eab32308d3d1
-EBUILD kwallet-pam-5.16.5.ebuild 656 BLAKE2B 9046dd736fb13f9ddcf12f2724ecc3516841cb99aeac7c61dcd4d2fc724bb0c16d077d33fb8efb455d67eacde53807ef9606c1f7ff78cb2d2eb7f2339194f79d SHA512 52c901080659e071b96583ea30887d68185290a60141905df63b09dd96596b3dae9ede2d1df7de0283971a8424b99a0cc14ad4b6c7bd4c9bf361ca5c12583b8a
+EBUILD kwallet-pam-5.16.5.ebuild 657 BLAKE2B 3e7808f3098d000d8ab4670dccc6a3c15e6bdbea4c4201dc5e95ecdc9d9785fa5af4c721e3976f31987e0f074233dcb874aa461174101da3be7a8ee0e3c26680 SHA512 a1a06693a8ceb902aa8652ec95624b7c8850cc60731b43e71b61d4655399db7a25934c7c5be809cf395dc5c810c1ce13cef2212968d7d38248a0cf8dd8733341
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.16.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.16.5.ebuild
index 29de02de6fbc..f4803c0ed16b 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.16.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.16.5.ebuild
@@ -13,7 +13,7 @@ IUSE=""
 DEPEND="
 	$(add_frameworks_dep kwallet)
 	dev-libs/libgcrypt:0=
-	virtual/pam
+	sys-libs/pam
 "
 RDEPEND="${DEPEND}
 	net-misc/socat