[gentoo-commits] repo/gentoo:master commit in: www-plugins/adobe-flash/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     1e7ebbb82557b540da6540814995fe4511573a02
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 15:11:54 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 15:12:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e7ebbb8

www-plugins/adobe-flash: Version bump (bug #586044).

Package-Manager: portage-2.3.0_rc1

 www-plugins/adobe-flash/Manifest                   |   3 +
 .../adobe-flash/adobe-flash-11.2.202.626.ebuild    | 235 +++++++++++++++++++++
 2 files changed, 238 insertions(+)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 541e620..ed34d73 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,3 +1,6 @@
 DIST adobe-flash-11.2.202.621-debug.i386.tar.gz 7459844 SHA256 2d1cbb9f8d73120ac4f717ca216b9742ffb13ca5a68413fc5e830c210045a947 SHA512 e9e0e5d44f4450c00a532414999ff44a381a836430227976d30f6a504badc2aeb54b4c7187629f6ec812606577c9483b3da0b5af40f99aa5b4b444433928b1d0 WHIRLPOOL 860d8089646a44e6967e4b99f8be9c4408b69258ee439259fd2def34bbbf53975ea9cb2e891148913e4f4844527a872a89c2c8f93f51a192628c5d70a6afabcc
 DIST adobe-flash-11.2.202.621.i386.tar.gz 6978540 SHA256 137c87098f0fa9d02a3ab49e9e07a486e7a09e7b68f151294ee3c957d7d51d45 SHA512 ce1ecfe1fc8c5b617bbb87bc8677be96630cf91547baa960c8be7eea341da4b09faebd69bc28eda23a407493c2dafcf28c652ae40ee2c71a06e5cc37f76454a3 WHIRLPOOL cca2d87e0d0167cc8b5277555422b3bb9cdeeb1a34d294d6b38fef2c996037c7ef2584254878e27f7b69f4e2bfe59a8de6b3925c02ef84f38d50787be411cd48
 DIST adobe-flash-11.2.202.621.x86_64.tar.gz 7290265 SHA256 c8860c0f21bd90b78f023b4ce7a12ab48cc63f20524b2d60fd032755169fa92e SHA512 474ab3c1ea3642a248352467cb17cf27949af99ced2cf2f98dd070b3c170dd78c761afd062beb576039bcd414d3b177c5b7f12503d90e806e354982e62118a02 WHIRLPOOL f0b45743ef9e45d6496fa3605ad147d9fc46c99cb0ede7e800710e556285e824159c0a4b768702f268f5e470cd4e33be7048b1e36d589f39db4e1d6cdc81eb6e
+DIST adobe-flash-11.2.202.626-debug.i386.tar.gz 7465648 SHA256 830269b22315898096d45576ecc13ab34f9ecd40e73fa1bc6558a9ca070686fe SHA512 d772c2833065ac26b0253a41d3e9a8c13b9fc342f6698cc88823a7a8989442cc293a8e7493a813cb386c24800999d17549006f35090eac6a3e7f606aa1e450e3 WHIRLPOOL 5369798eb5e2578295de95406c0aa434be9fecbd094c3697d66deb10fba5a62af66af0dba7d77447fe3c6a9f2017db7e8dc36016b039e0633700b9382c87e77c
+DIST adobe-flash-11.2.202.626.i386.tar.gz 6981743 SHA256 1ec079f9d8578255435e15f704f05e4af69e749a480427af2be64fe447e2ca8c SHA512 d88c893cf11bd4d93dc77971e2c0cb50e59ae371b1f4e3dfeda2046b9f571f93ea074b35de9bf824aa67f5bee6cc4ac987a387451457bdc686d0a1d4dee28798 WHIRLPOOL a9c70f90d8c6af66f1bd1c03ebeb8f584bda7b9798daef97b65a6dd2455d018f0dc1a57c373327079eccf911af88cf421fd56faa9e6a47cd6257c41745a3a271
+DIST adobe-flash-11.2.202.626.x86_64.tar.gz 7295646 SHA256 14f6f10c664984302e2cb67bda06b8da8358cf4110235a3ad1dff06df22ad0ad SHA512 13d0f0aa206e4ca3e4e024760574d3e05445d57979a951ae3e5d51b61da8adae2b953f9b642be13c158cbb0fcd824ff4ff6af6636a01b7078a517af84506a595 WHIRLPOOL c465e13280152d809f8bd314257d46581b8828664592da33bef0af471cb98d300324e96e2312dedf86509ab87ebea2d54dbcc8d1bd2b8d45a70b68c9c874b216

diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.626.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.626.ebuild
new file mode 100644
index 0000000..df210f7
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.626.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
+
+DESCRIPTION="Adobe Flash Player"
+HOMEPAGE="
+	http://www.adobe.com/products/flashplayer.html
+	http://get.adobe.com/flashplayer/
+	https://helpx.adobe.com/security/products/flash-player.html#version11
+"
+
+AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
+AF_DB_URI="http://fpdownload.macromedia.com/pub/flashplayer/updaters"
+PV_M=$(get_major_version)
+AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.i386.tar.gz -> ${P}.i386.tar.gz"
+AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
+AF_32_DB_URI="${AF_DB_URI}/${PV_M}/flashplayer_${PV_M}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz"
+
+SRC_URI="
+	abi_x86_32? (
+		!debug? ( ${AF_32_URI} )
+		debug? ( ${AF_32_DB_URI} )
+	)
+	abi_x86_64? ( ${AF_64_URI} )
+"
+IUSE="debug kde selinux cpu_flags_x86_sse2"
+REQUIRED_USE="
+	cpu_flags_x86_sse2
+	debug? ( abi_x86_32 )
+	|| ( abi_x86_64 abi_x86_32 )
+"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-11.x"
+RESTRICT="strip mirror"
+
+S="${WORKDIR}"
+
+NATIVE_DEPS="
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	kde? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+		kde-base/kdelibs
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXft
+		x11-libs/libXpm
+	)
+	media-libs/fontconfig
+	media-libs/freetype
+	>=sys-libs/glibc-2.4
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+"
+
+DEPEND="
+	amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) )
+"
+RDEPEND="
+	${DEPEND}
+	abi_x86_64? ( ${NATIVE_DEPS} )
+	abi_x86_32? (
+		amd64? (
+			>=dev-libs/atk-2.10.0[abi_x86_32(-)]
+			>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
+			>=dev-libs/nspr-4.10.4[abi_x86_32(-)]
+			>=dev-libs/nss-3.15.4[abi_x86_32(-)]
+			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+			>=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
+			>=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
+			>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
+			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+			>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
+			>=x11-libs/pango-1.36.3[abi_x86_32(-)]
+		)
+		x86? ( ${NATIVE_DEPS} )
+	)
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
+	selinux? ( sec-policy/selinux-flash )
+"
+
+# Ignore QA warnings in these closed-source binaries, since we can't fix them:
+QA_PREBUILT="usr/*"
+
+any_cpu_missing_flag() {
+	local value=${1}
+	grep '^flags' /proc/cpuinfo | grep -qv "${value}"
+}
+
+pkg_setup() {
+	unset need_lahf_wrapper
+	if use abi_x86_64 && any_cpu_missing_flag 'lahf_lm'; then
+		export need_lahf_wrapper=1
+	fi
+}
+
+src_unpack() {
+	local files=( ${A} )
+
+	multilib_src_unpack() {
+		mkdir -p "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		# we need to filter out the other archive(s)
+		local other_abi
+		[[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
+		unpack ${files[@]//*${other_abi}*/}
+	}
+
+	multilib_parallel_foreach_abi multilib_src_unpack
+}
+
+src_configure() { :; }
+
+multilib_src_compile() {
+	if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		set -- $(tc-getCC) -fPIC -shared -nostdlib -lc \
+			-oflashplugin-lahf-fix.so  "${FILESDIR}/flashplugin-lahf-fix.c"
+		echo "${@}" >&2
+		"${@}" || die "Compile of flashplugin-lahf-fix.so failed"
+	fi
+}
+
+multilib_src_install() {
+	# PLUGINS_DIR comes from nsplugins.eclass
+	exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
+	doexe libflashplayer.so
+
+	if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		doexe flashplugin-lahf-fix.so
+	fi
+
+	if multilib_is_native_abi; then
+		if use kde; then
+			local pkglibdir=lib
+			[[ -d usr/lib64 ]] && pkglibdir=lib64
+
+			exeinto /usr/$(get_libdir)/kde4
+			doexe usr/${pkglibdir}/kde4/kcm_adobe_flash_player.so
+			insinto /usr/share/kde4/services
+			doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
+		else
+			# No KDE applet, so allow the GTK utility to show up in KDE:
+			sed -i usr/share/applications/flash-player-properties.desktop \
+				-e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
+		fi
+
+		# The userland 'flash-player-properties' standalone app:
+		dobin usr/bin/flash-player-properties
+
+		# Icon and .desktop for 'flash-player-properties'
+		insinto /usr/share
+		doins -r usr/share/{icons,applications}
+		dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
+			/usr/share/pixmaps/flash-player-properties.png
+	fi
+
+	# The magic config file!
+	insinto "/etc/adobe"
+	doins "${FILESDIR}/mms.cfg"
+}
+
+unregister_pluginwrapper() {
+	# TODO: Perhaps parse the output of 'nspluginwrapper -l'
+	# TODO: However, the 64b flash plugin makes
+	# TODO: 'nspluginwrapper -l' segfault.
+	local FLASH_WRAPPER="${ROOT}/usr/lib64/${PLUGINS_DIR}/npwrapper.libflashplayer.so"
+	if has_version 'www-plugins/nspluginwrapper' && [[ -f ${FLASH_WRAPPER} ]]; then
+		einfo "Removing 32-bit plugin wrapper"
+		nspluginwrapper -r "${FLASH_WRAPPER}"
+	fi
+}
+
+pkg_postinst() {
+	if use amd64 ; then
+		if [[ ${need_lahf_wrapper} ]]; then
+			ewarn "Your processor does not support the 'lahf' instruction which is used"
+			ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which"
+			ewarn "should allow this plugin to run. If you encounter problems, please"
+			ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
+			ewarn " ${CATEGORY}/${PN}[abi_x86_32,-abi_x86_64]"
+			elog
+		fi
+		# needed to clean up upgrades from older installs
+		if use abi_x86_64 && [[ -n ${REPLACING_VERSIONS} ]]; then
+			unregister_pluginwrapper
+		fi
+		if has_version 'www-plugins/nspluginwrapper'; then
+			if use abi_x86_32 && ! use abi_x86_64; then
+				einfo "nspluginwrapper detected: Installing plugin wrapper"
+				local oldabi="${ABI}"
+				ABI="x86"
+				local FLASH_SOURCE="${ROOT}/usr/lib32/${PLUGINS_DIR}/libflashplayer.so"
+				nspluginwrapper -i "${FLASH_SOURCE}"
+				ABI="${oldabi}"
+			fi
+		elif use abi_x86_32; then
+			elog "To use the 32-bit flash player in a native 64-bit browser,"
+			elog "you must install www-plugins/nspluginwrapper"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	use amd64 && use abi_x86_32 && ! use abi_x86_64 && \
+		unregister_pluginwrapper
+}