gentoo resync : 22.06.2019

6 files changed, 12 insertions, 37 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 05abe41477c7..79726b71dce7 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 2665b6f5ffad..b9be1df932de 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,4 @@
 AUX gwenview-18.12.1-exiv2-0.27.patch 19132 BLAKE2B a0f390fa9a6f7037a46a8c2e53897e2290bee8284b5fc120c24445c2f37c16c4efb4dbd6d272e2df821ca70e49e74af86cf8a949176bd22e8ef6adbcd539db7a SHA512 327cf77dad47824321f62443a88f64bb519c9f8dfc850fbea5fbcfa1ea7ac0a596d925e2aa79f610f6d76118d9064d89ab106ea880972a5c31853a62ce9d9a87
-AUX gwenview-19.04.1-exiv2-0.27.1.patch 978 BLAKE2B f83aebfb9c938166bed94cca7f6c2069a2f518a4ae680af1be7ed06f1a0a65953ba4ba015a8d841dc1ca9b6bf45adfd12272eea7eb7a03c91b60964a1950d9c8 SHA512 5d21c782ec69c1e929e2723ccf6dc44bd5d354eebb8cbf0b362d2dffba782717a987f3c3d467e818e25305f346e24ffdbe020225d93dbb47f6eddb0c7d044c97
 DIST gwenview-18.12.3.tar.xz 5714316 BLAKE2B 911a1ab5950f63382fdda471bea5160241ce579a5dd9c925a0cdd6f729188a8d52a41653bc9a746d3f3a692f087bd22faaa815c824f4422cbaf640cbb0773d11 SHA512 4105ef3529170e7c92cbbdca4bfb31f0fa4220979ce808f86d23aac0a2fdd9f59d927f87a7909e2d1641defd97bd31e1142075f30d526c7d1b29e8afe314fd51
 DIST gwenview-19.04.2.tar.xz 5717536 BLAKE2B b3110c20ec09d97c997eb47572a9d2c0fa10f6e5293220cf078da0740507245bef0f59941ef45963d3be1e92b061f6405ef0eb68718bf1907bf09b29725020b7 SHA512 38592c6f456fa9d6627a4044b06da0688126fc2f0cffdd0c9cfcc9c31886981d73d4cc7c4c764385c05c0d1e39155ea2c7ff6c2c1c3e81361a3537d31b80907f
 EBUILD gwenview-18.12.3.ebuild 2718 BLAKE2B b96a85f6198df8b4eea738a7421b455d5803da0d40425d98c2481fe730ac01484038ca3f774db3b6e91c86c9bb8dc6daa5975ffff53d91c09a50808ac7561db6 SHA512 1a852d8192de77269841983cd2a6fa8b9942261a0dbfba60b56c58fcf406e27d94494d1a58560d46f54385abb336ece7f402866d7694ffa65911ca59fbf77e7e
diff --git a/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch b/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch
deleted file mode 100644
index f95f26c68bda..000000000000
--- a/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3f3e9a546fa5e9a335ad3dc9afc805fd4d2809fd Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 12 May 2019 08:40:53 +0200
-Subject: [PATCH] Fix build with exiv2-0.27.1
-
-Summary: Upstream is moving things around between headers. While they are busy doing that, they recommend including exiv2.hpp.
-
-Reviewers: #gwenview
-
-Tags: #gwenview
-
-Differential Revision: https://phabricator.kde.org/D21148
----
- lib/imagemetainfomodel.cpp | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/lib/imagemetainfomodel.cpp b/lib/imagemetainfomodel.cpp
-index d7b89ab2..58f1c13d 100644
---- a/lib/imagemetainfomodel.cpp
-+++ b/lib/imagemetainfomodel.cpp
-@@ -33,9 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #include <KFormat>
- 
- // Exiv2
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/iptc.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- // Local
- #ifdef HAVE_FITS
--- 
-2.21.0
-
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index d53cda581b66..98e4338fb0f4 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,5 @@
 DIST kdenetwork-filesharing-18.12.3.tar.xz 312892 BLAKE2B f2f4bb3bbcccfed38c76f25d4cc82022bbaeda653cb6235992654d41e46990e23584d1f53d0ffa057312bb339ba8285a5886c1961d59f4b643f1c32b80106318 SHA512 39fbe11135bb13380aa73261fce97d64db1f72a30bc2ce465d8e093543691a9842040f8a87b559bad0f38e6ede1dc4af600a5850d6cf188b0326339fd6c75fd9
 DIST kdenetwork-filesharing-19.04.2.tar.xz 312980 BLAKE2B 5008f53c3e9e2951921657646a9c150d71ead7b97ba117f58334c26aab15f2ce712c0fd62b9c7fce8e5bb4ef3e7ea9549dafc88c73969cbc6b0d71247d68c8e6 SHA512 67131174acd689def9ddfe783e2c5a335bbcadb5d1b3bfa6a62805d119acd8b633ac9120ccef39534842413d7aa494860188b59eed069cd64ff66c95c5777d75
-EBUILD kdenetwork-filesharing-18.12.3.ebuild 582 BLAKE2B 60a5c5b50cbe56a0c31e425cf88f4af87b0af6c9f355fd2bed2e718f5be30d842b31ddf1273810564f3622f93d57afb3887c217436098cb0dc08ff2018d07bb9 SHA512 7ee3dea273b506480fe140dda20cfad68345b2701bcc315462c44c7973139964c171d9ce5e899f89e5f3868bce79c654a9348f3e7b5d1a39e89fc1788daae738
-EBUILD kdenetwork-filesharing-19.04.2.ebuild 584 BLAKE2B 58f32535b21e8f6ae3bf14137d598553922a895301b050a0bdb564f368a08a9312e60f0f8fd39617f0dd6dc021b81fa4cd75325a9b1c9be4e71fd9d60d8546e5 SHA512 e283db0fb0d653c3c6800072e357d3e7abacafc7476d8683f29d402e8d0b18d949b7f41426f0ed37e9e4a88149310a2c6b45ecce25cb94949f01132080816968
+EBUILD kdenetwork-filesharing-18.12.3.ebuild 648 BLAKE2B 9e258df5919e706acff45e214c3db099642d7cb1f4ef4725ec7ab37e7398154810fd492bdd430e7a28500e78ca8b82378e2817d877673c16cefce10596813cec SHA512 1136a75cbaa64923fb9e9c2c5d144d001102a956b15e235fd1a876ce881b99fa0c8145dd1089351eb4a7bd27839a9459d49b02ec4f1b66782c7ebff766f8d16a
+EBUILD kdenetwork-filesharing-19.04.2.ebuild 650 BLAKE2B 57a549e2beea48fe026263c99fddb98632bf9dfd2b6f933178a801899a6cd9448d56fa9a91ca07254dc93f913b141dd5599f2fca6ea16bb3b4bcecf998fd27d8 SHA512 bdc6cdf5b9f677ab19cbad5d6ab7f3ef21871df54adfe62e481bd5ac5ca61d515d8d3695f67c3548935781c82c592150126ce5e3ca20451d10c1f09c6207e1ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.12.3.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.12.3.ebuild
index 4adb9bb104bc..71c05391e9df 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.12.3.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.12.3.ebuild
@@ -20,6 +20,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	kde5_src_prepare
+	punt_bogus_dep KF5 DocTools
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.04.2.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.04.2.ebuild
index cf73bf082890..67b8503470e6 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.04.2.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.04.2.ebuild
@@ -20,6 +20,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	kde5_src_prepare
+	punt_bogus_dep KF5 DocTools
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON