Trim old ebuilds

7 files changed, 15 insertions, 449 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 6ec65c4e319a..6a088af1ddff 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/mozilla-thunderbird
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.2 2004/06/03 06:31:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.3 2004/06/07 04:15:55 agriffis Exp $
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  -mozilla-thunderbird-0.3-r1.ebuild, -mozilla-thunderbird-0.4.ebuild,
+  mozilla-thunderbird-0.5-r1.ebuild, mozilla-thunderbird-0.5.ebuild:
+  Trim old ebuilds
 
   02 Jun 2004; Seemant Kulleen <seemant@gentoo.org>
   +files/enigmail/Makefile-enigmail, +files/enigmail/Makefile-ipc:
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.3-r1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.3-r1
deleted file mode 100644
index 1091020a9b19..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 63bfc18db94e605a25a222e417d3a69d thunderbird-source-0.3.tar.bz2 30518769
-MD5 7fff5f1f5e9757eec09fd81051c34db4 enigmail-0.82.2.tar.gz 254794
-MD5 6cd6efb8cea6bb24fde3e02ba7f46676 ipc-1.0.4.tar.gz 134269
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.4 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.4
deleted file mode 100644
index 2edfc1c19787..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2de7805fcb3ca4a08b6062b426dfdad3 thunderbird-source-0.4.tar.bz2 30968925
-MD5 8ec2a2156cb5b646e9ce78dcdaab2d0a enigmail-0.82.4.tar.gz 270240
-MD5 457f8277b12f3e37defa71dc186f83b4 ipc-1.0.5.tar.gz 137083
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.3-r1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.3-r1.ebuild
deleted file mode 100644
index fa593843209a..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.3-r1.ebuild
+++ /dev/null
@@ -1,216 +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/mozilla-thunderbird-0.3-r1.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
-
-inherit makeedit flag-o-matic gcc nsplugins
-
-# Added to get thunderbird to compile on sparc.
-replace-sparc64-flags
-if [ "`use ppc`" -a "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -eq "3" ]
-then
-
-append-flags -fno-strict-aliasing
-
-fi
-
-
-S=${WORKDIR}/mozilla
-
-EMVER="0.82.2"
-IPCVER="1.0.4"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-SRC_URI="http://ftp.mozilla.org/pub/thunderbird/releases/${PV}/thunderbird-source-${PV}.tar.bz2
-	 crypt? ( mirror://gentoo/enigmail-${EMVER}.tar.gz
-	   		  http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-SLOT="0"
-LICENSE="MPL-1.1 | NPL-1.1"
-IUSE="gtk2 ipv6 crypt"
-
-RDEPEND="virtual/x11
-	>=dev-libs/libIDL-0.8.0
-	>=gnome-base/ORBit-0.5.10-r1
-	virtual/xft
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/jpeg-6b
-	>=media-libs/libmng-1.0.0
-	>=media-libs/libpng-1.2.1
-	>=sys-apps/portage-2.0.36
-	dev-libs/expat
-	app-arch/zip
-	app-arch/unzip
-	gtk2? ( >=x11-libs/gtk+-2.1.1 )
-	!gtk2? ( =x11-libs/gtk+-1.2* )
-	crypt? ( >=app-crypt/gnupg-1.2.1 )"
-
-DEPEND="${RDEPEND}
-	virtual/glibc
-	dev-lang/perl"
-
-# needed by src_compile() and src_install()
-export MOZ_THUNDERBIRD=1
-export MOZ_ENABLE_XFT=1
-
-pkg_setup() {
-	einfo "Please unmerge previous installs of Mozilla Thunderbird before"
-	einfo "merging this. Running emerge unmerge mozilla-thunderbird && rm -rf"
-	einfo "/usr/lib/MozillaThunderbird will ensure that all files are"
-	einfo "removed. If you need to do this, please press ctrl-c now and"
-	einfo "resume emerging once you're done."
-	sleep 5
-}
-
-src_unpack() {
-
-	unpack thunderbird-source-${PV}.tar.bz2
-
-	# Unpack the enigmail plugin
-	if use crypt
-		then
-			unpack ipc-${IPCVER}.tar.gz
-			unpack enigmail-${EMVER}.tar.gz
-
-			mv -f ${WORKDIR}/ipc ${S}/extensions/
-			mv -f ${WORKDIR}/enigmail ${S}/extensions/
-			cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
-			cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
-	fi
-
-}
-
-src_compile() {
-	local myconf="--with-x \
-		--with-system-jpeg \
-		--with-system-zlib \
-		--with-system-png \
-		--with-system-mng \
-		--disable-calendar \
-		--enable-xft \
-		--disable-pedantic \
-		--disable-svg \
-		--enable-mathml \
-		--without-system-nspr \
-		--enable-nspr-autoconf \
-		--enable-xsl \
-		--enable-crypto \
-		--enable-xinerama=no \
-		--with-pthreads \
-		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
-		--with-user-appdir=.thunderbird \
-		--disable-jsd \
-		--disable-accessibility \
-		--disable-profilesharing \
-		--disable-necko-disk-cache \
-		--disable-activex-scripting \
-		--disable-installer \
-		--disable-activex \
-		--disable-tests \
-		--disable-debug \
-		--disable-dtd-debug \
-		--disable-logging \
-		--enable-reorder \
-		--enable-optimize="-O2" \
-		--enable-strip \
-		--enable-strip-libs \
-		--enable-cpp-rtti \
-		--enable-xterm-updates \
-		--disable-toolkit-qt \
-		--disable-toolkit-xlib \
-		--enable-extensions=wallet,spellcheck \
-		--enable-necko-protocols=http,file,jar,viewsource,res,data \
-		--enable-image-decoders=png,gif,jpeg"
-
-	if [ -n "`use gtk2`" ] ; then
-		myconf="${myconf} --enable-toolkit-gtk2 \
-							--enable-default-toolkit=gtk2 \
-							--disable-toolkit-gtk"
-	else
-		myconf="${myconf} --enable-toolkit-gtk \
-							--enable-default-toolkit=gtk \
-							--disable-toolkit-gtk2"
-	fi
-
-	if [ -n "`use ipv6`" ] ; then
-		myconf="${myconf} --enable-ipv6"
-	fi
-
-	# Crashes on start when compiled with -fomit-frame-pointer
-	filter-flags -fomit-frame-pointer -mpowerpc-gfxopt
-	filter-flags -ffast-math
-	append-flags -s -fforce-addr
-
-	if [ "$(gcc-major-version)" -eq "3" ]; then
-		# Currently gcc-3.2 or older do not work well if we specify "-march"
-		# and other optimizations for pentium4.
-		if [ "$(gcc-minor-version)" -lt "3" ]; then
-			replace-flags -march=pentium4 -march=pentium3
-			filter-flags -msse2
-		fi
-
-	fi
-
-	econf ${myconf} || die
-
-	edit_makefiles
-	emake MOZ_THUNDERBIRD=1 || die
-
-	# Build the enigmail plugin
-	if use crypt
-	then
-		einfo "Building Enigmail plugin..."
-		cd ${S}/extensions/ipc
-		make || die
-
-		cd ${S}/extensions/enigmail
-		make || die
-	fi
-}
-
-src_install() {
-	dodir /usr/lib
-	dodir /usr/lib/MozillaThunderbird
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaThunderbird
-
-	#fix permissions
-	chown -R root:root ${D}/usr/lib/MozillaThunderbird
-
-	dobin ${FILESDIR}/MozillaThunderbird
-
-	# Install icon and .desktop for menu entry
-	if [ "`use gnome`" ]
-	then
-		insinto /usr/share/pixmaps
-		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
-
-		# Fix comment of menu entry
-		cd ${S}/build/package/rpm/SOURCES
-		cp mozilla.desktop mozillathunderbird.desktop
-		perl -pi -e 's:Name=Mozilla:Name=Mozilla Thunderbird:' mozillathunderbird.desktop
-		perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Thunderbird Mail Client:' mozillathunderbird.desktop
-		perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/MozillaThunderbird:' mozillathunderbird.desktop
-		cd ${S}
-		insinto /usr/share/gnome/apps/Internet
-		doins ${S}/build/package/rpm/SOURCES/mozillathunderbird.desktop
-	fi
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaThunderbird"
-
-	# Needed to update the run time bindings for REGXPCOM
-	# (do not remove next line!)
-	env-update
-	# Register Components and Chrome
-	einfo "Registering Components and Chrome..."
-	LD_LIBRARY_PATH=/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regxpcom
-	LD_LIBRARY_PATH=/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regchrome
-	# Fix permissions of component registry
-	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
-	# Fix directory permissions
-	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
-	# Fix permissions on chrome files
-	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
-}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.4.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.4.ebuild
deleted file mode 100644
index 74bf25f15378..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.4.ebuild
+++ /dev/null
@@ -1,217 +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/mozilla-thunderbird-0.4.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
-
-inherit makeedit flag-o-matic gcc nsplugins eutils
-
-# Added to get thunderbird to compile on sparc.
-replace-sparc64-flags
-if [ "`use ppc`" -a "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -eq "3" ]
-then
-
-append-flags -fno-strict-aliasing
-
-fi
-
-
-S=${WORKDIR}/mozilla
-
-EMVER="0.82.4"
-IPCVER="1.0.5"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-SRC_URI="http://ftp.mozilla.org/pub/thunderbird/releases/${PV}/thunderbird-source-${PV}.tar.bz2
-	 crypt? ( mirror://gentoo/enigmail-${EMVER}.tar.gz
-	   		  http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
-
-KEYWORDS="~x86 ~ppc sparc ~alpha ~amd64"
-SLOT="0"
-LICENSE="MPL-1.1 | NPL-1.1"
-IUSE="gtk2 ipv6 crypt"
-
-RDEPEND="virtual/x11
-	>=dev-libs/libIDL-0.8.0
-	>=gnome-base/ORBit-0.5.10-r1
-	virtual/xft
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/jpeg-6b
-	>=media-libs/libmng-1.0.0
-	>=media-libs/libpng-1.2.1
-	>=sys-apps/portage-2.0.36
-	dev-libs/expat
-	app-arch/zip
-	app-arch/unzip
-	gtk2? ( >=x11-libs/gtk+-2.1.1 )
-	!gtk2? ( =x11-libs/gtk+-1.2* )
-	crypt? ( >=app-crypt/gnupg-1.2.1 )"
-
-DEPEND="${RDEPEND}
-	virtual/glibc
-	dev-lang/perl"
-
-# needed by src_compile() and src_install()
-export MOZ_THUNDERBIRD=1
-export MOZ_ENABLE_XFT=1
-
-#pkg_setup() {
-#	einfo "Please unmerge previous installs of Mozilla Thunderbird before"
-#	einfo "merging this. Running emerge unmerge mozilla-thunderbird && rm -rf"
-#	einfo "/usr/lib/MozillaThunderbird will ensure that all files are"
-#	einfo "removed. If you need to do this, please press ctrl-c now and"
-#	einfo "resume emerging once you're done."
-#	sleep 5
-#}
-
-src_unpack() {
-
-	unpack thunderbird-source-${PV}.tar.bz2
-
-	# Unpack the enigmail plugin
-	if use crypt
-		then
-			unpack ipc-${IPCVER}.tar.gz
-			unpack enigmail-${EMVER}.tar.gz
-
-			mv -f ${WORKDIR}/ipc ${S}/extensions/
-			mv -f ${WORKDIR}/enigmail ${S}/extensions/
-			cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
-			cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
-	fi
-
-	use amd64 && epatch ${FILESDIR}/mozilla-thunderbird-amd64.patch
-}
-
-src_compile() {
-	local myconf="--with-x \
-		--with-system-jpeg \
-		--with-system-zlib \
-		--with-system-png \
-		--with-system-mng \
-		--disable-calendar \
-		--enable-xft \
-		--disable-pedantic \
-		--disable-svg \
-		--enable-mathml \
-		--without-system-nspr \
-		--enable-nspr-autoconf \
-		--enable-xsl \
-		--enable-crypto \
-		--enable-xinerama=no \
-		--with-pthreads \
-		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
-		--with-user-appdir=.thunderbird \
-		--disable-jsd \
-		--disable-accessibility \
-		--disable-profilesharing \
-		--disable-necko-disk-cache \
-		--disable-activex-scripting \
-		--disable-installer \
-		--disable-activex \
-		--disable-tests \
-		--disable-debug \
-		--disable-dtd-debug \
-		--disable-logging \
-		--enable-reorder \
-		--enable-optimize="-O2" \
-		--enable-strip \
-		--enable-strip-libs \
-		--enable-cpp-rtti \
-		--enable-xterm-updates \
-		--disable-toolkit-qt \
-		--disable-toolkit-xlib \
-		--enable-extensions=wallet,spellcheck \
-		--enable-necko-protocols=http,file,jar,viewsource,res,data \
-		--enable-image-decoders=png,gif,jpeg"
-
-	if [ -n "`use gtk2`" ] ; then
-		myconf="${myconf} --enable-toolkit-gtk2 \
-							--enable-default-toolkit=gtk2 \
-							--disable-toolkit-gtk"
-	else
-		myconf="${myconf} --enable-toolkit-gtk \
-							--enable-default-toolkit=gtk \
-							--disable-toolkit-gtk2"
-	fi
-
-	if [ -n "`use ipv6`" ] ; then
-		myconf="${myconf} --enable-ipv6"
-	fi
-
-	# Crashes on start when compiled with -fomit-frame-pointer
-	filter-flags -fomit-frame-pointer -mpowerpc-gfxopt
-	filter-flags -ffast-math
-	append-flags -s -fforce-addr
-
-	if [ "$(gcc-major-version)" -eq "3" ]; then
-		# Currently gcc-3.2 or older do not work well if we specify "-march"
-		# and other optimizations for pentium4.
-		if [ "$(gcc-minor-version)" -lt "3" ]; then
-			replace-flags -march=pentium4 -march=pentium3
-			filter-flags -msse2
-		fi
-
-	fi
-
-	econf ${myconf} || die
-
-	edit_makefiles
-	emake MOZ_THUNDERBIRD=1 || die
-
-	# Build the enigmail plugin
-	if use crypt
-	then
-		einfo "Building Enigmail plugin..."
-		cd ${S}/extensions/ipc
-		make || die
-
-		cd ${S}/extensions/enigmail
-		make || die
-	fi
-}
-
-src_install() {
-	dodir /usr/lib
-	dodir /usr/lib/MozillaThunderbird
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaThunderbird
-
-	#fix permissions
-	chown -R root:root ${D}/usr/lib/MozillaThunderbird
-
-	dobin ${FILESDIR}/MozillaThunderbird
-
-	# Install icon and .desktop for menu entry
-	if [ "`use gnome`" ]
-	then
-		insinto /usr/share/pixmaps
-		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
-
-		# Fix comment of menu entry
-		cd ${S}/build/package/rpm/SOURCES
-		cp mozilla.desktop mozillathunderbird.desktop
-		perl -pi -e 's:Name=Mozilla:Name=Mozilla Thunderbird:' mozillathunderbird.desktop
-		perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Thunderbird Mail Client:' mozillathunderbird.desktop
-		perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/MozillaThunderbird:' mozillathunderbird.desktop
-		cd ${S}
-		insinto /usr/share/gnome/apps/Internet
-		doins ${S}/build/package/rpm/SOURCES/mozillathunderbird.desktop
-	fi
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaThunderbird"
-
-	# Needed to update the run time bindings for REGXPCOM
-	# (do not remove next line!)
-	env-update
-	# Register Components and Chrome
-	einfo "Registering Components and Chrome..."
-	LD_LIBRARY_PATH=/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regxpcom
-	LD_LIBRARY_PATH=/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regchrome
-	# Fix permissions of component registry
-	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
-	# Fix directory permissions
-	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
-	# Fix permissions on chrome files
-	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
-}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild
index 2c4c8dc0736f..d4ca61310f87 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5-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/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild,v 1.2 2004/06/07 04:15:55 agriffis Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins eutils
 
@@ -114,7 +114,7 @@ src_compile() {
 		--enable-necko-protocols=http,file,jar,viewsource,res,data \
 		--enable-image-decoders=png,gif,jpeg"
 
-	if [ -n "`use gtk2`" ] ; then
+	if use gtk2 ; then
 		myconf="${myconf} --enable-toolkit-gtk2 \
 							--enable-default-toolkit=gtk2 \
 							--disable-toolkit-gtk"
@@ -124,12 +124,12 @@ src_compile() {
 							--disable-toolkit-gtk2"
 	fi
 
-	if [ -n "`use ipv6`" ] ; then
+	if use ipv6 ; then
 		myconf="${myconf} --enable-ipv6"
 	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"
@@ -185,7 +185,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 ${S}/build/package/rpm/SOURCES/mozilla-icon.png
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5.ebuild
index 820a18013d1f..9c3c1c9ac0f3 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-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/mozilla-thunderbird-0.5.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5.ebuild,v 1.2 2004/06/07 04:15:55 agriffis Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins eutils
 
@@ -125,7 +125,7 @@ src_compile() {
 		--enable-necko-protocols=http,file,jar,viewsource,res,data \
 		--enable-image-decoders=png,gif,jpeg"
 
-	if [ -n "`use gtk2`" ] ; then
+	if use gtk2 ; then
 		myconf="${myconf} --enable-toolkit-gtk2 \
 							--enable-default-toolkit=gtk2 \
 							--disable-toolkit-gtk"
@@ -135,7 +135,7 @@ src_compile() {
 							--disable-toolkit-gtk2"
 	fi
 
-	if [ -n "`use ipv6`" ] ; then
+	if use ipv6 ; then
 		myconf="${myconf} --enable-ipv6"
 	fi
 
@@ -182,7 +182,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 ${S}/build/package/rpm/SOURCES/mozilla-icon.png