gentoo resync : 07.07.2018

9 files changed, 11 insertions, 12 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index fe7f738a222c..f1a5a0555c07 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index aeb3048ecad7..f892ae287bef 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -2,5 +2,5 @@ AUX kaffeine-2.0.15-qt-5.11.patch 40573 BLAKE2B 2e782013fcdc06e3ba19170da714e756
 DIST kaffeine-2.0.14.tar.xz 5972768 BLAKE2B b1c8f7338474804ce0003126a0e041a6aefb3d4b6b48c4c45577138f0686100b08c1f64adfd23658a0f04f8638d38df81c9f186d6fab60d607550e238d14a2a0 SHA512 03a4ffbfbe7b9c90de546bf7449e8e5f05d5e7023b75b5253297e885c412677a0c4b46c7f60761ef5f48ad3c284591acba6ff0fe4fa7256d5b01ca9a07d7276f
 DIST kaffeine-2.0.15.tar.xz 5988584 BLAKE2B a9361b321a0af13013596c2d06e53053a889a0697fcf5c644195d6bd7e43fb3c108d2c03cf3250c6cb8b14383e10735e883e5ebb17be1b5f9fe5ca81f012dd28 SHA512 d2b21df76710eb79395a0d4e762ecdde4610945de3d1105002a44a56725aea3f10003f4ebefe4cd67f58f561e79aa3f5561639ad5c3afba488146dcb9360f53d
 EBUILD kaffeine-2.0.14.ebuild 1455 BLAKE2B 82497d168fc1ecdab6cb5c5180eef9423fed401defd6f510dc02a0c8b84b8671af8f3eca703168a17ee43354f5911455a2716557c193a86c313c9ea678d25d9b SHA512 66043b4298b5bdf30ee7b6a0774899dadbbc4f852a2223ebbd03df804b1b1265521d69b5fc4155a28cb29549243c56026784bcfd705609fe084e3d6d49c1029d
-EBUILD kaffeine-2.0.15.ebuild 1387 BLAKE2B 8dc648c2fa4ca5183dbde79b32c34b56064f6120cb3558f44e44a1846fe08021bc256ea5bbb464c6747cabc8b29ac8000eb3f1cbfa4ff8f5b2e9f8c9426c4fc4 SHA512 3856d44df2b2868e6ad5260fa997a21c9a43c894e76f35553e39263d94d6b4b7a4adb29295fbdc06e02be88dcf719f172d8b0bcf6daa9d3b14c76b0dee6027c6
+EBUILD kaffeine-2.0.15.ebuild 1386 BLAKE2B a4c397e6f0c68ecc941c8fd8515a2646a4b358f03914877b03cca82b0475ba4b108a6e9dc82d170aadbdad04c939fb4004d953a7c2555e55fbf66378b4e131fd SHA512 a4df9b4afd9cc3aea7683b03381c3eda2cfe44a4107683fd17df722228a1e2eed401771d5ee3bb4eb7048b50824d1095f54cb6ea6a3cee445a2c5d4f400e3aaa
 MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
diff --git a/media-video/kaffeine/kaffeine-2.0.15.ebuild b/media-video/kaffeine/kaffeine-2.0.15.ebuild
index ab018a232e49..1213b25aa2b8 100644
--- a/media-video/kaffeine/kaffeine-2.0.15.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.15.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="optional"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 fi
 
diff --git a/media-video/plasma-mediacenter/Manifest b/media-video/plasma-mediacenter/Manifest
index 790d33321861..aa3ae8e17760 100644
--- a/media-video/plasma-mediacenter/Manifest
+++ b/media-video/plasma-mediacenter/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-mediacenter-5.7.5.tar.xz 162076 BLAKE2B 6001c11ee96e989e9b9366e74637816e3f7d778a225d89c6414ae7b9cc0f3649b460d0e39ed3eb3f9daa6b3cee4d96e42fb71102d500cf2546e4c4af757d8990 SHA512 47a5b015364a1ffd1fd1b1dd3720e5ae8ebc38e4aee03e55d042c6b9aeea2579e1b7a31f1b0fcef74c4c19c470c7a380694d9c93624a75337eb58080f5b8d09b
-EBUILD plasma-mediacenter-5.7.5.ebuild 1205 BLAKE2B 73e4cbdbfd724a061da6aab3fe92872b0ecd3ae30c2fd384dc3a81d8ea92c28ee2faba8ee427b422e8d7229ed7bf060597765af230c82bb2c693bd067938fe6a SHA512 d6ec74cf4e6d77984b9d099f66e14f8874781c416102e329c2299c9bbca3de7cabdaaf6ed4dd011cf1952b7b0951200ad33762536a7ebebaac972a117f80efc8
+EBUILD plasma-mediacenter-5.7.5.ebuild 1138 BLAKE2B a3e708baf9909d92d3f75b0b004265ceb1184e2ec6079272a1e57b98413a2d767e1e98e26a20b33bb3190a743b2a8a9b1d67d80759dbbc753631f72d5b1d3d94 SHA512 35be93f8d78ba3d92a6029b7c2f86c6c27054c02725faa23c2cbc22ea5fe4552c70839b9316a29ad38fa14d5080b1038d27cd5ff632f8d2091c772d05c56395e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild b/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
index 81d5579d3d99..57312a69e418 100644
--- a/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
+++ b/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,6 @@ RDEPEND="${DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetadata)
 	)
 
 	kde5_src_configure
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 6275fccbd169..268e1a845ca6 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -18,7 +18,7 @@ DIST vlc-3.0.2.tar.xz 25175492 BLAKE2B c0f2bebd9df491ff511f6bbdf27dc21b5676c5fbc
 DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc1414c4d96bf66e8b3104154154229bb5d638955c855b6cf471b8630196b170db94b61506c7e0dd42bec8fbb20 SHA512 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab
 EBUILD vlc-2.2.8-r1.ebuild 14828 BLAKE2B b3f586131caf059eb621eb3d8b5a4acef12ea8e5a55aa5445b372777e9c67c5444e2c5ff0a2045d3a7c151b7453a10dfe6f55121b4afc7bbf2adcb065f94fa85 SHA512 de4c8f6b34dd6be0d7657c69fd926ba88e2d49fe2185d368693532c73d9ae497326742dc8608beca7f970c55a49e7471fb165a969b813cd2ac4b51afdcd4576d
 EBUILD vlc-3.0.2-r1.ebuild 13436 BLAKE2B 7ac65a355a8d490ee6d4b2b10367f7e07010f5b3875d7fa02852186d1076ba565c5c9326b75b71635629a1f040f305dbed86817fe746f9bbb7c10cdc079b090a SHA512 fd565e3519b7b2b223aacff1ba77238463704eb96d59cf0fcd6ac5bc32786e616395c25a51375b7e708a30691e2d42de3823445d92915c3a77b30717ddc29c9d
-EBUILD vlc-3.0.3-r1.ebuild 13313 BLAKE2B fdadc67821d36e0bead20ec448b45b7f3e79d311119ab0ae8c11c313d9b77588af86d5f208e04c4389c5e0b576a4f0ebcdbb8bab8ea56a8ec9716889eaab3d9f SHA512 e9d144db32e6d5545fd879f0aaed9740fbed086c4d5af851d3f3f46691cbd02f4a2d74f5976a3143d02d16a1532209e58b49dabd64e74231de3feb1bec9cae62
-EBUILD vlc-3.0.9999.ebuild 13267 BLAKE2B 2a0a81c8834d61a1c98a6beb92884ac9f3131174a2b7549b107266ef434ab90db3f75b9d2a94ccf77115d9eec34f5f79f2683e0ca836e9018f9f27f14b58d05b SHA512 ea3aa2cc6be36e4df082bde8e0a63aa570585da4f874bccd465b800f3097fd60cc9b0a1dc838c05f81a8199b921a5ae4fd853edd91d063cc1138c9932d920284
-EBUILD vlc-9999.ebuild 13191 BLAKE2B cbbedfc8ff756fea752b2db31d298eda1c33287a02a99cd55d023afa09bc7b6e62ced8674edb8a2a184e9522a5d0164a98de20485043f33726e46cdaf64f4dcb SHA512 344bfd2a577748f7d2361d88d35a8d4c2b0a619b132a7b35cdfdb17344102b57a4f85b70fd13a8ecd81513f86558c69d8add7f10680d35384b46bfd268b9ae1e
+EBUILD vlc-3.0.3-r1.ebuild 13312 BLAKE2B e512693ba782e22c0ac4ffa239c545d78625ce5cf6b135ff63ef2e3690603bcc8efd510517d4c1f2bda5c63c3540fc75a66eb618622098b9da9f87b43c5f02c5 SHA512 d337ce9dd8d84a9cbba1d55099cd21ba6f98517fffe9221d46c934d966c7e2db3d1d00e649186f658c56cf88327afb386c34c51b7e755386575276099b032101
+EBUILD vlc-3.0.9999.ebuild 13267 BLAKE2B 47729197d456de777c9385362f92d655717c1080f2fca5164bacdb3881000454b7438bcd6048e0a14e828c03dc79a3edf205f7058136508cb493ea9c573ff2f6 SHA512 3438988f6876e98515de816e599c65c2992d122a6b0efbeab346224236ee78d4be0470f9c8accdb61252fa19a72bc20daab9c7a7f361364aa6c32007d5b9717f
+EBUILD vlc-9999.ebuild 13191 BLAKE2B b9daef991ad07aa1dce5ebc83a1b257e5b3e8b203bd8bd3fdd79d73d00fe3f2c3810dce16348d5d76e1ff200674d7720239d0da09aa38675d118fc5991d4b178 SHA512 7dba561df7714da8d8b82d390b418a5f2659346209ce9df51533360fea7a3daa962e16d7306f7268de7d16572ae58802dc60ede2d2252957ae2a7704db73424f
 MISC metadata.xml 6646 BLAKE2B 569faa5b058689cd2fae2bf6832c166d0e7ab539cf489188b7ed5e780ed5a8d6fcb3a2bd1ef71b3905ad66b6f53c05ebff98b9b56a969ecb5a43383b94ab49a1 SHA512 e239b5ef49f73bce91cff3cd420c16435943f8ee8a22503a41cb610033fe3b9e1e13482398c26f7f1315257b3fc381eb9b49a59ae577f9bc516fdd0ef460bedc
diff --git a/media-video/vlc/vlc-3.0.3-r1.ebuild b/media-video/vlc/vlc-3.0.3-r1.ebuild
index 23f9b8241fc5..6aa05a391aed 100644
--- a/media-video/vlc/vlc-3.0.3-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.3-r1.ebuild
@@ -19,7 +19,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc x86 ~x86-fbsd"
 fi
 inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
 
@@ -89,7 +89,7 @@ RDEPEND="
 	fdk? ( media-libs/fdk-aac:0= )
 	ffmpeg? (
 		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
-		libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] )
+		libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
 	)
 	flac? (
 		media-libs/flac:0
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index eb219aabf349..4952663cc4be 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -89,7 +89,7 @@ RDEPEND="
 	fdk? ( media-libs/fdk-aac:0= )
 	ffmpeg? (
 		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
-		libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] )
+		libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
 	)
 	flac? (
 		media-libs/flac:0
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index db33c8ab2ce2..59118d7bf74a 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -89,7 +89,7 @@ RDEPEND="
 	fdk? ( media-libs/fdk-aac:0= )
 	ffmpeg? (
 		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
-		libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] )
+		libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
 	)
 	flac? (
 		media-libs/flac:0