Remove extra virtual/x11. Mark 1.0 stable on x86 and amd64. Trim older versions

9 files changed, 14 insertions, 277 deletions

diff --git a/net-www/mozilla-firefox-bin/ChangeLog b/net-www/mozilla-firefox-bin/ChangeLog
index 21ce6bc3c0d8..8018c3f77e44 100644
--- a/net-www/mozilla-firefox-bin/ChangeLog
+++ b/net-www/mozilla-firefox-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-www/mozilla-firefox-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/ChangeLog,v 1.26 2004/11/15 01:16:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/ChangeLog,v 1.27 2004/11/18 21:53:15 agriffis Exp $
+
+*mozilla-firefox-bin-1.0_rc1 (18 Nov 2004)
+
+  18 Nov 2004; Aron Griffis <agriffis@gentoo.org>
+  -mozilla-firefox-bin-0.9.3.ebuild, mozilla-firefox-bin-1.0.ebuild,
+  -mozilla-firefox-bin-1.0_pre-r1.ebuild, -mozilla-firefox-bin-1.0_rc1.ebuild:
+  Remove extra virtual/x11. Mark 1.0 stable on x86 and amd64. Trim older
+  versions
 
 *mozilla-firefox-bin-1.0 (14 Nov 2004)
 
diff --git a/net-www/mozilla-firefox-bin/Manifest b/net-www/mozilla-firefox-bin/Manifest
index 42c0df0066c3..b37413454134 100644
--- a/net-www/mozilla-firefox-bin/Manifest
+++ b/net-www/mozilla-firefox-bin/Manifest
@@ -1,16 +1,10 @@
-MD5 a50541a2da376bca94d4b73f80e0dd58 ChangeLog 4829
+MD5 5fe02784c0738bdba59c40320476dc47 ChangeLog 5156
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 3fdc3cb3aedac2456b003364410105eb mozilla-firefox-bin-1.0_rc1.ebuild 2433
-MD5 b85865532317ec858b5259572b594b48 mozilla-firefox-bin-1.0.ebuild 2295
-MD5 5bf449b3d908b1da4a4f513549bfec5f mozilla-firefox-bin-0.9.3.ebuild 2525
-MD5 2690e2b0a5d548875fdf123a81511fae mozilla-firefox-bin-1.0_pre-r1.ebuild 2414
-MD5 ffc946278accac924ff84ec65deb7ef7 files/digest-mozilla-firefox-bin-1.0_rc1 84
+MD5 d2cc5d05e786c0f86f870b2b997098a3 mozilla-firefox-bin-1.0.ebuild 2280
+MD5 41a88799cdfbdd1af85c3eb69080789a files/digest-mozilla-firefox-bin-1.0 64
 MD5 48924e6ea5eeccdde41276f2231a8630 files/firebird-0.7-antialiasing-patch 1253
 MD5 5327e9cd9d6e7d2fc1de431c1a969636 files/firefox 573
-MD5 41a88799cdfbdd1af85c3eb69080789a files/digest-mozilla-firefox-bin-1.0 64
 MD5 7b6378c14fc0f9bd858c2ac9abbca109 files/firefox-bin-0.9-init.tar.bz2 3327
-MD5 4682d7ab300858b026579a39eb1c4b4e files/digest-mozilla-firefox-bin-0.9.3 86
-MD5 67de8188ceecf23eaf471c3adeb770bb files/digest-mozilla-firefox-bin-1.0_pre-r1 88
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/mozillafirefox-bin-icon.png 3979
 MD5 dc62e3f15845b0343d1513abada402d7 files/icon/mozillafirefox-bin.desktop 203
diff --git a/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-0.9.3 b/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-0.9.3
deleted file mode 100644
index bf2260c20d56..000000000000
--- a/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-0.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 60f830c9d9fe8492d84be49f183c498d firefox-0.9.3-i686-linux-gtk2+xft.tar.gz 8039237
diff --git a/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0_pre-r1 b/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0_pre-r1
deleted file mode 100644
index 9486bd7ab3a1..000000000000
--- a/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0_pre-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 54f0df67b9fd0cfb7c93a860b8f561c3 firefox-1.0PR.1-i686-linux-gtk2+xft.tar.gz 8145364
diff --git a/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0_rc1 b/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0_rc1
deleted file mode 100644
index f3a9395e48a1..000000000000
--- a/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a4f75963f65292fdfc919daa06c0add firefox-1.0rc1.en-US.linux-i686.tar.gz 8250499
diff --git a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9.3.ebuild b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9.3.ebuild
deleted file mode 100644
index fc04b52f9d48..000000000000
--- a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9.3.ebuild,v 1.3 2004/08/05 20:07:03 slarti Exp $
-
-inherit nsplugins eutils mozilla-launcher
-
-IUSE="gnome"
-
-MY_PN=${PN/-bin/}
-S=${WORKDIR}/firefox
-DESCRIPTION="The Mozilla Firefox Web Browser"
-# Mirrors have it in one of the following places, depending on what
-# mirror you check and when you check it... :-(
-SRC_URI="
-	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/firefox-${PV}-i686-linux-gtk2+xft.tar.gz
-	http://ftp.mozilla.org/pub/firefox/releases/${PV}/firefox-${PV}-i686-linux-gtk2+xft.tar.gz"
-HOMEPAGE="http://www.mozilla.org/projects/firefox"
-RESTRICT="nostrip"
-
-KEYWORDS="-* x86 amd64"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-
-DEPEND="virtual/libc"
-RDEPEND="virtual/x11
-	x86? (
-		>=sys-libs/lib-compat-1.0-r2
-		>=x11-libs/gtk+-2.2
-	)
-	amd64? (
-		>=app-emulation/emul-linux-x86-baselibs-1.0
-		>=app-emulation/emul-linux-x86-gtklibs-1.0
-	)
-	virtual/x11
-	>=net-www/mozilla-launcher-1.13"
-
-src_install() {
-	# Install firefox in /opt
-	dodir /opt
-	mv ${S} ${D}/opt/firefox
-
-	# Plugin path setup (rescuing the existing plugins)
-	src_mv_plugins /opt/firefox/plugins
-
-	# Fixing permissions
-	chown -R root:root ${D}/opt/firefox
-
-	# mozilla-launcher-1.8 supports -bin versions
-	dodir /usr/bin
-	dosym /usr/libexec/mozilla-launcher /usr/bin/firefox-bin
-
-	# Install icon and .desktop for menu entry
-	if use gnome; then
-		insinto /usr/share/pixmaps
-		doins ${FILESDIR}/icon/mozillafirefox-bin-icon.png
-		# Fix bug 54179: Install .desktop file into /usr/share/applications
-		# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-		insinto /usr/share/applications
-		doins ${FILESDIR}/icon/mozillafirefox-bin.desktop
-	fi
-
-	# Normally firefox-bin-0.9 must be run as root once before it can
-	# be run as a normal user.  Drop in some initialized files to
-	# avoid this.
-	einfo "Extracting firefox-bin-${PV} initialization files"
-	tar xjpf ${FILESDIR}/firefox-bin-0.9-init.tar.bz2 -C ${D}/opt/firefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/opt/firefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /opt/firefox/plugins
-
-	# Remove entire installed instance to prevent all kinds of
-	# problems... see bug 44772 for example
-	rm -rf "${MOZILLA_FIVE_HOME}"
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/opt/firefox
-
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}
diff --git a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0.ebuild b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0.ebuild
index 8059b60ba4ac..ddd5414cdc6d 100644
--- a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0.ebuild
+++ b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0.ebuild,v 1.1 2004/11/15 01:16:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0.ebuild,v 1.2 2004/11/18 21:53:15 agriffis Exp $
 
 inherit nsplugins eutils mozilla-launcher
 
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/linux-i686/
 HOMEPAGE="http://www.mozilla.org/projects/firefox"
 RESTRICT="nostrip"
 
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* x86 amd64"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
@@ -25,7 +25,6 @@ RDEPEND="virtual/x11
 		>=app-emulation/emul-linux-x86-baselibs-1.0
 		>=app-emulation/emul-linux-x86-gtklibs-1.0
 	)
-	virtual/x11
 	>=net-www/mozilla-launcher-1.22"
 
 S=${WORKDIR}/firefox
diff --git a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0_pre-r1.ebuild b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0_pre-r1.ebuild
deleted file mode 100644
index 3962e88dadd5..000000000000
--- a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0_pre-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0_pre-r1.ebuild,v 1.2 2004/10/07 13:13:40 blubb Exp $
-
-inherit nsplugins eutils mozilla-launcher
-
-IUSE="gnome"
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_pre/PR.1}
-S=${WORKDIR}/firefox
-DESCRIPTION="The Mozilla Firefox Web Browser"
-# Mirrors have it in one of the following places, depending on what
-# mirror you check and when you check it... :-(
-SRC_URI="mirror://gentoo/firefox-${MY_PV}-i686-linux-gtk2+xft.tar.gz"
-HOMEPAGE="http://www.mozilla.org/projects/firefox"
-RESTRICT="nostrip"
-
-KEYWORDS="-* x86 amd64"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-
-DEPEND="virtual/libc"
-RDEPEND="virtual/x11
-	x86? (
-		>=sys-libs/lib-compat-1.0-r2
-		>=x11-libs/gtk+-2.2
-	)
-	amd64? (
-		>=app-emulation/emul-linux-x86-baselibs-1.0
-		>=app-emulation/emul-linux-x86-gtklibs-1.0
-	)
-	virtual/x11
-	>=net-www/mozilla-launcher-1.13"
-
-src_install() {
-	# Install firefox in /opt
-	dodir /opt
-	mv ${S} ${D}/opt/firefox
-
-	# Plugin path setup (rescuing the existing plugins)
-	src_mv_plugins /opt/firefox/plugins
-
-	# Fixing permissions
-	chown -R root:root ${D}/opt/firefox
-
-	# mozilla-launcher-1.8 supports -bin versions
-	dodir /usr/bin
-	dosym /usr/libexec/mozilla-launcher /usr/bin/firefox-bin
-
-	# Install icon and .desktop for menu entry
-	if use gnome; then
-		insinto /usr/share/pixmaps
-		doins ${FILESDIR}/icon/mozillafirefox-bin-icon.png
-		# Fix bug 54179: Install .desktop file into /usr/share/applications
-		# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-		insinto /usr/share/applications
-		doins ${FILESDIR}/icon/mozillafirefox-bin.desktop
-	fi
-
-	# Normally firefox-bin-0.9 must be run as root once before it can
-	# be run as a normal user.  Drop in some initialized files to
-	# avoid this.
-	einfo "Extracting firefox-bin-${PV} initialization files"
-	tar xjpf ${FILESDIR}/firefox-bin-0.9-init.tar.bz2 -C ${D}/opt/firefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/opt/firefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /opt/firefox/plugins
-
-	# Remove entire installed instance to prevent all kinds of
-	# problems... see bug 44772 for example
-	rm -rf "${MOZILLA_FIVE_HOME}"
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/opt/firefox
-
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}
diff --git a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0_rc1.ebuild b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0_rc1.ebuild
deleted file mode 100644
index 5acf9d4ae4ce..000000000000
--- a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0_rc1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0_rc1.ebuild,v 1.2 2004/10/29 06:00:27 brad Exp $
-
-inherit nsplugins eutils mozilla-launcher
-
-IUSE="gnome"
-
-MY_PV=${PV/_/}
-S=${WORKDIR}/firefox
-DESCRIPTION="The Mozilla Firefox Web Browser"
-# Mirrors have it in one of the following places, depending on what
-# mirror you check and when you check it... :-(
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/firefox-${MY_PV}.en-US.linux-i686.tar.gz"
-HOMEPAGE="http://www.mozilla.org/projects/firefox"
-RESTRICT="nostrip"
-
-KEYWORDS="-* ~x86 ~amd64"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-
-DEPEND="virtual/libc"
-RDEPEND="virtual/x11
-	x86? (
-		>=sys-libs/lib-compat-1.0-r2
-		>=x11-libs/gtk+-2.2
-	)
-	amd64? (
-		>=app-emulation/emul-linux-x86-baselibs-1.0
-		>=app-emulation/emul-linux-x86-gtklibs-1.0
-	)
-	virtual/x11
-	>=net-www/mozilla-launcher-1.13"
-
-src_install() {
-	# Install firefox in /opt
-	dodir /opt
-	mv ${S} ${D}/opt/firefox
-
-	# Plugin path setup (rescuing the existing plugins)
-	src_mv_plugins /opt/firefox/plugins
-
-	# Fixing permissions
-	chown -R root:root ${D}/opt/firefox
-
-	# mozilla-launcher-1.8 supports -bin versions
-	dodir /usr/bin
-	dosym /usr/libexec/mozilla-launcher /usr/bin/firefox-bin
-
-	# Install icon and .desktop for menu entry
-	if use gnome; then
-		insinto /usr/share/pixmaps
-		doins ${FILESDIR}/icon/mozillafirefox-bin-icon.png
-		# Fix bug 54179: Install .desktop file into /usr/share/applications
-		# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-		insinto /usr/share/applications
-		doins ${FILESDIR}/icon/mozillafirefox-bin.desktop
-	fi
-
-	# Normally firefox-bin-0.9 must be run as root once before it can
-	# be run as a normal user.  Drop in some initialized files to
-	# avoid this.
-	einfo "Extracting firefox-bin-${PV} initialization files"
-	tar xjpf ${FILESDIR}/firefox-bin-0.9-init.tar.bz2 -C ${D}/opt/firefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/opt/firefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /opt/firefox/plugins
-
-	# Remove entire installed instance to prevent all kinds of
-	# problems... see bug 44772 for example
-	rm -rf "${MOZILLA_FIVE_HOME}"
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/opt/firefox
-
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}