Old.

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

3 files changed, 8 insertions, 267 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 8fa9e01ba8e8..884d7e24df6e 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.290 2015/01/23 07:53:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.291 2015/01/23 08:00:11 jer Exp $
+
+  23 Jan 2015; Jeroen Roovers <jer@gentoo.org> -adobe-flash-11.2.202.429.ebuild:
+  Old.
 
   23 Jan 2015; Agostino Sarubbo <ago@gentoo.org>
   adobe-flash-11.2.202.438.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 1a4c3ea97791..f2276cf7dfe1 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.429-debug.i386.tar.gz 7406320 SHA256 9f2e25181908e9c50b9ed92d7a14c06eef769e804274e1d5f98532020b697950 SHA512 4cf905bc3fa034baa12651e46c66571036c7c6744c5f1bd3a55f97e99218bcda18a04e2ab4a44b64ae52f9defdd57b880f7315996808343422900480a64766af WHIRLPOOL 850d7b3ce8b22f16cbaa09a0588859afb1414ff434de420f83f871f8e1dd39aeb01bdb8d768a1524d6f5201a2054dfa55c5fc238c038598f9ea13772a09296d2
-DIST adobe-flash-11.2.202.429.i386.tar.gz 6926838 SHA256 6439c185e3e0397c958b26b1ee6af809e739d4bdca2ad520213b0f6eb036e064 SHA512 0cb29dd6583edf690f2853b4e2899db304dbf9518f82bc5719c3f62d884ba242b968df5160f2f34d57658c3e5765dc5201ef90e3cb13978ef27fb94c116bef37 WHIRLPOOL 31133d1730a7d075e177722514ec5614900dabc6dca0d4ff13dbfd5e7eae545ad9cf8edbad7f1852d5d64d77e68d93acfcc6a24faafeded06c568ff4a009cd5e
-DIST adobe-flash-11.2.202.429.x86_64.tar.gz 7240298 SHA256 0b679f89469d6a7ad919432a050098349c91744d7298c142edc1afb722cee25b SHA512 0f01a9a73c391ce31be94f4023bd5b8dac58895270cf19251af362831af6fdb13d41e4e373d7b4c2a8bcca2fd5a1fd569a4724c0040012b1f5c59a1a3523ac83 WHIRLPOOL 8843cb0f74a2de59a1b61b5954782e99941abc09c6f2f5595dd93f1a3ec9fa70fc7905e589d0c2db84d11baaf0acae06592dc520c4d555fa8d8d1e91f9deeef4
 DIST adobe-flash-11.2.202.438-debug.i386.tar.gz 7406493 SHA256 9cc836d54d48260ebcd9629e8a221512bceee99411587e2537f20f79f3572fd2 SHA512 3db32b92cfeb1dd306872ad1d1b53b2c4caef5e5379e6bea8b5a570fd169f6107a6667256020845dbab06d2a18f2964659d50d16fc1b47db5e8b8138fbd743d2 WHIRLPOOL 2f2bf561be78dc319151e4926c358440c65f5e4ab06ea7dcbf40d11bb210872667982a65403b4b52f2ed38684642601138095430d737b51944bceea1e4b98305
 DIST adobe-flash-11.2.202.438.i386.tar.gz 6926814 SHA256 aba7c700e0efe42be5995b61a6c2069b8f2208da209ad7e652914aaf6fbc6950 SHA512 3310d160154ea3ac0050d37d95d98b695efab02c4fd82725cf0ed46515d5c8f99da9ce1beaa4669b161fc18199e4fded8eb3f73fff679147d04f114726de8af4 WHIRLPOOL d6abd13528dad1fcb18ffb479ac59c99da2c49ada1a67eb5f11edb6e483b020c0a7f1dd17cb5d32ef9c9d8959278237c96b1710f300cdb5f7b88045bfb9a63de
 DIST adobe-flash-11.2.202.438.x86_64.tar.gz 7240645 SHA256 b923d0a82ca4daf57a5566da411c319691214f8b092475c25f5e686961330ab6 SHA512 70b8311bdbbd1053269ba1d6b3767ead3c44dd94b35d5153af9cfb763c346907dfabe3bfef1c5968c29353d1c87ec24e615c6db54f87cbc7c5f419095e69df74 WHIRLPOOL f06189583d9aa75040743ad7345c02354843f3a9e3b20b239e2358e742d89f5783b6a3fa5f1436fdaf38d2769d2df39cd6cfeb118b7659bd909203e4339f34a7
-EBUILD adobe-flash-11.2.202.429.ebuild 7046 SHA256 5af940d4382668b62892b47bb2421e164bc48f92ab076ee10d1b3f8ba2cd6e02 SHA512 1a59ee317a820e89467d0e22ad319a5a0d08da2f9d04b5590d316358980a071cdcb5a8d2ebd715f5e015953f04d06fcb2457a84f5262122801c03d364abdf314 WHIRLPOOL 91b8abfb74f94e7ecb5775bdcb49d981ef08ee24c1ecbadcd897f124ce34a2fb5616b5c0db447720b65a1f33a1687db6f7a81d762457015195fecbed2c720854
 EBUILD adobe-flash-11.2.202.438.ebuild 7046 SHA256 859aa8273605a2696f3379c3ac578d5937395e3a7b9eaf0619055ae93de11a08 SHA512 3968b13a05629617381e545a440fd1c7c57fcc3f7d47a20bae375ade0b90a7d6009ed453e7c70990b22b24e7c389a079a0d8822c988654f3a43159761fc2be1c WHIRLPOOL 4e149a3e9db69683d5e338ce69cf34bba14c54ea3259e6b5c8db36133b964d278d9c54f7a5b48e6e365836160ca82d36d2f50bee4388f65bd7f0b6df737ebd0a
-MISC ChangeLog 63476 SHA256 af0ad083dbb7ae0b89ab5c5d0e99548def7ef74f96b3f21675c0bd633f8d1853 SHA512 7cbf46b96fbb2c34bf0b48f0f853e34f1c89c4720233203caa6e46dacb4a5c8fc3e5a9e390314a17b674e8bb085c9f4ff2d4ded57071452417d076641da6a9a3 WHIRLPOOL 535647a57de28e36c435f0305598fac616d58ca458dd5ff6e71f71131b82187024a0409fb25f52bc9428ec67f34caa4e35086d010497ca3813d7d2dc373ff0b1
+MISC ChangeLog 63565 SHA256 6a8618a606cfcd2bab9d82d890c4fe38cbb55c274343240690fb32d0c4179919 SHA512 a619de34d317f05734bf32c58ed0305798cfd9a2de4cdcf466bb15aeb3012d3819be1c11a7480b69c2ac83f64f0a70ebf0e1f68e2cf61b2d8b1d1c6814970041 WHIRLPOOL 569d029d2c04b40c6ba9db1282e50e306351f680943be0199ac5a22a193ac0be6df54a1f0a66226dfbee0b05c920697f261e27c206961261d7532a5e167838d3
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUwf4CAAoJELp701BxlEWfd24QAMOgftCuq0TOwfg3FvHKgJJa
-LB/DfHtVsxrLqb3/6Z7jZxWoJdHSUvErW1siVyMyLfcx1h5KjgudJbkn8AN5MY6/
-542wmkf1CCcBA9xFBlKAQ3M7iTjH8Rsc3A9Iwrnm+j7MZJEXUOLLxig9cpbBrZ/t
-eEzL5ElYHtBrS/WCAwd9lmGrRNRnqIGlStWjfRaqPGm/hymb7eF11IVNrG9Eph/D
-AWro2azmfYfQJUOykIwOP2/IzwQMOkK53HN82NlH1i1zthCGS/PyP36HspqXe1jo
-D0RaqWJcpyPJJithAtHFvt0Va0wJJM6WC33IUu2hfF5sacbXcmcLkzVZTI6HLyYf
-Q/B8DjULuHW4QEfAjMtXo99wbUtK6z5mWAs1rAIZfb5Eb/WtsJTVu4QCd5hMy5vj
-gSNz8JyXom1zfpQpxTVQo+C5HVKoVFEvTs144x7uYGpxxOvCvNigg3QaJhTMfqwI
-BwD0YjHUW953gUpYv/kEesucTgCtBs4/Q4fAIYwTZ2Z3vq10lMknU8f4gg43F890
-11gymbg+bFFay1pXMqN5A1ZTrT9MadYnItot5RRdo/yVzOQen4PNhJfSJp+nP/xL
-gIPCfWjMn1ihLRnb1E82VfNHFAzA+NZERtyBYO0N1WkzRbjtz7NEGLQe2xh2giN0
-8WsT69PcSxXBRvFxkcDf
-=PTQg
+iEYEAREIAAYFAlTB/4wACgkQVWmRsqeSphNq3QCdFXLXybNeEdB699Y8JBgTQafB
+9msAnjzEVDDKaDqWvOrm62elFMKMB6pW
+=wnnz
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.429.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.429.ebuild
deleted file mode 100644
index 58f94cd56bb8..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.429.ebuild
+++ /dev/null
@@ -1,248 +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.429.ebuild,v 1.3 2015/01/14 11:52:14 ago 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 ) ) )
-"
-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[-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(-)]
-				)
-				app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			)
-			|| (
-				(
-					>=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[-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
-}