Fix bug 54402: change mozilla description from browser to application suite

7 files changed, 66 insertions, 56 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index 5b64028c4519..f4c6397097c4 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.173 2004/06/19 19:12:33 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.174 2004/06/19 20:43:57 agriffis Exp $
+
+  19 Jun 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.6-r1.ebuild,
+  mozilla-1.7.ebuild, mozilla-1.7_rc1-r1.ebuild, mozilla-1.7_rc2.ebuild,
+  mozilla-1.7_rc3.ebuild:
+  Fix bug 54402: change mozilla description from browser to application suite
+
+  19 Jun 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.6-r1.ebuild,
+  mozilla-1.7.ebuild, mozilla-1.7_rc1-r1.ebuild, mozilla-1.7_rc2.ebuild,
+  mozilla-1.7_rc3.ebuild:
+  Fix bug 54402: change mozilla description from browser to application suite
 
 *mozilla-1.7 (19 Jun 2004)
 
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index 2619c5df51e1..84968f6812a4 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,46 +1,46 @@
-MD5 2431e8c4091b5b50b56eb34fb4ba2146 ChangeLog 30626
+MD5 cff200926cf73fb110a0b1d82b86357d mozilla-1.7_rc1-r1.ebuild 15779
+MD5 83ed72b34c50ff76746b6bf0b22e9541 mozilla-1.7.ebuild 16378
+MD5 797a7141c65a237b7c52a83c3f9e7a58 mozilla-1.7_rc2.ebuild 16382
+MD5 1999727d91e2f5a3dbb65faa7f9ce143 mozilla-1.6-r1.ebuild 17065
+MD5 043f69bbc39325118d1cbc80d683b577 ChangeLog 31132
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 7379576ce2f1d449416cf3286c18200e mozilla-1.6-r1.ebuild 17203
-MD5 8d067ab8fe4012f38deea5ed347ae12a mozilla-1.7_rc1-r1.ebuild 15734
-MD5 3527fffac3a11d6971f192b3ce80d813 mozilla-1.7_rc2.ebuild 16337
-MD5 e28b86274c58ec63673c723cacded640 mozilla-1.7_rc3.ebuild 16337
-MD5 e89b00d90bd5522a4e50acab459a85e0 mozilla-1.7.ebuild 16329
-MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
-MD5 11cae063228d9997b2cf9f150d9837fe files/digest-mozilla-1.6-r1 201
-MD5 fd25ae9f126eecac401987c2c84fe136 files/digest-mozilla-1.7_rc1-r1 204
-MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
+MD5 c486077409eb2bbc08466f271e8695d5 mozilla-1.7_rc3.ebuild 16382
+MD5 e816a98fb3581a6d4a050aa4cdf12905 files/mozilla-1.7-amd64.patch 25433
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
-MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
 MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052
 MD5 3ad7410bd680964096c84eee3fa21abf files/mozilla-1.6-gcc-3.4.patch 460
-MD5 e816a98fb3581a6d4a050aa4cdf12905 files/mozilla-1.7-amd64.patch 25433
-MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
-MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
+MD5 11cae063228d9997b2cf9f150d9837fe files/digest-mozilla-1.6-r1 201
 MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
-MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
-MD5 2e275ac9f0f12d670020e3b18a295dfb files/mozilla.sh 6688
-MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
+MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
+MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
 MD5 6ad8ad7f83c525040d7211ec7fc33d01 files/digest-mozilla-1.7_rc2 204
 MD5 6b463df2a6fd5694f4988508ae5baca6 files/digest-mozilla-1.7_rc3 207
+MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
 MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
+MD5 2e275ac9f0f12d670020e3b18a295dfb files/mozilla.sh 6688
+MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
+MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
+MD5 fd25ae9f126eecac401987c2c84fe136 files/digest-mozilla-1.7_rc1-r1 204
 MD5 c3b63fbbf42894e19fff553092660af6 files/digest-mozilla-1.7 204
-MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
+MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
+MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
+MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
+MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
 MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
-MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
+MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
 MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605
-MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387
 MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
-MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
+MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387
+MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
+MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
 MD5 696d4810f2ccb8f2bcb0275fa13c67b9 files/1.2/mozilla-1.2b-gtk2.patch.bz2 6091
-MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
-MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
 MD5 1655fea18e9fc538b41d88561d6080c7 files/1.3/mozilla-1.3-fix-gtkim.patch 921
-MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
 MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
-MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
-MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
+MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
 MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
 MD5 ba7b561abda8274253ec38859a8797fc files/icon/mozilla.desktop 121
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
+MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
diff --git a/net-www/mozilla/mozilla-1.6-r1.ebuild b/net-www/mozilla/mozilla-1.6-r1.ebuild
index 421b8ce31d90..3eded7c2ffed 100644
--- a/net-www/mozilla/mozilla-1.6-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6-r1.ebuild,v 1.10 2004/04/26 18:30:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6-r1.ebuild,v 1.11 2004/06/19 20:43:57 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama"
 # Internal USE flags that I do not really want to advertise ...
@@ -61,7 +61,7 @@ PATCH_VER="1.0"
 MY_PV1="${PV/_}"
 MY_PV2="${MY_PV1/eta}"
 S="${WORKDIR}/mozilla"
-DESCRIPTION="The Mozilla Web Browser"
+DESCRIPTION="The Mozilla Application Suite - web browser, email, HTML editor, IRC"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV2}/src/${PN}-source-${MY_PV2}.tar.bz2
 	crypt? ( http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
 			 http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
@@ -113,7 +113,7 @@ moz_setup() {
 	export BUILD_OFFICIAL=1
 
 	# make sure the nss module gets build (for NSS support)
-	if [ -n "`use ssl`" ]
+	if use ssl
 	then
 		export MOZ_PSM="1"
 	fi
@@ -174,7 +174,7 @@ src_compile() {
 	local myconf=
 	# NOTE: QT and XLIB toolkit seems very unstable, leave disabled until
 	#       tested ok -- azarah
-	if [ -n "`use gtk2`" ]
+	if use gtk2
 	then
 		myconf="${myconf} --enable-toolkit-gtk2 \
 		                  --enable-default-toolkit=gtk2 \
@@ -189,12 +189,12 @@ src_compile() {
 			              --disable-toolkit-gtk2"
 	fi
 
-	if [ -z "`use ldap`" ]
+	if ! use ldap
 	then
 		myconf="${myconf} --disable-ldap"
 	fi
 
-	if [ -z "`use debug`" ]
+	if ! use debug
 	then
 		myconf="${myconf} --enable-strip-libs \
 			              --disable-debug \
@@ -212,9 +212,9 @@ src_compile() {
 	fi
 
 	# Check if we should enable Xft support ...
-	if [ -z "`use moznoxft`" ]
+	if ! use moznoxft
 	then
-		if [ -n "`use gtk2`" ]
+		if use gtk2
 		then
 			local pango_version=""
 
@@ -248,7 +248,7 @@ src_compile() {
 		myconf="${myconf} --disable-xft `use_enable truetype freetype2`"
 	fi
 
-	if [ -n "`use ipv6`" ]
+	if use ipv6
 	then
 		myconf="${myconf} --enable-ipv6"
 	fi
@@ -274,33 +274,33 @@ src_compile() {
 		sleep 3
 
 	local myext="default"
-	if [ -n "`use mozxmlterm`" ]
+	if use mozxmlterm
 	then
 		myext="${myext},xmlterm"
 	fi
-	if [ -n "`use mozaccess`" ]
+	if use mozaccess
 	then
 		myext="${myext},access-builtin"
 	fi
-	if [ -n "`use moznoirc`" ]
+	if use moznoirc
 	then
 		myext="${myext},-irc"
 	fi
 
 # Disable SVG until it's properly implemented
-#	if [ -n "`use mozsvg`" ]
+#	if use mozsvg
 #	then
 #		export MOZ_INTERNAL_LIBART_LGPL="1"
 #		myconf="${myconf} --enable-svg"
 #	else
 #		myconf="${myconf} --disable-svg"
 #	fi
-	if [ -n "`use mozcalendar`" ]
+	if use mozcalendar
 	then
 		myconf="${myconf} --enable-calendar"
 	fi
 
-	if [ -n "`use moznomail`" ]
+	if use moznomail
 	then
 		myconf="${myconf} --disable-mailnews"
 	fi
@@ -325,7 +325,7 @@ src_compile() {
 		fi
 	fi
 
-	if [ -n "`use alpha`" ]
+	if use alpha
 	then
 		# mozilla wont link with X11 on alpha, for some crazy reason.
 		# set it to link explicitly here.
@@ -334,7 +334,7 @@ src_compile() {
 	fi
 
 	# Check for xinerama - closes #19369
-	if [ -n "`use xinerama`" ] ; then
+	if use xinerama ; then
 		myconf="${myconf} --enable-xinerama=yes"
 	else
 		myconf="${myconf} --enable-xinerama=no"
@@ -390,7 +390,7 @@ src_compile() {
 	# *********************************************************************
 
 	# Build the NSS/SSL support
-	if [ "`use ssl`" ]
+	if use ssl
 	then
 		einfo "Building Mozilla NSS..."
 		cd ${S}/security/coreconf
@@ -453,7 +453,7 @@ src_install() {
 	mv ${D}/usr/lib/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
 
 	# Install the NSS/SSL libs, headers and tools
-	if [ "`use ssl`" ]
+	if use ssl
 	then
 		einfo "Installing Mozilla NSS..."
 		# Install the headers ('make install' do not work for headers ...)
@@ -534,7 +534,7 @@ src_install() {
 	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
 
 	# Install icon and .desktop for menu entry
-	if [ "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/pixmaps
 		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
diff --git a/net-www/mozilla/mozilla-1.7.ebuild b/net-www/mozilla/mozilla-1.7.ebuild
index d1adc86996f4..2b0d9303fd27 100644
--- a/net-www/mozilla/mozilla-1.7.ebuild
+++ b/net-www/mozilla/mozilla-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.ebuild,v 1.1 2004/06/19 19:12:33 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.ebuild,v 1.2 2004/06/19 20:43:57 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama xprint"
 # Internal USE flags that I do not really want to advertise ...
@@ -18,7 +18,7 @@ MY_PV=${PV/_alpha/a} 	# handle alpha
 MY_PV=${MY_PV/_beta/b}	# handle beta
 MY_PV=${MY_PV/_rc/rc}	# handle rc
 
-DESCRIPTION="The Mozilla Web Browser"
+DESCRIPTION="The Mozilla Application Suite - web browser, email, HTML editor, IRC"
 HOMEPAGE="http://www.mozilla.org"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2
 	crypt? ( !moznomail? (
diff --git a/net-www/mozilla/mozilla-1.7_rc1-r1.ebuild b/net-www/mozilla/mozilla-1.7_rc1-r1.ebuild
index cbede63cdea8..d400172b2167 100644
--- a/net-www/mozilla/mozilla-1.7_rc1-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.7_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc1-r1.ebuild,v 1.7 2004/06/09 19:21:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc1-r1.ebuild,v 1.8 2004/06/19 20:43:57 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama xprint"
 # Internal USE flags that I do not really want to advertise ...
@@ -18,7 +18,7 @@ MY_PV=${PV/_alpha/a} 	# handle alpha
 MY_PV=${MY_PV/_beta/b}	# handle beta
 MY_PV=${MY_PV/_rc/rc}	# handle rc
 
-DESCRIPTION="The Mozilla Web Browser"
+DESCRIPTION="The Mozilla Application Suite - web browser, email, HTML editor, IRC"
 HOMEPAGE="http://www.mozilla.org"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2
 	crypt? ( !moznomail? (
diff --git a/net-www/mozilla/mozilla-1.7_rc2.ebuild b/net-www/mozilla/mozilla-1.7_rc2.ebuild
index f8ced677ceb7..771b1e9fde33 100644
--- a/net-www/mozilla/mozilla-1.7_rc2.ebuild
+++ b/net-www/mozilla/mozilla-1.7_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc2.ebuild,v 1.2 2004/06/17 21:18:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc2.ebuild,v 1.3 2004/06/19 20:43:57 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama xprint"
 # Internal USE flags that I do not really want to advertise ...
@@ -18,7 +18,7 @@ MY_PV=${PV/_alpha/a} 	# handle alpha
 MY_PV=${MY_PV/_beta/b}	# handle beta
 MY_PV=${MY_PV/_rc/rc}	# handle rc
 
-DESCRIPTION="The Mozilla Web Browser"
+DESCRIPTION="The Mozilla Application Suite - web browser, email, HTML editor, IRC"
 HOMEPAGE="http://www.mozilla.org"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2
 	crypt? ( !moznomail? (
diff --git a/net-www/mozilla/mozilla-1.7_rc3.ebuild b/net-www/mozilla/mozilla-1.7_rc3.ebuild
index 44524003501e..eb43a1ca64e2 100644
--- a/net-www/mozilla/mozilla-1.7_rc3.ebuild
+++ b/net-www/mozilla/mozilla-1.7_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc3.ebuild,v 1.2 2004/06/17 21:18:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc3.ebuild,v 1.3 2004/06/19 20:43:57 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama xprint"
 # Internal USE flags that I do not really want to advertise ...
@@ -18,7 +18,7 @@ MY_PV=${PV/_alpha/a} 	# handle alpha
 MY_PV=${MY_PV/_beta/b}	# handle beta
 MY_PV=${MY_PV/_rc/rc}	# handle rc
 
-DESCRIPTION="The Mozilla Web Browser"
+DESCRIPTION="The Mozilla Application Suite - web browser, email, HTML editor, IRC"
 HOMEPAGE="http://www.mozilla.org"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2
 	crypt? ( !moznomail? (