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

[Jeroen Roovers]

commit:     82ba2cf4532a1bc8f7119677153280c16898676b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 06:32:17 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 06:32:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82ba2cf4

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

Package-Manager: portage-2.2.26

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

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index b6859e7..1f22593 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,3 +1,6 @@
 DIST adobe-flash-11.2.202.554-debug.i386.tar.gz 7443385 SHA256 069484562fcf9dc41dd1517e83e3b33d4cdb464ed68a2790249909b7fb994802 SHA512 c38a5320ae8ba5f5397de24bcd471c60ec1d561c7aa5c496032633a9fd3ab6e744ae2d74901603149fafcd2095231ee8baaaf5893a7dea3cf368b55a91552d80 WHIRLPOOL 0ad6f4db68d02a2fac48f5c0bf4c3d7b267c27b762575d7a62204d9a73f6b88bfa4da5d548968c90caf047ba73cf632f032eb16e100967cc9900c0c4a5d27105
 DIST adobe-flash-11.2.202.554.i386.tar.gz 6963199 SHA256 dfdfbb529238b966b25776691d0d3c277f30ff35469c4a495fd8d0f2a9a146a8 SHA512 3f76c3eefdc4d09ee4a8b1174e22bbafae9606632bf37b31c447179ac38c63be0a8fcf1384346e5bcb096cab2d044bcfe0ce0f5bbb063b4074fa0ff6fabea5ca WHIRLPOOL 36b2bee2c69fb32eacb787e4bd94c09353ee4b886982f7a08ec6caf8d9e47a63e8bf651f495357d7b7cc2a6a3efe4c7e82f5f054abfd48d143b9347907b5dd15
 DIST adobe-flash-11.2.202.554.x86_64.tar.gz 7273685 SHA256 7dd0d790d8b99c07ad9a56f35fef38f698b1075c9fcfe72f074a6fe7288bff97 SHA512 4eed8c083fa9b3655237ae1555688b6b10aa68c545351edafbf23ed966db6ce61ddb5cc887d9ea4ca64f6d28640ed17322c7dc8e3030577799f40e52285e1800 WHIRLPOOL 4c6c0a5d21d738115d6456f1c7683a2aad3b3ef0b2338ec0bde424c884f89a62006678cd4c9a11cb874e9f418753dc49b8d9c742a2af978de3ec3c1f92ca0d41
+DIST adobe-flash-11.2.202.559-debug.i386.tar.gz 7447011 SHA256 2f3e00891a3b953e0aed5a794a6352733f868a58743a4ab7f1e9a94d26a4d079 SHA512 f4c58f70b30ee5725087344eeee674916f3c5dfba203fe05bc21baff7fe7201d4e77fb1ebe1eb9b671a0f1f7d9c6f970707acd3f43c1c983d7b3728c238d442f WHIRLPOOL 0e90a187c239bc57606831ee7fbcd627106aabdb894c6675a849cc5de51d45ae56ed674c7944b7c351766b72401dc5b6dd450e0e4526e49f71ab8e7bcd9ac739
+DIST adobe-flash-11.2.202.559.i386.tar.gz 6965297 SHA256 09d4d16f8a508fdb678372ae91ba9ea3c2b22d9c0c72591fd3a2f0d39171a8c5 SHA512 56d01e78b22c3cbd2e7b332c1ff4111f15c40544b57d1bd4761131a7da50dff001174283444352d5e6400a1a6caec16758194a071dedc13f9d1cb9c8bb2d3411 WHIRLPOOL 5acacafd34233f8ec53dec74b938d960ebb1e59931dfd2d39df9bb3a1d12fbc82588bf4054dcb03dfd7ea096fec11ba372af3417aab44ef4df38929aa697303d
+DIST adobe-flash-11.2.202.559.x86_64.tar.gz 7275447 SHA256 ebba1e03aa2e191811a6165e2dc1b3cdda49cc855399f07bc9786421c40308b6 SHA512 8ef12946aafdaea6f7af16ca4f52c7f0abbf164c1a0539de2631b404112e7fd43bcef295f4fc3cf7b99876c859efc14a9826c2fa81ce23ab8aee237ea882a8e1 WHIRLPOOL 1d77419f6123a5bbf7412591b86d5c72c6733cf76f9f0ce6fbc36bab061c4c85e8315377ba11b1306158c34534a9b96fe6365379277f85419d4a9cd480ed2e54

diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.559.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.559.ebuild
new file mode 100644
index 0000000..162eb06
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.559.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
+}