Old.

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

3 files changed, 9 insertions, 253 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 31eaed1fe82d..2c7b511ada03 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.318 2015/06/26 08:06:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.319 2015/06/27 07:04:17 jer Exp $
+
+  27 Jun 2015; Jeroen Roovers <jer@gentoo.org>
+  -adobe-flash-11.2.202.466.ebuild:
+  Old.
 
   26 Jun 2015; Agostino Sarubbo <ago@gentoo.org>
   adobe-flash-11.2.202.468.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 427a1f701e6f..aa798fd93bd5 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.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
 DIST adobe-flash-11.2.202.468-debug.i386.tar.gz 7416165 SHA256 a80381ef428b64c7e04f6ee3d4c915d359e424ab856833acfb48199359ea63e7 SHA512 3b03e2fdb5b7a8171a91b93b1cfc8a828b035e273a63ea59c87933cb1facfb43cc8843a60d25086f06c5de72002956f5a6060a260145252207b2986e5e7bf559 WHIRLPOOL c3d4d42e10d135e2015a068d97969b03cae88e86642d9045da4169db668840e85856749fd048c2e07679c6af4b743ea6df5e13331db164cd9aeaf1ac600bf216
 DIST adobe-flash-11.2.202.468.i386.tar.gz 6935039 SHA256 146d5c67a78fb43ab8d48d3c73b05d3ff90654c004eb94abb31610a0da6b9fad SHA512 ac6048f17340c631ca239691137aa5ef5aae44237233ae6952795662826bccabf24297c75637a0b98fa978d756121533645b8499fb965adde9e05c8f4526f3ba WHIRLPOOL 4d71c96aea3bf37b7ec35af95af3efd7b5f13f61e56598e12853435e12ba018b203f52aaaaa5592fe51c1a7f3e4b7627942e9f96a33c034c8173f02c7d01a826
 DIST adobe-flash-11.2.202.468.x86_64.tar.gz 7247794 SHA256 f483be2fc948f263ad9a472bba041aff03a3b7a5c13bf2d3ff8442ce0acfcbef SHA512 0ca941c4a1157d0ee7558c3a772f9552ace0dc0fa1d900ef21048b6dec351f778e02fc6f70dc6f7f16f227a12b741578641c21e48d634599fbc749a3d4d6a56a WHIRLPOOL d870c3bf80cd81372c11934d536d7867f7d09ec582795223679cd87511d94cfe054bead41b6db36f524394507eea7a626553b58dca2916c77e601a8c040986bb
-EBUILD adobe-flash-11.2.202.466.ebuild 6800 SHA256 d09497222e2edc46bf57c8ca0740d8eecb964f925d1b7d81f19f866e2dbcacdf SHA512 fb62adfae6cc00f909c1d7db11c4c870d6f902f040e5a9690e99e438cf7cc3d5d3a6cbda92814e81a717eb09b2fd897a893e6cfbd721a9b6008b60a4ed8dde56 WHIRLPOOL b8de7173e0a81d7558b512a34df05741ace0786acaa23668373bef776de521f60c299be1891444942ce55b8bebbd95e04dcc5ffffc579951cbfe0a60cfd45fb7
 EBUILD adobe-flash-11.2.202.468.ebuild 6800 SHA256 aa259a4263a4a2224754a389b9fce35b485dcccfcc5d4127de7b3609b57168d5 SHA512 f944b64823b0c9836be063b20068768a994e123e93c4b33d026516080ecb362473ce7ad7f187631024a073d3c7f1e51d539b67d759e0e212743617cf7b1aa7e9 WHIRLPOOL 43eb00a3449a0d6959c084e3da9355d61d804bb062c4cc11e706133ed6b79874bf7b7efd9a42649dad255df3672cde9984933d62f02ea5eaa383f6f91862022f
-MISC ChangeLog 66895 SHA256 08fe12c340ce230d23c93cc5ffde8b05afe4236a8e76d090f02748aa8b7116f5 SHA512 8fecab6f7c582dd5c360f77ac727340b84d2dfe96177136006df0f7be29777a971d803a41d9899ab9317bb3a85a660d7495e9d985b9b667f08d27fa54658e5ec WHIRLPOOL c02c620deae42a8c8f282ae62ffc63ce7593287b1b6420bcdb31df3bc3030c98d5680e5c294bd13d274492fe29656394702147ec902c5df60454980e7e8dc60f
+MISC ChangeLog 66986 SHA256 e37bece7d9d7da6ca18945cd28c3f90ed1288871a1042db2957da99cfa579f56 SHA512 c18ed420d4df824e773731651c8743de0aabdd0168edc29b288ec8343ca67a3f6277917a6f59966e677346dc3b7a8b52ef69a3d9d6a91d1055266568f4154eb4 WHIRLPOOL 7823078aa2697a55e6ae1802e01aac70562de08b8716e7aa4fbf045ac9c19774a61c1f77e82c0dde82caaf343a2c7282abfd533af31b275e121c8915be6eec46
 MISC metadata.xml 321 SHA256 8deb56ef6832b7228800012723bae22d3eca62c387a3080bca3a98010767e00d SHA512 a728e401d2210342cc1747de4291136d3fbe25060eb0dec35a3b7c8ca5c082acd95780ef5b8d33d5d0a98f372367b5424b6dd777902d4387188758ad8dc0a09a WHIRLPOOL 5ab060286049fb7bbb0e9461561c2f29cbaa5c42bb9d44901bcf6a0a56726879c6f2a65ee08b9c278441a072addcf09f6c2f481b5c008818c25c9911dbf95a4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVjQgPAAoJELp701BxlEWf5kkP/AtH97r1OUtHrj5YE6N/sNuo
-iiezrsdhDlff+gIPRovqeVz+FfAOIJ7EW/Sabv3GGt4rIjNBLuMb8XSj6Lyo/8iE
-6z6JqHdj2p3iP8LMrNxIX9GjZaaDCyGVw94FiqAgc8h7uT2KoOzC3leneWZyofuB
-acy3AkQQ61Iw2oWfgsQft+6B3y3QtZ3rc17J+nsGuO4+OQJUkP0kyAYhrWB4Njmv
-34KiiNPQvpEEw65nfV2WayCyikRLdJZoR1HZ0YVx7NNAHrn8O6KODNnd/s76oj2R
-kqvoZUbUdZ7aT+mojlmRgH57LipmyKHU/Js3Xe8XxXfFiLQ+VhcHdDNUMuylGO8v
-uUf14C2v+1B8mdjfSmia53afQO6ajK+bMTyOohGWJRft4ShQDkTl6sU8rwMOch5Q
-rqxtHkSkG5XtAHh1uJvc2cIOknM2K3VOcJp3Ctzxz/eOu09wdJ6zl9yfBYRa4qqN
-aM2tvJ48n8dMZsBmHHkPwpOt+StcI4iaapjlVEv9kuqsLk3pwPGDlSRNeVkDUqid
-vbwDcAgb6Ff8m03yq1xtGiCd6gj20+WuothJyuu14rXxJJHU92yuUF7uN6bkmsiQ
-bOe6nU9QIYdCfwYPByisRXCB0cLQHIANm2Pk0IfqALN8XoyFBWXpawUlnpcakJja
-+DvrK8LhzL0CQKbKI4M8
-=Z1f2
+iEYEAREIAAYFAlWOSvMACgkQVWmRsqeSphMDIACfd8Y3K3CE7zr+125a0M6oLc+I
+LcoAn0vDTqloSmUnAmXrGGaYlDc3GZa/
+=8Jjw
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index 49d2ce6f6eae..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild
+++ /dev/null
@@ -1,234 +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.466.ebuild,v 1.4 2015/06/14 16:42:14 ulm 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(-)]
-			>=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(-)]
-			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			>=media-libs/freetype-2.5.0.1[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/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(-)]
-			>=x11-libs/pango-1.36.3[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
-}