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 730ccd945b48..576fad9b6a96 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.279 2014/11/28 10:59:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.280 2014/12/09 15:08:10 jer Exp $
+
+*adobe-flash-11.2.202.425 (09 Dec 2014)
+
+  09 Dec 2014; Jeroen Roovers <jer@gentoo.org>
+  +adobe-flash-11.2.202.425.ebuild:
+  Version bump.
 
   28 Nov 2014; Jeroen Roovers <jer@gentoo.org>
   -adobe-flash-11.2.202.418.ebuild, adobe-flash-11.2.202.424.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index ab00138b0e04..5943fda102cc 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.424-debug.i386.tar.gz 7406275 SHA256 d4f056ba44125a1dcfa2b43b7404f1b70af6055b2fef1f7fd72138ca1e4a4a01 SHA512 9275430585efc060f2375659dfbc45e407d91906083c4e24f3da86858b1cf7d3f90e32c550acc3de4832885a1ba4cee7b1e1a8afed37c44399f11c1fe4945d64 WHIRLPOOL 84fe138360753fee334687e878421af9eb5f0fd4b294f3429667d1b94116e67734f2a123eecce3fcf9e1a080a3682aa5efb70748e5a511141af163236f9dc8a2
 DIST adobe-flash-11.2.202.424.i386.tar.gz 6926508 SHA256 5661d38963f1636a1c858184df657a20a7ce24f7d2f42f61c91b61f30ffb94ff SHA512 c18a0df282aeff7165006a622e79eda21e0c773120221d2529e9ebc73fd3c27b3b77c67fc06896ceca257b262f3a30f3b21f9258f1de34ffac4c11da740c1e4c WHIRLPOOL f776f01ffd4cb144633aaa06d5d222ffddc3b48137334a4cab2d9cf71033f90cb93d634f10bd99117e27b852e4450b1e9045334d45e7bfc72a1e682040510bfc
 DIST adobe-flash-11.2.202.424.x86_64.tar.gz 7241264 SHA256 e8c3768ec878da19f3de9dc75c22b3ef0a9cefa4fc799a4fe809efbde83973da SHA512 7ce511e58f74d4d92c8c29907e080eafc54ab9cbe7e64f3320639ac236a1c18a7237e23b8d9af60e9eee62b1e42016dfd50655c7cf26bb568475a6a80482b254 WHIRLPOOL f8f83ea6440cb4bcdcac9d1503fbeb00c675cdeb7001c41f02411eb34ab8361996b5443d2926a3193ef9326cfd690f1953574b5ec186373b3fc165fe7997dde0
+DIST adobe-flash-11.2.202.425-debug.i386.tar.gz 7406303 SHA256 0e6077387d74d2f7ddaaa30f23bd92f13877f865d271e8c01f0050c3c1019afa SHA512 35c1864781738b12d155ae26c0871f600d0300b18de01682eb11fbcb096f7e63bae1dfaee44b535a1ae0cd1fc828f9e938d92f2298a2b281c1b8bf518c3ca829 WHIRLPOOL 98ceb92881acea3c3fea6d14a033b76e27f8497f6d4da0fc5bbd2d9cacda243522dff6ff9d97dd346fa4d4bc2ef1b69d1b8ab20541cd5977e8e7a1e5af31847d
+DIST adobe-flash-11.2.202.425.i386.tar.gz 6926590 SHA256 0be4858e345e078fbb34a6eeefef53ed1bc09dff75134fc0508c37f080b99149 SHA512 9bc93486b59caf739ad34abb129393e216e6623bf2781951c4d0bd481fbee90830b09403903b6103b52995b1ef4161a78a6505080b8122877f726c2daec79dfb WHIRLPOOL 4d305f53f0a03640ae15eca0473d05e55cfdc7d13b0fe74c437e2fdaeebde851a76a42104633aab46af08d313e24d871f7827318b0943a5b34c50c9c32332f5d
+DIST adobe-flash-11.2.202.425.x86_64.tar.gz 7241549 SHA256 8e2a41b8c747218eba50223e87e1d47d693a7700f5a0e201b671c91104ec60ae SHA512 83e43b969c72ee8a9383ca9cd4ec015e7229382898e3b83f33a9bebdcdc40d572882c8ee1ea8325752c2a0be9cbea9947ad7bf3635dfcee351970a9de548d009 WHIRLPOOL ac983c50186d1b5762c1ee0d17b1e7a3bef5560f9882572e63e7e6887e2ece4271a486030bad723af3c05c6131ebe91adee7a3ac303cb988527f136b473afd7a
 EBUILD adobe-flash-11.2.202.424.ebuild 7046 SHA256 ff257382b44ead2051fd2edc4e3cdf610a0ccc5624a3240a8a950cd3d547c532 SHA512 562f8dc6fe3184ab20a240ff6beeb4eae2c5bc2a46492e22843028abb8c6ac77f22c97d5b7882546caf0b86068a9a39ed37d94ca7d49b84f45770676c7f653a3 WHIRLPOOL ef6e89debf25e43382df6a44a5af4af238f502ddf725e6c43f8dbc8068c959962b005b7f8794b83687a0a020c98674c9d649c335e928111650cf40b0349f968e
-MISC ChangeLog 62137 SHA256 3d4246cfdd41614ea01d8a1bffc48dd19573b2655b8d4360f40cc8c673a28ee4 SHA512 9cf9670c6a4eccd8a9e9cb8e19760ab19bb66794a304aaea572b456e83d7e91a466d8d0ec048233f2d16e2719e0108a716795639269d0150995809dccec40055 WHIRLPOOL 502a948d5e8c01f1d23d771d0899fbc054788710bad87a7776e994810e96bc6d1fe8204831e34ee284db98aea1daa85d1bf588a31f09a8b36158a4e5714775b0
+EBUILD adobe-flash-11.2.202.425.ebuild 7048 SHA256 6b2f984bb218adb20806898021e7b2f3e3a9eda5968355185937652ef8c17703 SHA512 db6b86c3a2c6576bad04547dca9f7e2c2cc534cb4ecdf47935296c7e2e40e2ba02aa3daa30b8288f5f5ca18edceb105a68420c433044f5c6757c596db861e1e3 WHIRLPOOL 852e368b970da978791c96a40b6075864dbde1a59cfc22ef9cb950d7192c943ddb37d857b33480490928a4f32c4ef4f400974ab3732b415d59d1c569b8fd1fc9
+MISC ChangeLog 62278 SHA256 275f6aba4f1ddf10ac9a952069549fcbd09f5db6198609b6135213a6e01a83f5 SHA512 ad8ab262ef07806507a8ab97a563c924d9f842f91dc4b56b033a4bdb304cc738f66c6d557d9df2da7801f56f07f0161c1cc9a3b2aa849706e110db19948541b5 WHIRLPOOL eaeee926909633a98e8c16edfd8472b90ea7984bec7ef5738f3124b304ea5dcb8e9b447b1d802d434bd77c2e8ad4b698b3b26c87c8bac32e68e31b0be73ed81a
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR4VZ0ACgkQVWmRsqeSphOS4gCdEODQaNN4UOB6bHCodMT0Usui
-yawAmwfc3wZjHc2/VaZ1fYHpONyxyWBS
-=t/Pj
+iEYEAREIAAYFAlSHEFwACgkQVWmRsqeSphM0hACeKwu0XjsoBPAjdrntMzWcpSrO
+2mMAn1inwuGC7xG3iNQ0ygclPOvbXxCh
+=Jn6s
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.425.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.425.ebuild
new file mode 100644
index 000000000000..291ffb3c66e0
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.425.ebuild
@@ -0,0 +1,248 @@
+# 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.425.ebuild,v 1.1 2014/12/09 15:08: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
+	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
+}