Old.

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

3 files changed, 9 insertions, 267 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 41ed9a548773..6652bdb8a45a 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.286 2015/01/14 11:52:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.287 2015/01/14 11:56:47 jer Exp $
+
+  14 Jan 2015; Jeroen Roovers <jer@gentoo.org>
+  -adobe-flash-11.2.202.425.ebuild:
+  Old.
 
   14 Jan 2015; Agostino Sarubbo <ago@gentoo.org>
   adobe-flash-11.2.202.429.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index ddc9059b9333..32869477cb7c 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.425-debug.i386.tar.gz 7406303 SHA256 0e6077387d74d2f7ddaaa30f23bd92f13877f865d271e8c01f0050c3c1019afa SHA512 35c1864781738b12d155ae26c0871f600d0300b18de01682eb11fbcb096f7e63bae1dfaee44b535a1ae0cd1fc828f9e938d92f2298a2b281c1b8bf518c3ca829 WHIRLPOOL 98ceb92881acea3c3fea6d14a033b76e27f8497f6d4da0fc5bbd2d9cacda243522dff6ff9d97dd346fa4d4bc2ef1b69d1b8ab20541cd5977e8e7a1e5af31847d
-DIST adobe-flash-11.2.202.425.i386.tar.gz 6926590 SHA256 0be4858e345e078fbb34a6eeefef53ed1bc09dff75134fc0508c37f080b99149 SHA512 9bc93486b59caf739ad34abb129393e216e6623bf2781951c4d0bd481fbee90830b09403903b6103b52995b1ef4161a78a6505080b8122877f726c2daec79dfb WHIRLPOOL 4d305f53f0a03640ae15eca0473d05e55cfdc7d13b0fe74c437e2fdaeebde851a76a42104633aab46af08d313e24d871f7827318b0943a5b34c50c9c32332f5d
-DIST adobe-flash-11.2.202.425.x86_64.tar.gz 7241549 SHA256 8e2a41b8c747218eba50223e87e1d47d693a7700f5a0e201b671c91104ec60ae SHA512 83e43b969c72ee8a9383ca9cd4ec015e7229382898e3b83f33a9bebdcdc40d572882c8ee1ea8325752c2a0be9cbea9947ad7bf3635dfcee351970a9de548d009 WHIRLPOOL ac983c50186d1b5762c1ee0d17b1e7a3bef5560f9882572e63e7e6887e2ece4271a486030bad723af3c05c6131ebe91adee7a3ac303cb988527f136b473afd7a
 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
-EBUILD adobe-flash-11.2.202.425.ebuild 7046 SHA256 d8d3b212c6c074ca5d08a86db138beb9860ab086b9650faa8464cff313836d34 SHA512 5c28a5610b2be3272fd650494f4ef587afa4171b51a6d1c9c7d686a0e68161feaa87c531b4bccc0a7fda3aea0ff97413c44f70178afccb8a6cb6d983b85e5742 WHIRLPOOL 50228914550fbd3787e97644493a76bd3c2af66d722d301b763423165004e0ef128cf1289a18273fce2faffab14287300d121d573d66d998d2adb8e5459a2678
 EBUILD adobe-flash-11.2.202.429.ebuild 7046 SHA256 5af940d4382668b62892b47bb2421e164bc48f92ab076ee10d1b3f8ba2cd6e02 SHA512 1a59ee317a820e89467d0e22ad319a5a0d08da2f9d04b5590d316358980a071cdcb5a8d2ebd715f5e015953f04d06fcb2457a84f5262122801c03d364abdf314 WHIRLPOOL 91b8abfb74f94e7ecb5775bdcb49d981ef08ee24c1ecbadcd897f124ce34a2fb5616b5c0db447720b65a1f33a1687db6f7a81d762457015195fecbed2c720854
-MISC ChangeLog 63004 SHA256 63aaa71fda3427ccafbb91acaed6daa6ef35040cc490dada30a69ea3ce3fbf4d SHA512 fc540702d4fe1554288eb48db3e27fa4871fb2abe24c4c36acdf080e61414b3d316d239b8b87b80adc2081b3642a6bfe3d586c140f375f3ca457a5e53494009c WHIRLPOOL fe135b2a317a3ae7824f302db22ba306fa18e5ff44931ac0e32a2c287df23e0d386bd3acea628e1d0f5fce85e794b577299be4eb20c420fad25b3211de5a3501
+MISC ChangeLog 63095 SHA256 ed67907926ba0f8a46b29c93acde695f1e45f07ceab8f12a1e6e38ea88ee9936 SHA512 70822a173e292f68c1a305aa0b87df51ee47cb138dc06e7de808bbbca1713cb90770f98e078687c489ea73eeec8a537c905e2bae5387414a914a37f6ab589744 WHIRLPOOL da0573fe103161ebad12bc402ccf83d9757521baad5141120480a8ae32ed2beac0139a6af9412ac11a4f2888b228e9df86604c57edf7a90d9a7aa52ae2c4d34e
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUtlhvAAoJELp701BxlEWfvCEP/21oGqMaDnSwgc/AFtxMa1+y
-jXxoa/Yjg+UvOO+0a38UQsJwTs1lCQTZKSOIx37Mft3Y+3riZBUkc6Foxhh5sa/+
-Bt6EEdXRWWkjVNkKGgxpWi0EDfOVA23GSo0a9D8a1UPJr/oOdV+AwLb6iHaheC+A
-NrBX7AhZFK2eEiZHUiDlYfo6dAwWowFxpwPYb1Pc6QSZ8xq0W9FZcYh8FNr7d1BH
-5pTyv/qVPt+fgEpLSf9HM2jdondve9JTxQzRRE65O9B8OT0lsLtHnTRCGrIYr+6w
-iFb6uBCIwCB/1Tm1LlrUtqSytclcP6P+htLDYMOrgiI/NrJp7ozTVHV5A5CFLsrd
-wRE98fV9zm5zmAnGtKGXmjgxt6JfQiUhoBG8YGWIe+Kq4x6qQnA9drxDpFwx1yJg
-+taAlbMaC62uDWQTCEEvBnLav5JTbUsLYydm2EcrMPMBMPAofJHgmRat6KyQxpBV
-nEnj9F8UdpK3b1PtfsZLY0VKYSeax+BPEWpRcE03bj2eANAwNfufUlDIMKy9o9Xt
-2kx4rAGvGm4e7lCjbmcRtuTYH58lbS4caq57M+BOMzriLhGUMf6bTTnOQ5+D01kQ
-ORyIPF5KwazyQ5bLG1sXqg/ZO8h+Kh5BBS4agdkvw1xheH4ZFDJYUMRbWHng2zg5
-YHmNFMOkAhof/hV7+aTU
-=AKRv
+iEYEAREIAAYFAlS2WYAACgkQVWmRsqeSphO7UACfcHI5TY0PUmQcBRIa3umlp4wh
+1SQAn1kkCzH1RC5fOoyWEGOAUy2iCKN/
+=lqaq
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.425.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.425.ebuild
deleted file mode 100644
index acd7e74b355c..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.425.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.425.ebuild,v 1.3 2014/12/09 21:37:11 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
-}