Old.

Package-Manager: portage-2.2.0_alpha171/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 8009b2a5cdb7..05aef292e235 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.185 2013/04/11 21:44:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.186 2013/04/12 13:38:00 jer Exp $
+
+  12 Apr 2013; Jeroen Roovers <jer@gentoo.org> -adobe-flash-11.2.202.275.ebuild:
+  Old.
 
   11 Apr 2013; Agostino Sarubbo <ago@gentoo.org>
   adobe-flash-11.2.202.280.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 1407e24c8f86..c9a77ff312ec 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.75.i386.tar.gz 5466873 SHA256 80391038d5060f376b16a6058d102188c44e985c583f29386ffceaf6ce24476b SHA512 010ac31c4718e8663a17f887324c1a04dff0eedf37f1a40391652a6af6f6ff38f17a9edb749470b6beac3504e63ec781062cbbf682f6dbcd7cb5099dffa29744 WHIRLPOOL 428da1a29c6cca953796933e98385e096ce571a6ef4600d16491999843e83175acdbc135e7118128313cce2b22a04c5113f2f6609ccb955859fce1d02f5c5c59
-DIST adobe-flash-11.2.202.275.i386.tar.gz 6924007 SHA256 d58b597d69dcf1b61c062624f982cdb035631ed37d0bbda4f8fe8bdd6712b1ef SHA512 aa92f8b9ec9164e82ca30e23035109bc8b5231d771ce12b49266d26e3cc2152132dfbddfebd6a78a06be70f8cde972c6528a55ff4a1f27b6752d9637a20be901 WHIRLPOOL 19684d7a3edcaf7c507cc709cfc03f315c26a2af7e9b6ecfb0d351a1318f107a178b4a62fd4bdd50fd393779b77997ba136b9834597105fded378f02e6b543fc
-DIST adobe-flash-11.2.202.275.x86_64.tar.gz 7234388 SHA256 13ba2dba78027ad73c9ab300afff3e47ce8ceb0e9a1541f5b2d7517e57a77c5c SHA512 afca7cde79bada81c9c3dbc24f0c4b03773a3549e349af7d01854190b729f45400ec78bc56d50f6b36c86a2336a7d6ccf39779b687b5e83245b3cfe00164b24a WHIRLPOOL b53ee914e434ace878313c2a4d7cdb5ca1fa9235f6ae8c9c6760becf13ea996614fd709c51a2b9dd00c6e16c8eedf780067eb4bfd0721fd34f3135df8c89c9ec
 DIST adobe-flash-11.2.202.280.i386.tar.gz 6923631 SHA256 b4b3e709fa758637c6e6d8ea711a62ca2c8105ff89b233da7cb1bc0087404d06 SHA512 dcbb586c004b6636796a0838e75e4c0d472c69c3c8b913d4ded527af2a4ef0f258c70fd0b0baf7542d5ba03ee45e0a46d67c5a856e9f157b5f6a1a0a1cf4ffc5 WHIRLPOOL 4bb8b0a1a3d50f41483d90e96706499f39f14ee07c6853c053c79b2af2aad6efb0ae9032b49be7e2f6cae9ac8a4f0e9eaef5c8d441c098750399399a935434cf
 DIST adobe-flash-11.2.202.280.x86_64.tar.gz 7235302 SHA256 b8466163663cd781377abdcb8d2cfe43c6100551ed1c331f3d1aa7ad93bdb6dd SHA512 1d3cf55951f231d9283daad1592cf0be592b50fba58f1734d0de5c77a694db24f5445326aba0a260fb71e0f8fdd9e1bbd997733a5ae33fa19c622f8fdd88bb2b WHIRLPOOL fb7686194babb9f6c836dae09eba21671ad9ab6ffb7c56e55ddfde6e55b2b640dcc22e3de0d918192e012a63b94267008919eef24102f5b0880638e8f84fe1a5
 EBUILD adobe-flash-10.3.183.75.ebuild 3506 SHA256 28f6170da6c57129eaeae0433f3765c0794ccc6e0c98290cf5567a75a950465c SHA512 0b8c3e7be56deaaf328c5af2cb342a88289465c2fa72f69e1bb197072d72856a28345b2fb31f8de6618dbac64d3f59ea7cb92a548ed71c2934fc2e2bcf72189d WHIRLPOOL 1ab9ec05638ded9078964a812bec1fc1f1b9306a95f221ccfa9c3797fd1538adf5d6893c5c2c5ffaabd6121e69ab160c3198e255eb4bc0162eefb58f03c52d05
-EBUILD adobe-flash-11.2.202.275.ebuild 8039 SHA256 d282fa119867554ad5c01c55219e2de8b6043d5340cbb0ace47e89e2e3f4f4a4 SHA512 f127929cceeaf17677efbb007fdb65673bbff8441d9a035b19382fbc3ca91c34a10dfe08fbad0211d63cda9471ebc2dba9bdb97589a5040dbdc4ccffdc3ec45b WHIRLPOOL d736917bb745cbd35fa41ac28c68422a941d6af24e0f7af8e4107a85f1cc30ac7c1e19bbe5cb9e5ecb83c502d3841ea40240abf05ef7743d68c0804cc5834220
 EBUILD adobe-flash-11.2.202.280.ebuild 8039 SHA256 514cb94fb549a6873c2045722137ea74a9bfefc9168acf3f943296653fb0b413 SHA512 0c152ab8210ec7a67e9c816350a21ba26bfd5a553db1ffad0c74db725852465a1167760aabdee61416b928be4ee78dda499426905aaf492353ac3e3ea519248f WHIRLPOOL 0975e9fe2e41dda13892acae68bb8afba2e1401915dc1947e67b6254d1a4c20b16154492e80798e2ebcc57715151b9fd1a024c21e8725fa98e31ae07bc48ea4e
-MISC ChangeLog 49696 SHA256 9ba883106b1e588b1511f7da54e8228bafb4416f7cff4655d57bab94a1cf0c14 SHA512 953d53324ec49cd703e968710b41373de7994ecb968ba65bec0482e3a51268cfa147d0eee6cac14b23763b92ac29975d8a221ec366ad641dd887a49af02880c7 WHIRLPOOL d832f8070b13f59029f7668c7a12c7048034009a8964cbd397e52882c49d0a4398daa41b3accc26a7b0197a81820c56faf3bf113c1fd63736d506ba312d72514
+MISC ChangeLog 49785 SHA256 6dae06044cfb883c9b1eaa106cc791c3631789b9a19124ed111f702909ecc71c SHA512 288b27e4148961581982d1f820d3a89bd05edba7ae278a1957c447ea2b7d4c713b166f16072039dcc8b76603e1d2e90e7eff8fd10ce5d199df15204f1046abd2 WHIRLPOOL 5d7a5947fc0dd1b30770e6a5dd939ecb0669404585ef49d88982f3943cba9a69f0d65abea08705dbfd8c0e626ca686b5d26927ff2bb922887c4cf4ec819c25ae
 MISC metadata.xml 975 SHA256 c7f61bcfba67a817e96f88f722c6f27c9e651425741b1059c6669b9cfb36fa56 SHA512 243421601866d9eeb5017f22b1c15b4f8834fa8ad9561953f1e05f6c3b02e18b28b9a62dcb4d85f43f38c1fc021221004123cd1930225acaac5b491c2333fc5c WHIRLPOOL 99781ee2984d90ce8fe0c0f37fa91948fe6a843dc9e74ae4a92e645ab5345fc4835b220d4c8156d752787cba8b50a720409a670af7ad2c5c99968934119dd4d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRZy6YAAoJELp701BxlEWfZsQQAIfMC6t/eaDzeUdEkgfSmjPk
-A33Zy9O4pKCAaBwZ7PQnOwc3A26a4zov6NJijBWdEVnu+LEN7scVpVu3ya2dxwj7
-njC006Dzkc2mk7KmGDXHGtgNT0ZpYj+m+beUVRxcFWoY5pBB4WXM7DZ2A9582M91
-aVWusJctA3sJft0IRCvUw7d0BfFBDcCVpVqFGRY+ycnIJQrgorH6PlULDmR9Xdrg
-U/wJ7vNwtOWiBMlHN/ZkGGFd6l6BL2oeyG9G7emdd+oWE/aqL56Cu6TN0rLg3mK9
-w+cCp9wUz3kfGlVt1x6jnFrpbThqjEFQ2vvm89WzjlUao0NvwD3NnH+m3zIBaVaQ
-nVZ2qZNGOF0c8ld0QmAdvh/rEUPqs0goFEGrnDgAEh9IY4AnDQbZVXbl8Q5HgCmf
-rmFFFBDCGbP1KMRmyntNKo//RtxCOW9UTwl4HsM465ASD7mohAW3On+I/ju9tCQR
-NfKh4ZgnuYOl0MlsvAp9k9eMsMBZduEVjQskeIBmsvXHOIJZhhIuTxA/BnvU2Qni
-AELWxjJxmiWjvnGqUFLhRcGFOpd46c8h0B/JaBmD4+Z0JGZ8/rXycBGTM0aXf9CV
-iBJzDLenQFXow5cWNMSTg2Psudq4Sc5/Z39Z6cXNfzBK36n3FStpoet3kGBa2UhB
-M6cJ1fZoUFk++Yaiq0t2
-=RMLV
+iEYEAREIAAYFAlFoDjkACgkQVWmRsqeSphOBBQCfQRVGspMffxCo4/UxCX5aMlcI
+o+4Anjd71SiF3Zz3Lc6E4PbK3ymosplD
+=trdI
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.275.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.275.ebuild
deleted file mode 100644
index 63d7ea0df1a6..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.275.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.275.ebuild,v 1.3 2013/03/15 11:57:03 ago 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
-}