Old.

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

3 files changed, 9 insertions, 267 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index c4a28a85659b..3902928a90fb 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.266 2014/09/10 07:40:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.267 2014/09/10 08:49:54 jer Exp $
+
+  10 Sep 2014; Jeroen Roovers <jer@gentoo.org>
+  -adobe-flash-11.2.202.400.ebuild:
+  Old.
 
   10 Sep 2014; Agostino Sarubbo <ago@gentoo.org>
   adobe-flash-11.2.202.406.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 452db0889d44..79123dd021a6 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.400-debug.i386.tar.gz 7404959 SHA256 f818a18f92a807744939fcf19092b55cdc53b99e871e8e77f949ceda4e29b932 SHA512 b6857f49a5aac39c48db80d6482cdd5a502717f0845327df8e18b344506d211e33c42516c03aaec15c2df63db1b5251b1759bb1d60c29b8241f7b08ad41fb565 WHIRLPOOL 2c54d4340a6bb6208d1f042cb55f60b4299083f1ce885827cba6caa8e39a2f61644d2ffe673443222e7e32e46dbacd7efa4f2d65568fd0d3af946765afb5e260
-DIST adobe-flash-11.2.202.400.i386.tar.gz 6927109 SHA256 d0ac17fa50069520e1aee59e3aa893ebec3cfdcecb4f81aba040662352fd6ef7 SHA512 04b8dbe2a36712180886234b8587e199605b0805dc92fc234dd8f2efbe37168342ffb96be663bf6d9352e1bad2837b6439fa77247fcb6177fc6ceae4e4f9200c WHIRLPOOL f0f901ddab307723f728b4c780a75a2ccaebf85f3f01f95091b91b9f60d3eb10b9cbe9992cc605e43de5eb3f691a2b702a0c2506bb5066f2ae5cdcf3c10c933b
-DIST adobe-flash-11.2.202.400.x86_64.tar.gz 7238196 SHA256 d43b05d76b2f2a6eafbc7e8901c37966a652cf99b6a835919972ca8e99fc6b10 SHA512 39219a0990ca7d945c17836d03e9657da523d8011d51a1a425726bf7721655d0951f29c669d5a7c1b8a0d77e1fccf4276973962cd92017a5f57195b67cb49596 WHIRLPOOL f7f18687c5f3e3c0019a0e37d9eaf46a07df394dc429c7b650e9202764922d09857b4ffa8d7a34fbbbdda2d9db2359ec8cae8620287b8fca84b624950ea9e755
 DIST adobe-flash-11.2.202.406-debug.i386.tar.gz 7406685 SHA256 2761c477216351dd84b7626ee867affe2166c4d0632cf7d1a1f0520ce13408c6 SHA512 b27102df86ab694ff0182f56c33fb4c960d9cd20011ab3e78d089d9a63320e02de69b2f776bbfb08712bfb6bfad25b7615dabb16b3c55784eb2fadc9cee95cbc WHIRLPOOL 06b131697e086ee6ba4f03ca9aabe7c681f697c21a4fe421c2c444ac01e5ce19dfa2ebe63468df020254f56a8300af1a6e5bf0c6ffa7a9f13458d787f18f76fa
 DIST adobe-flash-11.2.202.406.i386.tar.gz 6925631 SHA256 8b44f49b85ed7dba310306cd62a3de35d37bb8468c3841e4d713a0b80541c381 SHA512 6e415dbec2a8e0d2c1bece938d3d54fa1c91ef7d08779a1f3102a632d1105e7748469d20103ec9bd7f232aef67e6a3734fa0dde59b288922c0d5a8af67c3511e WHIRLPOOL 4b5e1ba262d9f8f58c198ba3404efe10e084c5dd95b41230abbf7b5cf2df08e35ef141aa6cefb2ec29ad7d1208e6ff5af77ce26108b335b100e9ec672ca5b32f
 DIST adobe-flash-11.2.202.406.x86_64.tar.gz 7241482 SHA256 a003ba4e7bd8189b67e04c2ce8f0ae5a896fd512e7726315b40cfc9910675315 SHA512 a07172d9d6dd3e7fddcc62167c5e530ef6b475318eef9935063e2ca7dfba7e2f6ccc46442057fb9a62e87404356c426c283aa31ffb860978ef76bd6475523b91 WHIRLPOOL bc6d9483ceb21634cef3248c7d3a929ae28e635adfb36c602ac8689fde2cdc3d5e154b61bd80eed36ba98c879d3f541386da5c520bc0b0f07c6c641a09c4e815
-EBUILD adobe-flash-11.2.202.400.ebuild 7002 SHA256 857bd2a775844e41eed01f032399d322d3bbea8ac5c728c5ed150c61a26bd11c SHA512 e411f051ed1bf6364fbee411b3ca040e1799adb1918cb4eb5fc3e09a9141972a210d23ad42684f79aa1a0e30b59ea8e6685cca181c936e88884d090535913977 WHIRLPOOL 9beb5176541bcdcb9a91e2e3bc5075c0bc5e5fef495001f6fd1b146a36b4605578ae2c1eb5f1ef52ab0ef8c9c4ddb63094332634bd739bef0afee8a9b8aa83df
 EBUILD adobe-flash-11.2.202.406.ebuild 6998 SHA256 b3b61e1744b64a70b3124460c8f86a5b8d374cbc692e4579359f95cb7b0292a5 SHA512 292d947a4dbee3410a903445e8bdcbe7340f0b13a822713ca3d46eb6d15cc67c65c51bfff3095b45c395efeb8667639f61567f1027984b6dd16cb2f0a9d90248 WHIRLPOOL 1f9c7ef649d852cc8943dc0f9c90060708a3e870c208fc072697a38b1ebc41b70e2dc29f16ada659fc16f20b322cf8606bde54406050b22d77613727735de7f3
-MISC ChangeLog 60454 SHA256 676828ec8c9f9b24ae30cbab61cb0d05f188d9d3f92935e760463c489b3315de SHA512 8ef91b15a6597f335893f2b5b039c99e8a0d44a7853ba442f6d441140d62290c6eb7a555b62e35f61be9aa194b21c919062af97a409cd900da2a026bb6ad8070 WHIRLPOOL 1a48c8ccac43d937b0fb1f9dd6ed5a4d329cfec5a87ed8e35a177a5259a65fb6dc966dafe25ecc3dfe4cd798c92a73808d03d03ddfe8215c027dfd3c4c7ec4e2
+MISC ChangeLog 60545 SHA256 3756ddde700e7e63b2aa36d8102dd2ee55ed02f2bfa995c101232b2e5fcd706c SHA512 c579d12b71f18e447a25c1e9cd93fc24909921603261cf056c18d54127ac5bbc0e16609d1db19e72af1c348f2d82c6ebd3df7bf52b17ef983020fee898894505 WHIRLPOOL bf84a12a0a0d6130208ff4658ac52f20cf5d253bacffe2a1822dbafc2aa026ce7728d8c1bad83e77af57b6ee814c9f570aa7152839a96749cbc8a6867d7c5b7a
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUEAB0AAoJELp701BxlEWfWrkQAIeYrf42x40RwtlL8M+JTN7n
-2dq+TtUXdOO53lJEFwDqiM8xPsJlAq8L7cn20ajRKa6hzMruRzv0FSy+Zv2/x+YD
-YD5EaKS4EHpKsxFKojAls9jWh68taof/VAkVT0yw0pXCdVJBZ45oIJsR77tAOTeH
-26hfQkeRp32/AM2CTOBrldLD5VjeVgCxN1qKyQbGKre+IP3T/nmJYB0PC6T5AHE8
-kB08u8gdTE8ZBrW6G6UX09xHL6Sk3RIoQqVrWl6Ggg9aDLtjZLA/Q83V8KH4O2fy
-3MPv0QwubA6V8pkgahvj1ZoruXQOP5uIpofyoJd+BPvM0nwgl2w5iReIHS5UvsKa
-YmL1YHUy1x6hWjrMEstbj0jELo4sBH5DfPN+vgwK27tUwQf9ol68Y1yCZwZdmGYY
-0+KeU4lOJCZvrvKsO9NrHMGoVAEMm3iGtvj6TJ2e8LDLO+WHHMmH3ok6ToGfcy2c
-EaHb0N3CiVmxPHzDxqFdiaHZgkX5rNAx3QgAr96ZgEQgQ6t1IoxBeUCGWTUue7lj
-+ggZ+8BJ9O2+HDXvLvgahYdyIYEmOhL0ULOxmGTD7NNrpnuxrKQMhLHKXscN0Nhp
-ZOBsaTBu/RqztjvIuRgsNm/LLd0AG9m0IUSu0Afqtf16VstdnH3n/SquZWilrWAW
-dm5wCLoMHWfvXZhmo9p9
-=whfr
+iEYEAREIAAYFAlQQELMACgkQVWmRsqeSphN41ACfWKINlMe0zTGJrJvIVncSnE7i
+bcgAmwbzQIzG8Q2e6uwBnbTg7iLxDCLJ
+=JCwQ
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.400.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.400.ebuild
deleted file mode 100644
index fcadf84bc727..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.400.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2014 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.400.ebuild,v 1.2 2014/08/13 13:31:09 zlogene 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 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-2.10.0[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/pango-1.36.3[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-gtklibs
-			)
-			|| (
-				(
-					>=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(-)]
-				)
-				app-emulation/emul-linux-x86-baselibs
-			)
-			|| (
-				(
-					>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-					>=media-libs/freetype-2.5.0.1[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(-)]
-				)
-				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_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
-}