Old.

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

3 files changed, 8 insertions, 264 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index c307db5799f6..0a1e03fe9bd1 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.242 2014/03/15 13:16:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.243 2014/03/15 15:02:19 jer Exp $
+
+  15 Mar 2014; Jeroen Roovers <jer@gentoo.org> -adobe-flash-11.2.202.341.ebuild:
+  Old.
 
   15 Mar 2014; Agostino Sarubbo <ago@gentoo.org>
   adobe-flash-11.2.202.346.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index d1dac454dc4e..253e0ccd21f7 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.341-debug.i386.tar.gz 7404292 SHA256 323f9bd1519654b7f41e76986f56e51c6b1db7ce827bbcd702c2b58fdf5db88e SHA512 603c8f89ba9fcb124044a6400d2e5f7ed15338b2c2d272991d108122d8ef3ab6acfc53c578c6165670694a4df3b4d75f20b64517c486b51c897cb381883c089e WHIRLPOOL dde56860847ebc1f1f9973eada854a37d506ef84da0e195818f57f9f783d5a9763211e21eabca751c6d12b6bf63135201a86fca254c705047ae192c55cd62228
-DIST adobe-flash-11.2.202.341.i386.tar.gz 6924197 SHA256 4cc1d08661c8b39bd86bc8ad867fcecfd344916ca076e2f9b4b20c405a0cdf2d SHA512 aaf5868a8a7ec7fc8d031ce52df7e807118e4ee40a2eebaa835e10d8e3f626f95ce6ce29c59a5c4720348705ae8a9b2037feebe3c8846e64dbb584888d3e0730 WHIRLPOOL d934ace20d7a5c1681010c6e7619a018035dc73828cf73fcb635981f542724c01cc11b3d340905db1f52e45ed7ab6557d152b4695ba256f46374408923df1b57
-DIST adobe-flash-11.2.202.341.x86_64.tar.gz 7235766 SHA256 32115cbbd22465109f06e32acd6bed88465b2bc275eb94cc062f36aec0613134 SHA512 2971ea0143f0a770f211debe5216d4718363ac501f764a705f087b3609b820d8dc7c8ebf41115ab14e5c88c21bd9460195c9af271ca9d75e5981e286f5276a03 WHIRLPOOL 0017cec85b20d966d2f3e08b835c8ecbd82ec65be6e341cb9b5a032f56c502c58e325be4a0e48f49901b9829f2306c8c222ab98170a88317d51117a5221d4bd6
 DIST adobe-flash-11.2.202.346-debug.i386.tar.gz 7403530 SHA256 e3527616501110a6adb1a4a07b34b961d1a416af56ecd58b933743d324794ded SHA512 59361a4c26bb25966d635cf1697cf6bf316800a172fd209f8e72c91bcf853e06879eabfd483f54881d3a41a246c71c7b3ee0168f41522f94fec53e77e1ac21c6 WHIRLPOOL 44ca703d698507640a31beb1bfc65b5e1aad0f09bbe7a7a3169c4ac74d26eee150527a66dfd4dafc384ef8732cc5b9a5ad9c88c1c1865fd681d78b54d5544c24
 DIST adobe-flash-11.2.202.346.i386.tar.gz 6924402 SHA256 2a27d40ae597965c73b40ed5eceaf5918fc0b62e48088c5d2e1664e09bfac405 SHA512 8c3256df60e063c507d5a084b170afc3bfcc8a4584a417291cb4342db4f730aaafcb6e8db6eca15f943580b891179162cf5eea9d6d31fc190de28d8424d47729 WHIRLPOOL 1209d3b4ed276279a5760cee950e8092d0df1343752a8b76a47299505262b0fd51f44a345033299a106cdb9cdc6f9614d1c3fb24e357d1652d9224308e65894c
 DIST adobe-flash-11.2.202.346.x86_64.tar.gz 7236196 SHA256 a56c409b2b14d6b3acc24fde2a93b52ff57730268a4e69e2c35d4fe00a8f4fa6 SHA512 eece74c01705599e62dbd9e29c876f2ff070118c800bb74109dd9bb51d1e083c508689e5a9a38435d1ae75539e3d7f957611b8b9a5c266d2634dac3e2c91bff0 WHIRLPOOL 556c78098676b14a0ed2a5564f521dc7369643a0f7db0b9ffa29c9c970361e98bee3ff965e956ab2f0d430f2bc33499151d57e7c92ae427d3d33f9c57ef94de9
-EBUILD adobe-flash-11.2.202.341.ebuild 6823 SHA256 7be20071f8020e227b4057cd2ed2a4d49b0576ad55ef9bcf1cd3f717513cc641 SHA512 a26b0155ba94229447f6ca5d7a89d29579055afe02ff8a356b3abb966d22ebc5f6aba007cc37573d3be06c658f80a46e70bda81a6e80df260dfd329645581134 WHIRLPOOL 01355d563193a032be3db3b9e36b855985bcddbfeae84d96d7bbd6e6e29b396915311c0d9c07cb717dc22ffe947f651de6bfabcbf7fe678e6eb9f2548af28aca
 EBUILD adobe-flash-11.2.202.346.ebuild 6823 SHA256 98d554b2ec51bd1bc97f02ef4406ec8e649f89f24a10b3cee9042830fb624222 SHA512 9eb8337471d1d3fafd7942ae57c14ca4028e907f7b80d75e0692b1011880d66a7b2b17afb1cbc1eecd2390570e1ed2e9c70de251af5a4799664acfa08629b359 WHIRLPOOL 22989d64b2888771e37892da979e2cbab20da987077514643e99d1764e99fcfe292f1e14928229d0636e7c12a2965ab7d1e95266c9a5ccc4264ee7fd427a2dd8
-MISC ChangeLog 57175 SHA256 26eb62a73f97e1173b598f996972eaeff485a66a763093dc84eb7b9f1434453c SHA512 2d72456cb529c9f74c12b28b1b8d9c84f9221737d027670d3b101f71d22b975f2dabcf1fd8cf230f99e4f3e44964807b24ac89a05138c451d222c94c9857763b WHIRLPOOL 60b9fdf1ba54469a3bae8eea1e9ce7988feff4304400beeeafc7c18d0f867daaccdf2aac58eddb45336dc9ae58efec9c77d3b3ba5f7432df3f6050b79e6938cb
+MISC ChangeLog 57264 SHA256 5c8a262e216794db9bb9838a714c46ae7b3de8ee9e01a0fe1ae1ccf5e26d7059 SHA512 813c98e5aebba8bae6d1a6895e7fb08b4e5c479c4f37f6b935039cd8ec64270deaebaf1ff76d344b9debfb64dc5ea7928859f7a3356c104181830e1b0acb71a9 WHIRLPOOL 4ed6ef7f0c5d2ce0e0399f06208afe9cc11be0690686460028887e031547c7eb303fb0ab79dc54473ad3e59e076e1a25e417df57113262b0f46509bdc6247a20
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTJFK0AAoJELp701BxlEWfiZwQAIqgQkKCQSXylJ5j4eQKQmI2
-OLPqZ5j8ylLjm6vLQGnPLfhzSfNo7/Pl/E7DvLGmzF60NTU2h2ZOcIcy6+XnmgT6
-r/2G9Mjc8tD+tOAbjW+VkbO7nvFzIbfcSorYDhQh+YilPvuGhMsNX/BL1G7CpTCq
-M/eWAvNc9FLK/MSeI157ooxXmRj/bFB4P37gdFdPr8hcrCHle85LdyXU4wFbQLvi
-kIlEHl4MeVzPZT+pIJ1bXtEjVDFUXtr2HH73tQZCJUq3eyuaQO4HHGcRMCrmw1Ws
-77S15FykeCF8HFDbd4PGtFqUFpsofdsqqF3x5xyqdTJ45rbXhZSfHqgOk0JYUetc
-mHm2F8MXjLl3yLgkPST3I/gLcu3q2di+Lpw/3jAQzRRIsmXcJ6P0cVbewhCDZJgL
-XpigN6YnbPBKZLkCWTNgoJ0YyBETRifeC2p0h/mXzuc7W+5jRGsN8MTHx8ONfJ4n
-Wu+oiD4xzn47JuY6nUt+wVOEQxjxTRcH5oc8UIgyfUwOUXTNnE2GqjuUOWgjFKV6
-nfsiKXDo1zVr4vwqxMlvGXvGAFwFimb3NHAE5HKCCjKq+PUToz+fPJ4MxAFYdG7s
-DiT8GyrhbABEyppa5H4hwk6OT6jXAZPbjxxprwsRUdRnfv663ckX5WUCAeW4r770
-EP/V52B7QOZWWqjXSSXj
-=BpDf
+iEYEAREIAAYFAlMka30ACgkQVWmRsqeSphPoPwCbBmK2xoRnmAlPTkco4KruJS4B
+UNkAn2sOm+my5peDfqPzuPnSoRxTE7TE
+=1CDm
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.341.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.341.ebuild
deleted file mode 100644
index 74c2c3ca4a95..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.341.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.341.ebuild,v 1.3 2014/02/22 07:15:25 ago 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_build_binaries; 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
-}