Version bump (bug #442084).

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

4 files changed, 278 insertions, 8 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 7c5c8747d672..f66c8a9798e8 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.147 2012/10/22 09:00:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.148 2012/11/06 21:38:11 jer Exp $
+
+*adobe-flash-11.2.202.251 (06 Nov 2012)
+*adobe-flash-10.3.183.43 (06 Nov 2012)
+
+  06 Nov 2012; Jeroen Roovers <jer@gentoo.org> -adobe-flash-10.3.183.18.ebuild,
+  +adobe-flash-10.3.183.43.ebuild, +adobe-flash-11.2.202.251.ebuild:
+  Version bump (bug #442084).
 
   22 Oct 2012; Jeroen Roovers <jer@gentoo.org>
   -adobe-flash-11.2.202.238.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 7a8e3ce97a93..08fa551976d3 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.18.i386.tar.gz 5459173 SHA256 49596b20f5bf659a772110e88b9e5990ecb20306dcfb2daba8917b6367184dc9
+DIST adobe-flash-10.3.183.43.i386.tar.gz 5460239 SHA256 b6d01187b6e3090cf2e88820c2ca220ebf8ce14e9febed2259d3ac9a963178cf SHA512 7bc243da636226c8773703a6fe994105bc5072ee2f832feda4285c9b22c2c0a5684f7eb26b22e855f5be6112d11b9cd876cce13186c526b1cd66b9cade4485d4 WHIRLPOOL 8e49d1f9619ba3fcf68c097ccb8e8ec7308b6bea14efa164cb90e17ca7621d9bf87b2d12351dbed343861ae2bbbf825edc28cf2d0100cb6d60b530655849b0f9
 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
+DIST adobe-flash-11.2.202.251.i386.tar.gz 6917347 SHA256 a3362986fe9cba5628c1b1684707de79f63947623b631c2a42eeea15b420f05a SHA512 3f714b397537401ba92d10a76f7185b02896c3d3064653c6aaaf095450c738139280f412dea07650cb219001d443ea102cf3785d11256812f6cb2174ec23ff7a WHIRLPOOL 7b44e7ec191eae349603c9af703b448a4e122aec8e162d3219ec72b1e60143aeca69e5eb23b8e5d4194e64eb389f76ad3814bc140d67f1fd189b8720af2fd6cd
+DIST adobe-flash-11.2.202.251.x86_64.tar.gz 7228964 SHA256 e267678d480e1f934da738f0e14512bf3adb96425b925c690e62d3882ebe7c5a SHA512 458df3c314bec1dc7cb2af111a7e409b05cbccedb8f98cd8178993f77e55403c54cfc240458cc8916cc34a96c4c782c2a62d8898fc1723ce8475eb71b142f10b WHIRLPOOL 65e081cb8fc03e674646f657ae3b793ee91ca4bfd6a8733abd10509c827615c7635573aa93b47955794c55b202e00ea0c156fe5fbf4552a53a7e0193a1e24bfe
+EBUILD adobe-flash-10.3.183.43.ebuild 3483 SHA256 31759fa409c75efdff44e2e90d69737e4b7a2dbced3657f4096930f825da9f87 SHA512 b2cca19bf3d7918eb8de69bfb23828d150c406496c3261cc2ff7acc00b3609dbe8797d85a186b8f3861c6a78dafd25aa14f46461771a12721029af5ad60e02d3 WHIRLPOOL a3d305220b186ce70d4a587cf95048e88f61deb13fcb92cf001e588900eb18229d27e2977bf7ebd3d1578c24c6a74b6b6c374326ae756a8a3fb07cbd37d53ffa
 EBUILD adobe-flash-11.2.202.243.ebuild 7992 SHA256 7f1ebc556b007bc3adbc61e46c68aa2a3f2e711bf5ae63b4ed0095d4a109c61e SHA512 2d8762226f2f9f426435f56a53f53658fc5db768fa9202ba9e064bf95bc0d5ba55cf48b24e4f701649a2f7145f64f15582c4a1533b091d9b1879b636cbfd82b0 WHIRLPOOL f5be7e986c36d17c0db12944a441821c6d6530b2f9240de0e24624fa1756f7bdd33dd655244b08b0a11609137b211fb1266e3d3061a15cc50da4b0a84cb89175
-MISC ChangeLog 44329 SHA256 34e437dbffa23f57b18b8eb87c9b6af782f4a81415b96057470eb8fecfa95ad3 SHA512 b6dba90ee93a2a767b5e5e73e1dac6d637c401207ab83c637c4bb13827ac3726f1d39f31a90a5a0fb25f197b42fc93f9c696657783c26fce76c9804c8c768805 WHIRLPOOL cff93a66d6c1eb2919fcdf6c114976b8a15e6e7a5fb5acd50be2d182d13a223fc9fe707a2f206c71521b6524877d602cd38b4b3eee38a4127df51e34699a90dd
+EBUILD adobe-flash-11.2.202.251.ebuild 7994 SHA256 a234ca1a350bc15f238ec0dab264980f7bb7462a99cd1464e78a11ed5026b839 SHA512 f6edc1becaceeee1d0d81feb22129936de7798f51421dba7a4ec6c9dc31a2b8a268c24bff72588771f8d65161c3caf59ad68d65e5566c3f349aa339e469350aa WHIRLPOOL 56c594ce461819d5b5991a97f152616fbbaf24596c8bc3f236c2151e8dee23f027fea120d8049a708b42f22528da8daf84e14737c9e0ad320ad2629077c6068f
+MISC ChangeLog 44589 SHA256 1d8ff972cb51decf975269c51205ea7643b4ba16cf143018abd7aa457c34c766 SHA512 27a942771b305e9258b05191003540fdd8a072d851980bfbad08b26db55fc9e8557c428157e629131086d760af7718601e4226a4609f62f720610cefd4b10efd WHIRLPOOL 2c1951ea6fb28e9643b9632b49fedb40feb646570ad1ab5fe478af666edf49987f51a76002c5bf596830ec8560822b43924291c6b4f03245e6aee57239972dc4
 MISC metadata.xml 1084 SHA256 20d7dd4b855c8a6d441febca72a4c5ed1605db2fe884c11dbf3b129b02556552 SHA512 46832c87dcc6ffa683fe99293547695e75a2bacef7534aa0f084b6fa3b50073d6498660a2142a100b17d97c1b8cfc5a55e4c3f8869785f3282bfa084f7ba4306 WHIRLPOOL 63ad404c407b53a7df7cdbb74203872ce85282eaaeb529d83ab6a7a17f757874b26e92aab065fc799a908fd681ff8af82092b927079dbb8eb77b3ddf5e7760df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCFCxoACgkQVWmRsqeSphOGxwCfU/cmJmnuzUBdUROjYZh5MePz
-lC8An3jE6QFNEixe0rUHttI8d0MeWWH4
-=yR5A
+iEYEAREIAAYFAlCZg0gACgkQVWmRsqeSphPYTQCfdbRBvCWaM7b89TRzACabxhbG
+ZlsAnRsLim76nNftAyMukCY1hHwKTHsC
+=Y6Op
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.183.18.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.183.43.ebuild
index 940b1f1af908..61ed49dff269 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.3.183.18.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.3.183.43.ebuild
@@ -1,6 +1,6 @@
 # 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-10.3.183.18.ebuild,v 1.2 2012/06/19 19:32:58 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.43.ebuild,v 1.1 2012/11/06 21:38:11 jer Exp $
 
 EAPI=4
 inherit nsplugins multilib toolchain-funcs versionator
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.251.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.251.ebuild
new file mode 100644
index 000000000000..6729111503ea
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.251.ebuild
@@ -0,0 +1,260 @@
+# 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.251.ebuild,v 1.1 2012/11/06 21:38:11 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 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
+}