Version bump (bug #552946).

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

3 files changed, 249 insertions, 12 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 0a1404f20cd8..a15a1666d95e 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.315 2015/06/14 16:42:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.316 2015/06/24 04:23:04 jer Exp $
+
+*adobe-flash-11.2.202.468 (24 Jun 2015)
+
+  24 Jun 2015; Jeroen Roovers <jer@gentoo.org>
+  +adobe-flash-11.2.202.468.ebuild:
+  Version bump (bug #552946).
 
   14 Jun 2015; Ulrich Müller <ulm@gentoo.org> adobe-flash-11.2.202.466.ebuild:
   [QA] Remove emul-linux-x86-* from dependencies.
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index bd82a1265d7c..72e0b616114f 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -6,20 +6,17 @@ AUX mms.cfg 4420 SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8f
 DIST adobe-flash-11.2.202.466-debug.i386.tar.gz 7415367 SHA256 9bd88305af7bd3460da416cad520dc021ba3dd7a9c526146a771d078e68f0750 SHA512 d9bb71a213401d579955714c8aad33dee33b013d716a5a22711694311fe74789502e934a40c3c8cedd4926bd6ffcdd59ddd8eae1b6f3a8fa24430a888632c571 WHIRLPOOL 84aa575aaf084d4a12912a917c12e8cc8dcf3d1ed782c5ffc891440a49f2b8f0f222fd19a0ada917d92e43bcb2af54184ba812f8b04babc5ec085eaf04095bb5
 DIST adobe-flash-11.2.202.466.i386.tar.gz 6934400 SHA256 30718b8af36247d5713e63e533cdb67b9f98a8b241e203c9d0fd34b34654fdef SHA512 88e8c3c0925079b74907041127a9c2be3e7c3403fe5dd7bec4e02fffd62ea46863710f58ca866c918f0c0e4e092484e951c197e4f11c0097a5783ed5575839ad WHIRLPOOL 2ec4b222f20d8184cb055ab509aa5685ae48f98c0d38f4ae4a4d3d55564b9c77c8fca1ec87da37b80d500e85651bf28c342b50764ec8d7b60210a26b8edbd6d5
 DIST adobe-flash-11.2.202.466.x86_64.tar.gz 7246913 SHA256 a884194f5125144b63ba8137f7859ee587acfa4b211ea9d13093bd5330749cb2 SHA512 ae7249b83cc943f98cd77dc1603a8ce30d93ca7821dd3a598888a39d16e109cfc15ee688654428889e06bd3a6768fb0a9f84078c36b478dcf6fefa43967f7533 WHIRLPOOL 7b7be330547d3f527918d0f8580932f826acec8f5b5ac1764b104468fb4c711c1b6a054b1937baf5580511b43ab7828d75158b2c4a99a096ca31e41404cae86b
+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
 EBUILD adobe-flash-11.2.202.466.ebuild 6800 SHA256 d09497222e2edc46bf57c8ca0740d8eecb964f925d1b7d81f19f866e2dbcacdf SHA512 fb62adfae6cc00f909c1d7db11c4c870d6f902f040e5a9690e99e438cf7cc3d5d3a6cbda92814e81a717eb09b2fd897a893e6cfbd721a9b6008b60a4ed8dde56 WHIRLPOOL b8de7173e0a81d7558b512a34df05741ace0786acaa23668373bef776de521f60c299be1891444942ce55b8bebbd95e04dcc5ffffc579951cbfe0a60cfd45fb7
-MISC ChangeLog 66500 SHA256 847e281d3dfc49897d9b03e9b3df3d96680398ce035d7c7da11e05a741ce9cb6 SHA512 324ef7316d8235bab465386518680d783343c321f576a0cda45daedf3aeab264359b6b33edfc90c51fc79deb2d727f338d5bccf2ded947f80c4fdc70fa99ea5a WHIRLPOOL 95c07a7dd77d35525ed494a23f17f398dfa44efa00cddb3bba2e8b1c7bf91684b92ff8534d515de138a7a5f2b0823c789d8a86c00a66a993c9044a8e89b7a6f5
+EBUILD adobe-flash-11.2.202.468.ebuild 6802 SHA256 858e5e7118730c353497dd347411364abdeb5a2f3ca16e4889b23c3d7fce2370 SHA512 94667524b6a792cc3a36a119c5e7683e553558238e7aed0ee279f32b4dd410e6870c829a050a46cdb1d42eedd046b2c63469fd08adc5b376bf43d64b07f27e90 WHIRLPOOL 2a24ff72d21a33fafec41dabb8190293b50b091b58ccdf9dd273dc86e273f08628ac1ad1555ed8913f94a7e88ec7fe1429403d2223c7b4e8acb51278af65a17a
+MISC ChangeLog 66655 SHA256 c567b2e41589c32e0489ab4ae1239fad3f1e5457edaa8a9148fd23f169fcf758 SHA512 5a7727b80ec39c75b38b0b544fca201540dc022b8b0eba67c0369fc2e24e8b5b49271508a7ad7cc67144e39145e31511e224cf4e23e18ff9a60aa73e34812992 WHIRLPOOL cd1b3aa9ec634fd996be9692b872cf0658c2aff3f568680b3d38e2c0978ae1dca0c5e3ca1ca2ad7c97d04dc76e348bbe881658889d5775b29bd8e00d07b9d393
 MISC metadata.xml 321 SHA256 8deb56ef6832b7228800012723bae22d3eca62c387a3080bca3a98010767e00d SHA512 a728e401d2210342cc1747de4291136d3fbe25060eb0dec35a3b7c8ca5c082acd95780ef5b8d33d5d0a98f372367b5424b6dd777902d4387188758ad8dc0a09a WHIRLPOOL 5ab060286049fb7bbb0e9461561c2f29cbaa5c42bb9d44901bcf6a0a56726879c6f2a65ee08b9c278441a072addcf09f6c2f481b5c008818c25c9911dbf95a4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJVfa5wAAoJEJQzkH1pP7W4o08MAIH9BBwcAVcN0NvqF/YvETeb
-bwbtZAH8757aLsFQ4YzS63wMI8S4KYzRS6MiYhprFIuEOUY3b+r+UD0hR2X11hBd
-gBRLDxnCcxUP9hwZj+juX7vulHzZ64L8UfifTuJ/JD0Rro3zrHABu3Uz9foNbztt
-tEDiOhxntCZnwofBIO3OH1X+55tqpSutKCm+PjqTWUSjvU0PRhgh6zINWb0ky/d1
-GX/xDCf4cKcKQyOcnKHSGk1Jw4C9J4USv55errm/K12T17dkBQ6mRSuNawmhBlXi
-e59W+1cJ0AfuMFtz1cNmP0CKFYicoZ/mHMnQiaY4pDB0yoZeFkjVb6Kg8aBMcnL5
-uQ3WFfGkQl1PvRRMOy+5tgZnL6swoeZI5WFfwItNbCwW+l2JvAUg2jhpLThJY+9a
-eWVoZlLikCjfhfz3BqkVE9RzfeolCehayk245tPjlysPQyuMhKV+/oUtP6QU8sTu
-6urZzW6OFCUZOmVEp3RtBIlSu9A0r+T4YBUalXOwHQ==
-=Om3x
+iEYEAREIAAYFAlWKMKkACgkQVWmRsqeSphNRvACfVCmgtPikTHExtzAsxBy6XPSl
+NXAAn2VIfPwObngjbOCYjULo/ahQIm7y
+=AruB
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.468.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.468.ebuild
new file mode 100644
index 000000000000..43a8174ec319
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.468.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.468.ebuild,v 1.1 2015/06/24 04:23:04 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
+}