Version bump.

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

3 files changed, 263 insertions, 5 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 6652bdb8a45a..f4c0b7543f51 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.287 2015/01/14 11:56:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.288 2015/01/22 18:13:50 jer Exp $
+
+*adobe-flash-11.2.202.438 (22 Jan 2015)
+
+  22 Jan 2015; Jeroen Roovers <jer@gentoo.org>
+  +adobe-flash-11.2.202.438.ebuild:
+  Version bump.
 
   14 Jan 2015; Jeroen Roovers <jer@gentoo.org>
   -adobe-flash-11.2.202.425.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 32869477cb7c..c9df2f1c0c52 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.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
+DIST adobe-flash-11.2.202.438-debug.i386.tar.gz 7406493 SHA256 9cc836d54d48260ebcd9629e8a221512bceee99411587e2537f20f79f3572fd2 SHA512 3db32b92cfeb1dd306872ad1d1b53b2c4caef5e5379e6bea8b5a570fd169f6107a6667256020845dbab06d2a18f2964659d50d16fc1b47db5e8b8138fbd743d2 WHIRLPOOL 2f2bf561be78dc319151e4926c358440c65f5e4ab06ea7dcbf40d11bb210872667982a65403b4b52f2ed38684642601138095430d737b51944bceea1e4b98305
+DIST adobe-flash-11.2.202.438.i386.tar.gz 6926814 SHA256 aba7c700e0efe42be5995b61a6c2069b8f2208da209ad7e652914aaf6fbc6950 SHA512 3310d160154ea3ac0050d37d95d98b695efab02c4fd82725cf0ed46515d5c8f99da9ce1beaa4669b161fc18199e4fded8eb3f73fff679147d04f114726de8af4 WHIRLPOOL d6abd13528dad1fcb18ffb479ac59c99da2c49ada1a67eb5f11edb6e483b020c0a7f1dd17cb5d32ef9c9d8959278237c96b1710f300cdb5f7b88045bfb9a63de
+DIST adobe-flash-11.2.202.438.x86_64.tar.gz 7240645 SHA256 b923d0a82ca4daf57a5566da411c319691214f8b092475c25f5e686961330ab6 SHA512 70b8311bdbbd1053269ba1d6b3767ead3c44dd94b35d5153af9cfb763c346907dfabe3bfef1c5968c29353d1c87ec24e615c6db54f87cbc7c5f419095e69df74 WHIRLPOOL f06189583d9aa75040743ad7345c02354843f3a9e3b20b239e2358e742d89f5783b6a3fa5f1436fdaf38d2769d2df39cd6cfeb118b7659bd909203e4339f34a7
 EBUILD adobe-flash-11.2.202.429.ebuild 7046 SHA256 5af940d4382668b62892b47bb2421e164bc48f92ab076ee10d1b3f8ba2cd6e02 SHA512 1a59ee317a820e89467d0e22ad319a5a0d08da2f9d04b5590d316358980a071cdcb5a8d2ebd715f5e015953f04d06fcb2457a84f5262122801c03d364abdf314 WHIRLPOOL 91b8abfb74f94e7ecb5775bdcb49d981ef08ee24c1ecbadcd897f124ce34a2fb5616b5c0db447720b65a1f33a1687db6f7a81d762457015195fecbed2c720854
-MISC ChangeLog 63095 SHA256 ed67907926ba0f8a46b29c93acde695f1e45f07ceab8f12a1e6e38ea88ee9936 SHA512 70822a173e292f68c1a305aa0b87df51ee47cb138dc06e7de808bbbca1713cb90770f98e078687c489ea73eeec8a537c905e2bae5387414a914a37f6ab589744 WHIRLPOOL da0573fe103161ebad12bc402ccf83d9757521baad5141120480a8ae32ed2beac0139a6af9412ac11a4f2888b228e9df86604c57edf7a90d9a7aa52ae2c4d34e
+EBUILD adobe-flash-11.2.202.438.ebuild 7048 SHA256 72b74474a81db6290e010f59dcbf824e3a63a1a7b0b713fcade09c367d822de3 SHA512 cf69b2fbdea260cdd564c7d4b6ba735b0539740691fc72968843faf0b6f1cee3b1ba8f130a4ee39bf870e018812cbc0116e7a796cd0df63bdf6edb9c9170cccb WHIRLPOOL c180e02ae7ddf3a34a6b19eb8e093eff96b49e38d0d482cab7c42b69be0eaadb7b162a952f11b8da9323080f7123f199f32e1175580a07a9f885e1090ee66ea4
+MISC ChangeLog 63236 SHA256 bb3506145ac03a024aeb9f8b2313e9b99d638825c9c01789eb06e80cacd7f1e4 SHA512 d32bdb293e11167f6679c326b5dbbdefd57f73709fc6c03c95a7b3b453cf8a5367753f1c86420a6007056eadf29143cef21eaf4de87cb062a4362c8caae104a8 WHIRLPOOL d6e5c0bdad38047ee5ec9a8030e1b267d9b64bdf66ef753a5f25a9de3942c3a361966e489b5d78dac996ffeca8a6ebe85a2a4624a900ce428d4d12a5e64d1ba5
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS2WYAACgkQVWmRsqeSphO7UACfcHI5TY0PUmQcBRIa3umlp4wh
-1SQAn1kkCzH1RC5fOoyWEGOAUy2iCKN/
-=lqaq
+iEYEAREIAAYFAlTBPhMACgkQVWmRsqeSphN3ogCePKsfu8VO+kftAZSWPiIJ5XWw
+kUYAnj4wra4JXFNBRiVDE1BCT80tKjq3
+=qgZF
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.438.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.438.ebuild
new file mode 100644
index 000000000000..281ddc757a24
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.438.ebuild
@@ -0,0 +1,248 @@
+# 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.438.ebuild,v 1.1 2015/01/22 18:13:50 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 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
+}