[gentoo-commits] repo/gentoo:master commit in: www-plugins/adobe-flash/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     68899092d96bc573b69026fd5422cacbf4f08277
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 06:45:09 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 06:45:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68899092

www-plugins/adobe-flash: Version bump (bug #593684).

Package-Manager: portage-2.3.0

 www-plugins/adobe-flash/Manifest                   |   5 +
 .../adobe-flash/adobe-flash-11.2.202.635.ebuild    | 235 +++++++++++++++++++++
 .../adobe-flash/adobe-flash-23.0.0.162.ebuild      |  68 ++++++
 3 files changed, 308 insertions(+)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index f4e4f73..a459ec9 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,5 +1,10 @@
 DIST adobe-flash-11.2.202.632-debug.i386.tar.gz 7464481 SHA256 a0d82fdfc50912e89e9ee51777947ce02753c5c439a08ace4eccdd3765c57dd9 SHA512 ac16e3cc9d0ffb672b61b246a8ccf4c1211eb1af8fb24d31ad2d995a175cec885c4efc7375b0325ed2221124885c9e22e62c38ace4b29bbc109a8633277acac8 WHIRLPOOL 3f39e91902ff7d9988ab2fc14012a34b396aa76597909e3ea959ff3bda9f675cc13e9a1ec2ee1d25308c646d4b2d144516dacde4d0be6b44ffbae575eb53dbee
 DIST adobe-flash-11.2.202.632.i386.tar.gz 6986419 SHA256 c455ba9b72318d87434c7199a94ca15dc0f1c7fca590ee3703e013cbdecce942 SHA512 b33f4fbc888e10ce034cd2236272960bed4c429ee5c6f3f93162bbd1642fd6ee3bb5b0273654818eef5b84540c826e3c3dd039e982b26e93091532e5a30941aa WHIRLPOOL fe7d364442ba5543d4d7f54d0f039c8c8a69d5e72b145d12a0add32ed7635b56abd9966e49d577bc45733c6f81c8b43db20d2a407e188320d6def540d4f17493
 DIST adobe-flash-11.2.202.632.x86_64.tar.gz 7296191 SHA256 8a0cea025f854f2c6e139f623851eee60bb3842d5326fb7502644a1a94a6d1d7 SHA512 cdda85ec491d0e3b08333d8547fbb693e342cd73110231b2df8b285424cdf30fe7296892c2744c3a33eac2eb4b4562d08ecb8f80f62f45834e739e0bd13c3da8 WHIRLPOOL 5bc3a9079b18623d2ee227496d91429131075a2ba04d901075a0e83d599031909c2f750fd31e7393409994cd4ff0e164d2e5f67eea82fab4c95849d960d0c1ac
+DIST adobe-flash-11.2.202.635-debug.i386.tar.gz 7470860 SHA256 82ce5728503b42795d7e7eb055ac8d784661bcb30ea4bd5f2e278d32b7fb4327 SHA512 bb9fa2f7840d5a45012c73b16f0cf5dc268ec7d3fd610f2ac6df04d216036ee26f036691b7657919aea7887e14e7fc71bd55078aae760b0861e8d3c4c7b11ce5 WHIRLPOOL 44f15d5491f1974574ed41b8defc79bc454c89a54c1e8dcf248f6c4a6e41e3785f4fb81609535f8a0e087db613e8c795d3625f19107fbd3a736f83007380dc3c
+DIST adobe-flash-11.2.202.635.i386.tar.gz 6991502 SHA256 a55a147bb1e4a3ea594fd140db2cf21fd5c70b8cec66546c3e54f1d256577fea SHA512 38b9392e2f1315fb104f3b258cc212af917d894f31cd3a42c8772d824228bad87c6ee8b010ca71c4e7f5e5d245c22fe7064dc069af117f5631ed5544fe44a295 WHIRLPOOL 9a67879870358f66f6aefa227f1b564a9d25de7bded3b62b6e714f9fa0bfc60e86e3a8dfdadd181ec7261d06b1458b5a305462bef3fa206c77a7b14021dcdb68
+DIST adobe-flash-11.2.202.635.x86_64.tar.gz 7300571 SHA256 07913caafa295b90ec2e56d2f2bdf745a90622afac323d75961555e94420c8c7 SHA512 6a9fe142b388cd7b0997aa1c47a7f20d782478118f9d0dbe4572e3b24d7be036672a156c5dbbc2229f96916d7bcb82e1ddd98a86deba3a355fbdee612f6b7865 WHIRLPOOL 99aa83d44efa3fe0e4758c65341f43de7d270f9844429427c4f4479289bc5bc64bee633c883af31ef4b3a2aa04f94b104595988f2128ed26741dd80a7039cc10
 DIST adobe-flash-22.0.0.209.i386.tar.gz 5980870 SHA256 512cac431b46fd2ed96d4e724ffa0e67eacc9eb6b2066ab92b83323b017e54f4 SHA512 07ab7a662aa45855ce02aba5bd9367df2a73910f4a43869922c2d7c332b2bb6d265b5db24dfb0f2ff57d42f99a00e83a51fb8ffee3739c5d5cd9ae821e83488b WHIRLPOOL 50386c1c06c71338b3415310e8fb8ff796d44446af55784a6285dd1411d9b96e48bbb9970d02edb379271f9606b234c16d668b92ad9bc4f7d2262ce783d19109
 DIST adobe-flash-22.0.0.209.x86_64.tar.gz 6897798 SHA256 644b5bd10b0adaef09468ed9ee6f1d3fc4b3801d9eeb40591930ff40493135f8 SHA512 456052ff699c48b4d0c54439d57269115badef8940019b30999dcc8245b5b61394dc0b4095c71bce48e8eb2560369033b6d7e70a7a1c697ed6149707e85a5aa4 WHIRLPOOL 57f40d1d3361ec77344880b27d4d7195aa803469bec3018bc5ef73c0295dfd2f6bf0594b402f8f274b4df7ad6e9481e10b4cd841b57ab6627b5b508fbd852ca8
+DIST adobe-flash-23.0.0.162.i386.tar.gz 6000163 SHA256 d0d2788daff437e7f8d018bc3e10a190776d9bcbef556f6d343c12beee58ce34 SHA512 8857b2fda64d83429727e4f7713f86a3fe1ab7e30ef502b802fde9835bdbbe8819ee4f41deb9e90f6a39cf1ced84fff3f50562bbfe56936b3c1d74d8ba507ee0 WHIRLPOOL d99d99c4ffdcf546bb92c24d9147b6fa9b035515943d5019210dd2407fad806a3225a6acb11909ebde366f5432ff85e9c3e04c9e020e3d9c3364485ff8d55773
+DIST adobe-flash-23.0.0.162.x86_64.tar.gz 6923247 SHA256 7467e5401d6cc6bb6f3c9034841aa834ff357d7500fbf2e0adf22d4979668bec SHA512 77ca4c01b439dc6375fc66c345a6f6c79788d851b13622d50303bc83b0ba751f3f6e43722c4476fde219bd9d43458e5da579fc8e6275c74e2514e7a3ccc70361 WHIRLPOOL a048c6372c5d445f325c3271b50748ef14f69e3971dfd9d9c27c6d8fa93215e6e94f53b82b8635c3154d645cba086356496ea0f1259a7aefa24fc61793e0da2c

diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.635.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.635.ebuild
new file mode 100644
index 00000000..df210f7
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.635.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/
+	https://helpx.adobe.com/security/products/flash-player.html#version11
+"
+
+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(-)]
+			>=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(-)]
+			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			>=media-libs/freetype-2.5.0.1[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/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(-)]
+			>=x11-libs/pango-1.36.3[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
+}

diff --git a/www-plugins/adobe-flash/adobe-flash-23.0.0.162.ebuild b/www-plugins/adobe-flash/adobe-flash-23.0.0.162.ebuild
new file mode 100644
index 00000000..da08d5d
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-23.0.0.162.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit multilib multilib-minimal
+
+DESCRIPTION="Adobe Flash Player"
+HOMEPAGE="
+	http://www.adobe.com/products/flashplayer.html
+	http://get.adobe.com/flashplayer/
+	https://helpx.adobe.com/security/products/flash-player.html
+"
+
+AF_URI="https://fpdownload.adobe.com/pub/flashplayer/pdc"
+AF_32_URI="${AF_URI}/${PV}/flash_player_ppapi_linux.i386.tar.gz -> ${P}.i386.tar.gz"
+AF_64_URI="${AF_URI}/${PV}/flash_player_ppapi_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
+
+SRC_URI="
+	abi_x86_32? ( ${AF_32_URI} )
+	abi_x86_64? ( ${AF_64_URI} )
+"
+SLOT="22"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-11.x"
+RESTRICT="strip mirror"
+
+RDEPEND="
+	!www-plugins/chrome-binary-plugins[flash]
+"
+
+S="${WORKDIR}"
+
+# Ignore QA warnings in these closed-source binaries, since we can't fix them:
+QA_PREBUILT="usr/*"
+
+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
+}
+
+multilib_src_install() {
+	exeinto /usr/$(get_libdir)/chromium-browser/PepperFlash
+	doexe libpepflashplayer.so
+	insinto /usr/$(get_libdir)/chromium-browser/PepperFlash
+	doins manifest.json
+
+	if multilib_is_native_abi; then
+		dodir /etc/chromium
+		sed "${FILESDIR}"/pepper-flash \
+			-e "s|@FP_LIBDIR@|$(get_libdir)|g" \
+			-e "s|@FP_PV@|${PV}|g" \
+			> "${D}"/etc/chromium/pepper-flash \
+			|| die
+	fi
+}