gentoo resync : 05.04.2018

3 files changed, 111 insertions, 17 deletions

diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest
index a98bbf05a11d..b312f0f36113 100644
--- a/www-plugins/lightspark/Manifest
+++ b/www-plugins/lightspark/Manifest
@@ -1,7 +1,9 @@
 AUX lightspark-0.8.0-ffmpeg-free.patch 1213 BLAKE2B 1d5f5fa78361f3bd527c84fd5655f5037b2662c2c4c357028a36b229dda8da53b89715b87a8ae947eedef5085cefbe6cde9a61cc85ac808418c9bb1e1081108e SHA512 28946cc7dc4d0d440e977c403fef10f2766941fe53a4b92a87411c100664d4f1618b510af7a5f14ffcc5a6a9f2ee00df882be04ff4e11fc009f99840a97cfe1f
 DIST lightspark-0.7.2_p20160107.tar.gz 1803064 BLAKE2B 95b7522ed5e8c757e6b6de7251dbdd862a3094fd2779d9c49e049ef3518b65ef9747be304e1a6ce2ff1ca8f5ccbfc98516f9d614666c4a37c0fe147d18fcba2d SHA512 937352c8d428579a9ac89a45724db2beb624eba874da59d684e07d9d306305d85937f4b2e692c56750a1b5e6ca485e05d9997409d3bc934fab209124cd471601
 DIST lightspark-0.8.0.tar.gz 1830071 BLAKE2B 5fe10d3795cdaedc88ffbc6479957c863440b8400fb4d90bc06a302730343c95e24898e115e4c59f0962cce952ccd51c0a21141091cc0e57cfb6635c1c868619 SHA512 333de501caf5f5ed9c8581cfda5bf1e6e04170c90f1c2f6150c9c2343f9de20e140a041d066f693e406d24fa24e7a5c3464675a583f4a5c104f5214ebee072b9
+DIST lightspark-f6ed8284810ad91c277ed5d0835b215e7329450e.tar.gz 1880249 BLAKE2B 031dc48f40956fcfb5a8b0fd825da8a2a0dba6daa4646296a385d5f90f13027d44cbb09562f6bf57b8d5d415a278fa06974624aee42e14b75892c36798dceda0 SHA512 a75ebf5e666daec0f244285bfd1029feb6fcfa2aeba800f175bb07bc148d39e76435d77868c964b2e149019b763498990bf0db25ba632cf21b91ad0958412332
 EBUILD lightspark-0.7.2_p20160107.ebuild 3010 BLAKE2B 22fd266023103480640358809b99159c9efb829fbe38f41c268ce5bf2cdd1910d804271025e2d330c0a8f56a17d4d300cd413f8046105d96191db0fa9f575b4a SHA512 aee936f6d6c12f2f965c10e9c0b90a3ddaeba3e89e4a5a47e8a61d4758f16c237513bf63471e831959d2808946fd31944b22641f0d8ed9676b33e956da8a437c
 EBUILD lightspark-0.8.0.ebuild 2983 BLAKE2B 896367d21b9b45fc9e26b80cd6f0e64bcf71be51122764c4d764c7cbe77f15128cf846d867eed497dead3a87a6fea0fe2522fb7759fe061c0c0a8df9c4f0a25e SHA512 a7ad8491eac0ad5299715b43dd5780dd52c18f5266889ca3767bf58b22dda3b0c672e23922406e8482343de4c052c0964171251849861645053a2b1dd481d025
-EBUILD lightspark-9999.ebuild 2923 BLAKE2B 9c2d51ef428babd230df306412b05e01987c22f6614e4027efdcbb9c99d0a00a62fe8978f3de73a2ceaf3d8d559207046beb8605a1f766f8e9cc97cd9d4ec2a6 SHA512 d08f1553943d7850df97e941f694bbc5ef92b05ed12a1572834a51f35a5f5c4a8b5f279ac6c0977f8f1cf8220e13512e359be4af45a898f006f8cd1496bdd6e3
+EBUILD lightspark-0.8.0_p20180401.ebuild 2732 BLAKE2B 08a5b4fc6846543722b269f8d16ace29eac1c282f3872ebd5c00fcbaf0c81130906990a39073d014c537edfec2b239414d59218684f3b1fb29af2fb0c9b4ed1f SHA512 6a3ee2e83cdf4f7396b8e1b760093b84f3f1f0ee1dbebc2d8ddf2c07576a50f714347c574f0b2dc138e2fb474eb1af39878667100afba427177bb54ebc97ba3c
+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.0_p20180401.ebuild b/www-plugins/lightspark/lightspark-0.8.0_p20180401.ebuild
new file mode 100644
index 000000000000..eb9a35fde59a
--- /dev/null
+++ b/www-plugins/lightspark/lightspark-0.8.0_p20180401.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/${EGIT_COMMIT}.tar.gz -> ${PN}-${EGIT_COMMIT}.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: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}/${PN}-${EGIT_COMMIT}
+
+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
+}
diff --git a/www-plugins/lightspark/lightspark-9999.ebuild b/www-plugins/lightspark/lightspark-9999.ebuild
index 435e878ed31e..e85c7575af90 100644
--- a/www-plugins/lightspark/lightspark-9999.ebuild
+++ b/www-plugins/lightspark/lightspark-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils git-r3 nsplugins toolchain-funcs
+inherit cmake-utils git-r3 gnome2-utils nsplugins toolchain-funcs xdg-utils
 
 DESCRIPTION="High performance flash player"
 HOMEPAGE="http://lightspark.github.io/"
@@ -14,8 +14,6 @@ SLOT="0"
 KEYWORDS=""
 IUSE="cpu_flags_x86_sse2 curl ffmpeg gles libav nsplugin ppapi profile rtmp"
 
-# Note: code-wise llvm-4.0 is fine but due to CMake bug it can't work:
-# https://gitlab.kitware.com/cmake/cmake/issues/16606
 RDEPEND="app-arch/xz-utils:0=
 	dev-cpp/glibmm:2=
 	>=dev-libs/boost-1.42:0=
@@ -26,11 +24,9 @@ RDEPEND="app-arch/xz-utils:0=
 	media-libs/libpng:0=
 	media-libs/libsdl2:0=
 	media-libs/sdl2-mixer:0=
-	>=sys-devel/gcc-4.6.0:*[cxx]
-	>=sys-devel/llvm-3.4:0=
+	>=sys-devel/llvm-3.4:=
 	sys-libs/zlib:0=
 	x11-libs/cairo:0=
-	x11-libs/gtk+:2=
 	x11-libs/libX11:0=
 	x11-libs/pango:0=
 	virtual/jpeg:0=
@@ -52,15 +48,6 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P/_rc*/}
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if tc-is-gcc && [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then
-			eerror "You need at least sys-devel/gcc-4.6.0"
-			die "You need at least sys-devel/gcc-4.6.0"
-		fi
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_CURL=$(usex curl)
@@ -89,6 +76,9 @@ src_install() {
 }
 
 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."
@@ -100,3 +90,8 @@ pkg_postinst() {
 		elog "https://bugzilla.mozilla.org/show_bug.cgi?id=581848"
 	fi
 }
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}