Version bump (bug #546706).

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 e7b7f95423f6..ae48ee67a447 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.304 2015/03/13 19:05:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.305 2015/04/16 04:24:14 jer Exp $
+
+*adobe-flash-11.2.202.457 (16 Apr 2015)
+
+  16 Apr 2015; Jeroen Roovers <jer@gentoo.org>
+  +adobe-flash-11.2.202.457.ebuild:
+  Version bump (bug #546706).
 
   13 Mar 2015; Jeroen Roovers <jer@gentoo.org>
   -adobe-flash-11.2.202.442.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index eec4b3ad4413..3661199aae47 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.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
+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
 EBUILD adobe-flash-11.2.202.451.ebuild 7075 SHA256 9658bcd5b1495185084a48ecffec617d3ad91a021e0fdffbb5261705aa081065 SHA512 d842d47af99b515af6fb32b225058f77fba6c676cb348c2250a641c038a29404f2e8aacb6186e07f478890c44817e4d50992cbd198266c258eea7b04266bff64 WHIRLPOOL 3749f22b11c903b5ccd34fa8fad5b391954d48d29116ba4a8efa31f06f66aa2c49744d2a8237100490d28b516f8671e361f85717fc4fe1727b1f5792bfb9060c
-MISC ChangeLog 65105 SHA256 6777994e97e50b5d8675451f9b7251d5995edfc49c9309bfe9fbb2f9dafcc3f4 SHA512 134826f7ddb70cb93aff279b15b1d030a51ee8c25c9599e42967fc7b74b5a86e9e3d3622dfee75760344b8291728e32cf437b60b227da088f2973ccd581050c1 WHIRLPOOL f6228971569f5d5e6fe113e32b8697646596b27d14dd8f4391077ce5b8b4cb833260ffb09f0fdda7b5da2f558b58362cfddc4f33248b7d92b6cc6c21d391a17a
+EBUILD adobe-flash-11.2.202.457.ebuild 7077 SHA256 0c62e358b19786b19ddc3fb7509e7be6992c377911d1a964ef98a309dd03eb13 SHA512 0ac2009b328c12c59c219d2659e4be320a298763ac4d8593529039fe95bf41218331f20cc6963c3adfa2ac04572b16440aa2294fb693b45bb387925d6d3f007d WHIRLPOOL a3fcf2a4aa5fa4a5f94a7edef453cec2b712307f4135b23628cea962dae1cf6e9d079eb70b7c26297b231cc599c655970c67e6b78b8e63ec72b9a0bf54465b36
+MISC ChangeLog 65260 SHA256 e6b2b93884bb0efc51fef5cf3c6b77dd3f142dc0ed5c2a34922a581077d2c8cc SHA512 3994616c0e5fdb8fdbdfa402d6127e3d743dafed2dc534b3a0d039886003acc0cd261d6951d3661cb4c8b75b8361c694f26efa2e29e0702d9c5cc81ae01496ec WHIRLPOOL bbf5f6c99139d372edeab0d87f82228cec0fd7382a4549a9d1149f5bc009c79bb67141cffe5bae04e9142b0242bc17fae9fbd01e082edfddada36463f40a774f
 MISC metadata.xml 321 SHA256 8deb56ef6832b7228800012723bae22d3eca62c387a3080bca3a98010767e00d SHA512 a728e401d2210342cc1747de4291136d3fbe25060eb0dec35a3b7c8ca5c082acd95780ef5b8d33d5d0a98f372367b5424b6dd777902d4387188758ad8dc0a09a WHIRLPOOL 5ab060286049fb7bbb0e9461561c2f29cbaa5c42bb9d44901bcf6a0a56726879c6f2a65ee08b9c278441a072addcf09f6c2f481b5c008818c25c9911dbf95a4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUDNN0ACgkQVWmRsqeSphPX6wCfcI1Y20pdNMBK8YxlC9/Izv96
-RHMAn1la3In7/OWzG61N2AR71MrXs6ao
-=RN0D
+iEYEAREIAAYFAlUvOXAACgkQVWmRsqeSphO2XgCdHcGnzHAntxtL4Vibwld4einK
+dGIAn1rWtb1pn9l2Xs/o2AbxBAtqJKd9
+=2Yf3
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.457.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.457.ebuild
new file mode 100644
index 000000000000..e5937daaaf94
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.457.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.457.ebuild,v 1.1 2015/04/16 04:24:14 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
+}