Introduce a simplified, multilib-friendly ebuild by me, AxS and iamnr3.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 270 insertions, 6 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index e7bd6892aa24..e140777c90ef 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.213 2013/09/11 13:37:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.214 2013/09/27 19:35:08 mgorny Exp $
+
+*adobe-flash-11.2.202.310-r1 (27 Sep 2013)
+
+  27 Sep 2013; Michał Górny <mgorny@gentoo.org>
+  +adobe-flash-11.2.202.310-r1.ebuild:
+  Introduce a simplified, multilib-friendly ebuild by me, AxS and iamnr3.
 
   11 Sep 2013; Jeroen Roovers <jer@gentoo.org>
   -adobe-flash-11.2.202.297.ebuild, -files/memcpy-to-memmove.sh:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index d35132bae865..1ca02d82c323 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -6,13 +6,26 @@ AUX mms.cfg 4420 SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8f
 DIST adobe-flash-11.2.202.310-debug.i386.tar.gz 7403002 SHA256 ac0033a0db826138ba2b6cebc44c3efed8c57c9f696d0aba137f27318ce603b1 SHA512 8d470be8553655091a2bb01e27868b4d5f1cea990b3fc0afff88f2d705365c1d2c7cf6ae82cee35fb53ce265bbd8efc065d3fa9cadb092a96558f6ada4d95705 WHIRLPOOL 5533c98cb7ea2489d922e15d7003c847646abec4941e9fab9835f952166aab50e0ec65a3aae33b3bf486e8c9d4cb4fdd38d9fc5a789731b470c1d414f17e6490
 DIST adobe-flash-11.2.202.310.i386.tar.gz 6923724 SHA256 7051aee6bbca66a562c1a8acfa63533744c71cdbe231276f4097462dd24dc061 SHA512 87d340c519e19a4165ff1a16d84b66469707fe49f068da4b717110a8a084a1f35a20c5a7b18e217a40704dfa62ed8f62a929f7894fe1c2fff06a9df612ac2d61 WHIRLPOOL 90ee7bd6c148db110f9e50812587ab0a228daaba13f30477fb718a7e11bfd452cf65dd61d7d635bd46429c1d00179f497ca4322b0bf3953f06152da9bf035f3f
 DIST adobe-flash-11.2.202.310.x86_64.tar.gz 7235294 SHA256 f2c7a410b81d044fd619b9bfd5a81522e02fafa1314d61382c21123ae0c9290f SHA512 2882ea869eed270e4b24dc4dffd5e5ac3a3249d6d4e4d985b246314602d72dc3775909dcf43539925b0e821dadf2abade0fd46c4bac068539b71b7a081c0568b WHIRLPOOL 05402df96157bf5237f9265cbaee49aacecef69b6d74018843c2b72a432e80400b924b26b0b3c3e5e88f274f54374575d31a658975a2281dd3a91d049b1924ad
+EBUILD adobe-flash-11.2.202.310-r1.ebuild 6853 SHA256 407281e4f355867c8962722ca916a45cbf848e5e9aaef5c47cd45ba27976ff2b SHA512 e14ea23d814accd1d0a3fbc0ce3ea25530757555982a7465c8591348d31366a0c4c2e425e9e1377c0e410be425cf6d87ddd28ab548d998d4c177dcdaaed47241 WHIRLPOOL 26da28d929ec30e778974c52a50596feed39ffa0305233baf535e2e3c28e2e4e636f9c5d5f6dfc981490e7e3e7e2bd596956c692e3c8b5c5e0d4d56045e773f2
 EBUILD adobe-flash-11.2.202.310.ebuild 7324 SHA256 93e7064deaecd96506cebf77a315af5424616caec58db6a60b6699e178e2ac9b SHA512 39dc68a5b2b926287277cd226f54d07208f598be85b388ea020a476b8e4e3e8c8d6b39cf6acfeed5f9815f4339de486cbb4d0fbea338643c5ad4f8df36557474 WHIRLPOOL c594fb3a1cc0ed83b4dae602a74200097b780ec562e10e3945168e5790bfd659088709de5d2ddd6785f7515bfa8e47c912795811b315cd18c0407eb285c69587
-MISC ChangeLog 53373 SHA256 bccd19698155cf0591bc96be12c3ee8859286f8fd6cff3c958091fc0bf24b2dc SHA512 298fc679f3599727a7a818c3fccd441ed817375b69868596853c88de8d54e513b03bd69fc99ef5c3a2b15d887de7a8688eb1971a36fdc4f61344b153c08e2126 WHIRLPOOL 74e999be8b2ac47e711ef79e3d4cac25a41ccc4a953205da47f0edfc1814d3fd6aebd33b9b059ec323bfe5056f2f09d203f8c24d2c7b55829e572b620d1402f8
+MISC ChangeLog 53584 SHA256 5e6bbdea89255f66a99bd81637636adc3a68c609a181f3b9a606550ed7acfaac SHA512 241c016178d4dfaecc90587c68a2f1a51220a7ac056f68ee942c06340be145ce9c864154608b8dcfba17bf41ef87e50b6313d03b0943c34d88272521fd9cc5c7 WHIRLPOOL c82b4808f157a50bd742deee1c082327a5a79d72760795dc8fba4223cc3d83886ed5e6d39ae027b1a60635a0027c42b67643ffee4836a171bc5efed95d24d0e2
 MISC metadata.xml 616 SHA256 6e1428bd0d59c68629d9d71a04ac2f39cb709ae34f9887d26a04d8dcaafa3e84 SHA512 051cf27faf9edfcd9e5ac12d6936bf87d876bdac9c9389ce414850f77724795401bd4d1d704f45d23a8f0802db1cfa701bbe9384bd94b47879f5c56a50374ff1 WHIRLPOOL 3e8fb952a34307dd571feb013ce5a741d50eeb9420b4a6678e780392bedaecb3e318811a26607f2d4a7717ab2439afb4baccb78f5c01f5c04aa8fc4e33c69ca3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlIwcgsACgkQVWmRsqeSphONYACeOrudF0xhpd1izJZXyroW1b+Y
-fQAAnA3T+nat7r9qaElx+vhe4BMcmGAl
-=ebyA
+iQJ8BAEBCABmBQJSRd4eXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOvI4QALxfWamSC6dCD/+EDidbwMNy
+RLl7L6EbG/unGGCKlA2l/suncEmSxTODLaH/6XbpfxLQyjaqOqplOh9JteMXDOdx
+smIVMlxakOd5RP4iAQp/rhEe+11Pf55Z+eTWLFsvR4qF3aRT/DyoUjIqVaQc1kCR
+iVarHe/hjLLkb14BSJjMZtuVC9x1jtNeQ8wjSERqk+bPewV4DmjWlYVvVKStrcxm
+DCGNIjKfWmaYd4/bqtFcPQ9TqpJSSeUfCMmq30FJkwlgNJ70mAHSznKMrtvpMxVv
+fMsKxa/Ifrcct1OTCUbVTfeYIYDIZguOl7LM1WOlblPc18rryciNkfFLLaon9tNX
+zzfpExEY1nM5LvWc4IqLaxWVvifxBMFF35+Bn6z4iYVLwZGhSeeXW2Cu+ApCibvY
+L5TRBLnu8aja/PSCVBE2P9+1GiIYGvhjqvs/593ScoWCKdb7fWrVRlUbf/GnDqZw
+2lW/v8hfqYc7KX/oRWZ22lGCbUHoeSz6CDVRruPRvjXsIuiptc7aFtE4M6WS/OlG
+nBnNS3WoA9okRf3qV6+n294gIZi0G0Lymg/Axe6OEM/mUlXr3hA0z5WQ9PGMzB5z
+3ZbklCt3LYI6vD2vB67wdfE5+i/lgsFyoXpNW2o1JA5wYFRSPkcwLPW03Dvfm+Uo
+WG5i5dakZTcGEHogV2dF
+=TDpV
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild
new file mode 100644
index 000000000000..e88f80135c37
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2013 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.310-r1.ebuild,v 1.1 2013/09/27 19:35:08 mgorny Exp $
+
+EAPI=5
+inherit nsplugins toolchain-funcs versionator 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 )"
+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? ( 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 )
+"
+
+# Where should this all go? (Bug #328639)
+INSTALL_BASE="opt/Adobe/flash-player"
+
+# Ignore QA warnings in these closed-source binaries, since we can't fix them:
+QA_PREBUILT="opt/*"
+
+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
+}