NEVER use exit in an ebuild

2 files changed, 12 insertions, 8 deletions

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`