Bump #538982

Package-Manager: portage-2.2.15/cvs/Linux x86_64

3 files changed, 261 insertions, 12 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 40baea20db42..988b809160c9 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.295 2015/01/28 22:30:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.296 2015/02/06 03:31:56 patrick Exp $
+
+*adobe-flash-11.2.202.442 (06 Feb 2015)
+
+  06 Feb 2015; Patrick Lauer <patrick@gentoo.org>
+  +adobe-flash-11.2.202.442.ebuild:
+  Bump #538982
 
   28 Jan 2015; Michał Górny <mgorny@gentoo.org> adobe-flash-11.2.202.440.ebuild:
   Switch to CPU_FLAGS_X86.
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index ff0c67790655..c0f7df96082b 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,18 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX flashplugin-lahf-fix.c 1038 SHA256 52acc6658eb7d49fb167c848345f7dcb49e4057e2872ca8319bccbff6728df6d SHA512 c56082ca6371176a3454f94a7ee5c00aba2d27c969783b26740b6ff61f42e240a34b7eeacc736f035cc101709141c4786f241f98495654a67f61544a10ce478d WHIRLPOOL f43cc3b836c8d43e6d706d847693bd34a212eb4c4ba3ee698db0f752bf36a7029f81e05664ba3ebbb8190fca414dee3fc109e586fe5e02f1c6263cd6e5bbb8b0
 AUX mms.cfg 4420 SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a SHA512 597380071a06176f09df1a56cba24e83a74990c175fe9f167f026eacbf01e66a083d2389ff399ead0a39654a40ae636f8459feed2d6012e51e65c5407fe7fdbd WHIRLPOOL 915b86d717db181a776eb9392aaae2becac4747bc0e551900bfecdeda17f9d0495f54c7173e47adf2ea92567c193c466e302cac78bd2126f10fd9956c204596a
 DIST adobe-flash-11.2.202.440-debug.i386.tar.gz 7406172 SHA256 227553cf1b4b8bd6ccb6831013e1b1fa386d11156aba6e8dd40a7b26309dc74a SHA512 df7020b508d88f16cb005364e0faf6ff390986d34766b2259729cafc0fce1afaadbdf68a69c4702b6c266ee9b3914b3981f511a7702203a0269e0121badc9b6c WHIRLPOOL ba43742bdbd8e08d06c3a618a4c22b8f0c8a69ac32db544d590d1f9a693256ff092fbcb1e1fd64e4cd23315fa83cf8c57ebfcdafb1d44940e19c3b55e12642ba
 DIST adobe-flash-11.2.202.440.i386.tar.gz 6927249 SHA256 c4317e9c224ffe5f056605ada015739fd51a962ed4589ef7d92c9839c3d3c8e2 SHA512 85e9fda01f4db13e3d7d51d2bb55419b652bbc6765a75fc5cd0ebd8c0563a5a5d2184718f0fcb372f280ec9642d4fc135ecbd9ac071e57a0b49d31ac03f92d7d WHIRLPOOL f80b284cbc458681f31ea37d57bfcac0344268ac1862e41fad6ad92cde4272ef8db1f0a6600916ac01b1b3b8428913326d38561271267f45a98fa8117ba77709
 DIST adobe-flash-11.2.202.440.x86_64.tar.gz 7240820 SHA256 84c1b890bec0a8e1952e444de58c8c1b8e3a2c06687509323942fdc1cf3aa1eb SHA512 2730e3ce7aeb615cc896672e11fb7ee79475bafced9cafa29a348c9857ecf9b869346579a7df03ee79167b7d7dd214f57534639431546be891fb10d323f4a0ee WHIRLPOOL 410b429c41a9cd6c717b5fa49aee6c434a366ef85bd634d6681694758d54a2d7d52c2138022a71570d8e576b8bf4e109f6c4ed2c74b0f185596da929eec068dd
+DIST adobe-flash-11.2.202.442-debug.i386.tar.gz 7409646 SHA256 b519e74cd3dfc89e7621a5a4a78c009282c670a63db5762c730693e583a40cdd SHA512 30ed674d24c058090c24160b8ab1e0445ab7a73efe5e7d1c70d7f7b9342c9a22b39df713224b67d4cb7c2fb3da0b07dcddefafad54dcf8935c8c642348c17b53 WHIRLPOOL 6090c4ad1c24408bda69e2243edd0fe407b9218f499901254e50d635caf6da6e0b82cd43fdfff27fb343043368a8840eeb7d7092d038d43969efa71b11ce0c2a
+DIST adobe-flash-11.2.202.442.i386.tar.gz 6928808 SHA256 b5cdb9cc826c40ffa3d4917662d4f05ec72478c2c50aeef4a514902b1146e200 SHA512 256240dd158ff5984d57e4d369262bfb71879bc2269f034b443c0f5c639ca85ed84af2a7eb5aea48ea5f354a24e729ea8eda40f46fe67dbee02b4099aa79c8fc WHIRLPOOL b211e022fcb7b6bb948d5f942d881d05e4ec729d8be1c8891970eacf9412b5b5dda45a53c5fe2e18357bd591cd32b165b90355f3acac5066a612191c226522b3
+DIST adobe-flash-11.2.202.442.x86_64.tar.gz 7241885 SHA256 4850a54a9fd9af1d93c015a475b545ca57df3ceab48ccf153f0da54b690dd122 SHA512 6c67b67efc87b1711e21b340cba2f2520ba27e335fc2d9fca094e470a7ba16662b9f00f10180cdd8e45f3bee199aeec860ae04b97c290ba3e493b9fc5fd7257d WHIRLPOOL 004d0c88a2c5b0af3b0bdf8f3e756c8fba53af7702d4d8550b6ef6d5dca8c15cbd7aec86fdc0710735532d63a1415ed4aa8bfd9b650177dd92bf28950be23b82
 EBUILD adobe-flash-11.2.202.440.ebuild 7078 SHA256 07d81a49c324354068fee44838f38241a58daacca2870ea0716a6d08ef1478cc SHA512 845ce9649c975ade93039376a2aa307d81c3f687287dbfebcb9a7f5eb774b5aee7914914df9d4146453a98a83ff3afe5e11ad8171e40ea68ef0cb9c7b917c295 WHIRLPOOL a1ec7ff587fe7e72853a3ea5b02d9564a6f2400827e67e0dfb0d9fd14b7caf50b1f238f30f0a06d788711c237de362f1420621623027702f93c45c591c3b5473
-MISC ChangeLog 64046 SHA256 08252e45b0e94dddd6e59806aa4e078ed5758cc815eea90bbaf83b47c44d4544 SHA512 fdcc350c52d1ad584ac50fdcad8aaabb6139fe0aa0f67874a3d8fe3acb422a04965c39890ab83d7abde12611ece4a1697f9a68d81ff10483270777a3b8d884fc WHIRLPOOL 7dfde9867e3ae078218d5a415ca0bf7380e4685ea38a1fa2c57cb8b45a7af2483167d0a65e985175998c0982030f576049fc098731b120369612b50be82ad6a5
+EBUILD adobe-flash-11.2.202.442.ebuild 7081 SHA256 1f7b2ad37057889ba5276b18c59f44a3648153497e417e2ceca7f44a0acc50e3 SHA512 b8992d6d51ee836bddd29c6680bcfccbc9973d53dc1a62a5dea7373011d2493173c4a3a375071dd45e950f4241fde41c5b3853c3b0c5e60ae5a9654864442098 WHIRLPOOL 024ec8255bfa9d324bf79f863e65a6876465937b71b4fb57efa92e4d2ad64bdb4f0a69412551f3fbb21611f700fe0e9346716c9174400a2079c604ac3394364b
+MISC ChangeLog 64190 SHA256 4ce996e25ab777f675bad89766f32a7c886adbea95a9625f51934e6d32e4dfa2 SHA512 db82e693ff3e38354aaec993221668a48d7ac04e6224254f4f1b3ae2c8492b61ddc75192bc90d167d26a5710519c9ebd7fdfa7df30d4fc757757cde445867f84 WHIRLPOOL ed06d781110f7ec0f77be576bc61df2aad42d36731231c652f6cb61ff9ae94af37eaf1808b13b5d513626156a2a0566622406a555de704a24fa847024ee32763
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlTPSUoACgkQVWmRsqeSphOCGACfbkgH8NfZa7TMM1uPWtMJy8+r
-BecAnjJpxVNApe+gDMKYyX7eg/PhW4Cv
-=IYjL
------END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.442.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.442.ebuild
new file mode 100644
index 000000000000..7eddeef05032
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.442.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.442.ebuild,v 1.1 2015/02/06 03:31:56 patrick 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
+}