Version bump: 10.0.22.87 is released, for both 32-bit and 64-bit. Enjoy the first multilib flash plugin ebuild.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 129 insertions, 76 deletions

diff --git a/net-www/netscape-flash/ChangeLog b/net-www/netscape-flash/ChangeLog
index a1d32e155866..0a09f1994820 100644
--- a/net-www/netscape-flash/ChangeLog
+++ b/net-www/netscape-flash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/netscape-flash
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v 1.87 2009/01/07 13:50:16 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v 1.88 2009/02/25 19:32:09 lack Exp $
+
+*netscape-flash-10.0.22.87 (25 Feb 2009)
+
+  25 Feb 2009; Jim Ramsay <lack@gentoo.org>
+  -netscape-flash-10.0.21.1_alpha.ebuild, +netscape-flash-10.0.22.87.ebuild:
+  Version bump: 10.0.22.87 is released, for both 32-bit and 64-bit. Enjoy
+  the first multilib flash plugin ebuild.
 
 *netscape-flash-9.0.152.0 (07 Jan 2009)
 
diff --git a/net-www/netscape-flash/Manifest b/net-www/netscape-flash/Manifest
index 06c091d2a706..6566ba3b8f23 100644
--- a/net-www/netscape-flash/Manifest
+++ b/net-www/netscape-flash/Manifest
@@ -1,10 +1,11 @@
 AUX mms.cfg 4409 RMD160 bf6407b5c785b45b76ca323712d44f925ccf20ae SHA1 7f6eb9e4224ab70522a21b894f7f334c2cde8ce0 SHA256 f0f2c7f20653cc9f275eb84c853f2695dd9b0531ce8c037d56ae7ae94cb0ca6c
 DIST flash-libcompat-0.2.tar.bz2 1162317 RMD160 197841eb76faacb05aec3e003f5e06e00fb5a19f SHA1 8fe47ef587ae679a37757038710750eb6a3c393e SHA256 aa96a25420f6527f5c2a467222bccf5c54a5f8001edfa0ec274864fc3e94faea
 DIST flash-plugin-10.0.15.3-release.i386.rpm 4031586 RMD160 fd4a8d57c5f74cc751aa1b3f449aa1697e42c522 SHA1 6108dda2cce4db33d130c010ac93c2cbde68faea SHA256 ce82077d6c8db2d017677674393ee2f206b2e9e10c92c3049f0fe9ce8bee18d3
+DIST flash-plugin-10.0.22.87-release.i386.rpm 4065576 RMD160 0e28bd9d4c581fedbb88bf7fe94afc543b474759 SHA1 f8e928b811844532b8c23d93f40133a874f981ce SHA256 ec5ace49df7cfe69b7c02c8d1b6df8089f32076a390b931051feed2a9762d554
 DIST install_flash_player_9.tar.gz 3056503 RMD160 775e1739faff05e520958197d64842e3be4e6041 SHA1 7bba848da718ad321209263b8951447c976364d6 SHA256 e4fcb13e79a28bc4866b986ac9c2a63e1acf7d709547a84fc2151b31cf43487b
-DIST libflashplayer-10.0.d21.1.linux-x86_64.so.tar.gz 3714828 RMD160 768aaaa3319bcdf33fa46c08f50f7e41a676da4c SHA1 67aa4a0b205584bc5a841eb948cafab7f888ec79 SHA256 2c0020d9b0b9228e0a276e1c42378c41abbec6427247599de18a007724d00d18
+DIST libflashplayer-10.0.22.87.linux-x86_64.so.tar.gz 3729613 RMD160 010b1ac1795d9833e0ac5d7e8babcbfa7f21914e SHA1 ff6d1d72d9b17b5411dc6fdd4ee6046a8f6676f8 SHA256 eac1d05aa96036819fe8f14f293a2ccc9601e1e32e08ec33e6ed9ed698e76145
 EBUILD netscape-flash-10.0.15.3.ebuild 2831 RMD160 c660b8bc44290bd218257d0aaa8b9d9ce4de4a89 SHA1 309f980e0f639680ed98af6feed3c9ba2e9eed33 SHA256 4a458b827408adacdbdb5975b449455496ed34d64c1878fb4b534bc310af6ffd
-EBUILD netscape-flash-10.0.21.1_alpha.ebuild 2243 RMD160 aeef322665e59ac16c1722a55772b820a545a2ab SHA1 ef57b3582d8accb6a60d1992b583ae657b7dedb7 SHA256 004fcd6a912664414e94af3fa45bb2ed2f630e4db3cbe01da686bf0eb081f0a6
+EBUILD netscape-flash-10.0.22.87.ebuild 3763 RMD160 dd7900a96cb7ff31b248b990896d672b77765702 SHA1 aa4f7c82456ce368e6fff25e3a59157a779732eb SHA256 f69d96dc0facfe0798a16ec4e37ec1d388990d6166eebaa746a68e25a094e92b
 EBUILD netscape-flash-9.0.152.0.ebuild 1817 RMD160 9d9e3574fe70b73dba6068fbaf88ae9693c214b7 SHA1 1d7ca60115eaf136fc9be3edcfd19ab3b99e28b4 SHA256 b3473fcd6cf26723a47bfcb207aa3b9bc62fde1116dce1598635186f7160dc2f
-MISC ChangeLog 15462 RMD160 be1ebab5b820afcb2e45e3e2e08e8114f1d711e6 SHA1 f5b8caa504cbe915ca256353fc15fedd84460c7f SHA256 23775733155742da32696ae375145449f78882f269185e4456383b643dcd6792
+MISC ChangeLog 15742 RMD160 b16373913b60169638424b3e2712f044d2b674d4 SHA1 ca77d611cb021307b37af219fe076d0b49fa2046 SHA256 09b318b84cbd2e3c322fa9b87cf4866b3111276e31cb7252d9fc51b82bded8d3
 MISC metadata.xml 254 RMD160 1f5a6322e4956b30592a1e0caf7edc67613ecc43 SHA1 f0813ac26740fae9e0f0899b5dad74b5a6fd5b3c SHA256 740784d71bef88214e4d8508e351a376d8908f4c4b6175d98b6b77e107799f12
diff --git a/net-www/netscape-flash/netscape-flash-10.0.21.1_alpha.ebuild b/net-www/netscape-flash/netscape-flash-10.0.21.1_alpha.ebuild
deleted file mode 100644
index 5c814b386256..000000000000
--- a/net-www/netscape-flash/netscape-flash-10.0.21.1_alpha.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-10.0.21.1_alpha.ebuild,v 1.1 2008/12/21 15:55:31 lack Exp $
-
-EAPI=1
-
-inherit nsplugins
-
-DESCRIPTION="Adobe Flash Player"
-SRC_URI="http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-10.0.d21.1.linux-x86_64.so.tar.gz"
-HOMEPAGE="http://www.adobe.com/"
-IUSE=""
-SLOT="0"
-
-# Keeps -x86 around as a placeholder for now - Some day we'll have the same
-# version for both arches...  I hope.
-KEYWORDS="-* -x86 ~amd64"
-LICENSE="AdobeFlash-10"
-RESTRICT="strip mirror"
-
-S="${WORKDIR}"
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/fontconfig
-	dev-libs/nss
-	net-misc/curl
-	>=sys-libs/glibc-2.4
-	|| ( media-fonts/liberation-fonts media-fonts/corefonts )"
-
-QA_EXECSTACK="opt/netscape/plugins/libflashplayer.so"
-
-src_install() {
-	exeinto /opt/netscape/plugins
-	doexe libflashplayer.so
-	inst_plugin /opt/netscape/plugins/libflashplayer.so
-
-	# The magic config file!
-	insinto "/etc/adobe"
-	doins "${FILESDIR}/mms.cfg"
-}
-
-pkg_postinst() {
-	ewarn "Flash player is closed-source, with a long history of security"
-	ewarn "issues.  Please consider only running Flash applets you know to"
-	ewarn "be safe."
-
-	if has_version 'www-client/mozilla-firefox' || \
-	   has_version 'www-client/mozilla-firefox-bin'; then
-		elog "The Firefox 'flashblock' extension may help:"
-		elog "  https://addons.mozilla.org/en-US/firefox/addon/433"
-	fi
-
-	if has_version 'kde-base/konqueror'; then
-		elog "Konqueror users:  You may need to follow the instructions here:"
-		elog "  http://dev.gentoo.org/~lack/konqueror-flash.xml"
-		elog "For Flash to work with your browser."
-	fi
-
-	if has_version 'net-www/nspluginwrapper'; then
-		elog "If you were using nspluginwrapper for this plugin, you may want"
-		elog "to run 'nspluginwrapper -a -u' as root to clear out any old"
-		elog "wrappers."
-	fi
-
-	if has_version 'www-client/mozilla-firefox-bin'; then
-		eerror "This 64-bit plugin will not work with a 32-bit firefox."
-		eerror "If you wish to continue using flash with firefox-bin, you should"
-		eerror "mask this version:"
-		eerror "  =${CATEGORY}/${P}"
-		eerror "And re-emerge netscape-flash"
-	fi
-}
diff --git a/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild b/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild
new file mode 100644
index 000000000000..c91019b5cad3
--- /dev/null
+++ b/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild,v 1.1 2009/02/25 19:32:09 lack Exp $
+
+EAPI=1
+inherit nsplugins rpm multilib
+
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-${PV}-release.i386.rpm"
+MY_64B_URI="http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${PV}.linux-x86_64.so.tar.gz"
+
+DESCRIPTION="Adobe Flash Player"
+SRC_URI="x86? ( ${MY_32B_URI} )
+amd64? ( ${MY_64B_URI}
+	multilib? ( ${MY_32B_URI} mirror://gentoo/flash-libcompat-0.2.tar.bz2 )
+)"
+HOMEPAGE="http://www.adobe.com/"
+IUSE="multilib"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-10"
+RESTRICT="strip mirror"
+
+S="${WORKDIR}"
+
+RDEPEND="x11-libs/gtk+:2
+	media-libs/fontconfig
+	dev-libs/nss
+	net-misc/curl
+	>=sys-libs/glibc-2.4
+	|| ( media-fonts/freefont-ttf media-fonts/corefonts )
+	amd64? (
+		multilib? (
+			app-emulation/emul-linux-x86-baselibs
+			app-emulation/emul-linux-x86-gtklibs
+			app-emulation/emul-linux-x86-soundlibs
+			app-emulation/emul-linux-x86-xlibs
+		)
+	)
+"
+
+# Our new flash-libcompat suffers from the same EXESTACK problem as libcrypto
+# from app-text/acroread, so tell QA to ignore it.
+# Apparently the flash library itself also suffers from this issue
+QA_EXECSTACK="opt/flash-libcompat/libcrypto.so.0.9.7
+	opt/netscape/plugins32/libflashplayer.so
+	opt/netscape/plugins/libflashplayer.so"
+
+src_install() {
+	# 32b RPM has things hidden in funny places
+	use x86 && pushd "${S}/usr/lib/flash-plugin"
+
+	exeinto /opt/netscape/plugins
+	doexe libflashplayer.so
+	inst_plugin /opt/netscape/plugins/libflashplayer.so
+
+	use x86 && popd "${S}/usr/lib/flash-plugin"
+
+	# 64b tarball has no readme file.
+	use x86 && dodoc "${S}/usr/share/doc/flash-plugin-${PV}/readme.txt"
+
+	if use amd64 && has_multilib_profile; then
+		oldabi="${ABI}"
+		ABI="x86"
+
+		# 32b plugin
+		pushd "${S}/usr/lib/flash-plugin"
+			exeinto /opt/netscape/plugins32/
+			doexe libflashplayer.so
+			inst_plugin /opt/netscape/plugins32/libflashplayer.so
+			dodoc "${S}/usr/share/doc/flash-plugin-${PV}/readme.txt"
+		popd
+
+		# 32b library compatibility:
+		#
+		# libcurl and libnss are not currently available in any emul-linux-x86
+		# packages, so for amd64 we provide these snarfed out of other binary
+		# packages.  libcurl and its ssl dependencies come from
+		# app-text/acroread; libnss and its friends come from
+		# net-libs/xulrunner-bin
+		exeinto /opt/flash-libcompat
+		pushd "${WORKDIR}/flash-libcompat-0.2/"
+			doexe *
+		popd
+		echo 'LDPATH="/opt/flash-libcompat"' > 99flash-libcompat
+		doenvd 99flash-libcompat
+
+		ABI="${oldabi}"
+	fi
+
+	# The magic config file!
+	insinto "/etc/adobe"
+	doins "${FILESDIR}/mms.cfg"
+}
+
+pkg_postinst() {
+	if use amd64 && has_version 'net-www/nspluginwrapper'; then
+		# TODO: Perhaps parse the output of 'nspluginwrapper -l'
+		#       However, the 64b flash plugin makes 'nspluginwrapper -l' segfault.
+		local FLASH_WRAPPER="${ROOT}/usr/lib64/nsbrowser/plugins/npwrapper.libflashplayer.so"
+		if [[ -f ${FLASH_WRAPPER} ]]; then
+			einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed"
+			nspluginwrapper -r ${FLASH_WRAPPER}
+		fi
+	fi
+
+	ewarn "Flash player is closed-source, with a long history of security"
+	ewarn "issues.  Please consider only running flash applets you know to"
+	ewarn "be safe.  The 'flashblock' extension may help for mozilla users:"
+	ewarn "  https://addons.mozilla.org/en-US/firefox/addon/433"
+
+	if has_version 'kde-base/konqueror'; then
+		elog "Konqueror users - You may need to follow the instructions here:"
+		elog "  http://www.gentoo.org/proj/en/desktop/kde/kde-flash.xml"
+		elog "For flash to work with your browser."
+	fi
+}