gentoo resync : 30.09.2018

6 files changed, 12 insertions, 10 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 721d3856e0e8..d7ba1651dda4 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 78b9ffa1992d..5a697912c544 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -2,5 +2,5 @@ AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed926
 DIST extra-cmake-modules-5.46.0.tar.xz 317056 BLAKE2B c67e5a4d207cb5fd3f7ff7d0e2dd16c5a0a44c562c0a9c0b7eac3a54930ae59b6fd8b36d7a464e7d03950c44c101befc57825f8ee2f23b35e3f7ddc792d5267e SHA512 6431ad8e5230bbc0a5e1199037102014c376a682d711211b257359c35c8a3aaddb6128277721ca40cedf43fcca77312a2754f306487a1b3dbea728d643f0ad3a
 DIST extra-cmake-modules-5.50.0.tar.xz 323928 BLAKE2B 79bc97221cda54a51f2f6ff8797f715f4e27b1d5724da852cf06022eaf88b687a6d6aa0afb5eb2abb45b846cb49bd4c2b5e8e863e4d2f1b9b8d4446bc57ccd60 SHA512 0e56b1137a9cd8ff6a25b7790986713fb2358d8ffa1a175ca87054790440e528a37f56e2785190b40a469fd4d32bc731d4d24f55d6557515c8edb311abf3a56c
 EBUILD extra-cmake-modules-5.46.0.ebuild 1275 BLAKE2B 26d0cbbedbb94bdd3a120927ddc53fecade47a421da8a4d0a44e59a35931a577ea20c5eb41da2fc4c2cfbb215b124bc9d7494b6e14941b57b3b77671819ac678 SHA512 617e537fb35c8d79db273839da20dc16bc94aa245a9cc9e292f6a651cc2bd7ba75a9a399e01211613040d785e68720c0a83af80988384898f76d39a13ba2a999
-EBUILD extra-cmake-modules-5.50.0.ebuild 1343 BLAKE2B a1c6c374e4fa1bb2c56a929847088db0cdd2d40f23f226e6404ed1d41523472d2d722b7f447dc839b56397fefadca4b5f1913d388999aa0f4ddcd7afda920307 SHA512 0d3233ff689c71ad7b6b965b6ba58649bf0c98845950019e73e11b21bc2555a907223c6d67eb1fab8d02fc6c0f3000df62466715f1c65e2ecc3442e7c05a9d4a
+EBUILD extra-cmake-modules-5.50.0.ebuild 1390 BLAKE2B a2f2d64e306aeac906ec763105e5a0c8593cad9098bbad8b68728cab3d0333e8023f7d990248186e5b785ecb916f2b075af2636d02c3342e008724cf3b982935 SHA512 cd44e0818039d4931d541bf8bcfeaa6271369f002c16bbb69787a39d85a128eac3a4837479a0794a31c1f59c33dc645f04c6ab9370f121629748ea3f8921dd15
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild
index 74bb9282f34c..4f32e710baca 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+ECM_KDEINSTALLDIRS="false"
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
 KDE_QTHELP="false"
@@ -43,13 +44,14 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_HTML_DOCS="$(usex doc)"
-		-DBUILD_MAN_DOCS="$(usex doc)"
-		-DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
+		-DBUILD_QTHELP_DOCS=$(usex doc)
+		-DBUILD_HTML_DOCS=$(usex doc)
+		-DBUILD_MAN_DOCS=$(usex doc)
+		-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
 	)
 	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON )
 
-	cmake-utils_src_configure
+	kde5_src_configure
 }
 
 src_test() {
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 86a87b8fd6d1..ee9dff5b795c 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,5 +1,5 @@
 DIST kfilemetadata-5.46.0.tar.xz 254912 BLAKE2B 4750573a9ee26f3adfbd35ead14c0e1ba892cacab47fcd5691eff5e817cb2367710aa4f6fe813d2828568b3d483f0995891ccc9e40c045dc831226887b9d5ff7 SHA512 c95bf901218ddd8eead9c5581d468884720e4c32a4e5320b24dd0fac4c898c477475a578ebe803e17213df3f0a4f07ed6501a653584547f86a441de793ef6a4e
 DIST kfilemetadata-5.50.0.tar.xz 258444 BLAKE2B 47653d094a6a543294284d9a07119bdd7d3815b90590351748afa6635a8f628773f570da33d1364bd00af09f2e66d82ca4abbd09d8120c3cdfe920cd4b8f9de3 SHA512 9e6d86da7e50e4dc432fc29af366572cc3504301686a38f8f46d44be0041bcd72fc0c8515906995d8ba4a6fb7217767efb9eb151d2578e1104c5a1cb8db9cc4a
-EBUILD kfilemetadata-5.46.0.ebuild 1627 BLAKE2B a3c021dfd8ccc38be83594f6efcfc15b0bc16729c0c1254b2bc9c6310b46c245c02db0144fb946d8e95cc408d4fd97601eded5412e72d9b563f41991de760b2b SHA512 49000005773df3976a8207615b6026b5ec8df0c0188332a8abd3acb10c2de30fcdea5f2abd9772974c726b502653e77cfb5d93c5ca0c89023d3e873057a4905d
-EBUILD kfilemetadata-5.50.0.ebuild 1627 BLAKE2B 6c60c579c510cd4807a1ef9facb3cebdbedb0c2d413a2db9352034f426f99b586c452dd034dc2ce66f0884b820b5be7cabdc790c1afdd6828ea8ff0979aec082 SHA512 216e53f359be61b7ecd0b41c113561dc51cbe37e0d54782895f55461d2c012c2e79a3a05253b3a8c17ade0e799902a463f9d5848e760c5e66849c650434601c1
+EBUILD kfilemetadata-5.46.0.ebuild 1634 BLAKE2B 157b2f061d7ac73e53a9913140fedad7a19dba1e0e28aa7f1863090a2c9a274aa44cd0f9fb2d5a16c101b38115d5e1e99f4e3b3c468085ec1e92ba0d9c36c09f SHA512 e616fc69261072bc95065f500531a655b46026ff7ae27974c14385836fb8708e126f32e19eb29204014ec4207f332d34b89b251244ae8c79609d92c83a84acb1
+EBUILD kfilemetadata-5.50.0.ebuild 1634 BLAKE2B 6d34092ddef0c49bf7a08f6b86cd8b21adc3c1be9ec80b7417c4d518c0c15a054ff3abe33061f094e8b6c3c69d1bb7d16ea81c78f9e016234583c775a314cff7 SHA512 9b30214fc5da628c122e61286e2e8648cc6c6d458176938b5e907854725bf07a46db7eb97680a8b63f9d60fce2f907ea006fe7f4900561ec935c594bfac211c2
 MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.46.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.46.0.ebuild
index a9c7e1e6bd84..0a130c94e318 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.46.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.46.0.ebuild
@@ -16,7 +16,7 @@ RDEPEND="
 	epub? ( app-text/ebook-tools )
 	exif? ( media-gfx/exiv2:= )
 	ffmpeg? (
-		libav? ( media-video/libav:= )
+		libav? ( >=media-video/libav-12.2:= )
 		!libav? ( media-video/ffmpeg:0= )
 	)
 	office? ( $(add_frameworks_dep karchive) )
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.50.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.50.0.ebuild
index aa7a7bdb01c7..538387f85e09 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.50.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.50.0.ebuild
@@ -16,7 +16,7 @@ RDEPEND="
 	epub? ( app-text/ebook-tools )
 	exif? ( media-gfx/exiv2:= )
 	ffmpeg? (
-		libav? ( media-video/libav:= )
+		libav? ( >=media-video/libav-12.2:= )
 		!libav? ( media-video/ffmpeg:0= )
 	)
 	office? ( $(add_frameworks_dep karchive) )