gentoo resync : 30.09.2018

6 files changed, 11 insertions, 9 deletions

diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 2c7cda5fe147..bade242c0a80 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index f6ccae6b44b7..1289d1e5e4b3 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_70.0.3538.16-1_amd64.deb 57099040 BLAKE2B dab3af9632b910a8ecda659aae0b7c64760298ad35a4a96ca484940f04d09cc09ed2251305d28789431054c5aaf333271fec7266d9b366ca8e862a56a28400a2 SHA512 b8a3f94fbc9144a158a280f3c72a989e3929bf75cbdc37c02e2f97b1664c7cd956bab75f5c57d953cb7ede7667cb3c49a9ac48db94f4a6a52fc8eaa187772ea1
+DIST google-chrome-beta_70.0.3538.22-1_amd64.deb 57115922 BLAKE2B e963deccf0cee55fc581c43bcab388e5197df560be3769ce3c32a091d556844c034f9897753f53d700c42079d96db529db0db1c5767238e5327129d9f0003931 SHA512 ecc07e8ecad852035f60692b5b3d04ec15567ada4d519095067f6d937116fdc2350a1b5cb62f0f4bb8fdc19f720a9f652f77b50b6556010b1128733c504377b7
 DIST google-chrome-stable_69.0.3497.100-1_amd64.deb 54675966 BLAKE2B 7043eca541b3dd75ed45ffd7bd06b26f2c3561378be913bc3988274ac1adc98ac05df7e7d42ec24402dea482131494f939578b5b1fde87224caa3e59bad25e96 SHA512 6566fefd13ef3013368d3f9edb7aa967d83fa888bec429beca16c0cab6398eaef5c07c31f399417baebeb7d0f79f5eebd651a31d0bca34eaa6ec729798b430e4
-DIST google-chrome-unstable_71.0.3551.3-1_amd64.deb 57396928 BLAKE2B 2cfdc4f7cfb0b1c934b132481fd8b38d2bbc6a981cbdfa5e8073714b3bd7890681acbe39604bca83dca273e4e742cc0afcbef7e07afea50a4712e0787aa48be9 SHA512 ce2da74e3460ffd372081549b73537e28eddf5ad69c1b67ec8fc98db9982777a87b7c7bf994046a78d6d82eab0f231aa54eab604c65f0245dfc0897cdc5df800
+DIST google-chrome-unstable_71.0.3559.6-1_amd64.deb 57503184 BLAKE2B 48fdb39d3523e1cd58641d57a7fd10172c67879fbcf327a68fdf76b4ce7adfbeddced03136f2a89d9012cfd27d79bd32c20f7c158d6541be5dcbc0180791beb9 SHA512 30367f713bb283df64c157f01bb9c3d6dc393546255558f331d5aca8b886d213d2f5b990536468a57979c7fc2fd89350abe32d47dbc1a4ebffa4055a2193ad4e
 EBUILD chrome-binary-plugins-69.0.3497.100.ebuild 1362 BLAKE2B c75ab3b0c0744543f6c0bb7716b1ff5eb0a7163fd91ac1e1b378588d1ebfc0ba57cae2ce8024315eac3d6a0b3a5ead6ae69a026e6c5e82724904f1fc524858f9 SHA512 c21c2bdf6845456d3f9cb47a5225f9962cf7897194c7f2c670010c5eec3fe33f88051c6a4000ebaac14313c1b630c0590fa8fb2b5b255f23fc75232f53cc6609
-EBUILD chrome-binary-plugins-70.0.3538.16_beta.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
-EBUILD chrome-binary-plugins-71.0.3551.3_alpha.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
+EBUILD chrome-binary-plugins-70.0.3538.22_beta.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
+EBUILD chrome-binary-plugins-71.0.3559.6_alpha.ebuild 1360 BLAKE2B d30b0fb27e6fa08e4a6137db221ff313580f7043862ffc3d2731058ffb26668d2ec3e247c69b323bd09b81d44bc845bc2d4745b040e4acb89503b1c9e75e81b8 SHA512 23e9ed678427dee23ab15c0196ed0772bd0647d9ee5e925698b988f72551aaa8e10f4952e376cb09b1f6554d8abe49277cd25d663285b57886f6edca31acaa54
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.16_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.22_beta.ebuild
index 08f94544e0a3..08f94544e0a3 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.16_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.22_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-71.0.3551.3_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-71.0.3559.6_alpha.ebuild
index 08f94544e0a3..6fcfccb7dc18 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-71.0.3551.3_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-71.0.3559.6_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest
index 7b3b1eee120c..97fdb7553345 100644
--- a/www-plugins/lightspark/Manifest
+++ b/www-plugins/lightspark/Manifest
@@ -1,4 +1,4 @@
 DIST lightspark-0.8.1.tar.gz 1899466 BLAKE2B d057deccc8ee03f16bfd384c9aee94ee70b7f6674bb0d46c2965f27868a2177c2985f791801975aab1608b4e59d9d40a51e327ec4b00e60eb6714f610b4c319f SHA512 ee9f02e4aa160d8e68cab743eddce5f4f5de0bb78f5daaaf69890b442701dc42094a59433cef136f6dc85e6fbce989bc8ff7ce8ad1ed1929c8501b13e24f2646
-EBUILD lightspark-0.8.1.ebuild 2708 BLAKE2B 9f428a1a4028d3880775974a92faa3cafdc235df08e05bc3112df5e5a175f2b003c142df9ccd5cff06d316554aae1bc9dcc2b6b6dcc524e744ff63fead269b93 SHA512 a7b510a5d07f6a10d39146dbb3ad72261a4ba691ab0da1b3321e4ad5e9345bf135dacc3c4021bd3b120c407f4586cf95ddcaa62f5b32f22e7a8305677e207017
+EBUILD lightspark-0.8.1.ebuild 2724 BLAKE2B 3cd481ddf676a2daa4cb33cfb38f3593041c34f5eaa33dbcd4daca937572cb61ba29e2d5d9f8aadf0ccff8e82b296d5454da2d8f39a7ab1dbed469cb9992b535 SHA512 0294e8a6326021c9980e11dfdb50fd9111a5ef3415db4894bb827f936b203a94332289fc09fb16ce0a84e36c20fde0bb834788ae467c83d65e1eae8c267a1528
 EBUILD lightspark-9999.ebuild 2619 BLAKE2B c90492a4d9bbda5c878548940ad9dac2fad26e3a129e07f68347c3cfc63f32cd76278f034208deb6b6d1fffd6f106562eaae2780c92b74961166154cbf854610 SHA512 1405ff1546e69903eb7e602c409209b3916c4c71019a512848fd224ea1de0fc8c256c557bda77ce67d2a573ebf60c1e79bc2183e4e7c991ab85a2b213a849576
 MISC metadata.xml 799 BLAKE2B 1bfc24a5d49f8996b6b9c5375af9f1ac838f720ee57e6056b7f2ac3d7a0f92a1abfdfb6e94f87024bb615a1a483c6193c8331ad0f33b4b78026b45c560df11fe SHA512 baa701313b4066fe50b7f34551800c73e2f90bd704581d9c39166fcb339a571a414fee07bdf9c2347137f031c63a44133b2e373821a88435a5d64f763bf6cb59
diff --git a/www-plugins/lightspark/lightspark-0.8.1.ebuild b/www-plugins/lightspark/lightspark-0.8.1.ebuild
index 6106645e3222..490141311ef0 100644
--- a/www-plugins/lightspark/lightspark-0.8.1.ebuild
+++ b/www-plugins/lightspark/lightspark-0.8.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils gnome2-utils nsplugins toolchain-funcs xdg-utils
+inherit cmake-utils gnome2-utils llvm nsplugins toolchain-funcs xdg-utils
 
 EGIT_COMMIT="f6ed8284810ad91c277ed5d0835b215e7329450e"
 DESCRIPTION="High performance flash player"
@@ -24,7 +24,7 @@ RDEPEND="app-arch/xz-utils:0=
 	media-libs/libpng:0=
 	media-libs/libsdl2:0=
 	media-libs/sdl2-mixer:0=
-	>=sys-devel/llvm-3.4:=
+	<sys-devel/llvm-7:=
 	sys-libs/zlib:0=
 	x11-libs/cairo:0=
 	x11-libs/libX11:0=
@@ -33,7 +33,7 @@ RDEPEND="app-arch/xz-utils:0=
 	curl? ( net-misc/curl:0= )
 	ffmpeg? (
 		libav? ( <media-video/libav-13_pre:0= )
-		!libav? ( <media-video/ffmpeg-4:0= )
+		!libav? ( media-video/ffmpeg:0= )
 	)
 	gles? ( media-libs/mesa:0=[gles2] )
 	!gles? (
@@ -48,6 +48,8 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P/_rc*/}
 
+LLVM_MAX_SLOT=6
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_CURL=$(usex curl)