Adobe Square (10.2 now with 64-bit support!) pre-release (Bug #337542)

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

3 files changed, 218 insertions, 2 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 27edd478712b..b617c4e79279 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.46 2010/08/15 00:43:13 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.47 2010/09/17 16:41:24 lack Exp $
+
+*adobe-flash-10.2.161.22_pre20100915 (17 Sep 2010)
+
+  17 Sep 2010; Jim Ramsay <lack@gentoo.org>
+  +adobe-flash-10.2.161.22_pre20100915.ebuild:
+  Adobe Square (10.2 now with 64-bit support!) pre-release (Bug #337542)
 
 *adobe-flash-9.0.280.0 (15 Aug 2010)
 
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 355a120c1a62..7b4b1ba45b9a 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -2,11 +2,14 @@ AUX flashplugin-lahf-fix.c 1038 RMD160 8b4550179b919f82acb67813eff33462bebeeb74
 AUX mms.cfg 4420 RMD160 b73a91462e1db48fb40983e896cb06b3deb2a51e SHA1 3e56ecb32b938f46eea17a924fa0b006c66a3e6e SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a
 DIST flash-plugin-10.0.45.2-release.i386.rpm 4121963 RMD160 67710d394ff7aaa44d35db44cd9d85fff4202c42 SHA1 2b9e1acff3af983d6f29f48014c77ed8c0ec998d SHA256 fd2a4427a0c801ce675736dcadbbaa4ff473418bb19edc7b5c1fd0f4f9a8c9b8
 DIST flash-plugin-10.1.82.76-release.i386.rpm 4901493 RMD160 be2f14dfae030c5cbfea38799aa2128e5c5aa11a SHA1 f8604dc68c9f063429e1185e627120640ed4ffba SHA256 76551552f864c2b37414bf244dd693758d351a004d9b0877b329c70e750e6c92
+DIST flashplayer_square_p1_32bit_linux_091510.tar.gz 4264619 RMD160 438fa5984438193494c34b8363cd9b3762e50601 SHA1 d2734b6207cd055788dca2f20b9a69ccbe36819f SHA256 b8528f1e34e653bdcb7d0e466bc274047c2878e78e0662b3dbd0b7d6d7034848
+DIST flashplayer_square_p1_64bit_linux_091510.tar.gz 4308402 RMD160 68b4d7a022a85783a8fed5256acd28721fa11d03 SHA1 119cc23b8b7e7131a7e2b84df17ef8941abb317f SHA256 8b581da45ea80aa4d83afc94f64bc294e1247cab505829e6c6d13bcebaddf037
 DIST install_flash_player_9.tar.gz 3064515 RMD160 3789d59f8586bef05e0fbf180f7af095ffe6b5b4 SHA1 2eacd5ad186f1b90bab2999cca3f9cd3b039459c SHA256 f18b60b79e1501d095a6cb7f9d91de737dce6a5c9905348607c22b82d7cd0fda
 DIST libflashplayer-10.0.45.2.linux-x86_64.so.tar.gz 3731155 RMD160 9c1a269c25b88a062f2529c7943ae9f73c408c1a SHA1 88193dd555e1510ffac360e293558458e75a7118 SHA256 eeabb58a7bb71843cd99fbbb5ba77b6dce93018bfcff579f6f89327a990074d6
 EBUILD adobe-flash-10.0.45.2-r2.ebuild 5606 RMD160 b78a0161a874c6121d9de87263b51c54f937f953 SHA1 61f477b751699bdaf0f10276d4e68dae200fba3c SHA256 e7501c56ad0667b7adb950c22b6345b3b718ffe28fe1977dc41c3e55f2374153
 EBUILD adobe-flash-10.1.82.76-r1.ebuild 5412 RMD160 b610b56117acaae4dcd243d03e2baa15949ab7e4 SHA1 cb20137377b7660c2c60350643c1c2c2bd56ad74 SHA256 1caee1b2cdf8b1f655182be6bdb571e743e7a6f907f3355509f4557334a631cc
 EBUILD adobe-flash-10.1.82.76.ebuild 5174 RMD160 ad4f2f2d572bc26d48031adc2a2658a79dae6c35 SHA1 82b43faee089e843e78b09780d65d86367002bd5 SHA256 b591a558d0ac109d1bb1c4f35bef2397f8926969399f0b9a276dd4b582e00823
+EBUILD adobe-flash-10.2.161.22_pre20100915.ebuild 6479 RMD160 f224ff083f031b06fef726b39aa1561ce988fb86 SHA1 cacc63233431569fb35d73b9a400ce81fa89e105 SHA256 85eee3491b18f99f853d767116cfb325333c44478d7df9dbdfa2d40e67539d2d
 EBUILD adobe-flash-9.0.280.0.ebuild 1695 RMD160 d6b1ce47b1902d408e8ec66645f2edf51d756122 SHA1 272fb53bfbe3e0a89136368234ff4b0df42be78a SHA256 cfed6baad954f526189fe92a5be15d45cb779d247a2e8fbbaec3698c7cb7bf20
-MISC ChangeLog 25229 RMD160 403e30c6494f14d8a76b874c180e2f4ff5697b19 SHA1 53de6335873ba139c65e0bc043139d00b5b40853 SHA256 ecac568c1c6a3c5cb5952387c5b6e8089a7cae72b6a337fc0811eb551dfbdb79
+MISC ChangeLog 25446 RMD160 d18209ac70261971058c1f1d2a43383df337d350 SHA1 2ab2428ed19f7949699da59b4abf0ee478b08aee SHA256 39d7fe64e41712960d299d8cb7bcf257eb3a1c67b75093a64616c206d9a6cac0
 MISC metadata.xml 762 RMD160 eb5dcd4ca6ad5e4bb661d0166bc03c2e1ed83bae SHA1 6560e0b9497f011033fbf08919a6c99de1a816c9 SHA256 d4cf7c284e2a031b7ca3abc2788a1a84ff1a1447e82928c6f20fcbe1eeb594c3
diff --git a/www-plugins/adobe-flash/adobe-flash-10.2.161.22_pre20100915.ebuild b/www-plugins/adobe-flash/adobe-flash-10.2.161.22_pre20100915.ebuild
new file mode 100644
index 000000000000..ae6881e77265
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-10.2.161.22_pre20100915.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.161.22_pre20100915.ebuild,v 1.1 2010/09/17 16:41:24 lack Exp $
+
+EAPI=3
+inherit nsplugins multilib toolchain-funcs versionator
+
+# Specal version parsing for date-based 'square' releases
+# For proper date ordering in the ebuild we are using preCCYYMMDD whereas Adobe
+# uses MMDDYY
+EBUILD_DATE=$(get_version_component_range $(get_version_component_count))
+DATE_SUFFIX=${EBUILD_DATE: -4}${EBUILD_DATE:5:2}
+MY_32B_URI="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p1_32bit_linux_${DATE_SUFFIX}.tar.gz"
+MY_64B_URI="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p1_64bit_linux_${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/technologies/flashplayer10/"
+IUSE="multilib nspluginwrapper +32bit +64bit"
+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
+	>=sys-libs/glibc-2.4"
+
+EMUL_DEPS=">=app-emulation/emul-linux-x86-gtklibs-20100409-r1
+	app-emulation/emul-linux-x86-soundlibs"
+
+DEPEND="amd64? ( multilib? ( 32bit? ( nspluginwrapper? (
+	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_EXECSTACK="${INSTALL_BASE}32/libflashplayer.so
+	${INSTALL_BASE}/libflashplayer.so"
+
+QA_DT_HASH="${INSTALL_BASE}32/libflashplayer.so
+	${INSTALL_BASE}/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 library USE flag (32bit or 64bit)"
+			die "No library version selected [-32bit -64bit]"
+		fi
+
+		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
+			else
+				unset need_lahf_wrapper
+			fi
+		fi
+	fi
+}
+
+src_unpack() {
+	# In this pre-release version, both tarballs have just 'libflashplayer.so'
+	# and no prefix directory, so put the 32-bit one somewhere else.
+	if [[ $amd64_32bit ]]; then
+		mkdir 32bit
+		pushd "${S}/32bit"
+			unpack $(basename $MY_32B_URI)
+		popd
+		unpack $(basename $MY_64B_URI)
+	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
+		exeinto /${INSTALL_BASE}
+		doexe libflashplayer.so
+		inst_plugin /${INSTALL_BASE}/libflashplayer.so
+	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
+		local oldabi="${ABI}"
+		ABI="x86"
+
+		# 32b plugin
+		pushd "${S}/32bit"
+			exeinto /${INSTALL_BASE}32
+			doexe libflashplayer.so
+			inst_plugin /${INSTALL_BASE}32/libflashplayer.so
+			dodoc "${S}/usr/share/doc/flash-plugin-${PV}/readme.txt"
+		popd
+
+		ABI="${oldabi}"
+	fi
+
+	# The magic config file!
+	insinto "/etc/adobe"
+	doins "${FILESDIR}/mms.cfg"
+}
+
+pkg_postinst() {
+	if use amd64; then
+		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
+				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
+			fi
+			if [[ $amd64_32bit ]]; then
+				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}"
+				ewarn "Using adobe-flash-10.1 in a 64-bit browser is unstable:"
+				ewarn "  http://bugs.gentoo.org/324365"
+				ewarn "The recommended configuration is to use the 32-bit plugin"
+				ewarn "in a 32-bit browser such as www-client/firefox-bin"
+				elog
+			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"
+}