Old.

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

3 files changed, 9 insertions, 259 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index e7e2429f96d0..951d7de31c74 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.262 2014/08/13 13:31:09 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.263 2014/08/13 15:25:55 jer Exp $
+
+  13 Aug 2014; Jeroen Roovers <jer@gentoo.org>
+  -adobe-flash-11.2.202.394.ebuild:
+  Old.
 
   13 Aug 2014; Mikle Kolyada <zlogene@gentoo.org>
   adobe-flash-11.2.202.400.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index b6f4e0e8c51f..09f6bde9b5e0 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -3,22 +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.394-debug.i386.tar.gz 7405280 SHA256 7752f485c3fcbeffe5054aa7f741f114c4f334e11f050eaee9aafcfca5ba36b6 SHA512 51713a4e1586f31d24fcc4a22b5e43c14443293b0db9af62e1d80bc6626cae914df58224b6e23d912c0cd441b6b642ed9936b12bccd993ef1de056e663a1c296 WHIRLPOOL e2cbde86f059f7d5fe0ad3c6e75de99f7265aec3732008f978f370e8c5cc31f93876f5b609cb569c9a414341af103c350438a89f7fc6dac87358648d6cf6a536
-DIST adobe-flash-11.2.202.394.i386.tar.gz 6925990 SHA256 273d987a41f7b271b13d90d095269d941f71ce43607518f324424c6331b91c31 SHA512 26c9aa6a2e2db9ab2ff1631b4cc87a2e074518865aaaef1829ba24c44ab22513dd9f16024a6bed0ecd07e5c2d85c97e801ec19b1477a75434bb0531902bd99fb WHIRLPOOL 8b4c0450c77480901175ac5acf34cf62f1042ba3a10050c465aab6944a34a4e4801fd8223959dea9891daaa3b9968b081620876e0dbaae7c6ef192b3485d79b6
-DIST adobe-flash-11.2.202.394.x86_64.tar.gz 7235530 SHA256 ddce56a38e2440e178721ba60efcd76e59ae7f5e6ce57971d6ad87a45a9d02f1 SHA512 14faf00fefc31b5ff0c1d58ac5906641a185436d106cb94e2f808078d5cf38f0890295240f47846cfe2992d75179501e47d2aa5f0bf04fd6a12aa4dcbd909d74 WHIRLPOOL 9885e7efe5532ef15015cd77c0f0a4a7bc9fa5016b409a83472cada95a06a6a3c65e7d45e6af1bd3247cef4daf14274e5366d191b6ceab5bd7c883767048be33
 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
-EBUILD adobe-flash-11.2.202.394.ebuild 6998 SHA256 12804dc074c25906b94e3e25058a40dc2adfe0a8a383506c95b22ab5438168e8 SHA512 d424be1936c6a384e90db79e6d9704c9ddcc5f13e069375797427709bd1488dfa41fd2ce39cc859a4e66242b1d83bb16436263a4d09f46d52eeb3039715c400c WHIRLPOOL 51d16a432051b2b2026b4c6bbaf189046d82a3c10d164a058f7f4df772aef6fd1a1b56531d0c6c2c36596b21b3bae30c424637a232e403ad56e3ff29da98d3b7
 EBUILD adobe-flash-11.2.202.400.ebuild 7002 SHA256 857bd2a775844e41eed01f032399d322d3bbea8ac5c728c5ed150c61a26bd11c SHA512 e411f051ed1bf6364fbee411b3ca040e1799adb1918cb4eb5fc3e09a9141972a210d23ad42684f79aa1a0e30b59ea8e6685cca181c936e88884d090535913977 WHIRLPOOL 9beb5176541bcdcb9a91e2e3bc5075c0bc5e5fef495001f6fd1b146a36b4605578ae2c1eb5f1ef52ab0ef8c9c4ddb63094332634bd739bef0afee8a9b8aa83df
-MISC ChangeLog 59986 SHA256 9d2b59ff2a867d9ecf575e8fd5b6c8a0f5d697394928cdef2af2f446fa5148eb SHA512 d5b0b236023b3c703df6bac8ecb0f9cfc38088aae6d88692d6492c60bc62bb3dda042a987e17ac65332d48ce53ffed26fff9000e8bf8068e69ce179862ac59e2 WHIRLPOOL e8e9b920d4a0c1dbb65f4204ee1a8d7803d473a125ea3d84154b669faeb57c518fb7a5081381c49ab094b53564b935ed9d8d803864ee047d69bedc229c915d48
+MISC ChangeLog 60073 SHA256 fc15e8eeeefc758e59944020c73aa07147910bc14f4f3ccac5bff62f1f0211c1 SHA512 51be93b8e6819970d860af70ffe28e02f73dded8130a70f9bb234b3db36ec19bcd694c36f99dc3c2a1b8ca349068618c0b1da3839f36fcd8dd5e90c6045f86af WHIRLPOOL 067b4e1cbaa2825ade2e2f05aac7b42fe3fbb5a2d86d5f71155273a322ce83bc52efbd4fdcf48cecfbfbe8f90d30dd38d91d4ef709f99584b513aadbe7cd9463
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlPradAACgkQG9wOWsQutdb0AQQAhlSMXeVMk9nd4JF7tR2uXKMA
-Es8A6kafouMI019ClSZEw6CcZ4q8tSJm6V4i+D7J38jwLS6Hu1rcTt17LABcOlbh
-pwk5WUrwW5gEZNTWLMLAvSlhmtvCHN44D4D7H0n4RMiEOgyarBzkIia6tpeX5fWC
-G1Cd/SvBig3ikuiMdI4=
-=vOjP
+iEYEAREIAAYFAlPrg4UACgkQVWmRsqeSphMCWgCeJn+TwlxLbyLBb110IjJSew0H
+RT8Ani7Jinde/h0RiXDt+B9kVEVD8g3I
+=pIcR
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.394.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.394.ebuild
deleted file mode 100644
index cfb7e92c018c..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.394.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.394.ebuild,v 1.3 2014/08/08 14:12:05 jer 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
-}