gentoo resync : 15.12.2019

3 files changed, 14 insertions, 114 deletions

diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest
index 97fdb7553345..baf7e0f8c12c 100644
--- a/www-plugins/lightspark/Manifest
+++ b/www-plugins/lightspark/Manifest
@@ -1,4 +1,3 @@
-DIST lightspark-0.8.1.tar.gz 1899466 BLAKE2B d057deccc8ee03f16bfd384c9aee94ee70b7f6674bb0d46c2965f27868a2177c2985f791801975aab1608b4e59d9d40a51e327ec4b00e60eb6714f610b4c319f SHA512 ee9f02e4aa160d8e68cab743eddce5f4f5de0bb78f5daaaf69890b442701dc42094a59433cef136f6dc85e6fbce989bc8ff7ce8ad1ed1929c8501b13e24f2646
-EBUILD lightspark-0.8.1.ebuild 2724 BLAKE2B 3cd481ddf676a2daa4cb33cfb38f3593041c34f5eaa33dbcd4daca937572cb61ba29e2d5d9f8aadf0ccff8e82b296d5454da2d8f39a7ab1dbed469cb9992b535 SHA512 0294e8a6326021c9980e11dfdb50fd9111a5ef3415db4894bb827f936b203a94332289fc09fb16ce0a84e36c20fde0bb834788ae467c83d65e1eae8c267a1528
-EBUILD lightspark-9999.ebuild 2619 BLAKE2B c90492a4d9bbda5c878548940ad9dac2fad26e3a129e07f68347c3cfc63f32cd76278f034208deb6b6d1fffd6f106562eaae2780c92b74961166154cbf854610 SHA512 1405ff1546e69903eb7e602c409209b3916c4c71019a512848fd224ea1de0fc8c256c557bda77ce67d2a573ebf60c1e79bc2183e4e7c991ab85a2b213a849576
+DIST lightspark-0.8.2.tar.gz 1996482 BLAKE2B 09ef5f4bc4e78efe8c8ddb305e0c47091ba5b27c9b3bb2dd782079bc05a4836d43a80b47d1c30eba424b5d43a724502235a60c08451df4c8526b15a32274dbb4 SHA512 0ff636ad59523726232d9c2105843dc9ea835526c300bca7833e6d1a0ebf7630c1d10109143baabc16f95c1c954094603c945b705a6c9fb02f369e94fead034e
+EBUILD lightspark-0.8.2.ebuild 2609 BLAKE2B c5f6bb9a00f4293c2e87e117e4710b1b0c71532f02bd6954b92aa9f305651d0452068d15e52b43629967f34225e8c3173708529149bda0419c141035b3b35fd5 SHA512 214102a4d9c52720e7a7bc54e60db686e8536141936086429599f1936bdd256ef328150b45e8850fed76893176e20065ac6520c6a91dc7b0c634ec82d73c29d4
 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.2.ebuild
index 490141311ef0..a844f48a7017 100644
--- a/www-plugins/lightspark/lightspark-0.8.1.ebuild
+++ b/www-plugins/lightspark/lightspark-0.8.2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils gnome2-utils llvm nsplugins toolchain-funcs xdg-utils
+EAPI=7
+inherit cmake-utils 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"
@@ -14,6 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cpu_flags_x86_sse2 curl ffmpeg gles libav nsplugin ppapi profile rtmp"
 
+# Note: no LLVM since it's broken upstream
 RDEPEND="app-arch/xz-utils:0=
 	dev-cpp/glibmm:2=
 	>=dev-libs/boost-1.42:0=
@@ -24,7 +24,6 @@ RDEPEND="app-arch/xz-utils:0=
 	media-libs/libpng:0=
 	media-libs/libsdl2:0=
 	media-libs/sdl2-mixer:0=
-	<sys-devel/llvm-7:=
 	sys-libs/zlib:0=
 	x11-libs/cairo:0=
 	x11-libs/libX11:0=
@@ -48,8 +47,6 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P/_rc*/}
 
-LLVM_MAX_SLOT=6
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_CURL=$(usex curl)
@@ -74,17 +71,18 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	use nsplugin && inst_plugin /usr/$(get_libdir)/${PN}/plugins/liblightsparkplugin.so
+	if use nsplugin; then
+		# copied from nsplugins.eclass, that's broken in EAPI 7
+		dodir /usr/$(get_libdir)/nsbrowser/plugins
+		dosym ../../lightspark/plugins/liblightsparkplugin.so \
+			/usr/$(get_libdir)/nsbrowser/plugins/liblightsparkplugin.so
+	fi
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_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"
@@ -94,6 +92,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/www-plugins/lightspark/lightspark-9999.ebuild b/www-plugins/lightspark/lightspark-9999.ebuild
deleted file mode 100644
index e85c7575af90..000000000000
--- a/www-plugins/lightspark/lightspark-9999.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils git-r3 gnome2-utils nsplugins toolchain-funcs xdg-utils
-
-DESCRIPTION="High performance flash player"
-HOMEPAGE="http://lightspark.github.io/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/lightspark/lightspark"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS=""
-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:0= )
-		!libav? ( media-video/ffmpeg: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
-}