fix for #15751

4 files changed, 28 insertions, 33 deletions

diff --git a/net-www/netscape-communicator/ChangeLog b/net-www/netscape-communicator/ChangeLog
index 55707a070f0a..18786559058a 100644
--- a/net-www/netscape-communicator/ChangeLog
+++ b/net-www/netscape-communicator/ChangeLog
@@ -1,34 +1,29 @@
 # ChangeLog for net-www/netscape-communicator
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-communicator/ChangeLog,v 1.7 2003/02/12 08:51:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-communicator/ChangeLog,v 1.8 2003/03/02 04:33:48 vapier Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*netscape-communicator-4.79-r1 (19 August 2002)
+*netscape-communicator-4.79-r1 (19 Aug 2002)
 
-  19 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, netscape-communicator-4.79-r1.ebuild :
+  01 Mar 2003; Mike Frysinger <vapier@gentoo.org> :
+  Removed libflash plugin and depended on newer netscape-flash package to fix #15751.
 
+  19 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, netscape-communicator-4.79-r1.ebuild :
   Added -ppc to the keywords.
 
 *netscape-communicator-4.79-r1 (28 Apr 2002)
 
-  28 Apr 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog, 
-   netscape-communicator-4.79-r1.ebuild  :
-   
+  28 Apr 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog, netscape-communicator-4.79-r1.ebuild  :
   When unpacking .nif files, make sure to use --no-same-owner
   so they are unpacked as root.
   
 *netscape-communicator-4.79 (9 Apr 2002)
 
-  9 Apr 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog, 
-   netscape-communicator-4.79.ebuild  :
-   
+  9 Apr 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog, netscape-communicator-4.79.ebuild  :
   The grand re-naming of netscape to netscape-communicator
   
 *netscape-4.78 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/net-www/netscape-communicator/netscape-communicator-4.79-r1.ebuild b/net-www/netscape-communicator/netscape-communicator-4.79-r1.ebuild
index 769ff094d5dd..aa64a2b53877 100644
--- a/net-www/netscape-communicator/netscape-communicator-4.79-r1.ebuild
+++ b/net-www/netscape-communicator/netscape-communicator-4.79-r1.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-communicator/netscape-communicator-4.79-r1.ebuild,v 1.9 2003/02/13 15:39:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-communicator/netscape-communicator-4.79-r1.ebuild,v 1.10 2003/03/02 04:33:48 vapier Exp $
 
 S=${WORKDIR}/communicator-v479.x86-unknown-linux2.2
 DESCRIPTION="Netscape Communicator 4.79"
 SRC_URI="ftp://ftp.netscape.com/pub/communicator/english/4.79/unix/supported/linux22/complete_install/communicator-v479-us.x86-unknown-linux2.2.tar.gz"
 HOMEPAGE="http://developer.netscape.com/support/index.html"
-DEPEND="virtual/glibc"
-RDEPEND=">=sys-libs/lib-compat-1.0"
+
 SLOT="0"
-KEYWORDS="x86 -ppc sparc "
+KEYWORDS="x86 -ppc sparc"
 LICENSE="NETSCAPE"
 
+DEPEND="virtual/glibc"
+RDEPEND=">=sys-libs/lib-compat-1.0
+	net-www/netscape-flash"
+
 src_install() {
-	cd ${S}
 	dodir /opt/netscape
 	dodir /opt/netscape/java/classes
 	dodir /usr/X11R6/bin
@@ -28,6 +30,7 @@ src_install() {
 	cp ${FILESDIR}/netscape ${D}/usr/X11R6/bin/netscape
 	rm ${D}/opt/netscape/netscape-dynMotif
 	rm ${D}/opt/netscape/libnullplugin-dynMotif.so
+	rm ${D}/opt/netscape/plugins/libflashplayer.so
 	insinto /usr/X11R6/bin
 	doins ${FILESDIR}/netscape 
 	chmod +x ${D}/usr/X11R6/bin/netscape
diff --git a/net-www/netscape-navigator/ChangeLog b/net-www/netscape-navigator/ChangeLog
index e5d2414eef4e..8ec0cc107da9 100644
--- a/net-www/netscape-navigator/ChangeLog
+++ b/net-www/netscape-navigator/ChangeLog
@@ -1,36 +1,31 @@
 # ChangeLog for net-www/netscape-navigator
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-navigator/ChangeLog,v 1.8 2003/02/12 08:51:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-navigator/ChangeLog,v 1.9 2003/03/02 04:34:53 vapier Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*netscape-navigator-4.79-r1 (19 August 2002)
+*netscape-navigator-4.79-r1 (19 Aug 2002)
 
-  19 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, netscape-navigator-4.79-r1.ebuild :
+  01 Mar 2003; Mike Frysinger <vapier@gentoo.org> :
+  Removed libflash plugin and depended on newer netscape-flash package to fix #15751.
 
+  19 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, netscape-navigator-4.79-r1.ebuild :
   Added -ppc to the keywords.
 
 *netscape-navigator-4.79-r1 (28 Apr 2002)
 
   28 Apr 2002; Jon Nelson <jnelson@gentoo.org> netscape-navigator-4.79-r1.ebuild
-
   Make sure to extract nif files as root
   
 *netscape-navigator-4.79 (9 Apr 2002)
 
   9 Apr 2002; Jon Nelson <jnelson@gentoo.org> netscape-navigator-4.79.ebuild
-  
   Update to 4.79
 
 *netscape-navigator-4.08 (9 Apr 2002)
 
   9 Apr 2002; Jon Nelson <jnelson@gentoo.org> netscape-navigator-4.08.ebuild
-  
   Rename navigator to netscape-navigator
 
 *navigator-4.08 (6 Apr 2002)
 
   6 Apr 2002; Jon Nelson <jnelson@gentoo.org> navigator-4.08.ebuild
-  
   Initial release of navigator package
-  
diff --git a/net-www/netscape-navigator/netscape-navigator-4.79-r1.ebuild b/net-www/netscape-navigator/netscape-navigator-4.79-r1.ebuild
index eb8a48808785..1d31b38846a5 100644
--- a/net-www/netscape-navigator/netscape-navigator-4.79-r1.ebuild
+++ b/net-www/netscape-navigator/netscape-navigator-4.79-r1.ebuild
@@ -1,24 +1,26 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-navigator/netscape-navigator-4.79-r1.ebuild,v 1.8 2003/02/13 15:40:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-navigator/netscape-navigator-4.79-r1.ebuild,v 1.9 2003/03/02 04:34:53 vapier Exp $
 
 S=${WORKDIR}/navigator-v479.x86-unknown-linux2.2
 DESCRIPTION="Netscape Navigator 4.79"
 SRC_URI="ftp://ftp.netscape.com/pub/communicator/english/4.79/unix/supported/linux22/navigator_standalone/navigator-v479-us.x86-unknown-linux2.2.tar.gz"
 HOMEPAGE="http://developer.netscape.com/support/index.html"
-RDEPEND=">=sys-libs/lib-compat-1.0"
+
 SLOT="0"
-KEYWORDS="x86 -ppc sparc "
+KEYWORDS="x86 -ppc sparc"
 LICENSE="NETSCAPE"
 
+RDEPEND=">=sys-libs/lib-compat-1.0
+	net-www/netscape-flash"
+
 src_unpack() {
 	unpack ${A} || die
 	ls -la ${S}
-#        chown -R root:root ${S}
+#	chown -R root:root ${S}
 }
 
 src_install() {								  
-	cd ${S}
 	dodir /opt/netscape
 	dodir /opt/netscape/java/classes
 	dodir /usr/X11R6/bin
@@ -31,8 +33,8 @@ src_install() {
 	cp ${FILESDIR}/netscape ${D}/usr/X11R6/bin/netscape
 	rm ${D}/opt/netscape/netscape-dynMotif
 	rm ${D}/opt/netscape/libnullplugin-dynMotif.so
+	rm ${D}/opt/netscape/plugins/libflashplayer.so
 	insinto /usr/X11R6/bin
 	doins ${FILESDIR}/netscape 
 	chmod +x ${D}/usr/X11R6/bin/netscape
 }
-