gentoo resync : 29.08.2018

7 files changed, 103 insertions, 8 deletions

diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 6de68eac2c29..8a6e8f814797 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 97239ee22836..5c531a88bb19 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_69.0.3497.42-1_amd64.deb 56458266 BLAKE2B eddbcdc402c2aead12f20c248a0a874391d8e8d924a1df7f4d0ab48df43cb9aaea1f5b024e2eb6cb2e0528ab28efb3f56087f957b153d361fe908bf92404fefb SHA512 4b2c261c221b3ad3284ba99e4610d2ddb26e7e804b95685958a23101207aea38907508eb69b22547e58f6c77b90a1f7d0d9336383cca223a1b8e6f5683862d42
+DIST google-chrome-beta_69.0.3497.57-1_amd64.deb 55993098 BLAKE2B 7be7bb1dbaa4f95cef1d65447310cfb64b002378ebdaa726db33042cd7a1808c58d5f26c63dcac83aee71f3a0b38cf8db6326c8ffac6cc7f217f233267bfbf38 SHA512 2edbd8ed777e5c069a03deaa727a5e84b8fc7d2cb7981216d5606dedaed640c8dc1878233f1ec9ff90a44d6013b6ccb8e7eea8c01ba13c07699ba17e82be00b4
 DIST google-chrome-stable_68.0.3440.106-1_amd64.deb 54090226 BLAKE2B b75d4eb0b1328cff35737253fd2339758be9d1630053d2e268e44d0fae25668f0c5c130c28b93a58820579a3c5698d46f18e7fb371f6d1704a5f5b9879a0cc6e SHA512 32d8f250039a28bf8343deea056b217b2ef748492d6910cb3704579686427b544d4007d62b8eeb7ecf27b229fbdd2c21fa05c43fa2bafdadb6fe473b6c5ef924
 DIST google-chrome-unstable_70.0.3528.4-1_amd64.deb 56917942 BLAKE2B b84ac6da31423a8665c8b300f9c2694dcf651b4fd710da6d5648c4ba7ee08637af85e2d26284ed6c1a1690b39639afd11641dd9bf81e72ffea56ec9b57fe7602 SHA512 cdfa46095c40fc9cdfc01d8ac2d323f7756567537946296474b53d91e3f773a2501abcea0f915a733382f6d01a4290a42a4b335db765df6dbf79ea0be0c14b6f
 EBUILD chrome-binary-plugins-68.0.3440.106.ebuild 1362 BLAKE2B c75ab3b0c0744543f6c0bb7716b1ff5eb0a7163fd91ac1e1b378588d1ebfc0ba57cae2ce8024315eac3d6a0b3a5ead6ae69a026e6c5e82724904f1fc524858f9 SHA512 c21c2bdf6845456d3f9cb47a5225f9962cf7897194c7f2c670010c5eec3fe33f88051c6a4000ebaac14313c1b630c0590fa8fb2b5b255f23fc75232f53cc6609
-EBUILD chrome-binary-plugins-69.0.3497.42_beta.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
+EBUILD chrome-binary-plugins-69.0.3497.57_beta.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
 EBUILD chrome-binary-plugins-70.0.3528.4_alpha.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3497.42_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3497.57_beta.ebuild
index 08f94544e0a3..08f94544e0a3 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3497.42_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3497.57_beta.ebuild
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index d1b1d0706bb1..a99b611d8d5f 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -4,5 +4,5 @@ AUX gnash-0.8.9-external-dejagnu.patch 700 BLAKE2B c01f515259aa96076cf47f0f3a555
 AUX gnash-0.8.9-kde4-libdir.patch 498 BLAKE2B ae7d071ef8026e134415481b613c343fea78e038ba7568a6b05e319eaf7c02ec6a20502a7486e560beec30f05d50716ec468456f5a0fd5b88c94c64f71bc5c1a SHA512 df1a6faf5b3cae8a519b590ee3e26009b5a194a01f5dacc5b1862751118d1172f0babf85f7641d6b8e898d5013b6c11002c593df589c57312d842930ab964341
 AUX gnash-0.8.9-klash.patch 471 BLAKE2B 0006bfe83a78dd923766972b44138ceea36befaaf5e9b09560e2a06b0d902791a8d7645e32d357196264fc126c34d448585672647cf800085e07a48138fd5980 SHA512 4a57310522ac2323eee26bb027432b12606d91add6d528b31afd69e172c73aa9f80bafc7c0a84fed4214773f901b65ddea4a7de67865f82a2984ac1dfe274c4d
 DIST gnash-0.8.10_p20160329.tar.xz 4079572 BLAKE2B 4d5f4799add9d2e00a9b9322dc48be0b8b3c9f790dc5881d9fba6e4d9646537786f7644d3dbbf3bd259d1975062438af071eb2ab28c661de2b5510368c9d218e SHA512 e8956d6277dde29a22bfe5af4279b40f80dad5659961d042e0bb57505b084f3ef1b489cf6fdf06730a8f3e2f9fdb737d7b1bc015a0255a80b167b98e686aa245
-EBUILD gnash-0.8.10_p20160329-r2.ebuild 6519 BLAKE2B 218f0ce4a1c7e4a4553dcb3f833a420bc9c73032ff3e14c4941dd67293bff9ec47bac70de2fb8be6b5d77a55d0fb8d1fa0961139054d02156404437616a0837a SHA512 9336aa523ecb5a4d2ca3d6bc3f0166a91d2e3a46334b6e93a4e7af24c8b81229f67325d60d6d772e8efaf7c8d854f4a114ecc7ef1e726cf891a2aa74d8295f7d
+EBUILD gnash-0.8.10_p20160329-r2.ebuild 6437 BLAKE2B 39440995a62854e1fdfcf72915f79f4b8970d6a4fe088ffa3f36376e09a59a519ae0a9b7e13c6e98226eeb5bbac1e67a38bed258bcac61b38b5a456a0a3a5cd9 SHA512 03ffb5419c74b676701bdb69a69be0536df793f40883de1d7fae056f1ed8d7f936f4ca3ae4dad5f4a8fcc9ed22d8b74fe0889df55651656c98aeedcc66de3585
 MISC metadata.xml 1139 BLAKE2B 9734261c64faac7dd8d8326bb939f154577ae0540e9b259bad40e871249b3878bdee4ef941b6e8c787e11779a7ef793f3505d2207d7166d0c1db4b098f5895f8 SHA512 10fea436cf59f26ccf534d869379a101ee0e3fb1a47950b58e12a0e3027314b0f4ac1bc4f72817dd1be0ca64f18b2463ef89587dd8d45b7a20929218dccef41e
diff --git a/www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild b/www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild
index a57919c38bc9..1d167f04709a 100644
--- a/www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild
+++ b/www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild
@@ -24,7 +24,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
-IUSE="X +agg cairo cygnal dbus directfb doc dump egl fbcon +ffmpeg libav libressl gnome gtk harden jemalloc lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
+IUSE="X +agg cairo cygnal dbus doc dump egl fbcon +ffmpeg libav libressl gnome gtk harden jemalloc lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
 REQUIRED_USE="
 	dump? ( agg ffmpeg )
 	fbcon? ( agg )
@@ -50,9 +50,6 @@ RDEPEND="
 	media-libs/giflib:=
 	agg? ( x11-libs/agg )
 	cairo? ( x11-libs/cairo )
-	directfb? (
-		dev-libs/DirectFB
-	)
 	doc? (
 		>=app-text/docbook2X-0.8.8
 		app-text/docbook-sgml-utils
@@ -156,7 +153,6 @@ src_configure() {
 
 	# Set hardware acceleration.
 	use X && device+=",x11"
-	use directfb && device+=",directfb"
 	use egl && device+=",egl"
 	use fbcon && device+=",rawfb"
 	use vaapi && device+=",vaapi"
diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest
index cc5f191c7cd3..49105d917f0e 100644
--- a/www-plugins/lightspark/Manifest
+++ b/www-plugins/lightspark/Manifest
@@ -1,4 +1,6 @@
+DIST lightspark-0.8.1.tar.gz 1899466 BLAKE2B d057deccc8ee03f16bfd384c9aee94ee70b7f6674bb0d46c2965f27868a2177c2985f791801975aab1608b4e59d9d40a51e327ec4b00e60eb6714f610b4c319f SHA512 ee9f02e4aa160d8e68cab743eddce5f4f5de0bb78f5daaaf69890b442701dc42094a59433cef136f6dc85e6fbce989bc8ff7ce8ad1ed1929c8501b13e24f2646
 DIST lightspark-f6ed8284810ad91c277ed5d0835b215e7329450e.tar.gz 1880249 BLAKE2B 031dc48f40956fcfb5a8b0fd825da8a2a0dba6daa4646296a385d5f90f13027d44cbb09562f6bf57b8d5d415a278fa06974624aee42e14b75892c36798dceda0 SHA512 a75ebf5e666daec0f244285bfd1029feb6fcfa2aeba800f175bb07bc148d39e76435d77868c964b2e149019b763498990bf0db25ba632cf21b91ad0958412332
 EBUILD lightspark-0.8.0_p20180401.ebuild 2732 BLAKE2B 08a5b4fc6846543722b269f8d16ace29eac1c282f3872ebd5c00fcbaf0c81130906990a39073d014c537edfec2b239414d59218684f3b1fb29af2fb0c9b4ed1f SHA512 6a3ee2e83cdf4f7396b8e1b760093b84f3f1f0ee1dbebc2d8ddf2c07576a50f714347c574f0b2dc138e2fb474eb1af39878667100afba427177bb54ebc97ba3c
+EBUILD lightspark-0.8.1.ebuild 2708 BLAKE2B 9f428a1a4028d3880775974a92faa3cafdc235df08e05bc3112df5e5a175f2b003c142df9ccd5cff06d316554aae1bc9dcc2b6b6dcc524e744ff63fead269b93 SHA512 a7b510a5d07f6a10d39146dbb3ad72261a4ba691ab0da1b3321e4ad5e9345bf135dacc3c4021bd3b120c407f4586cf95ddcaa62f5b32f22e7a8305677e207017
 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
new file mode 100644
index 000000000000..6106645e3222
--- /dev/null
+++ b/www-plugins/lightspark/lightspark-0.8.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils gnome2-utils nsplugins toolchain-funcs xdg-utils
+
+EGIT_COMMIT="f6ed8284810ad91c277ed5d0835b215e7329450e"
+DESCRIPTION="High performance flash player"
+HOMEPAGE="http://lightspark.github.io/"
+SRC_URI="https://github.com/lightspark/lightspark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse2 curl ffmpeg gles libav nsplugin ppapi profile rtmp"
+
+RDEPEND="app-arch/xz-utils:0=
+	dev-cpp/glibmm:2=
+	>=dev-libs/boost-1.42:0=
+	dev-libs/glib:2=
+	dev-libs/libpcre:3=[cxx]
+	media-fonts/liberation-fonts
+	media-libs/freetype:2=
+	media-libs/libpng:0=
+	media-libs/libsdl2:0=
+	media-libs/sdl2-mixer:0=
+	>=sys-devel/llvm-3.4:=
+	sys-libs/zlib:0=
+	x11-libs/cairo:0=
+	x11-libs/libX11:0=
+	x11-libs/pango:0=
+	virtual/jpeg:0=
+	curl? ( net-misc/curl:0= )
+	ffmpeg? (
+		libav? ( <media-video/libav-13_pre:0= )
+		!libav? ( <media-video/ffmpeg-4:0= )
+	)
+	gles? ( media-libs/mesa:0=[gles2] )
+	!gles? (
+		>=media-libs/glew-1.5.3:0=
+		virtual/opengl:0=
+	)
+	rtmp? ( media-video/rtmpdump:0= )"
+DEPEND="${RDEPEND}
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_rc*/}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_GLES2=$(usex gles)
+		-DENABLE_LIBAVCODEC=$(usex ffmpeg)
+		-DENABLE_RTMP=$(usex rtmp)
+
+		-DENABLE_MEMORY_USAGE_PROFILING=$(usex profile)
+		-DENABLE_PROFILING=$(usex profile)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
+
+		-DCOMPILE_NPAPI_PLUGIN=$(usex nsplugin)
+		-DPLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins
+		# TODO: install /etc/chromium file? block adobe-flash?
+		-DCOMPILE_PPAPI_PLUGIN=$(usex ppapi)
+		-DPPAPI_PLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/chromium-browser/${PN}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use nsplugin && inst_plugin /usr/$(get_libdir)/${PN}/plugins/liblightsparkplugin.so
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	if use nsplugin && ! has_version www-plugins/gnash; then
+		elog "Lightspark now supports gnash fallback for its browser plugin."
+		elog "Install www-plugins/gnash to take advantage of it."
+	fi
+	if use nsplugin && has_version "www-plugins/gnash[nsplugin]"; then
+		elog "Having two plugins installed for the same MIME type may confuse"
+		elog "Mozilla based browsers. It is recommended to disable the nsplugin"
+		elog "USE flag for either gnash or lightspark. For details, see"
+		elog "https://bugzilla.mozilla.org/show_bug.cgi?id=581848"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}