Version bump: Flash player 11 beta is out, and 64-bit support is back!

Package-Manager: portage-2.1.9.49/cvs/Linux i686

3 files changed, 252 insertions, 15 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 4cf3e7e31b64..69d6336b648e 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-plugins/adobe-flash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.89 2011/07/13 00:38:30 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.90 2011/07/14 23:54:56 lack Exp $
+
+*adobe-flash-11.0.1.60_beta201107131 (14 Jul 2011)
+
+  14 Jul 2011; Jim Ramsay <lack@gentoo.org>
+  +adobe-flash-11.0.1.60_beta201107131.ebuild:
+  Version bump: Flash player 11 beta is out, and 64-bit support is back!
 
 *adobe-flash-10.3.181.34 (13 Jul 2011)
 
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 6229045ed34b..3ec957b66f30 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -8,26 +8,29 @@ DIST flash-plugin-10.2.159.1-release.i386.rpm 4961766 RMD160 fe0c39821d262c2e66e
 DIST flash-plugin-10.3.181.26-release.i386.rpm 5446759 RMD160 d4a4c0672121930224f774a5e74b9b456d957667 SHA1 16b8e846d425412e05e13d4327b9753ce9af4eb0 SHA256 9357f1f2b5f065548dc82ec705a3eeb946f796b37a18e102d64bc191225f99db
 DIST flash-plugin-10.3.181.34-release.i386.rpm 5446695 RMD160 9d2db378ab8c673aadc38c21108c9ec9730650e6 SHA1 171af4caf86c0d51777d2b99aa4530ec92f61b49 SHA256 db074cb7b38dbc59e1d25f267a45d52dd09ccd85031cc0d01cd77b1420036a2a
 DIST flashplayer10_2_p3_64bit_linux_111710.tar.gz 4310219 RMD160 a57e8c4555545ca348f4b33e8c042c3f66e905f4 SHA1 a53ee83c02421f900fe25fd3738efd77932e542c SHA256 ef05f679f8977144621560587ffdf9bc81812e9941dea422e977070c9cd05ff0
+DIST flashplayer11_b1_install_lin_32_071311.tar.gz 6747871 RMD160 cbfe3943445f5e7b8c5e9288ecdb17c10af0c8d9 SHA1 d3f4417ad8c83afc3089aa6ff8b6c7706a0ef34b SHA256 1ccd71b27ffafc4ffa8cb4e494b972fe73378406a08e5a066d58c5a521fdfeff
+DIST flashplayer11_b1_install_lin_64_071311.tar.gz 7044701 RMD160 ed5d26c0c2f9387ed6ea3d9fdd37aa3c020a608b SHA1 8b7deb398e5e57cf2b8dcd1e498e8da07a8548ed SHA256 46dc0573bdfedc73edf2296be33fb9bfbb6e3238b54438f5b2d91d8ffe82b635
 EBUILD adobe-flash-10.2.159.1.ebuild 5203 RMD160 517edb0d526593d8175a2930877199a452fd4626 SHA1 90a3f5cc0d6a9282cfa8cb2fbd548f4160ab747b SHA256 07dd4f85690cc0c3ad1ebc08922c221aee811a996a2963bf82a413c27e3aecfd
 EBUILD adobe-flash-10.2.159.1_p201011173.ebuild 7063 RMD160 37873f2c83eeb0eb06089958580fb8f2deab25a9 SHA1 a17550a27fa665bff135645cab194641974491ac SHA256 e9886879abfd1ebce26529545ada71cb1b253fd3f92ccb8ef2281e7d99b15a74
 EBUILD adobe-flash-10.3.181.26.ebuild 3970 RMD160 9326ce5646d5252a8cb526d2d3fcb2d3e81cce7d SHA1 4b9e337d45fe4e93de6b0a1cb6349dcc89ee7d6a SHA256 49b1bd5d6f32b063de3d6a2ef71d09ccaf89324ff91026da7e7e790f3ac76c13
 EBUILD adobe-flash-10.3.181.34.ebuild 3972 RMD160 b48c60333b520a15f3e0877d41436243bd3238c4 SHA1 2eed6499c6121b4146df49335cd34bf0d48dc597 SHA256 1d3293a7160a45f4c7d51509d20efae2f581f07444063b54567ab77a105d40ab
-MISC ChangeLog 34510 RMD160 c353b714cd75cbbce5e6044c2a6a8a29086b26f4 SHA1 a8d329062f0fbc488afad0412e8a4c2e162838c6 SHA256 71a32780e49e7a8cf631a62231c7a99de79146a92d51bd47d68c5925d7a7ebf9
+EBUILD adobe-flash-11.0.1.60_beta201107131.ebuild 7240 RMD160 4a732d7a8c2392a5d5def8132909986569bc0400 SHA1 0ef0f0290f25ebe3e669364a7db3380198ebc443 SHA256 1c91f175c61c0ca9333215a15701b22bb26e6e23a2d03ffdf4d891e7efe1ca1e
+MISC ChangeLog 34727 RMD160 bf1e9191bf7671c1d9f55379df6be22981de1cf8 SHA1 e78cf5c3737ff456e28dfd297536f1927e5d5758 SHA256 87b9e3814bbfe738c6d57982a706d6ae8c2612615c63e432d29078888e076911
 MISC metadata.xml 1010 RMD160 73dd5ebd0ca15f10489748d441e8f5ad11f86a64 SHA1 83a453fe0b10a603237755eae9b4ff8ee47d438a SHA256 36e47f0f087760202d4ad961f9ec3fbf0bd2dc075f1b34d7d8950b2960409016
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOHOksAAoJEA8o5SF9Rr6qe30P/17+mml4KlHd2WfolH/IoFWY
-CfQb8/goYElY6k9hzi0BPOUmziXK4SJrtyVoO4+TWkSuEyIg1PIDWGK4k0dOvsTW
-AFYTJyoPcTs8nLzm6rFUgglxqpw7GOInY5hx94SgLWKGPlBmuJfkkJm65HK9/sul
-q6gcjwR6htrwsLHHoD2Vy+NTdaoHBaImMOamO+H4bWrtKlkEdgPwFo+g5Qo4lwcL
-C0MYVo0ZfG8E5iVm8RlaViVsKRf9Dc9n+B511ZlgLSUyqszNyjg/6eIQO5+1wIm/
-4Fg81ae8ukbBj75afFayE/ccDqeIz8ljolfHBys7O5aI6rGpov7h3fcckUnVWh2Q
-IVDlpErmyJMyut0pDBJuwt+N8KGarS07iimip3ndrFrsOaYJnTKKNehGR2vk18KV
-ZKx988tyaVfCpU43q0VcLsYGsCwCQaem85QOsXjRKaGNCSXUxVFH0VHPHlIJSxeu
-DaigkLdtO75U0wRJG2qz7x5uBUoEcCawPP+mcrH+nfba1W5BWmgraePVh/KITpX6
-W5HCkDsjhPK9UCM/x4I6X5Qy7adbjVAWVyuctT6Av4ZBKmPr+sxw9Bi88zlIbhEd
-n5e/gwke3+ZtiPGKtFTNHnjBvq7HSnXzkNR80bpkdyKMHj7paC8jS0DAAsqZqTU4
-Z+6ZeJaxV6yb2afUHGRx
-=BZpn
+iQIcBAEBCAAGBQJOH4JhAAoJEA8o5SF9Rr6qWQEQAIRHTgCQTHNAt9KlaFPEFXtm
+TJc0Lage6UcKynYdzHUX85NXndsiUThhaqzPhBzakG2JElQCFoSZvflgltf4PTWa
+gJQzVLSPl3Y/LjZap+5lcQU6Delp7hbpaLhjZbXzI7cz6XYJdUCRrgkjG8Ha+55k
+7m8ynCS931dEIQJbKAPa3qeeZVvns4aNGbxggjMvxqqVatEx0sUHyRwaIQ5j6Bnl
+UFdXAORenXmdTs31OzhdkFoYhL7rA7h9BFIpGq8u4D0cd2rNQjX8vTfxEVcEcjdl
+yU+7GzYvoo2JPrOb4BCK73CTsc4p3eb9xtqZ4qZfayLHJ/Qb/8TBMw8H9i0Obc1J
+PPz4nr4ZRLVdwUGWmL7W0kMd7RVD+m6IM3N3k4InqxXzkX2q6euMn+4j0oipmmod
+vDnOqXphOT8FoFUPwn9gF0un1gh5yLK25zS1R6IWaZmRiwVvDuUBzxt753WfLJHk
+okZt4Pu+XDjKoYO2pFN38XqK73u3G+vooFiQGeD2fht3uPtC/W6N+V/geJJv22yH
+OwxfWHATcQ4o4By5fBadKGZXw+PdXTSHfFDuvFKJxtstq5czso3YTl70TxLUkvSc
+eE9rrMmJC2wkjyR6G5hZc5WuL54eT/Zt23N2QtNyg0hYzu6p6cG2qEB5qjs+YJq9
+LjoEuq5D28qdfh3zk60p
+=CIdQ
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131.ebuild b/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131.ebuild
new file mode 100644
index 000000000000..5fd9ec187c72
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131.ebuild,v 1.1 2011/07/14 23:54:56 lack Exp $
+
+EAPI=4
+inherit nsplugins multilib toolchain-funcs versionator
+
+# Specal version parsing for date-based 'square' releases
+# For proper date ordering in the ebuild we are using CCYYMMDD,  whereas Adobe
+# uses MMDDYY in their filename.  Plus we tack on the release number, too.
+EBUILD_DATE=$(get_version_component_range $(get_version_component_count))
+DATE_SUFFIX=${EBUILD_DATE: -5:4}${EBUILD_DATE:6:2}
+REL_SUFFIX=${EBUILD_DATE: -1}
+MY_64B_URI="http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11/flashplayer11_b${REL_SUFFIX}_install_lin_64_${DATE_SUFFIX}.tar.gz"
+MY_32B_URI="http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11/flashplayer11_b${REL_SUFFIX}_install_lin_32_${DATE_SUFFIX}.tar.gz"
+
+DESCRIPTION="Adobe Flash Player"
+SRC_URI="x86? ( ${MY_32B_URI} )
+amd64? (
+	multilib? (
+		32bit? ( ${MY_32B_URI} )
+		64bit? ( ${MY_64B_URI} )
+	)
+	!multilib? ( ${MY_64B_URI} )
+)"
+#HOMEPAGE="http://www.adobe.com/"
+HOMEPAGE="http://labs.adobe.com/downloads/flashplayer11.html"
+IUSE="multilib +32bit +64bit vdpau bindist kde"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-10.1"
+RESTRICT="strip mirror"
+
+S="${WORKDIR}"
+
+NATIVE_DEPS="x11-libs/gtk+:2
+	media-libs/fontconfig
+	dev-libs/nss
+	net-misc/curl
+	vdpau? ( x11-libs/libvdpau )
+	kde? ( kde-base/kcmshell )
+	>=sys-libs/glibc-2.4"
+
+EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
+	>=app-emulation/emul-linux-x86-gtklibs-20100409-r1
+	app-emulation/emul-linux-x86-soundlibs"
+
+DEPEND="amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )"
+RDEPEND="x86? ( $NATIVE_DEPS )
+	amd64? (
+		multilib? (
+			64bit? ( $NATIVE_DEPS )
+			32bit? ( $EMUL_DEPS )
+		)
+		!multilib? ( $NATIVE_DEPS )
+	)
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
+	${DEPEND}"
+
+# Where should this all go? (Bug #328639)
+INSTALL_BASE="opt/Adobe/flash-player"
+
+# Ignore QA warnings in these binary closed-source libraries, since we can't fix
+# them:
+QA_TEXTRELS="${INSTALL_BASE}/plugin/libflashplayer.so
+	${INSTALL_BASE}32/libflashplayer.so"
+
+pkg_setup() {
+	einfo "Date is $EBUILD_DATE suffix is $DATE_SUFFIX"
+	if use x86; then
+		export native_install=1
+	elif use amd64; then
+		# amd64 users may unselect the native 64bit binary, if they choose
+		if ! use multilib || use 64bit; then
+			export native_install=1
+		else
+			unset native_install
+		fi
+
+		if use multilib && use 32bit; then
+			export amd64_32bit=1
+		else
+			unset amd64_32bit
+		fi
+
+		if use multilib && ! use 32bit && ! use 64bit; then
+			eerror "You must select at least one architecture USE flag (32bit or 64bit)"
+			die "No library version selected [-32bit -64bit]"
+		fi
+
+		unset need_lahf_wrapper
+		if [[ $native_install ]]; then
+			# 64bit flash requires the 'lahf' instruction (bug #268336)
+			# Also, check if *any* of the processors are affected (bug #286159)
+			if grep '^flags' /proc/cpuinfo | grep -qv 'lahf_lm'; then
+				export need_lahf_wrapper=1
+			fi
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ $amd64_32bit ]]; then
+		# Since the 32-bit and 64-bit tarballs collide, put the 32-bit one
+		# elsewhere:
+		local my_32b_src=${MY_32B_URI##*/}
+		local my_64b_src=${MY_64B_URI##*/}
+		unpack $my_64b_src
+		mkdir 32bit
+		pushd 32bit >/dev/null
+		unpack $my_32b_src
+		popd >/dev/null
+	else
+		default_src_unpack
+	fi
+}
+
+src_compile() {
+	if [[ $need_lahf_wrapper ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		$(tc-getCC) -fPIC -shared -nostdlib -lc -oflashplugin-lahf-fix.so \
+			"${FILESDIR}/flashplugin-lahf-fix.c" \
+			|| die "Compile of flashplugin-lahf-fix.so failed"
+	fi
+}
+
+src_install() {
+	if [[ $native_install ]]; then
+		BASE=${INSTALL_BASE}
+
+		# The plugin itself
+		exeinto /${BASE}/plugin
+		doexe libflashplayer.so
+		inst_plugin /${BASE}/plugin/libflashplayer.so
+
+		# The optional KDE4 KCM plugin
+		if use kde; then
+			exeinto /usr/$(get_libdir)/kde4/
+			doexe usr/$(get_libdir)/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 'properties' standalone app:
+		exeinto /${BASE}/bin
+		doexe usr/bin/flash-player-properties
+		for icon in $(find usr/share/icons/ -name '*.png'); do
+			insinto /$(dirname $icon)
+			doins $icon
+		done
+		insinto usr/share/applications
+		sed -i usr/share/applications/flash-player-properties.desktop \
+			-e "s:^Exec=:Exec=/${BASE}/bin/:" || die "sed of .desktop file failed"
+	fi
+
+	if [[ $need_lahf_wrapper ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		exeinto /${INSTALL_BASE}
+		doexe flashplugin-lahf-fix.so
+		inst_plugin /${INSTALL_BASE}/flashplugin-lahf-fix.so
+	fi
+
+	if [[ $amd64_32bit ]]; then
+		# Only install the plugin, nothing else for 32-bit.
+		local oldabi="${ABI}"
+		ABI="x86"
+
+		# 32b plugin
+		pushd "${S}/32bit"
+			exeinto /${INSTALL_BASE}32
+			doexe libflashplayer.so
+			inst_plugin /${INSTALL_BASE}32/libflashplayer.so
+		popd
+
+		ABI="${oldabi}"
+	fi
+
+	# The magic config file!
+	insinto "/etc/adobe"
+	doins "${FILESDIR}/mms.cfg"
+}
+
+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[+32bit -64bit]"
+			elog
+		fi
+		if has_version 'www-plugins/nspluginwrapper'; then
+			if [[ $native_install ]]; then
+				# TODO: Perhaps parse the output of 'nspluginwrapper -l'
+				#       However, the 64b flash plugin makes
+				#       'nspluginwrapper -l' segfault.
+				local FLASH_WRAPPER="${ROOT}/usr/lib64/nsbrowser/plugins/npwrapper.libflashplayer.so"
+				if [[ -f ${FLASH_WRAPPER} ]]; then
+					einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed"
+					nspluginwrapper -r "${FLASH_WRAPPER}"
+				fi
+			else
+				einfo "nspluginwrapper detected: Installing plugin wrapper"
+				local oldabi="${ABI}"
+				ABI="x86"
+				local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}32/libflashplayer.so"
+				nspluginwrapper -i "${FLASH_SOURCE}"
+				ABI="${oldabi}"
+			fi
+		elif [[ ! $native_install ]]; then
+			elog "To use the 32-bit flash player in a native 64-bit browser,"
+			elog "you must install www-plugins/nspluginwrapper"
+		fi
+	fi
+
+	ewarn "Flash player is closed-source, with a long history of security"
+	ewarn "issues.  Please consider only running flash applets you know to"
+	ewarn "be safe.  The 'flashblock' extension may help for mozilla users:"
+	ewarn "  https://addons.mozilla.org/en-US/firefox/addon/433"
+}