NEVER use exit in an ebuild

4 files changed, 18 insertions, 18 deletions

diff --git a/games-fps/ut2003/ut2003-2225.ebuild b/games-fps/ut2003/ut2003-2225.ebuild
index 05790184e6cb..b7e7af07c99a 100644
--- a/games-fps/ut2003/ut2003-2225.ebuild
+++ b/games-fps/ut2003/ut2003-2225.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ut2003-2225.ebuild,v 1.6 2003/10/04 19:06:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ut2003-2225.ebuild,v 1.7 2003/11/20 02:26:37 vapier Exp $
 
 inherit games
 
@@ -169,8 +169,7 @@ pkg_postinst() {
 				if [ "$CDKEY1" == "$CDKEY2" ]; then
 					echo "$CDKEY1" | tr a-z A-Z > ${dir}/System/cdkey
 					einfo "Thank you!"
-					sleep 1
-					exit 0
+					break
 				else
 					eerror "Your CD key entries don't match. Try again."
 				fi
diff --git a/media-gfx/gimp/gimp-1.2.3-r3.ebuild b/media-gfx/gimp/gimp-1.2.3-r3.ebuild
index 076e6aa7e797..3de1ac7fd5ef 100644
--- a/media-gfx/gimp/gimp-1.2.3-r3.ebuild
+++ b/media-gfx/gimp/gimp-1.2.3-r3.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r3.ebuild,v 1.11 2003/09/06 23:56:38 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r3.ebuild,v 1.12 2003/11/20 02:27:27 vapier Exp $
 
 inherit eutils flag-o-matic
 
-IUSE="python nls gnome aalib perl"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="The GIMP"
-SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.2/v${PV}/${P}.tar.bz2"
 HOMEPAGE="http://www.gimp.org/"
+SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.2/v${PV}/${P}.tar.bz2"
 
+LICENSE="GPL-2"
 SLOT="1.2"
 KEYWORDS="x86 ppc sparc alpha"
-LICENSE="GPL-2"
+IUSE="python nls gnome aalib perl"
 
 RDEPEND="=x11-libs/gtk+-1.2*
 	aalib? ( >=media-libs/aalib-1.2 )
@@ -22,7 +20,6 @@ RDEPEND="=x11-libs/gtk+-1.2*
 		>=dev-perl/gtk-perl-0.7004 )
 	python? ( >=dev-lang/python-2.0 )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
-
 DEPEND="nls? ( sys-devel/gettext )
 	sys-devel/autoconf
 	sys-devel/automake
diff --git a/media-video/mtxdrivers/mtxdrivers-0.2.1.ebuild b/media-video/mtxdrivers/mtxdrivers-0.2.1.ebuild
index d7d95b00c000..ff75d12694c0 100644
--- a/media-video/mtxdrivers/mtxdrivers-0.2.1.ebuild
+++ b/media-video/mtxdrivers/mtxdrivers-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mtxdrivers/mtxdrivers-0.2.1.ebuild,v 1.8 2003/08/07 04:20:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mtxdrivers/mtxdrivers-0.2.1.ebuild,v 1.9 2003/11/20 02:29:38 vapier Exp $
 
 RELEASE=2002
 DESCRIPTION="Drviers for the Matrox Parhelia card."
@@ -14,14 +14,14 @@ KEYWORDS="x86"
 DEPEND=">=x11-base/xfree-4.1.0
 	virtual/kernel"
 
-Xversion=`X -version 2>&1 | grep -s "XFree86 Version" | cut -d" " -f3 | sed -e "s/\([^\.]*\.[^\.]*\.[^\.]*\)\.[^\.]*/\1/"`
-
 src_unpack() {
 	unpack ${A}
 	mv mtxdrivers ${P}
 }
 
 src_compile() {
+	Xversion=`X -version 2>&1 | grep -s "XFree86 Version" | cut -d" " -f3 | sed -e "s/\([^\.]*\.[^\.]*\.[^\.]*\)\.[^\.]*/\1/"`
+
 	# hack to make mtx.o compile with rmap enabled kernels
 	if [ ${RMAPHACK} = "yes" ]; then
 		cp kernel/src/mtx_vm.c kernel/src/mtx_vm.c.orig
@@ -33,7 +33,7 @@ src_compile() {
 
 	if [ ! -e ${S}/xfree86/${Xversion} ]; then
 		eerror "Matrox does not support XFree v${Xversion}"
-		exit 1
+		die
 	fi
 
 	cd ${S}/kernel/src
@@ -42,6 +42,8 @@ src_compile() {
 }
 
 src_install() {
+	Xversion=`X -version 2>&1 | grep -s "XFree86 Version" | cut -d" " -f3 | sed -e "s/\([^\.]*\.[^\.]*\.[^\.]*\)\.[^\.]*/\1/"`
+
 	Xpath="`which X | sed -e "s:/bin/X$::"`"
 	Kversion=`uname -r`
 
diff --git a/media-video/mtxdrivers/mtxdrivers-0.3.0.ebuild b/media-video/mtxdrivers/mtxdrivers-0.3.0.ebuild
index 3e4f054710e1..9c180b48d614 100644
--- a/media-video/mtxdrivers/mtxdrivers-0.3.0.ebuild
+++ b/media-video/mtxdrivers/mtxdrivers-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mtxdrivers/mtxdrivers-0.3.0.ebuild,v 1.6 2003/09/10 22:35:28 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mtxdrivers/mtxdrivers-0.3.0.ebuild,v 1.7 2003/11/20 02:29:38 vapier Exp $
 
 At="mtxdrivers-rh9.0-0.3.0.run"
 DESCRIPTION="Drviers for the Matrox Parhelia and Millenium P650/P750 cards."
@@ -16,8 +16,6 @@ DEPEND=">=x11-base/xfree-4.2.0
 	virtual/kernel
 	!mtxdrivers-pro"
 
-Xversion=`X -version 2>&1 | grep -s "XFree86 Version" | cut -d" " -f3 | sed -e "s/\([^\.]*\.[^\.]*\.[^\.]*\)\.[^\.]*/\1/"`
-
 pkg_nofetch() {
 	einfo "You must go to: http://www.matrox.com/mga/registration/home.cfm?refid=7667"
 	einfo "(for the RH9.0 drivers) and log in (or create an account) to download the"
@@ -32,9 +30,11 @@ src_unpack() {
 }
 
 src_compile() {
+	Xversion=`X -version 2>&1 | grep -s "XFree86 Version" | cut -d" " -f3 | sed -e "s/\([^\.]*\.[^\.]*\.[^\.]*\)\.[^\.]*/\1/"`
+
 	if [ ! -e ${S}/xfree86/${Xversion} ]; then
 		eerror "Matrox does not support XFree v${Xversion}"
-		exit 1
+		die
 	fi
 
 	export PARHELIUX=$PWD/src
@@ -47,6 +47,8 @@ src_compile() {
 }
 
 src_install() {
+	Xversion=`X -version 2>&1 | grep -s "XFree86 Version" | cut -d" " -f3 | sed -e "s/\([^\.]*\.[^\.]*\.[^\.]*\)\.[^\.]*/\1/"`
+
 	Xpath="`which X | sed -e "s:/bin/X$::"`"
 	Kversion=`uname -r`