Version bump (bug #473038).

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

4 files changed, 285 insertions, 9 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 7f0f819195b2..410505e0321b 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,13 @@
 # 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.194 2013/06/01 12:05:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.195 2013/06/12 00:31:31 jer Exp $
+
+*adobe-flash-11.2.202.291 (12 Jun 2013)
+*adobe-flash-10.3.183.90 (12 Jun 2013)
+
+  12 Jun 2013; Jeroen Roovers <jer@gentoo.org> -adobe-flash-10.3.183.86.ebuild,
+  +adobe-flash-10.3.183.90.ebuild, +adobe-flash-11.2.202.291.ebuild:
+  Version bump (bug #473038).
 
   01 Jun 2013; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Whitespace.
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 157e5edf769c..8e90e651d30f 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -4,17 +4,20 @@ Hash: SHA256
 AUX flashplugin-lahf-fix.c 1038 SHA256 52acc6658eb7d49fb167c848345f7dcb49e4057e2872ca8319bccbff6728df6d SHA512 c56082ca6371176a3454f94a7ee5c00aba2d27c969783b26740b6ff61f42e240a34b7eeacc736f035cc101709141c4786f241f98495654a67f61544a10ce478d WHIRLPOOL f43cc3b836c8d43e6d706d847693bd34a212eb4c4ba3ee698db0f752bf36a7029f81e05664ba3ebbb8190fca414dee3fc109e586fe5e02f1c6263cd6e5bbb8b0
 AUX memcpy-to-memmove.sh 1418 SHA256 08a7203d19ca0d1ecbfaf6c46d915a28e2de81da97e42ef3c56e3d370c380096 SHA512 1686108fc6a1f5438e0d054de55e95829f53e551bb11efbc2632e62cd4432edf93a26dced2409512bbc641d61c840e0d5f241c6716811dbff00f32586f4aaeac WHIRLPOOL 28c8d1cc1f557a812c1bfd078068d7e8fb40604e7060705446d6317dc6e76375cec81190ec42e979f2e6a43516466d0454f45152de31d43f7dd5fc9854db9296
 AUX mms.cfg 4420 SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a SHA512 597380071a06176f09df1a56cba24e83a74990c175fe9f167f026eacbf01e66a083d2389ff399ead0a39654a40ae636f8459feed2d6012e51e65c5407fe7fdbd WHIRLPOOL 915b86d717db181a776eb9392aaae2becac4747bc0e551900bfecdeda17f9d0495f54c7173e47adf2ea92567c193c466e302cac78bd2126f10fd9956c204596a
-DIST adobe-flash-10.3.183.86.i386.tar.gz 5465495 SHA256 7bccc6d58a83eaeb22d9ffc6a179d7b818d0b30229cda7f2720600e63c6b012d SHA512 63e68ecef6a2624bf102a35b8c1f89840fb0403b813bac5bb916eaa4b1ece77a548b50dbd5ef87e758ac93a89acd26eaff981ec53fc41fffd35b6b8592c736a9 WHIRLPOOL 588e94b46aaebedf2a2f35613f3d4096d79c468e7e188cadddfc37dd494aba2a1be75a14c3b3bab6f42b9912c0a27f48ceafe886937f9c5c93575c2ede0d0cde
+DIST adobe-flash-10.3.183.90.i386.tar.gz 5466785 SHA256 b8b6496bcccbea57026b1926157436bc167dfaa8bf9d4a3c51f308f90255d4bc SHA512 b05dafa959ccf3d1291d769c4b60f00d75ea81a29e8162185eefdcafb09cf4392f5112e2ef0263d29a83c2c68571d32fb9af35cf548e6ccc79373cb6b1503d6f WHIRLPOOL 1030ddaac37da8a78fb020fd87510c2debb615987d7dae105ed7ba0e24796d1c36b75491a19bfe71533598673956bbfb03e31cc9d102f92068ebaeb5737937cc
 DIST adobe-flash-11.2.202.285.i386.tar.gz 6923111 SHA256 a7f109a871deeb3cff19b483d5ca2a996402e81793d7edf83b95b4c771694100 SHA512 a2af2f6022f08a0c94d4c2908f9cbaf5bec44defae1b265365ad4aee3db099da1497621bf74d2c331eb481ba3463ff74b20b37bd5d694f143ec16e1a843a2c18 WHIRLPOOL 2dfb64aa707a9ba2b2821693a2bb69bec510c705732919197027ee6a485c4c19335db1691b907247a93d050841e2c5cd3730b47c40b3279e1fd104889fc3ebf8
 DIST adobe-flash-11.2.202.285.x86_64.tar.gz 7234643 SHA256 abeb2457fdebd2e5dff8c63b5e11681b7a35340e2f3fa1f8c54b8728f84e02e6 SHA512 3cf04ce525fe8da960456907deeaefdeeda1103b96c0f9d458f66897a41a681664e95d97e3c18b043dab57407bcb662fc61d9b606a152d661a5cdd1c9571dfb2 WHIRLPOOL 477c11b5470f7df7f3e604629bb4acea1d80f34d68d28d27171a77ae6e6c486bbd6032bc7d8d95665a0ecd0e36a3fd276c9ff2e6d1207828769fbe3ee1dc99d7
-EBUILD adobe-flash-10.3.183.86.ebuild 3554 SHA256 04afe7d7e1817157751ef7f9bf7cf00d867b85a980e59180144c1cd0f366f202 SHA512 cd6c40ae241e7ac5d7338af8a8e6bbb756ca2f365d701be6c228cb71d93440095d83a4ebab6a0d7782641ec2c22643519927b93dc34489656fdfaff11852eb30 WHIRLPOOL 63bedc15a867660b2f3d4bf07a9baed8f7f7c056e2e5b895b28985a09d4d6811bd45bc314f632a131eb699c6c781a6fb8e8f557a755318c5f908b06f455d6a28
+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
+EBUILD adobe-flash-10.3.183.90.ebuild 3554 SHA256 3e0cfc0d2ba587e667236b275757e01cfa4451b6368a11475999114cdd08d2cb SHA512 9e94a5614b77288103c511da813b928f0493ad69c2bc292c23a78bd0ad401392a2f6dcdc3120ca9909c4a9d9d7c6dd751649bfffdd483a71b2ea0c77a9a3dc24 WHIRLPOOL 8b89d9f3253a9338ef07baca1fea74ccb71c6270a78e37d6c4b8653051cec9901dbfcd8f023887bc6b8c29501c90f091af7426ade213f598dbd50ad52139a68f
 EBUILD adobe-flash-11.2.202.285.ebuild 8087 SHA256 ab31325c1f4f06a998d359cf807b663c5b761c181a28ef0305054ed5023edb30 SHA512 94bb9da7f622434936db147e027e98c7452c5dc8df6a6fa3278236f6c898acc3bb442849f6b293046a5c0006257963f88c3195a457692b6d07ada1b0c7c10b5d WHIRLPOOL a82a3550f055f4a2ff44c1119f46a7a7cef60f8b1fc36edc54686dd9386c85f2fbef4f7938575585102228c0c5b5975465626cb137012f48ac2ede0551e0f6bc
-MISC ChangeLog 50799 SHA256 7761b4b4682eb4dd3c61827973ec358605cb3835177099ca3668640b2f75a23e SHA512 271cfc9655466090f7047d6752b1ae47bf7e041f027d204028ca2064cdfd059275e360cb89966b778dfc41dbf84392c1c303c34b7b6e5c31027661f06c832ea7 WHIRLPOOL 13c49eada96b4a765d2f0fa65accfd2e9be8a9f081d4478c643394ec4333f5a4fb1e16bba22732cda0c2331799075577a03efd7e69f1fbf4ec3ce5315d2548f8
+EBUILD adobe-flash-11.2.202.291.ebuild 8089 SHA256 cdb38a1d23b3ef4e27c726a8bdd2234d825a8cd353de0634442d65ba47b43ae3 SHA512 4830e2395d4de8993826cc097dc5d0d175dce3114643a50825e7c2d1222426bf6166543852085923c40ceb5d53416b7b9ab9a8d8951ed21475b05d872edcf49c WHIRLPOOL 34a3ec7cd94a55c1da63ab76696e58078cf62e315e7f21a9cc518f3d3d5810afc58cf8321fbf0880c89c9698e4f90f61a47b3f9b46242c0240c1ded652d83f44
+MISC ChangeLog 51059 SHA256 6ed85c250227d9fc5d3cc6727cd55659f76f33297fcc4b66ac7c16a251e319fd SHA512 6fdfc70b5aa481712d449a5baea642a301111a1efb012e00479efe0d8dfc286e69fbac619793d8963d4b5a46bcfdd37502be86870ed868f1f952ed3abb3e14c5 WHIRLPOOL 2b1706e48476ed7638d44888b1f0356f8d29b48f2d2e8f44ac0d776d5f1e25c5f77993cfacc607de9bee683e51a10838b2cebfca181c9d334a6625fee21d2f7d
 MISC metadata.xml 910 SHA256 ce8ddbe474e3b8e3cb069714254b6315f4a315092ea26f4c012f2516fbf4c7f3 SHA512 1ad409756e0c76fa4e5b6b7570eaceac505a7d922d307b0a0ed1a92212c08933d8519f58db5c54a2b3fa321cc647e7f98d3d7ab7755899f054139abb09618984 WHIRLPOOL 36af66ef3e829090c20e9d97ad78228725580979a91a6c1c2708d1ea877dd5d81dffe39c13f79dc0719883f042ae3997a90931f946b0d044a4c1141601e4cec3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGp45MACgkQVWmRsqeSphPKeACfSv3UhYzgmruMAqpNJdOe4FhI
-SAUAn0OF8otL8eaCjuDG2b1FZAVzgGNN
-=A/xJ
+iEYEAREIAAYFAlG3wWUACgkQVWmRsqeSphOiIgCeL7atyssu0KcIkDX3BNxcMYMG
+uCcAmwUIbPxRgS1WJJ8TOVP5DBaFBJjc
+=GjSM
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.183.86.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.183.90.ebuild
index fa41cd1cf46b..8c35489cbb52 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.3.183.86.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.3.183.90.ebuild
@@ -1,6 +1,6 @@
 # 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-10.3.183.86.ebuild,v 1.1 2013/05/14 22:11:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.90.ebuild,v 1.1 2013/06/12 00:31:31 jer Exp $
 
 EAPI=4
 inherit nsplugins multilib toolchain-funcs versionator
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.291.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.291.ebuild
new file mode 100644
index 000000000000..71cbcd279875
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.291.ebuild
@@ -0,0 +1,266 @@
+# 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.291.ebuild,v 1.1 2013/06/12 00:31:31 jer Exp $
+
+EAPI=4
+inherit nsplugins multilib toolchain-funcs versionator
+
+AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
+MY_32B_URI="${AF_URI}/${PV}/install_flash_player_$(get_major_version)_linux.i386.tar.gz -> ${P}.i386.tar.gz"
+MY_64B_URI="${AF_URI}/${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 selinux vdpau kde +sse2check"
+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_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
+}