Old.

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

3 files changed, 9 insertions, 256 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index c1a68ec559be..7c40acee1c3b 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.250 2014/05/14 09:34:51 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.251 2014/05/14 15:20:41 jer Exp $
+
+  14 May 2014; Jeroen Roovers <jer@gentoo.org>
+  -adobe-flash-11.2.202.356.ebuild:
+  Old.
 
   14 May 2014; Mikle Kolyada <zlogene@gentoo.org>
   adobe-flash-11.2.202.359.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index b8900f0180b7..294d5341523d 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.356-debug.i386.tar.gz 7403524 SHA256 c56a1391081171ad0a2376eb0a516ba9ce790b3d2a30e2fcb2724f8af5c2a2ae SHA512 0827364ebde09e58c629ca8f7d644e236e90bfe56aaca9e2c0e460fa3850e92d4d44d8fee2eb2cd5151ef434a31f85665cf5de0595ac75fed7bb282543e20515 WHIRLPOOL 60c422cd731659fc26f05fec66b1dc85cdb4e47d89fd2a1767b79781bdbc108ee05847ca9fc8f5343e003dccf001e9345a99ff7f814b1e346541657ac6817b13
-DIST adobe-flash-11.2.202.356.i386.tar.gz 6924166 SHA256 0b42d40f9362eab3f9eb13f495bfd392351873494cdbf8a02cece0b71c5ffae4 SHA512 562179bbbdd741902a8fce6e7acce93fee28be272e9931e24e1cc8efa6968f46832cba122da7288788cd9722de4a7c8ac9b899f579cc70075b659827164af3b6 WHIRLPOOL 072f61411c10ffa3cd65736f5ce0f48253c66ddd60683f0e53a81796276ef66a3e61d424be2875bddc5dd25f9365d005c7ed7159b8b317d0a1068f6d00bfb083
-DIST adobe-flash-11.2.202.356.x86_64.tar.gz 7235641 SHA256 455f10649c8645f76f18f10cc3b83f0a609e059b021784e217958fba5d5209bc SHA512 670143c65f0903afad2ea1773e083d9d7316a8792bbfd891c7952ad8305febcfc91e0e6b7e8c916c52de3a7c6c3236011a8415d01e1482b28c68fb3382411586 WHIRLPOOL d20f5e943ae512233b80c1a23da073203b17bfc6ef1779d0e8019b6fe4e5f1344a74e16f10dbf1ddda1d452f5aa8c45b96a241e6a9425284a887e9a19087eb0a
 DIST adobe-flash-11.2.202.359-debug.i386.tar.gz 7404160 SHA256 b435414b79589f81846e5e8ffcb831bdd1c9011661e8845675823c83010f7dc7 SHA512 74328f05caca10c32d34ff7b5c56a86dbb11f272a2b45119ebfc33da5b427824b7bd6ca51bbf35ab714a007324f330453cfa74d8abf60504cd7c4d588017e583 WHIRLPOOL 7d253b1486967ad902051eef5cf4761497314f78a2a29350d2a1d7f5a4de76d43cbf0d893e3965c4f64cc064e5c6808c4fd83127fe41163c31821e0e908e7374
 DIST adobe-flash-11.2.202.359.i386.tar.gz 6924219 SHA256 15adcd18f039a00e87c8ef02be93e11c5ab9c585bdeb9ddba8e732bd240a9013 SHA512 717ff4693b626b5de2472ad882d6bc639b785c3c2db161911384b30299e0f3a676f1edddddf5efe3d290917c8ab0ddf4144fa1521682d199ffdeb4c903bd5df7 WHIRLPOOL 99e6b6d5c3a7c9dedbf850886fa5ba731b21ef2e46d165c60277acec04483a818967a6a304239c314854a96d190cff9b44349ae56148f26e8a7275bc53a170b9
 DIST adobe-flash-11.2.202.359.x86_64.tar.gz 7236046 SHA256 6ade0c217d7c5d5ebb6fce4529a256bbf5dc94ed6f9cfa960c1ea7949cc1be8e SHA512 040c2ed2a0510b1c6a1b5054352ebc0c8f435aa4776989fb47ebaa8afb507c87a316d7202c092093f77481ec0a5105be984900f8648fe45891ee4f99f494f05d WHIRLPOOL c947cb77841c1aad7b2b750a9a9d5625279003ed9c6ceee41fcbc11f958c2c3ad48f5df4a9c24cb53ece45cb285e2f15317d297c0c9fb1b8249a843bc85b55de
-EBUILD adobe-flash-11.2.202.356.ebuild 6822 SHA256 5b628eb48a372dd0a2a601c813765d5be00c3c64792401f43d6ce3123499ede3 SHA512 0fc726d5d04ede706c3083e5144dae55737a0c4fb2ad18de905c70496f6cf8cd534692d0810b3cd17ed202695cf1450d079363573a962121e6e19503befdb9cb WHIRLPOOL 60880f0562f3804336f6b6b984f32d62a05902d373c46c961c98125dbc656d08985d765c77b7711cd1dfc4e7f8225bf612724732e412352aff1d5a3e928d7a9b
 EBUILD adobe-flash-11.2.202.359.ebuild 6826 SHA256 f932f681733b1ee8eebbe073494cd1b778a062a583bd53b16f0c03d617ad062d SHA512 d0bad6c6d65b338f797c08a3b6d9b754190729933b041bc4a8e90dc4cc22ba96e4fcd67c17ed69eff238170cb2f2b1102e73787a357eadee2f34f3de3cbbaace WHIRLPOOL 2ff9d25f45a5a4c02d86b54cb0362f71ee664c0cb7fec7130104f442307d967aa10191c5969d78b2c9b052535e963c9b81cdacf6047a5313dee4ec2aed5be588
-MISC ChangeLog 58463 SHA256 55392d4a9c12e6097265a359ca042075a5d946e8116285eadd253d9c697f1d4d SHA512 26b3d885c1d7f2898f90592a142506a2520a7590c2225e5b253bd166b3615c7c9d10009cf51c6fa61ba5e2cfb55301e70832d3dff5fbc6d0a8edc5c05ca2a8e8 WHIRLPOOL 8034f3afad8688d51a3899593809b47be6cf12207500a5bdd4b930951e347c4559912ea5c4dd127ec6ecfeed32085ce61e9eefc613256bd81bd8c8ed165f4136
+MISC ChangeLog 58550 SHA256 84449843a5c5a2dfda02a5923cd7e8267d4a6ec1e0c4ab4832275c0dc3768cdc SHA512 2993c815f7f4308cfdb441fb260030f85d7fe37a003999c9405b5ea099346cb5a55b1825c51c4a0b4cc8c5d9e2d55c91c3ba50279abf783533cc86969f8461fe WHIRLPOOL 88d7834d814905de8ab02fee92df9c656289faa2cb31635704b7bbe9f2f5b7d8ef558e43011dd6824518eb27acf53fbe44be22cd3e88f99d228b19295c8d560a
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlNzOggACgkQG9wOWsQutdbFUQQAqEnH7ZR086y8E7ww3ofsKvmd
-8J20wn6jt0aO7yMhW29FbXsyXWKxgd22ux8dzf/mEUsERAJnK0c5UorJcntkk/5w
-yXAG4Up8r3FGkAOZS7vXPtNx9gFXlCh/rJj0plzsSsp9T80v8WJvCUkjkZkWFzr4
-IsKmBOQSFEZz3ArbCW4=
-=Uzc7
+iEYEAREIAAYFAlNzicoACgkQVWmRsqeSphPJsACfTlOlQmb6hGbyAkgxZdOgiyPG
+DdAAnRcwEjZIFRz5FIVoxUH2jDUA/8l/
+=RxCg
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.356.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.356.ebuild
deleted file mode 100644
index f4384bc2348f..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.356.ebuild
+++ /dev/null
@@ -1,245 +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.356.ebuild,v 1.3 2014/04/30 05:05:43 jer Exp $
-
-EAPI=5
-inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
-
-DESCRIPTION="Adobe Flash Player"
-HOMEPAGE="http://www.adobe.com/products/flashplayer.html"
-
-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[abi_x86_32(-)]
-					x11-libs/cairo[abi_x86_32(-)]
-					x11-libs/gdk-pixbuf[abi_x86_32(-)]
-					x11-libs/gtk+:2[abi_x86_32(-)]
-					x11-libs/pango[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-gtklibs
-			)
-			|| (
-				(
-					dev-libs/glib:2[abi_x86_32(-)]
-					dev-libs/nspr[abi_x86_32(-)]
-					dev-libs/nss[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-baselibs
-			)
-			|| (
-				(
-					media-libs/fontconfig[abi_x86_32(-)]
-					media-libs/freetype[abi_x86_32(-)]
-					x11-libs/libX11[abi_x86_32(-)]
-					x11-libs/libXcursor[abi_x86_32(-)]
-					x11-libs/libXext[abi_x86_32(-)]
-					x11-libs/libXrender[abi_x86_32(-)]
-					x11-libs/libXt[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
-}