3 files changed, 269 insertions, 5 deletions
diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 1c9c93663d29..41936fcee8f4 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-plugins/adobe-flash
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.203 2013/06/18 23:44:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.204 2013/07/09 13:34:37 jer Exp $
+
+*adobe-flash-11.2.202.297 (09 Jul 2013)
+
+  09 Jul 2013; Jeroen Roovers <jer@gentoo.org> +adobe-flash-11.2.202.297.ebuild:
+  Version bump.
 
   18 Jun 2013; Jeroen Roovers <jer@gentoo.org>
   adobe-flash-11.2.202.291-r1.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index ef9d3afa4c5e..1f27da5e8bee 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -8,15 +8,19 @@ DIST adobe-flash-10.3.183.90.i386.tar.gz 5466785 SHA256 b8b6496bcccbea57026b1926
 DIST adobe-flash-11.2.202.291-debug.i386.tar.gz 7401909 SHA256 55b83ecfcc6ed307d25c2371c93354eacf93655fef35bd9938f2edfb8edda8e2 SHA512 37c8431aea9693a9dfddc8adc0a4798d3b54deec06e0fc9539dee0810ffb055375f43023c39eb065da5a40a78b1414ab990e3523807e24ab1fa092077319141d WHIRLPOOL 429ae28ef504080496fb55448f535e16266a01f6745f44c22e8bc3faefcdc7d184146c165f7e0bf641271779ceb31c9696856caa9d8a6fa333a4836c4127767a
 DIST adobe-flash-11.2.202.291.i386.tar.gz 6923403 SHA256 513abbfd9e4d7115c00264d82654ad226aa22f44e837301ccd0dd0e81de3a1f6 SHA512 f4aa275b6c97a4cb04a8bb5aafcb53bc193e69a78e78b34f79a84abec76bb52de512b311d75f037a4c8fee7bf8b370d37e53d75dbf54eaff91f7ad7d4c939cf5 WHIRLPOOL 34c099d12a449de15e0a9b22bd62f6f360f63dead1ec0ae3c444281e20fc5b94b8d7cd09a91caa56aa12de80ab2e2bc7b178923244317b3d267f5a3d1760e711
 DIST adobe-flash-11.2.202.291.x86_64.tar.gz 7234043 SHA256 eb2c827e334a6d21b6285f78c81c335bd51c412b6c7459e599d543bac6f40ab7 SHA512 d882c5b11a2fa7d4a47dbede3ef32270d8aa30e0eb294f8594ffbebf4640a2959e21f145a0fa536b61ba76ed41c8d1cc3c01f9a0c96308e013db1fb0083052a8 WHIRLPOOL 349f320699a7cc70af27611cf3812afdc4fa85ad046944c0a86f8c3909b9370006e4fd089551449cc828ee5abefa597b19e783002dcf5cf1e0cdc2c51f959548
+DIST adobe-flash-11.2.202.297-debug.i386.tar.gz 7401822 SHA256 0a6829a7b43fe2397db508aadd7619d303ca6345127d67a6635c1d9891ddbda8 SHA512 e090cde6345efdcbabc39054bc44f7ed389bd707f03be2b11b2c1fabb0d5822904370bcfdee01eb8d363527780329d73205c961e43d1b483d690ef694f9a4d07 WHIRLPOOL 4858f6858718e499dc8441f6b3ad681854546be83d2fdf261673136f101e69d4808fc859ee99044f7f9bc6aa6fa52efbe6bcfd203cfeda8a49daa2178888097f
+DIST adobe-flash-11.2.202.297.i386.tar.gz 6923530 SHA256 9e20d25df0bc008d02b5fc5d78a972de8f4c7f738e165e3163ef64255611f256 SHA512 8c8770631b4d5ba2094750299ebb379747999af13f32f1d46ebf889eda419da2be889bdeffe72f331ad90e321141a04c12d40de6b9f4bca337450e6725594a8f WHIRLPOOL 59b926bbc36296e2fb0cc43ababa12d7b581e8ac432816107bad596f5260ff0e3d12a94b1669295689f8e26ecb7392b0cecc884aa23550585fc575714a9bf493
+DIST adobe-flash-11.2.202.297.x86_64.tar.gz 7233858 SHA256 085223761c7cc608c60a12851aab8352ec87ae085412566f30f79b6b0a7ed149 SHA512 dfe73e3d6e56dd625ac78a02ac6070b9ca08f76fc312ee8bc7a8c3afb933f256e9f1ea732017ac8cc7526a902d0d98e4de56f78bfa3208a6a17bd67fe0711ae5 WHIRLPOOL 1d7367369281222bc4689e7fe0725483a3f24ee6dfc7344693cf03c5456571c7aa75ecef32e43730ded3fc287a014d62ff34e9ecfa45e153d659c7ea6de7c73d
 EBUILD adobe-flash-10.3.183.90.ebuild 3554 SHA256 3e0cfc0d2ba587e667236b275757e01cfa4451b6368a11475999114cdd08d2cb SHA512 9e94a5614b77288103c511da813b928f0493ad69c2bc292c23a78bd0ad401392a2f6dcdc3120ca9909c4a9d9d7c6dd751649bfffdd483a71b2ea0c77a9a3dc24 WHIRLPOOL 8b89d9f3253a9338ef07baca1fea74ccb71c6270a78e37d6c4b8653051cec9901dbfcd8f023887bc6b8c29501c90f091af7426ade213f598dbd50ad52139a68f
 EBUILD adobe-flash-11.2.202.291-r1.ebuild 7439 SHA256 7e013af2380233a4423522cdd5169189c09c3e9b9d91eb8b635e4fee42b150ee SHA512 2a9f8a6dbcf57c0f005e6b1be8ad9a27d42f6ab37d5c6679b9a2b363861f49a8974ac94a67e6a9446389cb591eb873986c89ef7c2cf8fc5b7ac28571fbd341d6 WHIRLPOOL 47e50265b52d00c8398292cb74be068713876310e70fb15ca38cf9a1ec8fc0c210aceefee6f0dbdb0786d0fb0df0ad6026c5bf8964bd49b9a71903d0a018cf81
 EBUILD adobe-flash-11.2.202.291.ebuild 8087 SHA256 92816dd00c11e292b22fd1f0f57abb9402c1cf221d84f1e604b5492fbeae1d4f SHA512 6799460709c57c86e7cdc1a5cad39ac3f777a457cd22b519cfe0e03cce920831676ae13275af19c544b8f1d0ca84af53442bf67b8d2c920f376e57b8b8e35103 WHIRLPOOL 2ad480d57364eac84b9af8c80b10c62a195a51fda74b6bb3f3e03d9240ed2cb2f5d17a620656072c1f5a39576f2997760c4b79d13212e2636a7b37326c778eca
-MISC ChangeLog 52138 SHA256 215b67fce90f9187c1a41e5acd173f7c5ea1a2e4aff5ea7a1110e6c726d72865 SHA512 664a4644969d10d65f93d56eb43d0fb9fab93beda5083dfbb3481413b1edaee5cebe13b61bfe1f2238bbeeaf60185b28ac314b11488216d74861825749810973 WHIRLPOOL 777de64a7eb3c20b3f4a60cf440ba4366a5dc13815dc199aa5ea532cfec6f53f58f8a22d77376962f7371f92731a37928b0ae8520aa92203d295203d2209cd67
+EBUILD adobe-flash-11.2.202.297.ebuild 7436 SHA256 0f1025fe4b29aa7dc537561d8a919af37b45dc76936401e1645991e05bc59099 SHA512 7cb61e1771dc664c45b98577762899f61a1e13f42b0f3c08327f89840af222e67455577eebd3e4eeb9a8295c69705827b763aef01981d5f741428ebc5e36f85b WHIRLPOOL d0928b23d8d59bc960f423a804fda327839706463391a16c8af62ce61f25c5aa61fed3e3db9509ba656776027f553fcbe87a6349d9346eba7756ce7084ff6612
+MISC ChangeLog 52277 SHA256 bbe23b6ad959782b2e9b0d1d0c869e27946636f98c48320b33ead8427c48842d SHA512 4f74b9c8d5548b1076dbfbd2f3e9e388503eb77e276b6bf5788edcb729abc621563c14706b859839a15945fa06e0ff5f3ea7d2755c5ab2aabcf7a89168e569b4 WHIRLPOOL a1aab70a5ced92050393e786c7e3b22bc53e6648493d105db9487ecba5960a103142d0bd08ba8457b451fa20ad16fc732ee21cc6d68628531adfa3c49fc748d5
 MISC metadata.xml 910 SHA256 ce8ddbe474e3b8e3cb069714254b6315f4a315092ea26f4c012f2516fbf4c7f3 SHA512 1ad409756e0c76fa4e5b6b7570eaceac505a7d922d307b0a0ed1a92212c08933d8519f58db5c54a2b3fa321cc647e7f98d3d7ab7755899f054139abb09618984 WHIRLPOOL 36af66ef3e829090c20e9d97ad78228725580979a91a6c1c2708d1ea877dd5d81dffe39c13f79dc0719883f042ae3997a90931f946b0d044a4c1141601e4cec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHA8NMACgkQVWmRsqeSphMfvgCeJJf23Xb48ve6PWpfqvNrZsyD
-mrEAnRiR70V3JkeQKIQCY+Ok/HGaLn31
-=OKCx
+iEYEAREIAAYFAlHcEW8ACgkQVWmRsqeSphPYdACfWP6npwBwWYmw9f/xenjhV9JX
+NVwAn2/95hB2Mf1w+E/zvUFrxCr6QsLh
+=zoHT
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.297.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.297.ebuild
new file mode 100644
index 000000000000..dd45cf4f9147
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.297.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2013 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.297.ebuild,v 1.1 2013/07/09 13:34:37 jer Exp $
+
+EAPI=5
+inherit nsplugins multilib toolchain-funcs versionator
+
+DESCRIPTION="Adobe Flash Player"
+HOMEPAGE="http://www.adobe.com/products/flashplayer.html"
+
+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="
+	x86? (
+		!debug? ( ${AF_32_URI} )
+		debug? ( ${AF_32_DB_URI} )
+	)
+	amd64? (
+		multilib? (
+			32bit? (
+				!debug? ( ${AF_32_URI} )
+				debug? ( ${AF_32_DB_URI} )
+			)
+			64bit? ( ${AF_64_URI} )
+		)
+		!multilib? ( ${AF_64_URI} )
+	)
+"
+IUSE="-32bit +64bit debug kde multilib selinux sse2 vdpau"
+REQUIRED_USE="sse2"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-11.x"
+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? (
+		|| (
+			x11-libs/libvdpau[abi_x86_32]
+			>=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 ) ) )
+	selinux? ( sec-policy/selinux-flash )"
+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_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=${AF_32_URI##*>}
+		local my_64b_src=${AF_64_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'
+				# TODO: However, the 64b flash plugin makes
+				# TODO: '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
+}