Remove 1.7.6 in favor of 1.7.6-r1 to avoid build/rebuild cycle

(Portage version: 2.0.51.19)

4 files changed, 7 insertions, 85 deletions

diff --git a/www-client/mozilla-bin/ChangeLog b/www-client/mozilla-bin/ChangeLog
index db2408df641b..b35939aa58bb 100644
--- a/www-client/mozilla-bin/ChangeLog
+++ b/www-client/mozilla-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/mozilla-bin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/ChangeLog,v 1.4 2005/03/23 17:19:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/ChangeLog,v 1.5 2005/03/23 19:17:50 agriffis Exp $
+
+  23 Mar 2005; Aron Griffis <agriffis@gentoo.org> -mozilla-bin-1.7.6.ebuild,
+  mozilla-bin-1.7.6-r1.ebuild:
+  Remove 1.7.6 in favor of 1.7.6-r1 to avoid build/rebuild cycle
 
 *mozilla-bin-1.7.6-r1 (23 Mar 2005)
 
diff --git a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.6 b/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.6
deleted file mode 100644
index 06e4f32f76b6..000000000000
--- a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 99adbd71ece39242f4563bd6297e4372 mozilla-i686-pc-linux-gnu-1.7.6.tar.gz 13889017
diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.ebuild
index eb59bc88e689..a43334cd5fe4 100644
--- a/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.ebuild
+++ b/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.ebuild,v 1.1 2005/03/23 17:19:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.ebuild,v 1.2 2005/03/23 19:17:50 agriffis Exp $
 
 inherit nsplugins eutils mozilla-launcher
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.mozilla.org"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${PV}/mozilla-i686-pc-linux-gnu-${PV}.tar.gz"
 RESTRICT="nostrip"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 x86"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.6.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.6.ebuild
deleted file mode 100644
index 96fecf0e4c37..000000000000
--- a/www-client/mozilla-bin/mozilla-bin-1.7.6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/mozilla-bin-1.7.6.ebuild,v 1.2 2005/03/23 14:30:49 brad Exp $
-
-inherit nsplugins eutils mozilla-launcher
-
-IUSE=""
-
-# handle _rc versions
-MY_PV=${PV/_alpha/a} 	# handle alpha
-MY_PV=${MY_PV/_beta/b}	# handle beta
-MY_PV=${MY_PV/_rc/rc}	# handle rc
-
-MY_PN=${PN/-bin/}
-S=${WORKDIR}/mozilla
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-HOMEPAGE="http://www.mozilla.org"
-# 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/mozilla/releases/mozilla${PV}/mozilla-i686-pc-linux-gnu-${PV}.tar.gz"
-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+-1.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 mozilla in /opt
-	dodir /opt
-	mv ${S} ${D}/opt/mozilla
-
-	# Plugin path setup (rescuing the existing plugins)
-	src_mv_plugins /opt/mozilla/plugins
-
-	# Fixing permissions
-	chown -R root:root ${D}/opt/mozilla
-
-	# mozilla-launcher-1.8 supports -bin versions
-	dodir /usr/bin
-	dosym /usr/libexec/mozilla-launcher /usr/bin/mozilla-bin
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/mozilla-bin-icon.png
-	insinto /usr/share/applications
-	doins ${FILESDIR}/mozilla-bin.desktop
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/opt/mozilla
-
-	# Remove the old plugins dir
-	pkg_mv_plugins ${MOZILLA_FIVE_HOME}/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/mozilla
-
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}