Version bump (bug #456132).

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64

4 files changed, 276 insertions, 15 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 50ada7d693f4..f15713fa5034 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.162 2013/01/16 15:31:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.163 2013/02/09 16:45:26 jer Exp $
+
+*adobe-flash-11.2.202.262 (09 Feb 2013)
+*adobe-flash-10.3.183.51 (09 Feb 2013)
+
+  09 Feb 2013; Jeroen Roovers <jer@gentoo.org> -adobe-flash-10.3.183.50.ebuild,
+  +adobe-flash-10.3.183.51.ebuild, +adobe-flash-11.2.202.262.ebuild:
+  Version bump (bug #456132).
 
   16 Jan 2013; Jeroen Roovers <jer@gentoo.org>
   -adobe-flash-11.2.202.258.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 3c98ec31629b..4dbe0df9e5ed 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-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.50.i386.tar.gz 5460887 SHA256 a890a01806e032b8335f4b73cc04886971302c316d3b8a0df6b73a78892e07b6 SHA512 c955f0306d0b678f697f2a149117dab0cf5ce8cca975cf861be2e0a991cfa00b94aa3bd1336e0d67e3c03ed43e46ab2eae96d239f11f0921e16420cfa6ff0f54 WHIRLPOOL 658e475acb2f625d3d68dd43d1b52be9b92bd73e1354894599d8d715cf75b78695e53e5b4c1f72fc3d0283c0f1b977d40f6d63110b21831fc3e68e04678e61ae
+DIST adobe-flash-10.3.183.51.i386.tar.gz 5461204 SHA256 b97ce81d1d9b35dce277467c862880e4a479056dc77f6e6f0cbca89e459ce61d SHA512 c0aa4b6359bf6596ede0ce52cfb338317d2ebf5e0957109a787fb358abc9bfd042fd7da8841b96d3afd30d04d0837035aa9707d2ebf692351994832e52f02e7b WHIRLPOOL 4035e6a3f6f13ba6b1bd99375c82a4887673cc13f84ae84b64044f01561ce4478dfe7f1e2a5d89302a16e6494bca365af1ff13ac0a1e115416ab12c0dc04d739
 DIST adobe-flash-11.2.202.261.i386.tar.gz 6917481 SHA256 c66d4a25f9f3c4598b1c1802e862430e3598aa6910aeda220c607483798b67f0 SHA512 0b020d553376300ae5d27758070425822f6ea1beee5aff8f32b8da1fb3c4ced39c2546e49d2cd5aeca0a84286cc053843df628d34a5185b144e4964e805abeb1 WHIRLPOOL 8ae93562d95b033fc27e79074b8a1eb8cb1e1120da795ef9dee9284eb9f3a2101f8ef8a00cc00c29bea74f6a98ae268a4686883c1e818592b3bfac766adeaa00
 DIST adobe-flash-11.2.202.261.x86_64.tar.gz 7229036 SHA256 60cfe63fbd08fdd6ebeaffe4d23509e554ac063f0fe0683bee9e6614c59ab85b SHA512 4739887b651b5506d682673d90c2979db2c6cc7e850bf1fa0b3a567e698fdd0d5d9c8555afe620041d0a9d7ab45552a36b45db48fca3f04ddc000460e85c4798 WHIRLPOOL 9a713a3ee8047b369a294edd26dc9c771d4e8fc87cb943110ec26a6640dd9920f1b46b50257e9a115207cf6d02329be5bdcda6e8a062ce679202fb6c9ad3b5fd
-EBUILD adobe-flash-10.3.183.50.ebuild 3530 SHA256 c7acf1ec637b211123b180d1e20cdab4942e4a144b000f68925b48e9db3b2c72 SHA512 30d568307e20507eb0aa9f46d586fe9091191348ece475f36236940d268b8fe5c6c4c1ecdf8ab0c63da4329bee50c219d22778c3440af078e26ba02ea2f956f2 WHIRLPOOL 842de0da052ec6ca2f2669d8f131049a81b9ba63fa0a9f738dae5eea5ff89f993a1b0b2eab0d09ecbe93bf4cd861875d6d188c064ce8df42e2afc78b9eaf582c
+DIST adobe-flash-11.2.202.262.i386.tar.gz 6917470 SHA256 5dcb830c16d4862384c72448037d0ee4d0b5d192f529d8bec3465d6548a61a3a SHA512 0ed90ba68add48001e86928fb09ae15e290287c6883b0b71dee7a22eb37aa738f4579ad12754d3b992ca0b62211d966e05fd9ba3ee5d455794471457de742a80 WHIRLPOOL 28a4dc9a903670ded1bdf14b7ac04e75a35dfa602d39835c8b77f741ffcebaae01ec81c2bbcb8557de91059bcdfa7776b2a164a41b22b384ce50ac3cbef35459
+DIST adobe-flash-11.2.202.262.x86_64.tar.gz 7229739 SHA256 f2a071598eca69f78e9e0967bd9430a9d6129888756208f524504d7ca53ad9ad SHA512 6127a8285db2c54659b770f22ceae2202f4d1206c774aee8d140bf6a86558585b1143385eae34390fd643accf23fed258a26e08099e0822f7df32f538ee233ed WHIRLPOOL 21f662ce7a904596e3f8eb577860804fb9276116039bd2ba98219fceb8958e70381416c84946f442c6595f32c1a43eda9e7c02f4d7e3d5e730d84b10ae20cb12
+EBUILD adobe-flash-10.3.183.51.ebuild 3530 SHA256 4c61e543bb39cf83674cebfc3cc1707c45ef9495b59c2f009e0c42627c1e3126 SHA512 31eea667c9f445d850e5967da7a5e1860681bf6f3b2af50fe0a06d7022f7860bfb4c3c0ad8d109b1cb4ed9ede3990df6b6293ac8e81be85592739d2a90166ac0 WHIRLPOOL 6b553dae6632d9d5c902c65446aef9040c5e5d0fd2ebf857ccb686a60f6eb02ed0b5b046d4c215af9a6cb86293de7fd2070f8cfb5a28fcb37e7ef859e47194be
 EBUILD adobe-flash-11.2.202.261.ebuild 8039 SHA256 785a18be292574d0fa3edc8302f3785230df0d10c9f5c61503344092b35375ad SHA512 b8eb082f60ebaeee471787847cb0f72cfcbd656e5b8c86d8cd1ded879e66c670daa772c0f31c611029133c390eca04db07a68c3c9a8dc9323434f56c578a16ba WHIRLPOOL e9aa97022f66d8f07eb04f1a1ab3b25098d3c6f1f2662b5aa9646785b92d93e56ee283e4d773a7ee52842c657f2469d5da1d3ffda93577d034b7cf074ac54917
-MISC ChangeLog 46429 SHA256 f4c0db054e095f83d7a59054fa1ebd446213bb72ad05b21ab47ce9cb309f0193 SHA512 bf98cbf3212224606992fd05aad1d825f9f1ece6b4f14c126c35284fb9088c53cbfb47eed7db1e0fb293db2f5a9198c2406e459f6b32f9ac19ff5ae439807731 WHIRLPOOL 771f39278471f42d9d9cfd6dfe7ab6c5324b29e36c829baa5f84eaf7d4ade87a82b1d94a8a1432d0c84f4e1752982de5ff0d8b5bc97a6b472f91bdecde2327e6
+EBUILD adobe-flash-11.2.202.262.ebuild 8041 SHA256 cda953e887139665e429ef751097e4aa9cd5cece4dc63621042aff6a52028024 SHA512 f5f10fb02670fbcccb15671a2d32b76903d304f0e821af6a6cd80fd48545f207e89ded43d7b0b39399bad58c0a76799814a128a1e4bfcc66a9f9244c1c118af9 WHIRLPOOL b83a5e192ca6c2eea7b6a4e8faed3f7eff225e0a4f4684550f55d6c3caa221bcee0501a5f29bc1d3f7e24cbe4b8c58d29861615114c49d27a59601a078dcfb12
+MISC ChangeLog 46689 SHA256 c9fe6b831c3c2d51d8f501e6b53b9675fdbab79de9cadcc51423b12b8334d62c SHA512 d78e8aac3a90d9fdcb704e064aff904e71386ecbe878fbc4c39b94061c0c6811b66036f92cfe71dceed355ee2b5d060243a9301a8c228a846ab4c38f89573cb8 WHIRLPOOL 08a81b2023ba1966c9944467ff5d9b68bd46e28802d7a6a02bdf4690ddd57a3771eb8d44e95ded83568bc530edcb44c02506eef88a32ef7c82e15db74796fc56
 MISC metadata.xml 975 SHA256 c7f61bcfba67a817e96f88f722c6f27c9e651425741b1059c6669b9cfb36fa56 SHA512 243421601866d9eeb5017f22b1c15b4f8834fa8ad9561953f1e05f6c3b02e18b28b9a62dcb4d85f43f38c1fc021221004123cd1930225acaac5b491c2333fc5c WHIRLPOOL 99781ee2984d90ce8fe0c0f37fa91948fe6a843dc9e74ae4a92e645ab5345fc4835b220d4c8156d752787cba8b50a720409a670af7ad2c5c99968934119dd4d2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlD2x78ACgkQVWmRsqeSphPaVACfUS+ABLTL6gpfIsekTk5254ib
-C+wAn2eclmI0wDjPg+4rqvXpqG0oDhGX
-=t9V8
------END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.183.50.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.183.51.ebuild
index 98a69d5ec72a..78b1ef3eba12 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.3.183.50.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.3.183.51.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.50.ebuild,v 1.1 2013/01/14 20:26:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.51.ebuild,v 1.1 2013/02/09 16:45:26 jer Exp $
 
 EAPI=4
 inherit nsplugins multilib toolchain-funcs versionator
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.262.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.262.ebuild
new file mode 100644
index 000000000000..2ff4a1bf28a8
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.262.ebuild
@@ -0,0 +1,261 @@
+# 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.262.ebuild,v 1.1 2013/02/09 16:45:26 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-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 ) ) )
+	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
+}