Version bump (bug #554220).

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

3 files changed, 249 insertions, 5 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 2c7b511ada03..0c36c68dfc4a 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,12 @@
 # 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.319 2015/06/27 07:04:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.320 2015/07/08 19:53:27 jer Exp $
+
+*adobe-flash-11.2.202.481 (08 Jul 2015)
+
+  08 Jul 2015; Jeroen Roovers <jer@gentoo.org>
+  +adobe-flash-11.2.202.481.ebuild:
+  Version bump (bug #554220).
 
   27 Jun 2015; Jeroen Roovers <jer@gentoo.org>
   -adobe-flash-11.2.202.466.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index aa798fd93bd5..58ae05ca7602 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -6,13 +6,17 @@ AUX mms.cfg 4420 SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8f
 DIST adobe-flash-11.2.202.468-debug.i386.tar.gz 7416165 SHA256 a80381ef428b64c7e04f6ee3d4c915d359e424ab856833acfb48199359ea63e7 SHA512 3b03e2fdb5b7a8171a91b93b1cfc8a828b035e273a63ea59c87933cb1facfb43cc8843a60d25086f06c5de72002956f5a6060a260145252207b2986e5e7bf559 WHIRLPOOL c3d4d42e10d135e2015a068d97969b03cae88e86642d9045da4169db668840e85856749fd048c2e07679c6af4b743ea6df5e13331db164cd9aeaf1ac600bf216
 DIST adobe-flash-11.2.202.468.i386.tar.gz 6935039 SHA256 146d5c67a78fb43ab8d48d3c73b05d3ff90654c004eb94abb31610a0da6b9fad SHA512 ac6048f17340c631ca239691137aa5ef5aae44237233ae6952795662826bccabf24297c75637a0b98fa978d756121533645b8499fb965adde9e05c8f4526f3ba WHIRLPOOL 4d71c96aea3bf37b7ec35af95af3efd7b5f13f61e56598e12853435e12ba018b203f52aaaaa5592fe51c1a7f3e4b7627942e9f96a33c034c8173f02c7d01a826
 DIST adobe-flash-11.2.202.468.x86_64.tar.gz 7247794 SHA256 f483be2fc948f263ad9a472bba041aff03a3b7a5c13bf2d3ff8442ce0acfcbef SHA512 0ca941c4a1157d0ee7558c3a772f9552ace0dc0fa1d900ef21048b6dec351f778e02fc6f70dc6f7f16f227a12b741578641c21e48d634599fbc749a3d4d6a56a WHIRLPOOL d870c3bf80cd81372c11934d536d7867f7d09ec582795223679cd87511d94cfe054bead41b6db36f524394507eea7a626553b58dca2916c77e601a8c040986bb
+DIST adobe-flash-11.2.202.481-debug.i386.tar.gz 7416138 SHA256 1efb97a14da8bfc551904218629870280f65c6221263f7cc8c27d1d1b5ebe484 SHA512 a440292dfed87d8394926e2bcb57f18a3f5c8b0fe9f94da5f4e01b3fd5c4b8796c4c2536b239e44dbcff11b2be131aa4c40ee7edca7b03211707d3756931439c WHIRLPOOL fc4bd5ae0c71e14ebbc9f0402357dbd6af172ff61996e79c300b91713b18d52811317171f53669c3ae53d42082c8259bf80b24a66a53d207edc9bd61ae697e7f
+DIST adobe-flash-11.2.202.481.i386.tar.gz 6936529 SHA256 76fbede606e9eda56c73541dd55dede1afe0e08ffbce95005989dce903cfcd17 SHA512 aadf27febdbc3235d779df973106cf0e4bca2bee1a628fe084f4b513b2c886788dd2e254785f94aaec46214efa2ed73b09db23045db405ea9edd38df96017af2 WHIRLPOOL 18f5ca0c92624b7ee152528965de8ca76709871121fb24843d6ae9a836d4ebfc11e1f6f951d14c3bb490be594bdf566b4789da48f4f916263a3135fdb67e0a32
+DIST adobe-flash-11.2.202.481.x86_64.tar.gz 7250105 SHA256 df2711b5bec70cde45625f60894b2fcdcb52b8d30b923d5c94dce31e8e892d94 SHA512 54285653004a93f1099a73d5f1e952072b4f923529b72399547d9be00060c998d0da897ea107bdf994db1c9260ab48677ac83aa3ef812f1a5a797a962fc08d7c WHIRLPOOL d0eb9c274df8078b35b9847fca09dda52e7e3c6dc8a69653b6bb1a3e9432465d0a40619195edc753896371c2f5bbb9aba0550b734b6ccbe42899ea05a2cdd9fc
 EBUILD adobe-flash-11.2.202.468.ebuild 6800 SHA256 aa259a4263a4a2224754a389b9fce35b485dcccfcc5d4127de7b3609b57168d5 SHA512 f944b64823b0c9836be063b20068768a994e123e93c4b33d026516080ecb362473ce7ad7f187631024a073d3c7f1e51d539b67d759e0e212743617cf7b1aa7e9 WHIRLPOOL 43eb00a3449a0d6959c084e3da9355d61d804bb062c4cc11e706133ed6b79874bf7b7efd9a42649dad255df3672cde9984933d62f02ea5eaa383f6f91862022f
-MISC ChangeLog 66986 SHA256 e37bece7d9d7da6ca18945cd28c3f90ed1288871a1042db2957da99cfa579f56 SHA512 c18ed420d4df824e773731651c8743de0aabdd0168edc29b288ec8343ca67a3f6277917a6f59966e677346dc3b7a8b52ef69a3d9d6a91d1055266568f4154eb4 WHIRLPOOL 7823078aa2697a55e6ae1802e01aac70562de08b8716e7aa4fbf045ac9c19774a61c1f77e82c0dde82caaf343a2c7282abfd533af31b275e121c8915be6eec46
+EBUILD adobe-flash-11.2.202.481.ebuild 6802 SHA256 21aaf518c531d044f4e02f9ca40286222c45fd39bfd9f299acb15a945aeaf47e SHA512 c0b31b3b7ed04bfbcb96f2959db834a9bd7f722776babed146a6c3c4d63315a7a1567ce41d70a6100af3c8ea7e5cd37ef7053ac6e10ec2246eb2ca8c31e8a3ad WHIRLPOOL 69a0643fc4b8d7548309a18e84c63b0869329d9642d2f0c81e85a829e849640911531189cfb80018b5fa438e74b3ea95d4ba39ebc711764eb0c9ac7c2f0013e2
+MISC ChangeLog 67141 SHA256 025934910a355a3cd5d22f499388d4c3c8535c2c59a0788150453e8ba3ea9cc9 SHA512 366cbc3694605998a9bb5a4d7173a087be77173fb86e21d74c76f6cf5f2f2458ff8f425cff1a2fd45182c2a90b835aaa1bea06a3bcab55cb39bedf2c7d337250 WHIRLPOOL 0cd23e07da628f477df2e23b1231e962a614b79a97396e44b4967f8b59f9c77c0f126a13db3dcf37e0db8e3123e99efafc93c6313108b0297beed2dc279fd9d6
 MISC metadata.xml 321 SHA256 8deb56ef6832b7228800012723bae22d3eca62c387a3080bca3a98010767e00d SHA512 a728e401d2210342cc1747de4291136d3fbe25060eb0dec35a3b7c8ca5c082acd95780ef5b8d33d5d0a98f372367b5424b6dd777902d4387188758ad8dc0a09a WHIRLPOOL 5ab060286049fb7bbb0e9461561c2f29cbaa5c42bb9d44901bcf6a0a56726879c6f2a65ee08b9c278441a072addcf09f6c2f481b5c008818c25c9911dbf95a4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWOSvMACgkQVWmRsqeSphMDIACfd8Y3K3CE7zr+125a0M6oLc+I
-LcoAn0vDTqloSmUnAmXrGGaYlDc3GZa/
-=8Jjw
+iEYEAREIAAYFAlWdf7kACgkQVWmRsqeSphPvugCfcPwcz3C76FnSdhp4/N0xVCEo
+/lgAn0+5wh42izFcXu48VMJR7rB9UJvP
+=PQ9r
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.481.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.481.ebuild
new file mode 100644
index 000000000000..51ee14bd9c26
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.481.ebuild
@@ -0,0 +1,234 @@
+# 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.481.ebuild,v 1.1 2015/07/08 19:53:27 jer 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(-)]
+			>=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(-)]
+			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			>=media-libs/freetype-2.5.0.1[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/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(-)]
+			>=x11-libs/pango-1.36.3[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
+}