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

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

commit:     61560b007d96aa7565c9c38e27de312047005a9d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 03:17:20 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 03:17:20 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61560b00

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

Package-Manager: portage-2.2.23

 www-plugins/adobe-flash/Manifest                   |   3 +
 .../adobe-flash/adobe-flash-11.2.202.540.ebuild    | 234 +++++++++++++++++++++
 2 files changed, 237 insertions(+)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index e7092f2..c8b3afd 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,3 +1,6 @@
 DIST adobe-flash-11.2.202.535-debug.i386.tar.gz 7436270 SHA256 c1e4b10f0cc1ce1f00bac4f3d8e8289bbea5d257b9efd17cfad33f78a7b03d42 SHA512 394249b9a94d83f945136f232a750f4584790391335e45b5206dab921e9da87c945799282e8141cf36740d3508beb280eddaaee5916cd789da10f7eb53947031 WHIRLPOOL be8fbb5440bf6f3212fc278915b5c1414763c68d2bb8a4825f4167930fa255c4ea4a683ad0c5d053267cbfde5a87bdc2315ca177eea9568c3c6e719b34e8876b
 DIST adobe-flash-11.2.202.535.i386.tar.gz 6954088 SHA256 da480341900a475ce26ff5b6a8af18b500675d6fed98a15f33c83130c3b7297d SHA512 da8e1227f166ac377990b44b5657fc59df8fe3db8247bf4150be67027372ce4ae74dee4151d14f8432cf386a717538ee106d451ec5afbc4800a095947d1c2ccc WHIRLPOOL d25049dab1cc827288daf6bcb0480c0c52098d7d898458cf70cbab4e296f2438f141a4ab536076a95bdeb0c6f83ccd6af02cb19f0cabd563f01080a109682cfa
 DIST adobe-flash-11.2.202.535.x86_64.tar.gz 7267961 SHA256 f727fe6b56555093b66089bce63dfa7cdd2c817a70e9800027db2e7a0541de8d SHA512 a89df355190fb2afa3264299c1d1bb4c94fa34f9f5bd87cdd82ef4d9afc2f9841a376152b4c9a66dbdb543f484a09547348acff7e4a39c526d27c46ea5fc5b7e WHIRLPOOL ef8be587c2209768738cee784ab8780b00b9534d1bbb0c12af29753bd26f131638a1d4d5704edb7a9472fbf0159ddf50e2e4b64326f7e31f80a8090e3bc0b91f
+DIST adobe-flash-11.2.202.540-debug.i386.tar.gz 7436356 SHA256 140b9023c07826548b3c3f23e55673b5436e158c4719fde01d129191b09c1bec SHA512 aa31a5a93047549089be80eb0e84de88a110748517796f72594e37ca10e6c9c3439d58b152c443f0b9deda5c7baa371330d65f15e72765d0e8ab6f46d0b6f8f9 WHIRLPOOL c6e67510f47b51dd192f6886f5461e6612f11b1debafab2ed04355f02d912bf242aa0519540b6e9a4794811995666fededf4155e8323678257d669d60c58a383
+DIST adobe-flash-11.2.202.540.i386.tar.gz 6954096 SHA256 7e057c77d6da64d4c5d67fc0fe277980461c037475be433142439f225c9911d9 SHA512 65f03be693a907d218cbfcfa21a0a07cd09d40e0cb8223c9cf7fc0588756b922cc79039ac3b38ba1ccbd7a82cc29fb9c6da2fc312d992232744eecc37ba59637 WHIRLPOOL 2c80f97e6dc4cf4bc184c294a4b93aa6ec224ba6c56fe8a427ca6fa818d0a3d745f69974ae0676e89fc6034e0935312827c2f13ce07b981c4e7300102bfc032d
+DIST adobe-flash-11.2.202.540.x86_64.tar.gz 7267851 SHA256 262ab05038716cce20ce294cbc29d9ba384f68332f0a14945d3c19038b4dca7f SHA512 55d1e3e5c426b083dcf64eb2de72f12e8a9d0866b6ea21cb524a0bba1895de976e25336f0222266ea912fbbb3cd06ebc4c2166acf933680f8b600ee76bb03985 WHIRLPOOL 85d7b8fd0480632663756db0e1df37b3c2bf3dc0aadb2e9d1443c297c6c7ba552728351e75e2d1fa920fbc995713207a9bcf77fbc2be0c53fe532ecfeaa15c48

diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.540.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.540.ebuild
new file mode 100644
index 0000000..162eb06
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.540.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2015 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/
+"
+
+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
+}