Stable for x86 (bug #551658).

Package-Manager: portage-2.2.20/cvs/Linux x86_64
RepoMan-Options: --ignore-arches
Manifest-Sign-Key: 0xA792A613

4 files changed, 12 insertions, 271 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index cf774461d4df..f926f0ca0099 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/adobe-flash
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.313 2015/06/10 14:53:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.314 2015/06/11 04:11:00 jer Exp $
+
+  11 Jun 2015; Jeroen Roovers <jer@gentoo.org>
+  -adobe-flash-11.2.202.460.ebuild, adobe-flash-11.2.202.466.ebuild:
+  Stable for x86 (bug #551658).
 
   10 Jun 2015; Agostino Sarubbo <ago@gentoo.org>
   adobe-flash-11.2.202.466.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 0a4ee36bcefb..efed955985d9 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -3,30 +3,16 @@ Hash: SHA256
 
 AUX flashplugin-lahf-fix.c 1038 SHA256 52acc6658eb7d49fb167c848345f7dcb49e4057e2872ca8319bccbff6728df6d SHA512 c56082ca6371176a3454f94a7ee5c00aba2d27c969783b26740b6ff61f42e240a34b7eeacc736f035cc101709141c4786f241f98495654a67f61544a10ce478d WHIRLPOOL f43cc3b836c8d43e6d706d847693bd34a212eb4c4ba3ee698db0f752bf36a7029f81e05664ba3ebbb8190fca414dee3fc109e586fe5e02f1c6263cd6e5bbb8b0
 AUX mms.cfg 4420 SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a SHA512 597380071a06176f09df1a56cba24e83a74990c175fe9f167f026eacbf01e66a083d2389ff399ead0a39654a40ae636f8459feed2d6012e51e65c5407fe7fdbd WHIRLPOOL 915b86d717db181a776eb9392aaae2becac4747bc0e551900bfecdeda17f9d0495f54c7173e47adf2ea92567c193c466e302cac78bd2126f10fd9956c204596a
-DIST adobe-flash-11.2.202.460-debug.i386.tar.gz 7415560 SHA256 5bcf0907be776d9879a177385acea073b5507d0cf35a09cec4a049c86447e6b9 SHA512 c6c0ce0332df30754ad0bbd8de1d032d511c9426a9d757ce28080de88f4275cbcad66058746a4e1b5fc45e51ad7ad649e3fa0628831dd4e53ad61fbe27dfd222 WHIRLPOOL 7872fc00f683ffaa8cd16e204b76c23ae15b6cef188dd728e03d550d9e1deadf885a604d18d06b26608ca6097182b777470288024eabf81add9722d8aedd9504
-DIST adobe-flash-11.2.202.460.i386.tar.gz 6933479 SHA256 a11f686f9931727cc8d1f2c9e91294e57f1245618f9f71009835cc3f072bc594 SHA512 33dab18c69f0dbe603bebd0eb03ba3aa49e19fbfbf63dadd092af1f1d4eeaeebfc80f83074f706572cd4cbfce1299eb1fb5ddd5fcd40ac937a7d62ca0a2fce52 WHIRLPOOL fe7379d6ac6ad3f387bc278c4521536dafa3b04d28aaaf09e70f260caa803cc45f4c62283543de66f58cc4cc024a4eb51e850d3f4ccffefabe5c8112d25e845b
-DIST adobe-flash-11.2.202.460.x86_64.tar.gz 7247288 SHA256 d9e6d8bb58f37e6d4dda637ed1aaa78edfdc422f1fd50227347fbfaa63875094 SHA512 8d22a785d10f97ea5b53390e89a9b93b181705cf0bf7df55545117f0d819306fc66c3f0d4a36542d6508199a98f335e1fafaf5172c1309a757d672399691bd39 WHIRLPOOL 57e1766cb82990e6e9d7b507dd6fa36f305ec0243bf4c6807f1d9c13aadf21dad35ca16800828ac693a1480ce4f323ef8c019f4d4070bda9fc53475f51f32fe2
 DIST adobe-flash-11.2.202.466-debug.i386.tar.gz 7415367 SHA256 9bd88305af7bd3460da416cad520dc021ba3dd7a9c526146a771d078e68f0750 SHA512 d9bb71a213401d579955714c8aad33dee33b013d716a5a22711694311fe74789502e934a40c3c8cedd4926bd6ffcdd59ddd8eae1b6f3a8fa24430a888632c571 WHIRLPOOL 84aa575aaf084d4a12912a917c12e8cc8dcf3d1ed782c5ffc891440a49f2b8f0f222fd19a0ada917d92e43bcb2af54184ba812f8b04babc5ec085eaf04095bb5
 DIST adobe-flash-11.2.202.466.i386.tar.gz 6934400 SHA256 30718b8af36247d5713e63e533cdb67b9f98a8b241e203c9d0fd34b34654fdef SHA512 88e8c3c0925079b74907041127a9c2be3e7c3403fe5dd7bec4e02fffd62ea46863710f58ca866c918f0c0e4e092484e951c197e4f11c0097a5783ed5575839ad WHIRLPOOL 2ec4b222f20d8184cb055ab509aa5685ae48f98c0d38f4ae4a4d3d55564b9c77c8fca1ec87da37b80d500e85651bf28c342b50764ec8d7b60210a26b8edbd6d5
 DIST adobe-flash-11.2.202.466.x86_64.tar.gz 7246913 SHA256 a884194f5125144b63ba8137f7859ee587acfa4b211ea9d13093bd5330749cb2 SHA512 ae7249b83cc943f98cd77dc1603a8ce30d93ca7821dd3a598888a39d16e109cfc15ee688654428889e06bd3a6768fb0a9f84078c36b478dcf6fefa43967f7533 WHIRLPOOL 7b7be330547d3f527918d0f8580932f826acec8f5b5ac1764b104468fb4c711c1b6a054b1937baf5580511b43ab7828d75158b2c4a99a096ca31e41404cae86b
-EBUILD adobe-flash-11.2.202.460.ebuild 7079 SHA256 bbcd3048537848bd7ebdc616a87c98298fc82cb297ebb180f0679d4f4d2fedd2 SHA512 b97c9bad47a635bb007a7600e4128b0a8c9451530932d3bc3958481bb15656895b508cbaa1d8836980fd2b7a4f70098a1a5f9e5e66f644ff9d99c08b88afdfab WHIRLPOOL 4c5bfd152bf1e9e181ed1b56317a5a73cd73fb2f56b2e8e47b88e3822c230978e991be30c4435f44693d81a67a68cfbf70b8cc3f163de475ed4dd229502bafd4
-EBUILD adobe-flash-11.2.202.466.ebuild 7076 SHA256 2cc7433a1c8ec300ed34df59370348c9e45239143fb8a41b489a5120a4e2d295 SHA512 ddb2bec6c01487cae510ce28ebeb082f097a26526ffd9029d37fa264ec9e08003979e5ba6a94350c0bc7b6ed7d7723fbc60a7b18d02d997287bf12228a990e6d WHIRLPOOL e863d72b7975eb7578132dbb7f3cc8c01b327b2dd940be37da75b886208889d08c75aeccb62b0e6dfbc35a4f4c3ce80290c935d484575abc69e0816764dd7f53
-MISC ChangeLog 66220 SHA256 00598d59901ee2e6c120844c1f053c8e242b16899d2a6d6067241d91249ef3bc SHA512 39c05650f594036461a58f8e1d443d2437673a8fe7055284f767babe221327c426660486fdb5e6f2b82c7d03e02c06f92eaaff4bf773bc3049ceb11e8de25bed WHIRLPOOL d41db42d1e3bc6867a4741f988244db74d75f0ddb5eb47ddcdaf6d8a86136cfa262df270f3d67e796d38e3d9af41832f3cb75bcec78657682f4e39bdcb0dfd32
+EBUILD adobe-flash-11.2.202.466.ebuild 7075 SHA256 e357b73f031564391e32cc3b1c836d4da08633e613729576b4032954ed649f85 SHA512 b0a4624e8e2bd214a3cc497b91be4426096279aa6e5b9233858639eb1ef8ca640ed473c68553f76a8dc8f30491a6131d080c7602b37c9bf35b09f4d7308b4c47 WHIRLPOOL 3e4d672e8e7b9f3a296ce75457825bc21da2f4645136f3667f525217d1f14c739f3b1a4170b98a29130b09f47bc12000d1facfe7c55012789d23c5ca2049dedb
+MISC ChangeLog 66369 SHA256 574327d8d909fde78bc25d29c812ef3678c3680d04466cdf27b3cd5641b7c966 SHA512 9497bfc2022537be0060cd54d2ac9258ba326f08e5a6c6940ecd1a7b805f73ad6650f402479ac32fe2b11471c47ca7c1f4eab826cb9a3cab08fbeb0b841150da WHIRLPOOL 3bac43b0d2edd92b82b0e74aa8185a0f29f0c4f3c9e079e1d861ee3909c6f96187c9283becad932cb3ad3b26bc56e216c748aeedaa2ad3b0726986d450c10115
 MISC metadata.xml 321 SHA256 8deb56ef6832b7228800012723bae22d3eca62c387a3080bca3a98010767e00d SHA512 a728e401d2210342cc1747de4291136d3fbe25060eb0dec35a3b7c8ca5c082acd95780ef5b8d33d5d0a98f372367b5424b6dd777902d4387188758ad8dc0a09a WHIRLPOOL 5ab060286049fb7bbb0e9461561c2f29cbaa5c42bb9d44901bcf6a0a56726879c6f2a65ee08b9c278441a072addcf09f6c2f481b5c008818c25c9911dbf95a4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVeE9dAAoJELp701BxlEWfUWsQAKUx4pj/TZ7O40AImRGwDef2
-RPtUwMs4N86Q22kFUQAbQ0si93bAUSSxw80Ja28TlZCwV07vs6pFVx/mvpOTMOiP
-Pgv5XKJ5mHP0EAetGTTXRcNB92lV70DDb7rSqihPDEbYouPJT4zc9fWUGiSTM44k
-U5pNKkJ1Wo36Y+smxWEjR9U+J2dSofIDNv/WsI9L7gmJ7YkWn6YEkIpyDjXmcG26
-AxzXiufGd6RhyD1uxRQbCQ5SC/FiId1xLp/HbetX7QVTA2xsS0O3OySlIMmO0WQ5
-10FAG9h6ywFipivCuiKbawLI7MDMRvrgV+PE6PNUa57q37btv3STf5d6aauUT+di
-9xyTSFeDlkdpf7xMUMAumECk02X+jwA+vn8TSRKERa4om43YzpuPuQQiwnPK7Zey
-MGKmLmyuPuWxSINyl1jFFm4lKwYjMIFaAUFD6QhPqfuLISwbD2Y7aVjE7dHttO8r
-vr4GHUw/jt+1GrIVTZ0LMIgw6Z85qCnBd2n0eaqbA4tToVkwOz2Bf6mcutIbCjlM
-vOutn2UiNoDXNUzmyWAcEdxMU+jsYpTB2PhKD2GuIeQRopn4gKil9kQyIxCZ2sp1
-WkWJoBX7T3zcwbyLg+wB/0N0i/S1bK+fR9a4fcaoaOynMcOot8oj4oeFww02Np+o
-1ewtLyVwbfZtrN724LQy
-=dT3R
+iEYEAREIAAYFAlV5ClYACgkQVWmRsqeSphNLBgCeOrh29Ncezi14hWOFghOGFoDK
+t/MAn0PpO/g3mIW21IoSl+bzuaU7RLLk
+=tV1+
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.460.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.460.ebuild
deleted file mode 100644
index b0acabecd6ed..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.460.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2015 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.460.ebuild,v 1.2 2015/05/14 08:49:11 zlogene Exp $
-
-EAPI=5
-inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
-
-DESCRIPTION="Adobe Flash Player"
-HOMEPAGE="
-	http://www.adobe.com/products/flashplayer.html
-	http://get.adobe.com/flashplayer/
-"
-
-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="
-	abi_x86_32? (
-		!debug? ( ${AF_32_URI} )
-		debug? ( ${AF_32_DB_URI} )
-	)
-	abi_x86_64? ( ${AF_64_URI} )
-"
-IUSE="debug kde selinux cpu_flags_x86_sse2"
-REQUIRED_USE="
-	cpu_flags_x86_sse2
-	debug? ( abi_x86_32 )
-	|| ( abi_x86_64 abi_x86_32 )
-"
-SLOT="0"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="AdobeFlash-11.x"
-RESTRICT="strip mirror"
-
-S="${WORKDIR}"
-
-NATIVE_DEPS="
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	kde? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-		kde-base/kdelibs
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXpm
-	)
-	media-libs/fontconfig
-	media-libs/freetype
-	>=sys-libs/glibc-2.4
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-"
-
-DEPEND="
-	amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) )
-"
-RDEPEND="
-	${DEPEND}
-	abi_x86_64? ( ${NATIVE_DEPS} )
-	abi_x86_32? (
-		amd64? (
-			|| (
-				(
-					>=dev-libs/atk-2.10.0[abi_x86_32(-)]
-					>=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
-					>=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
-					>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
-					>=x11-libs/pango-1.36.3[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-			)
-			|| (
-				(
-					>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
-					>=dev-libs/nspr-4.10.4[abi_x86_32(-)]
-					>=dev-libs/nss-3.15.4[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			)
-			|| (
-				(
-					>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-					>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-					>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-					>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			)
-		)
-		x86? ( ${NATIVE_DEPS} )
-	)
-	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
-	selinux? ( sec-policy/selinux-flash )
-"
-
-# Ignore QA warnings in these closed-source binaries, since we can't fix them:
-QA_PREBUILT="usr/*"
-
-any_cpu_missing_flag() {
-	local value=${1}
-	grep '^flags' /proc/cpuinfo | grep -qv "${value}"
-}
-
-pkg_setup() {
-	unset need_lahf_wrapper
-	if use abi_x86_64 && any_cpu_missing_flag 'lahf_lm'; then
-		export need_lahf_wrapper=1
-	fi
-}
-
-src_unpack() {
-	local files=( ${A} )
-
-	multilib_src_unpack() {
-		mkdir -p "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		# we need to filter out the other archive(s)
-		local other_abi
-		[[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
-		unpack ${files[@]//*${other_abi}*/}
-	}
-
-	multilib_parallel_foreach_abi multilib_src_unpack
-}
-
-src_configure() { :; }
-
-multilib_src_compile() {
-	if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
-		# This experimental wrapper, from Maks Verver via bug #268336 should
-		# emulate the missing lahf instruction affected platforms.
-		set -- $(tc-getCC) -fPIC -shared -nostdlib -lc \
-			-oflashplugin-lahf-fix.so  "${FILESDIR}/flashplugin-lahf-fix.c"
-		echo "${@}" >&2
-		"${@}" || die "Compile of flashplugin-lahf-fix.so failed"
-	fi
-}
-
-multilib_src_install() {
-	# PLUGINS_DIR comes from nsplugins.eclass
-	exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
-	doexe libflashplayer.so
-
-	if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
-		# This experimental wrapper, from Maks Verver via bug #268336 should
-		# emulate the missing lahf instruction affected platforms.
-		doexe flashplugin-lahf-fix.so
-	fi
-
-	if multilib_is_native_abi; then
-		if use kde; then
-			local pkglibdir=lib
-			[[ -d usr/lib64 ]] && pkglibdir=lib64
-
-			exeinto /usr/$(get_libdir)/kde4
-			doexe usr/${pkglibdir}/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:
-		dobin usr/bin/flash-player-properties
-
-		# Icon and .desktop for 'flash-player-properties'
-		insinto /usr/share
-		doins -r usr/share/{icons,applications}
-		dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
-			/usr/share/pixmaps/flash-player-properties.png
-	fi
-
-	# The magic config file!
-	insinto "/etc/adobe"
-	doins "${FILESDIR}/mms.cfg"
-}
-
-unregister_pluginwrapper() {
-	# 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/${PLUGINS_DIR}/npwrapper.libflashplayer.so"
-	if has_version 'www-plugins/nspluginwrapper' && [[ -f ${FLASH_WRAPPER} ]]; then
-		einfo "Removing 32-bit plugin wrapper"
-		nspluginwrapper -r "${FLASH_WRAPPER}"
-	fi
-}
-
-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}[abi_x86_32,-abi_x86_64]"
-			elog
-		fi
-		# needed to clean up upgrades from older installs
-		if use abi_x86_64 && [[ -n ${REPLACING_VERSIONS} ]]; then
-			unregister_pluginwrapper
-		fi
-		if has_version 'www-plugins/nspluginwrapper'; then
-			if use abi_x86_32 && ! use abi_x86_64; then
-				einfo "nspluginwrapper detected: Installing plugin wrapper"
-				local oldabi="${ABI}"
-				ABI="x86"
-				local FLASH_SOURCE="${ROOT}/usr/lib32/${PLUGINS_DIR}/libflashplayer.so"
-				nspluginwrapper -i "${FLASH_SOURCE}"
-				ABI="${oldabi}"
-			fi
-		elif use abi_x86_32; then
-			elog "To use the 32-bit flash player in a native 64-bit browser,"
-			elog "you must install www-plugins/nspluginwrapper"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	use amd64 && use abi_x86_32 && ! use abi_x86_64 && \
-		unregister_pluginwrapper
-}
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild
index 338d7c4d6fbc..87c8fd44c0d0 100644
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.466.ebuild,v 1.2 2015/06/10 14:53:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild,v 1.3 2015/06/11 04:11:00 jer Exp $
 
 EAPI=5
 inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
@@ -33,7 +33,7 @@ REQUIRED_USE="
 "
 SLOT="0"
 
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="AdobeFlash-11.x"
 RESTRICT="strip mirror"