Trim ebuild and fix use invocation

6 files changed, 15 insertions, 85 deletions

diff --git a/mail-client/mozilla-thunderbird-bin/ChangeLog b/mail-client/mozilla-thunderbird-bin/ChangeLog
index ef2fce55835d..848d73e16673 100644
--- a/mail-client/mozilla-thunderbird-bin/ChangeLog
+++ b/mail-client/mozilla-thunderbird-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/mozilla-thunderbird-bin
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.2 2004/06/03 06:36:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.3 2004/06/07 13:56:46 agriffis Exp $
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  -mozilla-thunderbird-bin-0.4.ebuild, mozilla-thunderbird-bin-0.5.ebuild,
+  mozilla-thunderbird-bin-0.6.ebuild:
+  Trim ebuild and fix use invocation
 
   02 Jun 2004; Seemant Kulleen <seemant@gentoo.org>
   +files/0.5/icon/mozillathunderbird.desktop,
diff --git a/mail-client/mozilla-thunderbird-bin/Manifest b/mail-client/mozilla-thunderbird-bin/Manifest
index 049fef042281..89ca8c378976 100644
--- a/mail-client/mozilla-thunderbird-bin/Manifest
+++ b/mail-client/mozilla-thunderbird-bin/Manifest
@@ -1,11 +1,9 @@
-MD5 aedc8fed7b297a5a9a0ae6912bafec32 mozilla-thunderbird-bin-0.4.ebuild 1991
-MD5 b0208d675b6143c1ea9de42d70fe9ef1 mozilla-thunderbird-bin-0.6.ebuild 1910
-MD5 40c1d1b6b005443a4df6776a77541ada mozilla-thunderbird-bin-0.5.ebuild 2129
-MD5 09aa2c35e48c5a235488d1a207e7571d ChangeLog 1667
+MD5 78f5f39541e8d8459b0d16b89233619a mozilla-thunderbird-bin-0.6.ebuild 1886
+MD5 9c0f9fb55a5e11407144aea8ac12580e mozilla-thunderbird-bin-0.5.ebuild 2105
+MD5 d5e912d11be8252519fa1fdb21d770f6 ChangeLog 1869
 MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
 MD5 7dd2dac40d6bb1cad39c82742ac7a949 files/MozillaThunderbird 294
 MD5 7dd2dac40d6bb1cad39c82742ac7a949 files/thunderbird 294
-MD5 680f6e780814d352113bbd3fc58b4052 files/digest-mozilla-thunderbird-bin-0.4 93
 MD5 d0ef06cd650e3b818c4654b87a6848b8 files/digest-mozilla-thunderbird-bin-0.5 93
 MD5 654ea1f7dbed8ebc5f0de9832c31c349 files/digest-mozilla-thunderbird-bin-0.6 89
 MD5 409c1fb9a49f402540b3ffa017bb3636 files/thunderbird-0.3-antialiasing-patch 1246
diff --git a/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-0.4 b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-0.4
deleted file mode 100644
index 72b4f07e522e..000000000000
--- a/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ed121921fe68be9a5be0de479a530943 thunderbird-0.4-i686-pc-linux-gtk2-gnu.tar.bz2 10330376
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.4.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.4.ebuild
deleted file mode 100644
index b7923d3f5610..000000000000
--- a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.4.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
-
-inherit nsplugins eutils
-
-IUSE="gnome"
-
-MY_PN=${PN/-bin/}
-S=${WORKDIR}/thunderbird
-
-DESCRIPTION="The Mozilla Thunderbird Mail & News Reader"
-SRC_URI="http://ftp.mozilla.org/pub/thunderbird/releases/${PV}/thunderbird-${PV}-i686-pc-linux-gtk2-gnu.tar.bz2"
-
-HOMEPAGE="http://www.mozilla.org/projects/thunderbird"
-RESTRICT="nostrip"
-
-KEYWORDS="~x86 -ppc -sparc -alpha"
-SLOT="0"
-LICENSE="MPL-1.1 | NPL-1.1"
-IUSE="gtk2 crypt"
-
-DEPEND="virtual/glibc"
-RDEPEND="virtual/x11
-	>=dev-libs/libIDL-0.8.0
-	>=gnome-base/ORBit-0.5.10-r1
-	>=x11-libs/gtk+-2.1.1
-	virtual/xft
-	>=media-libs/jpeg-6b
-	>=media-libs/libmng-1.0.0
-	>=media-libs/libpng-1.2.1
-	dev-libs/expat
-	app-arch/zip
-	app-arch/unzip
-	!net-mail/mozilla-thunderbird"
-
-src_install() {
-	dodir /opt
-
-	mv ${S} ${D}/opt/MozillaThunderbird
-
-	# Fixing permissions
-	chown -R root:root ${D}/opt/MozillaThunderbird
-
-	# Truetype fonts
-	cd ${D}/opt/MozillaThunderbird/defaults/pref
-	einfo "Enabling truetype fonts. Filesdir is ${FILESDIR}"
-	epatch ${FILESDIR}/thunderbird-0.3-antialiasing-patch
-
-	# Misc stuff
-	dobin ${FILESDIR}/MozillaThunderbird
-
-	# Install icon and .desktop for menu entry
-	if [ "`use gnome`" ]
-	then
-		insinto /usr/share/pixmaps
-		doins ${FILESDIR}/icon/thunderbird-icon.png
-
-		insinto /usr/share/gnome/apps/Internet
-		doins ${FILESDIR}/icon/mozillathunderbird.desktop
-	fi
-}
-
-pkg_postinst() {
-	einfo "To enable Enigmail, you must install the Enigmail and Enigmime"
-	einfo "extensions as root.  Go to Tools / Options / Extensions and click"
-	einfo "on Install Extension to install Enigmail in your Thunderbird build."
-	einfo "Restart Thunderbird after having installed both extensions."
-	einfo ""
-	einfo "The extensions are located at http://enigmail.mozdev.org/."
-	einfo ""
-}
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.5.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.5.ebuild
index 187ce006f293..9bb5bc2a0ae1 100644
--- a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.5.ebuild
+++ b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.5.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/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.5.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.5.ebuild,v 1.2 2004/06/07 13:56:46 agriffis Exp $
 
 inherit nsplugins eutils
 
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/thund
 HOMEPAGE="http://www.mozilla.org/projects/thunderbird"
 RESTRICT="nostrip"
 
-KEYWORDS="x86 -ppc -sparc -alpha"
+KEYWORDS="-* x86"
 SLOT="0"
 LICENSE="MPL-1.1 | NPL-1.1"
 IUSE="gtk2 crypt"
@@ -51,7 +51,7 @@ src_install() {
 	dobin ${FILESDIR}/thunderbird
 
 	# Install icon and .desktop for menu entry
-	if [ "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/pixmaps
 		doins ${FILESDIR}/${PV}/icon/thunderbird-icon.png
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.6.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.6.ebuild
index 758794142191..b25fe0fd1b8c 100644
--- a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.6.ebuild
+++ b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.6.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/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.6.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.6.ebuild,v 1.2 2004/06/07 13:56:46 agriffis Exp $
 
 inherit nsplugins eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/thund
 HOMEPAGE="http://www.mozilla.org/projects/thunderbird"
 RESTRICT="nostrip"
 
-KEYWORDS="~x86 -ppc -sparc -alpha"
+KEYWORDS="-* ~x86"
 SLOT="0"
 LICENSE="MPL-1.1 | NPL-1.1"
 IUSE="gnome gtk2 crypt"
@@ -43,7 +43,7 @@ src_install() {
 	dobin ${FILESDIR}/thunderbird
 
 	# Install icon and .desktop for menu entry
-	if [ "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/pixmaps
 		doins ${FILESDIR}/${PV}/icon/thunderbird-icon.png