Version bump (bug #549388).

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

3 files changed, 264 insertions, 5 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 39fea8378c24..c4eada03db92 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.308 2015/04/16 15:42:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.309 2015/05/13 16:08:30 jer Exp $
+
+*adobe-flash-11.2.202.460 (13 May 2015)
+
+  13 May 2015; Jeroen Roovers <jer@gentoo.org>
+  +adobe-flash-11.2.202.460.ebuild:
+  Version bump (bug #549388).
 
   16 Apr 2015; Jeroen Roovers <jer@gentoo.org>
   -adobe-flash-11.2.202.451.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 341eb3d2d484..e3a4874e5950 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.457-debug.i386.tar.gz 7413102 SHA256 2a39b71b988d90abca6e21aaf89bb2cffcc7678414a6a68bb803a86dd0433596 SHA512 18fc3445a538c75eb224f80cbaad2b76384df05cd95a95dfa6b3064d96bf6595e28b0c263df24356c753fff4f98312000100246767b9fded4c432c78f71caf19 WHIRLPOOL bb1f3b827d8012d3ab28a57abf2cabafc997f0616dbaa96d70db489a0d93c04d1b837666586ec965aa6bb61483735369317ae407d2916ea54199b72e922e1cbc
 DIST adobe-flash-11.2.202.457.i386.tar.gz 6933677 SHA256 6c123f7ef61a8a3ae92ffe75ce635f47718193d8360c191d4076ae60562e3462 SHA512 35879110bbc04c84f600d2c81b2de5216d537de81223474a567bc0ce8cc938f236b83b9f86b0e5852de6548a4bfda756eac23abc08e0ce34997766c3bf4495de WHIRLPOOL 9b09243a3130ba45f7202e1d49c99f1ffb57ad3413294da417fc435c630128198eefbfa304ec04a8c5e286d1c665c961d03dc4ddfa098bb2db1386e5e658de49
 DIST adobe-flash-11.2.202.457.x86_64.tar.gz 7246975 SHA256 22fb9acb4876afcdf74b52843a704e3d5096cab86ae92035f703d002c935795a SHA512 04865d812affdb69cb5d42a3766b17b0e279d47953a64e6d424f4b8dd1d8223c726f46f3e0b29ebd445bd06cfb68adad5b6806248bb0668a964c081d99c79ff4 WHIRLPOOL b5242d545f603bea31f06a0c837d491624b769922eca06b3f1902628e1af78b7dea08bc41ed9448d6a009e803a0b5d267179f01dfcbad0bc787adf83c0824ec4
+DIST adobe-flash-11.2.202.460-debug.i386.tar.gz 7415560 SHA256 5bcf0907be776d9879a177385acea073b5507d0cf35a09cec4a049c86447e6b9 SHA512 c6c0ce0332df30754ad0bbd8de1d032d511c9426a9d757ce28080de88f4275cbcad66058746a4e1b5fc45e51ad7ad649e3fa0628831dd4e53ad61fbe27dfd222 WHIRLPOOL 7872fc00f683ffaa8cd16e204b76c23ae15b6cef188dd728e03d550d9e1deadf885a604d18d06b26608ca6097182b777470288024eabf81add9722d8aedd9504
+DIST adobe-flash-11.2.202.460.i386.tar.gz 6933479 SHA256 a11f686f9931727cc8d1f2c9e91294e57f1245618f9f71009835cc3f072bc594 SHA512 33dab18c69f0dbe603bebd0eb03ba3aa49e19fbfbf63dadd092af1f1d4eeaeebfc80f83074f706572cd4cbfce1299eb1fb5ddd5fcd40ac937a7d62ca0a2fce52 WHIRLPOOL fe7379d6ac6ad3f387bc278c4521536dafa3b04d28aaaf09e70f260caa803cc45f4c62283543de66f58cc4cc024a4eb51e850d3f4ccffefabe5c8112d25e845b
+DIST adobe-flash-11.2.202.460.x86_64.tar.gz 7247288 SHA256 d9e6d8bb58f37e6d4dda637ed1aaa78edfdc422f1fd50227347fbfaa63875094 SHA512 8d22a785d10f97ea5b53390e89a9b93b181705cf0bf7df55545117f0d819306fc66c3f0d4a36542d6508199a98f335e1fafaf5172c1309a757d672399691bd39 WHIRLPOOL 57e1766cb82990e6e9d7b507dd6fa36f305ec0243bf4c6807f1d9c13aadf21dad35ca16800828ac693a1480ce4f323ef8c019f4d4070bda9fc53475f51f32fe2
 EBUILD adobe-flash-11.2.202.457.ebuild 7075 SHA256 898e26cd2a3052df7f548ad4005aa16f47c79178a33e06358856cb9622fe305f SHA512 5f9fdab997a0e70571d9e85b5244891ceb75e2ebcd28494e8d691132e8e8c5f8e97db0a85bc08521a4bf993fd443724d697817a6e731bc473a1a851b84d105b7 WHIRLPOOL fe62e6260f574d5a74ee748c5458ad2c025594b6911f2c29c184419d12a051f6c2586266bc9c04382323cbb6e32347e46275e2a0bc573ddc21d105907acd9795
-MISC ChangeLog 65591 SHA256 8e03c02b003ceb841c5ba74efd9c1e43f8bb83cb092ac33548080316da63532b SHA512 29e19590369ece739dd84f0e29e6555e0a922e09c6a11d7ae28a39d31c5357a94314585f9951850af44a3937aeabeeffd05f29dd16e36db614cf8bb2cd9bf535 WHIRLPOOL 933979900faeff84647c59da0cdc940aaa357f747c7129e94d9e9ec48fb934024e98033668eec4aaefd9f83b557ed39492af12d2b4a2925cf42c9918d611d2d1
+EBUILD adobe-flash-11.2.202.460.ebuild 7077 SHA256 a67009ec909dfe509a7a8f54091b86d08dfc1b3c75366ad181cf54bfa00aece1 SHA512 645e7e8367e9b0f4bf57acff4f1ebcb4dc9327256098338080bcb72ab9634ff50c8e68c64931c40812f5c1c2d425efbfb6a6a473a8ed194a3c23e247a8b0ad9a WHIRLPOOL 98217232126349de8bcd31646920187af7a2e336f6fc7c3d103f2188a8ef148f7649317d56f4cad33b27afa530ffd3a75a11838c2c2f16935a377904e9c1284c
+MISC ChangeLog 65746 SHA256 79f9b51b600490719a546a36328da2bad1ba9f84c1a1bd0abd0192cc700c210c SHA512 a7e47b771e5be97e087d6692e13b15f8271ddb57e0b54e5bbf41c175459858eb6787da67e1d3d26513805a099fbf237c03452622f648cbe40997fd17938fecff WHIRLPOOL 2ab0ec0a6d5b79fb42e8d52d052ff11890b24a4f078e912d17ef2d37e15baf34c20f29e4915c6317ee3e9df9f83c77e8c879562a62b22a228dea8e2511434b9e
 MISC metadata.xml 321 SHA256 8deb56ef6832b7228800012723bae22d3eca62c387a3080bca3a98010767e00d SHA512 a728e401d2210342cc1747de4291136d3fbe25060eb0dec35a3b7c8ca5c082acd95780ef5b8d33d5d0a98f372367b5424b6dd777902d4387188758ad8dc0a09a WHIRLPOOL 5ab060286049fb7bbb0e9461561c2f29cbaa5c42bb9d44901bcf6a0a56726879c6f2a65ee08b9c278441a072addcf09f6c2f481b5c008818c25c9911dbf95a4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUv2FgACgkQVWmRsqeSphOojACfcFu7jxutMt+F7ix8HRtdHNoc
-/RkAn3P7jOOVAXbEhVlc/OU3XmAyKW2O
-=SNJS
+iEYEAREIAAYFAlVTdwAACgkQVWmRsqeSphO7xgCeMhjv7ZKGOq4Xw8xMVp5aHL2L
+hIgAn389JTd5eG7ObXqBcimUwyN9y9vF
+=0Vlq
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.460.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.460.ebuild
new file mode 100644
index 000000000000..8f9cc6a803de
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.460.ebuild
@@ -0,0 +1,249 @@
+# 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.460.ebuild,v 1.1 2015/05/13 16:08:30 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(-)]
+					>=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
+}