Old.

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

3 files changed, 9 insertions, 268 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 3ea094836907..e7b7f95423f6 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.303 2015/03/13 14:10:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.304 2015/03/13 19:05:00 jer Exp $
+
+  13 Mar 2015; Jeroen Roovers <jer@gentoo.org>
+  -adobe-flash-11.2.202.442.ebuild:
+  Old.
 
   13 Mar 2015; Agostino Sarubbo <ago@gentoo.org>
   adobe-flash-11.2.202.451.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 23f3ee9965a4..eec4b3ad4413 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.442-debug.i386.tar.gz 7409646 SHA256 b519e74cd3dfc89e7621a5a4a78c009282c670a63db5762c730693e583a40cdd SHA512 30ed674d24c058090c24160b8ab1e0445ab7a73efe5e7d1c70d7f7b9342c9a22b39df713224b67d4cb7c2fb3da0b07dcddefafad54dcf8935c8c642348c17b53 WHIRLPOOL 6090c4ad1c24408bda69e2243edd0fe407b9218f499901254e50d635caf6da6e0b82cd43fdfff27fb343043368a8840eeb7d7092d038d43969efa71b11ce0c2a
-DIST adobe-flash-11.2.202.442.i386.tar.gz 6928808 SHA256 b5cdb9cc826c40ffa3d4917662d4f05ec72478c2c50aeef4a514902b1146e200 SHA512 256240dd158ff5984d57e4d369262bfb71879bc2269f034b443c0f5c639ca85ed84af2a7eb5aea48ea5f354a24e729ea8eda40f46fe67dbee02b4099aa79c8fc WHIRLPOOL b211e022fcb7b6bb948d5f942d881d05e4ec729d8be1c8891970eacf9412b5b5dda45a53c5fe2e18357bd591cd32b165b90355f3acac5066a612191c226522b3
-DIST adobe-flash-11.2.202.442.x86_64.tar.gz 7241885 SHA256 4850a54a9fd9af1d93c015a475b545ca57df3ceab48ccf153f0da54b690dd122 SHA512 6c67b67efc87b1711e21b340cba2f2520ba27e335fc2d9fca094e470a7ba16662b9f00f10180cdd8e45f3bee199aeec860ae04b97c290ba3e493b9fc5fd7257d WHIRLPOOL 004d0c88a2c5b0af3b0bdf8f3e756c8fba53af7702d4d8550b6ef6d5dca8c15cbd7aec86fdc0710735532d63a1415ed4aa8bfd9b650177dd92bf28950be23b82
 DIST adobe-flash-11.2.202.451-debug.i386.tar.gz 7412164 SHA256 3ced4089d10095d19c1da36566a8eec43aeafaff12fb679b2649e814d87ff88e SHA512 46542bd07b05075f3d805aea419752beec4aa243aac5fbfab32953f331997c2ac3f36497efbd4fbca33dc1a0219b8132a38452bd777425f4c2f9c16a6b8a393d WHIRLPOOL 5b6fd58ebac57df08f43abb0297203bfcce0d5cd835fea2df42c3b72cb5e1de36292a5e5d9f34ef2e2ae0bf5b5fb0116597b56688058292cbdaf7c4579462c18
 DIST adobe-flash-11.2.202.451.i386.tar.gz 6931380 SHA256 ba4dfc6450a48941c440994580751da604e86502aef5a1a11caec1f19be9fbd2 SHA512 f9ff7cc4052e021b5e301431db11cb95f86c9387a17a5720f46ade5bf0524216dfb924b1611e82e3c79548fbeeb57d1b786e5f356dbf8d8e135a3cdd5ff012ef WHIRLPOOL c4b49f4332b691bab2938dcd395dbc513fdb011920c8ff622977a1a39fc18654b1a28007dd10b7ffd01aea61479fb932615baad62997b8c73b1699dedaf3bcac
 DIST adobe-flash-11.2.202.451.x86_64.tar.gz 7244055 SHA256 ffec963ab1b23a5ff7aca8f24350637540817c7fb6535eaa5428a57ddf1a934a SHA512 ba1399173ede076d2dd1585bb009e8894538b13db189816006a34c7c3da5c1c3ec8d7c8656aadfef205c24c6c7e21fcff78be0eb2e2c6b7d016d1407e82e429c WHIRLPOOL 6e840c9fda80c49a387c15112183a86f265990cdc95c6a3f7a0691929ce60d2af12e92e0fbb01fb55aaa8201f4d6d18eed33a0501137d1c61158f209355c5032
-EBUILD adobe-flash-11.2.202.442.ebuild 7075 SHA256 66e0c2e4d3d1bd3e78a16a64effec9cc8f4e0b0a4e64c752573e284930d88ce9 SHA512 d3117321e880cdfce38714add4050c3e50ec7c1ea9e64b8c64671f7eb7053d9650f926d2a79900501c57702bd37d6eadf508f97dbc1f778c0e536756b38afe13 WHIRLPOOL 92a4f33a525273d1b2bc0b6b387da6bffe9352ade7880cf028dbd2ba5fbe905c33a3d44213c4a428c4addb626f4566ea5aabcb3a86980f344f31a893a3233366
 EBUILD adobe-flash-11.2.202.451.ebuild 7075 SHA256 9658bcd5b1495185084a48ecffec617d3ad91a021e0fdffbb5261705aa081065 SHA512 d842d47af99b515af6fb32b225058f77fba6c676cb348c2250a641c038a29404f2e8aacb6186e07f478890c44817e4d50992cbd198266c258eea7b04266bff64 WHIRLPOOL 3749f22b11c903b5ccd34fa8fad5b391954d48d29116ba4a8efa31f06f66aa2c49744d2a8237100490d28b516f8671e361f85717fc4fe1727b1f5792bfb9060c
-MISC ChangeLog 65014 SHA256 570e87ccb94d3b1680271b548f53ab2db09e7c16e41212c4ba5f1c9b1410ba47 SHA512 1c3ae067326fab958f98a14448a8f630bacb9ba89807eb5943affaec3ffbe404c7c7dcc57d240ec052b9d8d6d2e3aeaff63dd1cfaad38d037025c08f43632ccf WHIRLPOOL f4611ba019157f1e46763e548624f8c12c3bb42f203cdc7403c7838d9f3fc1353e059427be727cda8b2eca2c314ac4ff248a32d93dbc5ab6ff4d4392dcd0cc8f
+MISC ChangeLog 65105 SHA256 6777994e97e50b5d8675451f9b7251d5995edfc49c9309bfe9fbb2f9dafcc3f4 SHA512 134826f7ddb70cb93aff279b15b1d030a51ee8c25c9599e42967fc7b74b5a86e9e3d3622dfee75760344b8291728e32cf437b60b227da088f2973ccd581050c1 WHIRLPOOL f6228971569f5d5e6fe113e32b8697646596b27d14dd8f4391077ce5b8b4cb833260ffb09f0fdda7b5da2f558b58362cfddc4f33248b7d92b6cc6c21d391a17a
 MISC metadata.xml 321 SHA256 8deb56ef6832b7228800012723bae22d3eca62c387a3080bca3a98010767e00d SHA512 a728e401d2210342cc1747de4291136d3fbe25060eb0dec35a3b7c8ca5c082acd95780ef5b8d33d5d0a98f372367b5424b6dd777902d4387188758ad8dc0a09a WHIRLPOOL 5ab060286049fb7bbb0e9461561c2f29cbaa5c42bb9d44901bcf6a0a56726879c6f2a65ee08b9c278441a072addcf09f6c2f481b5c008818c25c9911dbf95a4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVAu/EAAoJELp701BxlEWfhW8QAIr1hvsxu+oXSupTKEKsZR+E
-Z57uOj9Ml6w1lbI+WYlOMNpMqbVfpMvqhAREMo24r3h6YtlaWsxhpFEkO9usZXEB
-WCie+i2fT0xJlAT+C8PZLrJhrZade9X++ZN3WCmDPoxsp3RjfmnnjsmTlWS9KU0N
-Xsv+O+AIYbS/E9/Ij57ZY0FC7awVVFDUBAEQyOsReH5ZPSeKRWKiQqjGDv2GFJHD
-EO3YhhtnKHh+dRstnSXSx9YPIrKN/MIf/DNePBGtyY/wwKoEKNPY3jkWAloa60zh
-XfH8pY9AKhzdlSwnxBEjL0RgPTL4dSbSOymaU1OuiZLZ1gTOvfRjzGVuiwEkAxxI
-IbFn711zh3QznBU3F29+X3oIQIUVnpAufZ5/XLOFSObc4jqPcDs23C8zNGhqO4UY
-nTeoAnoSrqhLUcb7gx3yzElT1N8es8tKd/xNiVo75R7rS0LAp4mMZhdAk2eS2Yh7
-Whn+pRaIKZh7dCsz5XLmBCUP4H9xLnU7/hMl0/tX0x0hRaRy9e4BH6EfoTPxufUg
-BidwkJVzBFpeZo5zrVAotVExJWUhnzhmc4Ya2a+aDzaHE2Ty5mKGh8SxtQhV5i15
-uMbiKwx+/0JfZlB93lelPkC+Hjm7juPZGxCzrWX5cxmWSlszo4nmuZy980o9QO/G
-mLVqAmYtJUmXHD2vhkkY
-=u/F3
+iEYEAREIAAYFAlUDNN0ACgkQVWmRsqeSphPX6wCfcI1Y20pdNMBK8YxlC9/Izv96
+RHMAn1la3In7/OWzG61N2AR71MrXs6ao
+=RN0D
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.442.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.442.ebuild
deleted file mode 100644
index 532cdb79d839..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.442.ebuild
+++ /dev/null
@@ -1,249 +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.442.ebuild,v 1.3 2015/02/06 11:34:41 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 cpu_flags_x86_sse2"
-REQUIRED_USE="
-	cpu_flags_x86_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
-}