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

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.26-gentoo-r1 x86_64

3 files changed, 29 insertions, 13 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/Manifest b/net-www/netscape-flash/Manifest
index 4c5f053926e9..ff00ff03e53c 100644
--- a/net-www/netscape-flash/Manifest
+++ b/net-www/netscape-flash/Manifest
@@ -4,7 +4,7 @@ DIST flash-plugin-10.0.12.36-release.i386.rpm 4026104 RMD160 bcf8b455f99cdafdfdb
 DIST install_flash_player_9.tar.gz 3056790 RMD160 d9e3da5833f2d7686a15e027a4938541b79c3ff8 SHA1 15c35cfa8dfc003ab582d8f05cc5ae2f93dbcbb7 SHA256 51964941f2e57be3024336d3d055d99e4da6972aece1744a3dc5f9214c283b94
 DIST libflashplayer-10.0.d20.7.linux-x86_64.so.tar.gz 3714948 RMD160 57ac1bc1604bb90af1bb47d9c054f40601515aab SHA1 66174de19a8d3a31170569e202e664e1e87d1f52 SHA256 57ce525c0aa9bfa40aaa2bcd80da3c3deb11d721256745a7d300b5632122f23d
 EBUILD netscape-flash-10.0.12.36-r1.ebuild 2835 RMD160 ca517ba51b3c4d75119053c85d74f646d792008b SHA1 e6113cc59404c1517620c3b314fef68e684b1565 SHA256 5cef1e9270338c7c254e09c50930eafdafb305c2a975ac639f90b98823e4a968
-EBUILD netscape-flash-10.0.20.7_alpha.ebuild 1645 RMD160 3497f7e4b91e3116888f9f5128907cc707081c81 SHA1 6e215a1934c5b3a213dd9c718d8680ca0fc73fcd SHA256 29b6d5caf9eb6b95b43032711e6c0aa60858a95253dc711fdacc50de1741781d
+EBUILD netscape-flash-10.0.20.7_alpha.ebuild 1943 RMD160 fc8d03fb2503da9e6cb9256746fdd0a89d69878d SHA1 af648e6d20d302405435732eb5409c1e9d8f78b8 SHA256 02eac2d12d789c3ac0e771c008eaca6f465a750993be961e9ccced52e7b59028
 EBUILD netscape-flash-9.0.151.0.ebuild 1806 RMD160 e7827d6de85d062a74b6697a73cd28fa45985968 SHA1 83dd2f82391c9fefb55193f0779e1b743e423f41 SHA256 052f8a4f8d74e6455e4cde2db26b6672c9c07c86226d0bab5f4279f35123c853
-MISC ChangeLog 13973 RMD160 cbbd71e52c584dda3b1bdf77df355d6404478338 SHA1 fbe1e7377ce3b93701fab8bc559410bb423af41e SHA256 88146247cdccef6b581666faa6d5a0972f5f511d36d04b38c757619aca144f80
+MISC ChangeLog 14315 RMD160 bb58c7c59eeda92ea739b7ff6cb113f311312e3f SHA1 a736068da6cfd0adafc15d450752839beb4ca94d SHA256 ccf7c86bc3edf4f0018814bcf46e4e2720032468946e6d9b443636bf31957df9
 MISC metadata.xml 254 RMD160 1f5a6322e4956b30592a1e0caf7edc67613ecc43 SHA1 f0813ac26740fae9e0f0899b5dad74b5a6fd5b3c SHA256 740784d71bef88214e4d8508e351a376d8908f4c4b6175d98b6b77e107799f12
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
 }