Version bump (bug #278819).

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 208 insertions, 2 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index b8c4a879fc8f..922e7fd0a4c2 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.5 2009/07/20 19:21:44 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.6 2009/08/02 15:54:30 jer Exp $
+
+*adobe-flash-10.0.32.18 (02 Aug 2009)
+
+  02 Aug 2009; Jeroen Roovers <jer@gentoo.org>
+  +adobe-flash-10.0.32.18.ebuild:
+  Version bump (bug #278819).
 
   20 Jul 2009; Jim Ramsay <lack@gentoo.org>
   adobe-flash-10.0.22.87-r2.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index d8aa022669a0..7a992bde5700 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 4409 RMD160 bf6407b5c785b45b76ca323712d44f925ccf20ae SHA1 7f6eb9e4224ab70522a21b894f7f334c2cde8ce0 SHA256 f0f2c7f20653cc9f275eb84c853f2695dd9b0531ce8c037d56ae7ae94cb0ca6c
 DIST flash-libcompat-0.2.tar.bz2 1162317 RMD160 197841eb76faacb05aec3e003f5e06e00fb5a19f SHA1 8fe47ef587ae679a37757038710750eb6a3c393e SHA256 aa96a25420f6527f5c2a467222bccf5c54a5f8001edfa0ec274864fc3e94faea
 DIST flash-plugin-10.0.22.87-release.i386.rpm 4065576 RMD160 0e28bd9d4c581fedbb88bf7fe94afc543b474759 SHA1 f8e928b811844532b8c23d93f40133a874f981ce SHA256 ec5ace49df7cfe69b7c02c8d1b6df8089f32076a390b931051feed2a9762d554
+DIST flash-plugin-10.0.32.18-release.i386.rpm 4118891 RMD160 0e1f0c3c355cdf919c5f3c845d5a5c1369b3c193 SHA1 5061dcb50a744a13f107e2c214fc2b3af6377597 SHA256 450f05012f71673cef6d80aa5d43bda2f45419530bb81f41ff878f744de26c9f
 DIST install_flash_player_9.tar.gz 3057882 RMD160 959557613c79b52f8e80daa8346948a8ed6e20a3 SHA1 df4868afc1927319b37bf2b6cd3871cc033da58c SHA256 fe7a55f86faf663b36befa19848ddd28f808666d5cf7b14311599128c6d85fb7
 DIST libflashplayer-10.0.22.87.linux-x86_64.so.tar.gz 3729613 RMD160 010b1ac1795d9833e0ac5d7e8babcbfa7f21914e SHA1 ff6d1d72d9b17b5411dc6fdd4ee6046a8f6676f8 SHA256 eac1d05aa96036819fe8f14f293a2ccc9601e1e32e08ec33e6ed9ed698e76145
+DIST libflashplayer-10.0.32.18.linux-x86_64.so.tar.gz 3727613 RMD160 a29f07e969a1861d13970409b42297a70417bea5 SHA1 222d35952ed7ecbbe37f8ad4c01d4c8046c4607e SHA256 fc423a7ffa3e45208274c9b4a6af361e7e06dff1c2d582c9d80253a8b61cd300
 EBUILD adobe-flash-10.0.22.87-r1.ebuild 5672 RMD160 b6925b6468aa8234580b6529521261cecca81b0b SHA1 2731de2f9efd979866bfbacb44bfe50528ca1d61 SHA256 5d367028859ece0041df39214d0a5c8ae1e286f2d9d16f50509c77ce3b972afa
 EBUILD adobe-flash-10.0.22.87-r2.ebuild 6310 RMD160 bf106c7e922846d481f7485408a9ed566cefb643 SHA1 05333daebf4ee312b90de5ddc643ada51011d0f3 SHA256 77a383cdc15a3f2b75b30fb2f3c01bbd42aee40501a6d31b1ad7bcfc41af776e
 EBUILD adobe-flash-10.0.22.87.ebuild 3807 RMD160 42c541a9c3248a22a1c0989c32cb227c797a42a1 SHA1 91f71ff4c73d09b50b505ec802ba945cbd5a6a9e SHA256 415f468e47438195ee9227b0bc6bdb70b53fbef71c1190c12c95ec781cd786d4
+EBUILD adobe-flash-10.0.32.18.ebuild 6306 RMD160 0c114be30ca3fe937c2fc6a7cf54eaca1aa781aa SHA1 1b26771b487cda4751e08d12fddaf9e2c218a9e2 SHA256 4b60f442c04d2dde92008fec53cbbfe9871aedc90ec80fb5f35b8451da0ad98a
 EBUILD adobe-flash-9.0.159.0.ebuild 1847 RMD160 447acbe83660e8e9e01d93e9dc96a93dd58cb405 SHA1 16a28daef4f8a5869c17ca2c7fb417175c4804f4 SHA256 58d0852d6c1222884a6ecf8b18e567b434b99eb4d7247f2ffc328ecd79707d9e
-MISC ChangeLog 17874 RMD160 e23b3b1636fc93d081cec6d32bbf1acf981c4ae8 SHA1 601576682776ff24b2696dc23395d490742d46ab SHA256 4da3a9ec8339ceb37fc7ec5605b074d57aa058f7420f68ac06b128a8e5777bbe
+MISC ChangeLog 18024 RMD160 08bb8f178f3fea8b7c833cc2c59f497b4abea90a SHA1 27ae1b2811669874847e0f6f322cc21eee3fa5fa SHA256 cd8ee8b0ede52202340acd467db9462ee4d1445d55a92da684453ebda6942f02
 MISC metadata.xml 429 RMD160 f5ba3860c5498d5accc68542463c813d4f61f546 SHA1 0693a51309cedd970ee6b0fc30a92a152648d39f SHA256 a43e3365edf85a93e58673f6fa03af6a7573d3ad3f2cb1c0c77ce9134f750fb6
diff --git a/www-plugins/adobe-flash/adobe-flash-10.0.32.18.ebuild b/www-plugins/adobe-flash/adobe-flash-10.0.32.18.ebuild
new file mode 100644
index 000000000000..4c61cf6a1f09
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-10.0.32.18.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2009 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.0.32.18.ebuild,v 1.1 2009/08/02 15:54:30 jer Exp $
+
+EAPI=1
+inherit nsplugins rpm multilib toolchain-funcs
+
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-${PV}-release.i386.rpm"
+MY_64B_URI="http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${PV}.linux-x86_64.so.tar.gz"
+
+DESCRIPTION="Adobe Flash Player"
+SRC_URI="x86? ( ${MY_32B_URI} )
+amd64? (
+	multilib? (
+		32bit? ( ${MY_32B_URI} mirror://gentoo/flash-libcompat-0.2.tar.bz2 )
+		64bit? ( ${MY_64B_URI} )
+	)
+	!multilib? ( ${MY_64B_URI} )
+)"
+HOMEPAGE="http://www.adobe.com/"
+IUSE="multilib +32bit +64bit"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-10"
+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
+	|| ( media-fonts/freefont-ttf media-fonts/corefonts )"
+
+EMUL_DEPS="app-emulation/emul-linux-x86-baselibs
+	app-emulation/emul-linux-x86-gtklibs
+	app-emulation/emul-linux-x86-soundlibs
+	app-emulation/emul-linux-x86-xlibs"
+
+RDEPEND="x86? ( $NATIVE_DEPS )
+	amd64? (
+		multilib? (
+			64bit? ( $NATIVE_DEPS )
+			32bit? ( $EMUL_DEPS )
+		)
+		!multilib? ( $NATIVE_DEPS )
+	)"
+
+# Our new flash-libcompat suffers from the same EXESTACK problem as libcrypto
+# from app-text/acroread, so tell QA to ignore it.
+# Apparently the flash library itself also suffers from this issue
+QA_EXECSTACK="opt/flash-libcompat/libcrypto.so.0.9.7
+	opt/netscape/plugins32/libflashplayer.so
+	opt/netscape/plugins/libflashplayer.so"
+
+QA_DT_HASH="opt/flash-libcompat/lib.*
+	opt/netscape/plugins32/libflashplayer.so
+	opt/netscape/plugins/libflashplayer.so"
+
+pkg_setup() {
+	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
+			# 64bit flash requires the 'lahf' instruction (bug #268336)
+			if ! grep -q lahf_lm /proc/cpuinfo; then
+				export need_lahf_wrapper=1
+			else
+				unset need_lahf_wrapper
+			fi
+		else
+			unset native_install
+		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
+	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
+		# 32b RPM has things hidden in funny places
+		use x86 && pushd "${S}/usr/lib/flash-plugin"
+
+		exeinto /opt/netscape/plugins
+		doexe libflashplayer.so
+		inst_plugin /opt/netscape/plugins/libflashplayer.so
+
+		use x86 && popd
+
+		# 64b tarball has no readme file.
+		use x86 && dodoc "${S}/usr/share/doc/flash-plugin-${PV}/readme.txt"
+	fi
+
+	if [[ $need_lahf_wrapper ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		exeinto /opt/netscape/plugins
+		doexe flashplugin-lahf-fix.so
+		inst_plugin /opt/netscape/plugins/flashplugin-lahf-fix.so
+	fi
+
+	if use amd64 && has_multilib_profile && use 32bit; then
+		oldabi="${ABI}"
+		ABI="x86"
+
+		# 32b plugin
+		pushd "${S}/usr/lib/flash-plugin"
+			exeinto /opt/netscape/plugins32/
+			doexe libflashplayer.so
+			inst_plugin /opt/netscape/plugins32/libflashplayer.so
+			dodoc "${S}/usr/share/doc/flash-plugin-${PV}/readme.txt"
+		popd
+
+		# 32b library compatibility:
+		#
+		# libcurl and libnss are not currently available in any emul-linux-x86
+		# packages, so for amd64 we provide these snarfed out of other binary
+		# packages.  libcurl and its ssl dependencies come from
+		# app-text/acroread; libnss and its friends come from
+		# net-libs/xulrunner-bin
+		exeinto /opt/flash-libcompat
+		pushd "${WORKDIR}/flash-libcompat-0.2/"
+			doexe *
+		popd
+		echo 'LDPATH="/opt/flash-libcompat"' > 99flash-libcompat
+		doenvd 99flash-libcompat
+
+		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]"
+				fi
+			else
+				oldabi="${ABI}"
+				ABI="x86"
+				local FLASH_SOURCE="${ROOT}/usr/$(get_libdir)/${PLUGINS_DIR}/libflashplayer.so"
+
+				einfo "nspluginwrapper detected: Installing plugin wrapper"
+				nspluginwrapper -i "${FLASH_SOURCE}"
+
+				ABI="${oldabi}"
+			fi
+		elif [[ ! $native_install ]]; then
+			einfo "To use the 32-bit flash player in a native 64-bit firefox,"
+			einfo "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"
+
+	if has_version 'kde-base/konqueror'; then
+		elog "Konqueror users - You may need to follow the instructions here:"
+		elog "  http://www.gentoo.org/proj/en/desktop/kde/kde-flash.xml"
+		elog "For flash to work with your browser."
+	fi
+}