Dependency and typo fixes from nightmorph, plus a note to nspluginwrapper people

(Portage version: 2.2_rc13/cvs/Linux 2.6.26-gentoo-r1 x86_64)

2 files changed, 27 insertions, 11 deletions

diff --git a/net-www/netscape-flash/ChangeLog b/net-www/netscape-flash/ChangeLog
index 21b6e0ab2e46..56683c7a966c 100644
--- a/net-www/netscape-flash/ChangeLog
+++ b/net-www/netscape-flash/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-www/netscape-flash
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v 1.80 2008/11/17 16:00:46 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v 1.81 2008/11/19 15:11:29 lack Exp $
+
+  19 Nov 2008; Jim Ramsay <lack@gentoo.org>
+  netscape-flash-10.0.20.7_alpha.ebuild:
+  Dependency and typo fixes from nightmorph, plus a note to nspluginwrapper
+  people
+
+  19 Nov 2008; Jim Ramsay <lack@gentoo.org>
+  netscape-flash-10.0.20.7_alpha.ebuild:
+  Dependency and typo fixes from nightmorph, plus a note to nspluginwrapper
+  people
 
 *netscape-flash-10.0.20.7_alpha (17 Nov 2008)
 
diff --git a/net-www/netscape-flash/netscape-flash-10.0.20.7_alpha.ebuild b/net-www/netscape-flash/netscape-flash-10.0.20.7_alpha.ebuild
index 3fafd85a5a74..7dbfe40746fc 100644
--- a/net-www/netscape-flash/netscape-flash-10.0.20.7_alpha.ebuild
+++ b/net-www/netscape-flash/netscape-flash-10.0.20.7_alpha.ebuild
@@ -1,6 +1,8 @@
 # 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.20.7_alpha.ebuild,v 1.1 2008/11/17 16:00:46 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-10.0.20.7_alpha.ebuild,v 1.2 2008/11/19 15:11:29 lack Exp $
+
+EAPI=1
 
 inherit nsplugins rpm
 
@@ -10,22 +12,20 @@ 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/libXext
-	x11-libs/libX11
-	x11-libs/libXt
-	=x11-libs/gtk+-2*
-	media-libs/freetype
+RDEPEND="x11-libs/gtk+:2
 	media-libs/fontconfig
 	dev-libs/nss
 	net-misc/curl
 	>=sys-libs/glibc-2.4
-	media-fonts/corefonts"
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )"
 
 QA_EXECSTACK="opt/netscape/plugins/libflashplayer.so"
 
@@ -41,18 +41,24 @@ src_install() {
 
 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 "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 "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."
+		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
 }