Old.

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

3 files changed, 9 insertions, 280 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 6a4a79cc29b9..96bc5417c007 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,9 @@
 # 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.171 2013/02/17 17:40:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.172 2013/02/17 17:52:10 jer Exp $
+
+  17 Feb 2013; Jeroen Roovers <jer@gentoo.org> -adobe-flash-11.2.202.262.ebuild:
+  Old.
 
   17 Feb 2013; Agostino Sarubbo <ago@gentoo.org>
   adobe-flash-11.2.202.270.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index a78fcfbdac35..9211cebcdac9 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,33 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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.61.i386.tar.gz 5467025 SHA256 bda887ed15c3172c411dd26e3a3cdc1a343b4e7b46c40b066ff03afb1f44f98b SHA512 6f4d66327a8e99ecbe85182a1cdc2ca6b8b9677a690ad895f35be334e4ed381f4340c653c610bfb3258415cbbe50d3dbe433299cce4bb6452ad4fe086a405a10 WHIRLPOOL 9a827fe4be7d787d198c02627bd5e5db6bc9e33df04b7f5e21fd04ce7857047e0805843c9d6b8849193cc21b2b6d649880b2533dd65d42208e4a17547c8aeb32
-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
 DIST adobe-flash-11.2.202.270.i386.tar.gz 6922991 SHA256 f4e55cc91a7d545308ef57fa9c1be0a6effbb42329216b2b45d9100ac400a747 SHA512 221300a4430cafaedb67fd537fec9f684e26e2a4a55596545d17af65a9843e0588381fa042098173f52c3bbec2b8ab5238af8bc1bd97754fd41e1603de0a2e92 WHIRLPOOL b3708da6f2a4189f8b3d5b71e97457a5e2c428e4afc294282ddf224f3e4e4f00fdc9f0b5368209af78a55048d242cacacb41a1a33f443c6c875ebda581296e82
 DIST adobe-flash-11.2.202.270.x86_64.tar.gz 7234968 SHA256 6e7c139beb152dcb0324405d50cfba32548bc967f62408a988ce3171d2c2bd3a SHA512 c4812668a8ee0458145c4423d3f2e50ec3ee62f26ce89bf117718c13f4084cc88121479123156611895db90eb007ce1e9018a0f9c7d70553f46f8deb9b5f9226 WHIRLPOOL ecc77d504a634f387276905dd6eda633f9ea6e56a6f9918bc6c24c6484f2a31b8f71a6567423ef6346d27cfded964524fd66b1dbddac93318fcc66cd2ffeb292
 EBUILD adobe-flash-10.3.183.61.ebuild 3530 SHA256 a82707f6d3caf1aabd450c2200cb47290095dba67292a42d7c1ad42abd051013 SHA512 3b199481bdd1749aa54dbf837b1ff00c0bc556858bb04b02b979eee79ef934890704fca5b0486e3fbb61a32d3beaa8bfc3dae4f2a924a0c59248d7079bfa0022 WHIRLPOOL e4a88851dd20f9dff5c6bef5c194387028389ea0287759c565b0459724faf435939a5060b2964e22fcc15fee03afd545f59f8fb2ab6a55231d71946173944aba
-EBUILD adobe-flash-11.2.202.262.ebuild 8039 SHA256 50cdc4805ac916efac6e7c048d34a46c2a7712833b7da28fdeb95d1ceac55690 SHA512 e044e4dfac39f5957efe36ad60457c01b723b28f0b2630f476861ee887c764e34b05652444765a1dbbd3e8a48b3de5ad3cae89093cc8f66753adee24a5db4f22 WHIRLPOOL 0e063f34f2f33d6869658315b855afe00b629b114e9b1c5c2bb0b5652d285ab94fe9c054d3ffa8f1cd7a956f2c7eef7685500b62f72833cd09ebeea5c134d72a
 EBUILD adobe-flash-11.2.202.270.ebuild 8039 SHA256 59e17db083af94b393167da78d6885689fa238b2dad07456c3f074e9a24379b5 SHA512 a67b16b924461f95267ec86acdb4d9017e2b789cda437800a2d92bbd2f7b1d596ea5e7398085d8cbfb1f6a8dc8e9b6dc36b916930c62082a8cfe5d2617220943 WHIRLPOOL d0520ae2f1b6cb84ee5e4c4a3491b4b41980850bf066bb69f3c08f4c2b95941adce200d1ec181ed6f4bcabb26903567954fffa8dd42d8f07c995e26478aaecfe
-MISC ChangeLog 47767 SHA256 c1bb1eb1cfbb43f3e4148fa494f9796bc0867a9228a8de5a2ad432a7148fc25d SHA512 9604e099fc69fea26cde4069fde7a5946dfc3b7e804deaf7e1948f17f97330b17b9e6fe48849550160638b558d628281a181c5aedf95703eafcfd95dd6a138d2 WHIRLPOOL 4dbd6a394e1af6725150e101a9f9cff7268a311d9c03bfe2b8260fd678459175e60ef6ab1e0757b6c09d0bdc0c0f76fecc8e74a1ea967ae1092aae54760e440a
+MISC ChangeLog 47856 SHA256 ea2612a0faecdf9f0e53991f73ccb380a17193cd89352135ab5f7a1166bc1ebf SHA512 7baa2047c4b2f1e373fcab7058067bcafa61cfaff95bccd1d8fac86e431fdac8dd7775c41cf2636aee0eaf0552bca2e3c51cf2b052f5ec3a514c1424e95c32e7 WHIRLPOOL 0af07bf828ce3fd9f4eec068faeedafbedee7588f079280a21dd7f1c7aa21ad3ca5f56d517594bf32eeb65b2ee9f7719d3600b0700a1c9186ea59181fe00144b
 MISC metadata.xml 975 SHA256 c7f61bcfba67a817e96f88f722c6f27c9e651425741b1059c6669b9cfb36fa56 SHA512 243421601866d9eeb5017f22b1c15b4f8834fa8ad9561953f1e05f6c3b02e18b28b9a62dcb4d85f43f38c1fc021221004123cd1930225acaac5b491c2333fc5c WHIRLPOOL 99781ee2984d90ce8fe0c0f37fa91948fe6a843dc9e74ae4a92e645ab5345fc4835b220d4c8156d752787cba8b50a720409a670af7ad2c5c99968934119dd4d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRIRYYAAoJELp701BxlEWfsvYP+gKfWUkbhGUFs4ne/LsAE3Af
-8w51lw+jP1YafQhmQJWVi+rOHTg1zbQrfiFoaR7jniiFmdYC+HUwuJCAicOlG4DC
-3Nthylbhq50ylMMO1p7KM5dxdrdMb74moYBS7vh1iqeIlT+Yl90lRZqztYhfEvJv
-RyKhIoaaP0Ow8Kro6QyMLVMYTnvkkJxVHsn7XXSP2Fwl0RswmjzJ3QOjM2ksmXSu
-X2vMGMAfVcnYJcY2rVX71mQC1z+bppurlUYm9shyHJq6103OqegheWOiJFwdct9r
-M2xRhaY59sClFDQ9fll2EVSsLSL1UZoNZadZLgvXsOklybWMTbfaLLe9oz1J68VI
-PzUtrPMXwTopYk5KJNikr6qnpP5qBdg5MODYzWDiR0JwZXlJBymr5KNoL9aZqDoL
-ZQ86jwZFrNIaGJj8UKtxMyXt/YBrQ1A/UbX16nLaEVNKbte/2hv7oUiuRXZqXsR7
-atSBbuai4T2r1zZJ8i3T0ykWae/gAysCNfeNRjCouNdXdevsZp8f1KYB3wxolo2X
-NtBbX9SqbbiSQ2B/llR5fP2RgZhfDRCDZE8PxJLEtHg5VcyOHalqKBD+H6q9F5Bl
-w3TSxQj+tu8RWR5/h8Vk6IblIcXMgQp6AbaJSe65qyxjAfN4kxn7XiwKjwVaSEzv
-/8tWsFNicLuUJDek7XKu
-=yrBd
+iEYEAREIAAYFAlEhGMsACgkQVWmRsqeSphMWkACdGLDrUB3cVsO9oSyoXDCCiLe5
+wY4An3GKbwX6Vm/qn4LnaFSRaHWV+l7F
+=kehH
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index dc62b73142e4..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.262.ebuild
+++ /dev/null
@@ -1,261 +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.262.ebuild,v 1.4 2013/02/13 15:02:50 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-11.x"
-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
-}