Version bump.

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

3 files changed, 260 insertions, 6 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 3414d24fd56f..390589881242 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-plugins/adobe-flash
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.227 2013/12/11 13:49:32 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.228 2014/01/14 15:07:10 jer Exp $
+
+*adobe-flash-11.2.202.335 (14 Jan 2014)
+
+  14 Jan 2014; Jeroen Roovers <jer@gentoo.org> +adobe-flash-11.2.202.335.ebuild:
+  Version bump.
 
   11 Dec 2013; Jeroen Roovers <jer@gentoo.org>
   -adobe-flash-11.2.202.327.ebuild, adobe-flash-11.2.202.332.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 1101d95cb734..64ba9a523193 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.332-debug.i386.tar.gz 7402825 SHA256 c6eaf175435e2f327ed757638a8c764f08e178ae901822a08ff8ccb7bc8cd4aa SHA512 5fbe32737a859efd55923826f8135f3711abb9bf1684ac1f5795e4344747a6ee8aa979fd77fc97facc8253f227e343d2a9349f0d9ed745e1d64274276382027d WHIRLPOOL f2c5a2cfe92fe40165a0eb4c07d3f89d57b8fd2f990b6579ff6499446af71f009c69c245b62d45fe9046268121c3b80a29242da494da6e0d6f42463bd25b7211
 DIST adobe-flash-11.2.202.332.i386.tar.gz 6923609 SHA256 01b643f24c129a724f09458c0cedec216e96c8e0dab020e07814304170c21aab SHA512 08bb0b349565e423ff8c62895c2f7b5f0e672afb1055a0d84e82ae0141e332fe39c6ef3c6354e9ac2750eb711af20304d07e1bc9d0490a80365ad10bfba3cadd WHIRLPOOL 9fe894ad44171d764ab6ce1858a86d4a46b42d71173372fa95af3dfc2406303edefd3b4d0fe27ed68d4b867f9c4085119ee5a29703ea49456f3f1de00265a751
 DIST adobe-flash-11.2.202.332.x86_64.tar.gz 7234961 SHA256 52f83893150aec94562a8b8f96cbd8471fa8453de930444fee0d7ee3afbb2530 SHA512 6eb77832306cef71601f40910ecefd5b0dbbe3c835ddc91c14448609c7e488ead5953adfc9ef23f7367045d324566c1bd9ef593e0e35a5a1848b9f11fba8d8d0 WHIRLPOOL 299b73aebea7831c4f8b77488712bdf8cde31c26d9f331afb16e1583cce24fcbe5993635770a1e6b2127d9ff6769c4c3c7d725220b491094b70637032bef38b7
+DIST adobe-flash-11.2.202.335-debug.i386.tar.gz 7402915 SHA256 2733c02b0267a432fbeeeed63d2de2ccd029d0cb88b47a113716f4076ee0d64a SHA512 be35d4c76c3ec742653755903b1289e203951a4a5e2ba8f6e8f8fe30bf7df7e1a52069361d4c947d42e7e1ab23db51795fc72b8f70320cc373a92c39a1807356 WHIRLPOOL dcf187995212ce205891de64ae193711b27f10bc2b533d261f57b75b7162402d8e863563d36386d92760ebc310159ba1d3ef09d4a727e791324c9fdcb5a2eae0
+DIST adobe-flash-11.2.202.335.i386.tar.gz 6923385 SHA256 71d403cdca7a0a13a37c024da28d8e07d765290e1df0e1b1e05482a7d4a27d46 SHA512 48539b4bdac82374391b64b9a26667e0ae3a54518b48851d094e99366c32a0a7bd02506abb52cd64e4567b3248ae2ab2d3784ea3cc259172260f1d8fb670bf62 WHIRLPOOL 512e72f2e42a598dd331e212d00b4dea69f594e2ff9c03653a21b6636a49f409b7718c8d689ed888bfbedbcbc6680ad2d6064265ae3fda1e633c0fe7c36d082b
+DIST adobe-flash-11.2.202.335.x86_64.tar.gz 7234767 SHA256 9362d68a274e8f934e542593a3be30ff760f1141f9b30220ec48d62f20d0eb95 SHA512 2b3127939bff24df2f628810c0a82032e21a248b213e5a0401742ec1f96e393748ef7c9998f34d612540906ce1711afde0811858ae739298437065426a456175 WHIRLPOOL afbe38bde6f6e64fd8b004f8c3db8c147ec416f6c92d6ca02f8699c732eefb6f465091471d0ef2d76252c23a50d58aed7df35868f941eacac97740bab5b31d79
 EBUILD adobe-flash-11.2.202.332.ebuild 6823 SHA256 4e08dce4cbc427e9a5209fddc87f6e40f7ff9c4c2350fff9d4c320e512917e22 SHA512 1bfd7a9889645b254a53a820721703b629332da3059798afef7062b5c400dfcb61e92281221521de62b92626c6b4cf9760240e7990f3fe7c69fb2ad8e4885ee1 WHIRLPOOL 63af89224fa56a5e81daa5274aa1d861cdbf4b6455f4b3b1a39cbe0879bea8fbfee6569f3f20fed89566e61458579e539e6bd95bc99e8c62fb1f914e6502d0d5
-MISC ChangeLog 55329 SHA256 5d492ac870c6ea6fcaa82cf753fd6d5fe091cfc35916cb3f5edd7806c99e3976 SHA512 0c5d41cca3d238de6f7e4a45f5324fb276c7779b74f5dbc7520faa6e594d4d193a013bb92afcdb7cc4a3bdc2ed2c1fa3f2c5e373c9192776f487a74df4c98e12 WHIRLPOOL 72c7991996a9d60e47ffd1a04b56f1e5d49df545d6828876078318e7e1bf5e4311aafb14da1a0d8025c6f247c06aef54d11a8c3ca6c40581648263c2636bf7d0
+EBUILD adobe-flash-11.2.202.335.ebuild 6825 SHA256 12d51ac403fdc46133b1d2626fc3c054c950327af8d4ca911a1eaa90f8375d88 SHA512 1d07b1a1782f22010338d23e9b78ae98b58689885c07245618a1f4d87d025af93b499fc7f14e6af6dff2f9d5a045ebc47680fee2fe4e6d218ae38b6d671a3b0f WHIRLPOOL 13653eecbc46da499838beec748a8ee66bbd4108f07c839213ac5e14a757e493db71851b74dac766033b1d9bc1c1ddf71f569abc24862e3da79648c4293ca625
+MISC ChangeLog 55468 SHA256 6a56a790c915fd7f57fe4cc5295831ab68b7bf766b94838eda371b5383183d23 SHA512 d5d84f57c6a5707846f7324646ca96797e9f53ca0ff0df8b39574a6319594bf6d777b5dc007d3d3b05651e445576f6cf56d7af14df0849e3816526816b84dec3 WHIRLPOOL 06f960658259e0d36351c98fff542a0cbb40429100f304fded3a008cb09754e8076ff6c5c248a5c3c7a569a45cbde84b2bbd4a3af31088c307b036e31082a088
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKobW4ACgkQVWmRsqeSphOvXwCfZo4Houa2z791wG6f8jrSKn3C
-hIwAn19LHV+gzRMUaKi5xqL8z/76qUpd
-=c3E9
+iEYEAREIAAYFAlLVUp8ACgkQVWmRsqeSphPOcwCfZGF7WjQe32iZBLgs1eiu5tju
+MdEAn1thDlCPKhkOUA3KYvVgm2SLrCMX
+=JBem
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.335.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.335.ebuild
new file mode 100644
index 000000000000..ce86bb8bbf4f
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.335.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2014 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.335.ebuild,v 1.1 2014/01/14 15:07:10 jer Exp $
+
+EAPI=5
+inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
+
+DESCRIPTION="Adobe Flash Player"
+HOMEPAGE="http://www.adobe.com/products/flashplayer.html"
+
+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 ) ) )
+	selinux? ( sec-policy/selinux-flash )
+"
+RDEPEND="
+	${DEPEND}
+	abi_x86_64? ( ${NATIVE_DEPS} )
+	abi_x86_32? (
+		amd64? (
+			|| (
+				(
+					dev-libs/atk[abi_x86_32(-)]
+					x11-libs/cairo[abi_x86_32(-)]
+					x11-libs/gdk-pixbuf[abi_x86_32(-)]
+					x11-libs/gtk+:2[abi_x86_32(-)]
+					x11-libs/pango[abi_x86_32(-)]
+				)
+				app-emulation/emul-linux-x86-gtklibs
+			)
+			|| (
+				(
+					dev-libs/glib:2[abi_x86_32(-)]
+					dev-libs/nspr[abi_x86_32(-)]
+					dev-libs/nss[abi_x86_32(-)]
+				)
+				app-emulation/emul-linux-x86-baselibs
+			)
+			|| (
+				(
+					media-libs/fontconfig[abi_x86_32(-)]
+					media-libs/freetype[abi_x86_32(-)]
+					x11-libs/libX11[abi_x86_32(-)]
+					x11-libs/libXcursor[abi_x86_32(-)]
+					x11-libs/libXext[abi_x86_32(-)]
+					x11-libs/libXrender[abi_x86_32(-)]
+					x11-libs/libXt[abi_x86_32(-)]
+				)
+				app-emulation/emul-linux-x86-xlibs
+			)
+		)
+		x86? ( ${NATIVE_DEPS} )
+	)
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
+"
+
+# 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_build_binaries; 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
+}