Stable for x86 (bug #493894).

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

4 files changed, 13 insertions, 268 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 391437abd792..3414d24fd56f 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.226 2013/12/11 08:49:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.227 2013/12/11 13:49:32 jer Exp $
+
+  11 Dec 2013; Jeroen Roovers <jer@gentoo.org>
+  -adobe-flash-11.2.202.327.ebuild, adobe-flash-11.2.202.332.ebuild:
+  Stable for x86 (bug #493894).
 
   11 Dec 2013; Agostino Sarubbo <ago@gentoo.org> Manifest:
   Stable for x86, wrt bug #493894
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 63bb85569af8..1101d95cb734 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,32 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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.327-debug.i386.tar.gz 7402721 SHA256 11c5c1a5bfacf8de2c7389cef24468cdaf0d5f5652398a4c5078a6d987c95d5e SHA512 b6569068948c857c9e97f4ed0d279563d558bfdc92385b972abcd0d6634b98ba706590abef0e9352b087564ee63b61436648ee21fd98434f8c9159b4fb4cc493 WHIRLPOOL cdf3b954627a24ce9c540e945de7aedea2095285a138d497dc391dce92e96ca55b841845fd0e01f3599fa51f3873deb1657d009008ced222c7a70d12ade71dfe
-DIST adobe-flash-11.2.202.327.i386.tar.gz 6923587 SHA256 1fbbadf17c86b3fd52bbf1df299f52c0b2eb7a0b9aca1d55756bc884c9270f62 SHA512 bc02dba73b337babf989c582a43a4b394294ae131f779a21fa0381ef98ac8f4efa580cf17306daeb364c549af9800ea328fc4a81f6e26e6c0d2e3f9d317b2d9d WHIRLPOOL f58b001878500b338a87a23e6f66cb773520bd7f095266ddd09099ca0b11774196e2e3eb6fa9ccac34312ad7b7398d06c81f49536b637a38da2784afc39d211a
-DIST adobe-flash-11.2.202.327.x86_64.tar.gz 7235065 SHA256 34248b36f4b640c0b3846a334f995414c1bf4c8813ec80e2dbd3028d38bb4235 SHA512 e840b94784ac1e19e127091e6945ee62d5c6128e20e0fe6baaf2c6a0746fd1e3f9fddf3f221d9a46f04f17fb2d9af8aca2c83fbf5350bed05097e56f94144500 WHIRLPOOL 76d243f2bcba115a01c41660ecbf1c38284fdc31027f7bca90e1013f454150c920f90086ffe8f86a90f1ae32300682c4b22491d7d9aec3d77846b5d1c9ff13af
 DIST adobe-flash-11.2.202.332-debug.i386.tar.gz 7402825 SHA256 c6eaf175435e2f327ed757638a8c764f08e178ae901822a08ff8ccb7bc8cd4aa SHA512 5fbe32737a859efd55923826f8135f3711abb9bf1684ac1f5795e4344747a6ee8aa979fd77fc97facc8253f227e343d2a9349f0d9ed745e1d64274276382027d WHIRLPOOL f2c5a2cfe92fe40165a0eb4c07d3f89d57b8fd2f990b6579ff6499446af71f009c69c245b62d45fe9046268121c3b80a29242da494da6e0d6f42463bd25b7211
 DIST adobe-flash-11.2.202.332.i386.tar.gz 6923609 SHA256 01b643f24c129a724f09458c0cedec216e96c8e0dab020e07814304170c21aab SHA512 08bb0b349565e423ff8c62895c2f7b5f0e672afb1055a0d84e82ae0141e332fe39c6ef3c6354e9ac2750eb711af20304d07e1bc9d0490a80365ad10bfba3cadd WHIRLPOOL 9fe894ad44171d764ab6ce1858a86d4a46b42d71173372fa95af3dfc2406303edefd3b4d0fe27ed68d4b867f9c4085119ee5a29703ea49456f3f1de00265a751
 DIST adobe-flash-11.2.202.332.x86_64.tar.gz 7234961 SHA256 52f83893150aec94562a8b8f96cbd8471fa8453de930444fee0d7ee3afbb2530 SHA512 6eb77832306cef71601f40910ecefd5b0dbbe3c835ddc91c14448609c7e488ead5953adfc9ef23f7367045d324566c1bd9ef593e0e35a5a1848b9f11fba8d8d0 WHIRLPOOL 299b73aebea7831c4f8b77488712bdf8cde31c26d9f331afb16e1583cce24fcbe5993635770a1e6b2127d9ff6769c4c3c7d725220b491094b70637032bef38b7
-EBUILD adobe-flash-11.2.202.327.ebuild 6823 SHA256 938be44a62e30784418b46f768b96a5de087d058617012ffe830b301f6105f70 SHA512 e8b33a1411bbcf756f1baa965c6e8b0fbd0eb021cee6a0b5587487f48f2f37613873afabffd23dd843655b48a99ffa986d6d1420da97f60f8084c597c9d82671 WHIRLPOOL f5172272a56b1795996a08fe16e3fa7b21645b94ed5166ad44f277cef36a858966e99f6ef35ce609af19fc2ca4fdfba6c0d104aea1a3aaf10a104e2841d3d178
-EBUILD adobe-flash-11.2.202.332.ebuild 6823 SHA256 e9a16423af533fbcec8f38549a1fb7ff1cc71e2b31232c6aee775a87307b70ce SHA512 2be9613da7d26256777a68134d707d7c1cf7c82eec93d469eb34c1d25ae89883d602a1418051344e03dd042c05a17853076d1579925689a1c10177693e44b2e0 WHIRLPOOL 73fc9e64385013798f89340085a12ce007261e2e2ccdde7eb8b30a21f2af83e78950b8c14d379a6fef8a0536a1b76a85fe318d5702803b4bf5d09bf0183257ad
-MISC ChangeLog 55180 SHA256 5ae138907fd0da8c4f40bafa75b3ea666bfa69acb9d131354cebd00099d5ada4 SHA512 98562aad851f956fb61216216dbcc7873c34366cdce17cfaf163774f698fc633bba20d0b03f243c66c22138462119b72f63c5c150ca50340e5b37c710a1235f4 WHIRLPOOL 51bac44470460984e3a0ad0e37a34d3fe30c396e7ffb4663689ff9a5919c8701ff3ba917a036857361ac5417aef824daddace783fd0e6fd1cd9d0fef87365939
+EBUILD adobe-flash-11.2.202.332.ebuild 6823 SHA256 4e08dce4cbc427e9a5209fddc87f6e40f7ff9c4c2350fff9d4c320e512917e22 SHA512 1bfd7a9889645b254a53a820721703b629332da3059798afef7062b5c400dfcb61e92281221521de62b92626c6b4cf9760240e7990f3fe7c69fb2ad8e4885ee1 WHIRLPOOL 63af89224fa56a5e81daa5274aa1d861cdbf4b6455f4b3b1a39cbe0879bea8fbfee6569f3f20fed89566e61458579e539e6bd95bc99e8c62fb1f914e6502d0d5
+MISC ChangeLog 55329 SHA256 5d492ac870c6ea6fcaa82cf753fd6d5fe091cfc35916cb3f5edd7806c99e3976 SHA512 0c5d41cca3d238de6f7e4a45f5324fb276c7779b74f5dbc7520faa6e594d4d193a013bb92afcdb7cc4a3bdc2ed2c1fa3f2c5e373c9192776f487a74df4c98e12 WHIRLPOOL 72c7991996a9d60e47ffd1a04b56f1e5d49df545d6828876078318e7e1bf5e4311aafb14da1a0d8025c6f247c06aef54d11a8c3ca6c40581648263c2636bf7d0
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSqCbzAAoJELp701BxlEWfI3MP/japO/s3/dvYnFvx1kJxOlbU
-SCL0S5nm3cF8cx8AQ8gHRNRlJY/ghWBwHjk58hiWQKWD1rSfC+9ZYSYcV5JeDHYe
-VMApWHjRq8SQeYv8EQFnddrrsCIPJuXjiLiL/ff5UurYvlGDTUV8A9H9LNcs2k1q
-m7mxUo82zVARh9r7GtulN6WUKMJO36wTZ3scanYjUowMos4pigL417J1tSOHDe01
-lJ+NZsHJltv25iOBCOzoRjIANgk7YXbduEMOioeiiRUcrHGj5ntQgkQe5cn5Pz16
-Fg9yh4o5KhFzFH/SkbBJxGnwwDtBQ6cG2D4PuRt56krNT7ri7XBxT23AtY4bA5XM
-WlECQczhu5h1hkRdjQvVBfsT9kjUAqPkrTLl7wbKYXCgvj/+orN56PIjXhazjOlb
-m3wDqyB9ZxWtq8PSL6dzUnWdA5Jq1TJlljvn+2IKmks1UZmGsDlcAgCfA3YMz+zI
-4Pat0pl8z7XFvamwgnCaKkQd5YnFNySNmem2nPpYAbSRzSDkiGF4FYpJ6mgkVqhs
-zxMADk9Dfx9e6+LV/HoVVyzSTadinJEbtxKKVY1+4CfEBDjOrDPa49sSskpdBl/5
-7PA+pUATQhze7inNVHqS+koCWNzAXGC4L+tfjl+Q8NwtlkpPz4ayrcuNqieLtm1h
-uMbNl0i/bDiXq69K1Dja
-=htD4
+iEYEAREIAAYFAlKobW4ACgkQVWmRsqeSphOvXwCfZo4Houa2z791wG6f8jrSKn3C
+hIwAn19LHV+gzRMUaKi5xqL8z/76qUpd
+=c3E9
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.327.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.327.ebuild
deleted file mode 100644
index 96d54bc4e113..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.327.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# 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.327.ebuild,v 1.3 2013/11/13 20:17:21 ago Exp $
-
-EAPI=5
-inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
-
-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="
-	abi_x86_32? (
-		!debug? ( ${AF_32_URI} )
-		debug? ( ${AF_32_DB_URI} )
-	)
-	abi_x86_64? ( ${AF_64_URI} )
-"
-IUSE="debug kde selinux sse2"
-REQUIRED_USE="
-	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 ) ) )
-	selinux? ( sec-policy/selinux-flash )
-"
-RDEPEND="
-	${DEPEND}
-	abi_x86_64? ( ${NATIVE_DEPS} )
-	abi_x86_32? (
-		amd64? (
-			|| (
-				(
-					dev-libs/atk[abi_x86_32(-)]
-					x11-libs/cairo[abi_x86_32(-)]
-					x11-libs/gdk-pixbuf[abi_x86_32(-)]
-					x11-libs/gtk+:2[abi_x86_32(-)]
-					x11-libs/pango[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-gtklibs
-			)
-			|| (
-				(
-					dev-libs/glib:2[abi_x86_32(-)]
-					dev-libs/nspr[abi_x86_32(-)]
-					dev-libs/nss[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-baselibs
-			)
-			|| (
-				(
-					media-libs/fontconfig[abi_x86_32(-)]
-					media-libs/freetype[abi_x86_32(-)]
-					x11-libs/libX11[abi_x86_32(-)]
-					x11-libs/libXcursor[abi_x86_32(-)]
-					x11-libs/libXext[abi_x86_32(-)]
-					x11-libs/libXrender[abi_x86_32(-)]
-					x11-libs/libXt[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
-		)
-		x86? ( ${NATIVE_DEPS} )
-	)
-	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
-"
-
-# 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_build_binaries; 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.332.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.332.ebuild
index 5e9d5160743f..3f2a0a856f08 100644
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.332.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.332.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-11.2.202.332.ebuild,v 1.2 2013/12/11 08:48:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.332.ebuild,v 1.3 2013/12/11 13:49:32 jer Exp $
 
 EAPI=5
 inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
@@ -29,7 +29,7 @@ REQUIRED_USE="
 "
 SLOT="0"
 
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="AdobeFlash-11.x"
 RESTRICT="strip mirror"