Old.

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

5 files changed, 12 insertions, 526 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index ff6f9542925e..8fbe066b835a 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,11 @@
 # 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.221 2013/11/13 20:17:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.222 2013/11/14 01:39:39 jer Exp $
+
+  14 Nov 2013; Jeroen Roovers <jer@gentoo.org>
+  -adobe-flash-11.2.202.310-r1.ebuild, -adobe-flash-11.2.202.310.ebuild,
+  metadata.xml:
+  Old.
 
   13 Nov 2013; Agostino Sarubbo <ago@gentoo.org>
   adobe-flash-11.2.202.327.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index f1356aeeea3f..126800826584 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,33 +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.310-debug.i386.tar.gz 7403002 SHA256 ac0033a0db826138ba2b6cebc44c3efed8c57c9f696d0aba137f27318ce603b1 SHA512 8d470be8553655091a2bb01e27868b4d5f1cea990b3fc0afff88f2d705365c1d2c7cf6ae82cee35fb53ce265bbd8efc065d3fa9cadb092a96558f6ada4d95705 WHIRLPOOL 5533c98cb7ea2489d922e15d7003c847646abec4941e9fab9835f952166aab50e0ec65a3aae33b3bf486e8c9d4cb4fdd38d9fc5a789731b470c1d414f17e6490
-DIST adobe-flash-11.2.202.310.i386.tar.gz 6923724 SHA256 7051aee6bbca66a562c1a8acfa63533744c71cdbe231276f4097462dd24dc061 SHA512 87d340c519e19a4165ff1a16d84b66469707fe49f068da4b717110a8a084a1f35a20c5a7b18e217a40704dfa62ed8f62a929f7894fe1c2fff06a9df612ac2d61 WHIRLPOOL 90ee7bd6c148db110f9e50812587ab0a228daaba13f30477fb718a7e11bfd452cf65dd61d7d635bd46429c1d00179f497ca4322b0bf3953f06152da9bf035f3f
-DIST adobe-flash-11.2.202.310.x86_64.tar.gz 7235294 SHA256 f2c7a410b81d044fd619b9bfd5a81522e02fafa1314d61382c21123ae0c9290f SHA512 2882ea869eed270e4b24dc4dffd5e5ac3a3249d6d4e4d985b246314602d72dc3775909dcf43539925b0e821dadf2abade0fd46c4bac068539b71b7a081c0568b WHIRLPOOL 05402df96157bf5237f9265cbaee49aacecef69b6d74018843c2b72a432e80400b924b26b0b3c3e5e88f274f54374575d31a658975a2281dd3a91d049b1924ad
 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
-EBUILD adobe-flash-11.2.202.310-r1.ebuild 6828 SHA256 db92b6628d0e26689d3758055fb3360fd7fd43fa9ff2be35c3552deea3fe419b SHA512 6d3d734964a05cf5856fc6d1203186508f223dc4fe12071b4b99734f0ce53c6ebed3dbf2a0b9a31fba83096625f6a39047c6df38db68d520733e5058d6fbf7b0 WHIRLPOOL 6b1487be5b1ae0dc19dec1ff9fa240a4c2d4813d6d4a7deb4ffd997d57855dac9a6e1a6358997afa7f1cf17dbecf48b6f5de92c8458d27c84acb3bea14467a44
-EBUILD adobe-flash-11.2.202.310.ebuild 7324 SHA256 93e7064deaecd96506cebf77a315af5424616caec58db6a60b6699e178e2ac9b SHA512 39dc68a5b2b926287277cd226f54d07208f598be85b388ea020a476b8e4e3e8c8d6b39cf6acfeed5f9815f4339de486cbb4d0fbea338643c5ad4f8df36557474 WHIRLPOOL c594fb3a1cc0ed83b4dae602a74200097b780ec562e10e3945168e5790bfd659088709de5d2ddd6785f7515bfa8e47c912795811b315cd18c0407eb285c69587
 EBUILD adobe-flash-11.2.202.327.ebuild 6823 SHA256 938be44a62e30784418b46f768b96a5de087d058617012ffe830b301f6105f70 SHA512 e8b33a1411bbcf756f1baa965c6e8b0fbd0eb021cee6a0b5587487f48f2f37613873afabffd23dd843655b48a99ffa986d6d1420da97f60f8084c597c9d82671 WHIRLPOOL f5172272a56b1795996a08fe16e3fa7b21645b94ed5166ad44f277cef36a858966e99f6ef35ce609af19fc2ca4fdfba6c0d104aea1a3aaf10a104e2841d3d178
-MISC ChangeLog 54588 SHA256 caa9c57443291cc2688bdb1333845e52d7716e836ad8322a4be249723737a93d SHA512 9dd55042304bc1eca8e2f9852b91d7c7e2d0d3ccea862cfd1a2bc0a84c5628340c7e632e51b13de5508b672d450e24e82f61bcbb7f134f1b67ebb7f9442091a8 WHIRLPOOL b04a1a6ef8dc03cc780d5e277686e199bb09a52bdf0bc8f9134c1b675b778bd06f869bea70d167d170f5db7eb1331bd46762a5282e46827e8adab8eed69ac244
-MISC metadata.xml 616 SHA256 6e1428bd0d59c68629d9d71a04ac2f39cb709ae34f9887d26a04d8dcaafa3e84 SHA512 051cf27faf9edfcd9e5ac12d6936bf87d876bdac9c9389ce414850f77724795401bd4d1d704f45d23a8f0802db1cfa701bbe9384bd94b47879f5c56a50374ff1 WHIRLPOOL 3e8fb952a34307dd571feb013ce5a741d50eeb9420b4a6678e780392bedaecb3e318811a26607f2d4a7717ab2439afb4baccb78f5c01f5c04aa8fc4e33c69ca3
+MISC ChangeLog 54732 SHA256 9899ea26f5060a18eea494cf77438dcbad1dc495db36da79a1dd6d1a5734d1ba SHA512 8fb0e90e4672d56a1f90564c9680707052c3c28c00902df037f8f5fb8748584dbf0d1963fc1a001bab9035bf4b90bde40f1c909187651a0a3e50252a8e03ee6c WHIRLPOOL 13f6b64672a413c0817d8957035113ac36e3e36e6900d1fa9923469c11e76f932811489516da1144fa9afdc7b4474348881635cbc31ddfc4242da1253c2305f6
+MISC metadata.xml 463 SHA256 b42ba14144af57dcb595c527bd42b8909850abc7c86672bc5e9c5157f8733232 SHA512 f284ea03b79798577e1adede1247c6eab48a1296a79955079f78c222951710cb227d181bd703e36aeccceb76066f17e4ae9ec8fa796e50fed2639d905d472c6e WHIRLPOOL 13e8def3da7e22c809307ab2002ebd7ed6d715fd676b8c99c0d08c9ed7420531eb4f50cddacea250b21346699479ee0e0f57f69bcb76166dbfec072cce024a74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSg+xcAAoJELp701BxlEWfEMYP/jgCFe7T73TEG4IDQD8J2ks+
-oA5jF4V4YVYUYYhlAZc8v8PiN1xVmiFiwgKEGuUkSHhS9mvd4lp4QUmR+SWRRbWn
-D9HEReSOz9q8VcJfT9KdU0bJidmMzYB7tv3KB841/Q4o1u1byJRTxK9c9rkhIzQZ
-3bca+TR4KW5t+ATVgFga+VYPKbTwjHAtyfn011t3+z2LSq1hVUHfX3/7bE2O+4nP
-OujXwTZdSnKQu4XYCJzMHClMFXyRGgDhjR9WLc5mXsHLNKpEMFjbNnemRaDXyWhi
-cHcYJudXuZ5rZLdO54WFryiTok8phPukmlX6AkUaBtq/EnZXLmD1OC7xtpq7Z2jJ
-P+PyNRXWGLx3v+sFU/y6ru1t0TGqQ/9pxwqVWSu4CcqUWY/GiFxs/uUkN81V3cyJ
-LHP9galx54M1Db6ToiirUq6kUqFsaPQL/SVNZJe9tU6715zYFST657NmdY5MJQeA
-3NoCGkP2oYtvyKyC408rj/Hj0lJslUVFLJDP4EJ2gHWIkSNvCG2c4ArBYJco6DYW
-zFyxWwZLDaWFHhIAtZLfNYeuI/l/yOWNZhk8Z3I+5UB9jeFzzepi3MRZGTwRlatn
-tzskFQ6g3Xu6zKdkCx8HieT/BlY4SBcqUvY8FNtQE3p4ojjI6NNdk4nDJQ7oji9v
-PBJPS4Yy/vmYR+09GetM
-=0PLW
+iEYEAREIAAYFAlKEKdwACgkQVWmRsqeSphOjLACfQQfI+kUXpun1ZuqWtehrUgDG
+HuEAn3NdXvJlphOFKiIbBtAZGXAKtzFj
+=cr2W
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild
deleted file mode 100644
index aff0785ede36..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.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.310-r1.ebuild,v 1.5 2013/10/02 18:46:02 axs 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.310.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.310.ebuild
deleted file mode 100644
index 795b055b087b..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.310.ebuild
+++ /dev/null
@@ -1,257 +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.310.ebuild,v 1.2 2013/09/11 09:04:54 pinkbyte Exp $
-
-EAPI=5
-inherit nsplugins multilib toolchain-funcs versionator
-
-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="
-	x86? (
-		!debug? ( ${AF_32_URI} )
-		debug? ( ${AF_32_DB_URI} )
-	)
-	amd64? (
-		multilib? (
-			32bit? (
-				!debug? ( ${AF_32_URI} )
-				debug? ( ${AF_32_DB_URI} )
-			)
-			64bit? ( ${AF_64_URI} )
-		)
-		!multilib? ( ${AF_64_URI} )
-	)
-"
-IUSE="-32bit +64bit debug kde multilib selinux sse2"
-REQUIRED_USE="sse2"
-SLOT="0"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="AdobeFlash-11.x"
-RESTRICT="strip mirror"
-
-S="${WORKDIR}"
-
-NATIVE_DEPS="
-	>=sys-libs/glibc-2.4
-	dev-libs/nspr
-	dev-libs/nss
-	kde? ( kde-base/kcmshell )
-	media-libs/fontconfig
-	net-misc/curl
-	x11-libs/gtk+:2
-"
-
-EMUL_DEPS="
-	>=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="
-	${DEPEND}
-	x86? ( $NATIVE_DEPS )
-	amd64? (
-		multilib? (
-			64bit? ( $NATIVE_DEPS )
-			32bit? ( $EMUL_DEPS )
-		)
-		!multilib? ( $NATIVE_DEPS )
-	)
-	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
-"
-
-# 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_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=${AF_32_URI##*>}
-		local my_64b_src=${AF_64_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'
-				# TODO: However, the 64b flash plugin makes
-				# TODO: '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
-}
diff --git a/www-plugins/adobe-flash/metadata.xml b/www-plugins/adobe-flash/metadata.xml
index 1472955ff840..9df990b4d29d 100644
--- a/www-plugins/adobe-flash/metadata.xml
+++ b/www-plugins/adobe-flash/metadata.xml
@@ -7,8 +7,6 @@
 </maintainer>
 <use>
 <!-- =www-plugins/adobe-flash-10.0* has both 32- and 64-bit versions -->
-<flag name='32bit'>For amd64-multilib, installs the 32-bit plugin</flag>
-<flag name='64bit'>For amd64-multilib, installs the native 64-bit plugin</flag>
 <!-- www-plugins/adobe-flash-10.3 and later has a KDE KCM thingy -->
 <flag name='kde'>Enables a KCM plugin for configuring flash player preferences</flag>
 </use>