Version bump (bug #437808).

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 273 insertions, 15 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 5b18972ef4a8..c67a8832deea 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.142 2012/08/17 12:54:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.143 2012/10/22 05:27:48 jer Exp $
+
+*adobe-flash-11.2.202.243 (22 Oct 2012)
+
+  22 Oct 2012; Jeroen Roovers <jer@gentoo.org>
+  +adobe-flash-11.2.202.243.ebuild:
+  Version bump (bug #437808).
 
   17 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   -adobe-flash-11.2.202.236.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 195d78633b57..25095d88569b 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -7,24 +7,17 @@ AUX mms.cfg 4420 SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8f
 DIST adobe-flash-10.3.183.18.i386.tar.gz 5459173 SHA256 49596b20f5bf659a772110e88b9e5990ecb20306dcfb2daba8917b6367184dc9
 DIST adobe-flash-11.2.202.238.i386.tar.gz 6917475 SHA256 8a9deb57288208d9d0300f6545358c04ff886187927ad9951985b0ba49be055c SHA512 19f60803713b3081e52820bb91705aeb7174d1de0142f997c604deb1b3eb5546c5f48c9d41b75cb1b70a9b98800e130c90ee3feb378f29ca543e47016118066d WHIRLPOOL 5fff3172c5fb867edda260d141c2a8208fc622338adc4eb8a937c551951e2a05799f145ad5c41bfeea06564c7a479305deea63c2fc22a2efe4f04b63144ac8d6
 DIST adobe-flash-11.2.202.238.x86_64.tar.gz 7225304 SHA256 f61b26afcc96abe905be0a5c2278872f3a46985169577dcf41150a6b654fa01d SHA512 d86c344ba915e6a10c1d823bc6fa10f09be43bd66315bfeab8d732e405389b397d372763880541c727b681a8c18e4463fc45f3c63dc574044009f5241bfc8d10 WHIRLPOOL 9dc70b3246fb3de6da75aec270a06e5c377f65c8e42a8a3326cad0c703b802f43f5a164a84e5b2c78bf30685d04cf82902ddab627de818a08794ba5ee00bc4ab
+DIST adobe-flash-11.2.202.243.i386.tar.gz 6918023 SHA256 c1d35fa76deddf72f4ed91c8fff6482dcc5720066ef4159db62f4cd9c0ca8ebd SHA512 a7699b70320fcf9606f463811c4ba1ae3ac14545b38894f37f94aea0de56299faa02cbccb51a31ca1c9d03b657106904457d3250c4ca5cca24c018463507ddcc WHIRLPOOL c902db6160f1a9e51e0899363c130111fd5ff3b089311514b234b73746ceef9eed72cd7e50c45b27c0db0c1f110fce3d653f04ed16afe53051e4672f9e1890d6
+DIST adobe-flash-11.2.202.243.x86_64.tar.gz 7229949 SHA256 111b1203d0777f594bde095edffe30d025a4b9e1e8af22385ca5e31f4eec265b SHA512 9be6a258b3cff4815d5c363f0c111f63c443f4bf1cf02a09f83ff62de5d3b1273a731f36391d39ca4fb0de861b55942e6d5cc77fa2c285efea882139d9c5ca89 WHIRLPOOL 906d27e42567525ab475f945e36d4b5b9445557efd129e5973a5a4b0315c0b397001dc9f0ccba5507ac332a8e5024cca35245ce380c151e423296b342525fcbe
 EBUILD adobe-flash-10.3.183.18.ebuild 3484 SHA256 ca83d68101539a792107a10a5899ababdcf71d4a63ff0f0fd5db1e8706dbb332 SHA512 459d4167f6607a5ee14573270f0aca95e744014391bdd10025d68681abdfb2282c34c3a5f55661709739bd979f6c2152886906ab92ad899a5b0372281227b8bf WHIRLPOOL 1656715c87e3c3f6a5bf041175ab0c247cc04107cbe74046896a03a0c1987376209621139b355aac5ef2393b8028e84334d3c5d7e93077e4274afa2fd1090030
 EBUILD adobe-flash-11.2.202.238.ebuild 8016 SHA256 03a9a0c272dfc5c3c40d173fcee8a755cb008221749d3622d1c75b6bea36c5ea SHA512 6f3382ac6d685637040d9baf5080e15ae010842c78d6b1e51ef2733fa761420c471375d7aa651a3b2996238e73561a51e59a84b04aa2a602a19e03b569c9e4e6 WHIRLPOOL 602364d4161ed038979cd1f3a1f28c01b0db3a99b251eff1e5d4d5b02aeef2c6e061e1e275e69edd0f36d9c2100fa4accfbe0deca74822d292bbeec23e49dabf
-MISC ChangeLog 43742 SHA256 14b051b4b517214a98e09a5085d2fb9a6a975c36f399fc1b9497b91a7efb6e1f SHA512 9721da96acef299b78b0075cd970dc8f1f47ceccc0d612dfc867dd00736e9017fb08e5ded466662e61e9529fe386bcfd491b2f930d799ee37e7adb34758c0b4a WHIRLPOOL aba10033562cdc9bb65b020c579a0c4e6de6ee9e19d2327c717421896f20e07f17231c3d42f89fe9eb8d17efcd0a1380db1033ffcd621eeeee571c4c00855226
+EBUILD adobe-flash-11.2.202.243.ebuild 8018 SHA256 955e87f91de4a4990f07d2c63f6eeaa681a66005aa8045131a414fac66b8d93f SHA512 97b518272457d5a6343db2befafcffbb6890cc3f049a41db067a412d98a249f99c1dd02a0bc4869671d066b3a09e5e6ed1efa1a3679aab45ea4d5f47a30eace9 WHIRLPOOL 731b9db8f9b52f4e28eba813bb2503e32a6a84e719a1f6deefc6a9538d207a2d6ca5e88e07ce0a8c39a21b227deebceae7ea5f4c2ff8ed6ece8d1a76e7dc5b23
+MISC ChangeLog 43891 SHA256 b69c01533cca33e2028f8f3df74b47ef7c6c34b3f365d9616d25af0a994394c7 SHA512 ade6a798656d06ac82c1ef5833981ecb2e4a42419203661cc2c68bffceddffd268c4d4e87a34dfc0b3ab9266e7b3f085b97f7a1382d080dcc7d8ee8718b5678e WHIRLPOOL 5d0dd38ff8146b34c2ca80a5b66a127ef174f905cf0e8bc844779d73dad9683a42f2701f0d3569ff930367f9a440a11d6b4c2b57381539f031ded5936da656bc
 MISC metadata.xml 1084 SHA256 20d7dd4b855c8a6d441febca72a4c5ed1605db2fe884c11dbf3b129b02556552 SHA512 46832c87dcc6ffa683fe99293547695e75a2bacef7534aa0f084b6fa3b50073d6498660a2142a100b17d97c1b8cfc5a55e4c3f8869785f3282bfa084f7ba4306 WHIRLPOOL 63ad404c407b53a7df7cdbb74203872ce85282eaaeb529d83ab6a7a17f757874b26e92aab065fc799a908fd681ff8af82092b927079dbb8eb77b3ddf5e7760df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQLj7OAAoJEOSiRoyO7jvoW0sQAKrReDgxVlL0j1YRMN1D4Cj+
-d9cz7WBE6brpfnIrsp8wbN7mHE340/QZFE2105osUVMaqifY8DzZE0ngPTBLArkr
-6cPxKX+1rtXjRcUvrLdtWUUaNJc2FP+gItKLiwm+meFhcFzG9eLHNAieCt8CN7Nk
-oP+zDK104lszGKCbsPR8uYpj532fE8f7oX38IaFvS+8iVuwYNe+mVJR0Ka+6EXxw
-ZpzK38UlLv/7J6xn0SZa8Mq9OUdYQzfdC2MfrxM35B8a4Vrh+O5fMzKJfs6YcwFT
-3ypJNr1Uw5OxWr5ahE+SqOM5/hpc7EVSlyEOtcmqCtApzyAWBr9ReSD0ipOZPEGJ
-woteBoWvfRNVF6r+L1F2bZbq3MBJtNl7uftnqD2HKEe8bW56W+9jlzVDRYRsBIC0
-4QPbxL+YvfM5dhh80BSfNotezjPGE4M+HVSHJTKLN9cNlYEuvt8gUG8EPDvFpaog
-dcWrerMPDBtpVdt3nPe7+c/iQ/ItlyQUix1iM02NMdwZk7E8nkqgfFxMdiYbFDWd
-xBAFJke96V7+rMBxz3O06X+AjSC24M0T0a8hcZIO4Z2yCSaA5o2XyUAxcOAWVOXH
-JJwq0BbKifpRvy43ESM+iyuQiGRk70Ahro5rQHtA2pDqPlMSNNMCWHpwSxzBsm3v
-9xyA8/SGRuAcLgb+8XJf
-=5Mb/
+iEYEAREIAAYFAlCE2VYACgkQVWmRsqeSphNQtQCdHdORuoBeWlmrVZL8D3bGbx66
+q/oAnRqEn8IRezf5hPNEyeHtFC/OMRFD
+=GycC
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.243.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.243.ebuild
new file mode 100644
index 000000000000..620974f22c42
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.243.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2012 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.2.202.243.ebuild,v 1.1 2012/10/22 05:27:48 jer Exp $
+
+EAPI=4
+inherit nsplugins multilib toolchain-funcs versionator
+
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/install_flash_player_$(get_major_version)_linux_i386.tar.gz -> ${P}.i386.tar.gz"
+MY_64B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/install_flash_player_$(get_major_version)_linux_x86_64.tar.gz -> ${P}.x86_64.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/products/flashplayer.html"
+IUSE="multilib -32bit +64bit vdpau kde +sse2check"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-10.3"
+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 closed-source binaries, since we can't fix them:
+QA_PREBUILT="opt/*"
+
+any_cpu_missing_flag() {
+	local value=$1
+	grep '^flags' /proc/cpuinfo | grep -qv "$value"
+}
+
+pkg_pretend() {
+	if any_cpu_missing_flag 'sse2'; then
+		eerror "This version of adobe-flash requires a CPU that supports the"
+		eerror "SSE2 instruction set, and at least one of your CPUs does not"
+		eerror "support this feature."
+		eerror ""
+		if use sse2check; then
+			eerror "You should mask this version and use adobe-flash-10.3.* instead."
+			eerror "To do so, add the following line to your package.mask file:"
+			eerror "  =${CATEGORY}/${P}"
+			eerror ""
+			eerror "Or if you are trying to build a binary package for another host"
+			eerror "that does support SSE2 instructions, you may override this"
+			eerror "check by setting USE=\"-sse2check\""
+			eerror ""
+			die "${P} requires CPU with SSE2"
+		else
+			eerror "Continuing anyway due to USE=\"-sse2check\", but be aware that flash"
+			eerror "will not function unless all of the CPUs on the system where it"
+			eerror "is installed support the SSE2 instruction set."
+		fi
+	fi
+}
+
+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
+		# TODO: In future revisions, remove this ability now that 64-bit
+		# binaries are officially released and working.
+		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)
+			if any_cpu_missing_flag 'lahf_lm'; then
+				export need_lahf_wrapper=1
+			fi
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ $amd64_32bit ]]; then
+		# Since the 32-bit and 64-bit packages collide, put the 32-bit one
+		# elsewhere:
+		local my_32b_src=${MY_32B_URI##*>}
+		local my_64b_src=${MY_64B_URI##*>}
+		if [[ $native_install ]]; then
+			unpack $my_64b_src
+		fi
+		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
+		if use x86; then
+			local PKGLIB=lib
+		else
+			local PKGLIB=lib64
+		fi
+		local BASE=${INSTALL_BASE}
+
+		# The plugin itself
+		exeinto /${BASE}/flash-plugin
+		doexe libflashplayer.so
+		inst_plugin /${BASE}/flash-plugin/libflashplayer.so
+
+		# The optional KDE4 KCM plugin
+		if use kde; then
+			exeinto /${BASE}/kde4
+			doexe usr/${PKGLIB}/kde4/kcm_adobe_flash_player.so
+			dosym /${BASE}/kde4/kcm_adobe_flash_player.so \
+				/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 'flash-player-properties' standalone app:
+		exeinto /${BASE}/bin
+		doexe usr/bin/flash-player-properties
+		dosym /${BASE}/bin/flash-player-properties \
+			usr/bin/flash-player-properties
+
+		# Icon and .desktop for 'flash-player-properties'
+		for icon in $(find usr/share/icons/ -name '*.png'); do
+			insinto /$(dirname $icon)
+			doins $icon
+		done
+		dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
+			  usr/share/pixmaps/flash-player-properties.png
+		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"
+		doins usr/share/applications/flash-player-properties.desktop
+	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
+}