Add die messages. Also try emake -C instead of moving into a dir, make, then moving out.

3 files changed, 18 insertions, 15 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 5d031213d462..73d2ed519caa 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.166 2004/10/19 07:53:08 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.167 2004/10/19 08:00:00 spyderous Exp $
+
+  19 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add die messages. Also try emake -C instead of moving into a dir, make, then
+  moving out.
 
   19 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r2.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 28f416033731..6e1e07910631 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,8 +1,8 @@
 MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230
-MD5 02b558bb41deebf39c59dd92a8508fd7 xorg-x11-6.8.0-r2.ebuild 43496
+MD5 fce9fef35d73d83520bfbfd5b7d26613 xorg-x11-6.8.0-r2.ebuild 43675
 MD5 ca34ddd369d94ea86b0774e029f54efb xorg-x11-6.7.0-r2.ebuild 38072
 MD5 c81b82b9a07e0975156358918886607e xorg-x11-6.8.0-r1.ebuild 41319
-MD5 d587d5bc316b021733c1042d0b422381 ChangeLog 36540
+MD5 c044b56f2a58010a05e88c10f10ebb78 ChangeLog 36717
 MD5 5f6772219f532c3baf3fb3ceecf1ab65 files/digest-xorg-x11-6.8.0-r2 906
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
index 23f84b9b5ff1..ade860b42052 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.23 2004/10/19 07:53:08 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.24 2004/10/19 08:00:00 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -247,7 +247,7 @@ host_def_setup() {
 	HOSTCONF=config/cf/host.def
 
 	ebegin "Setting up ${HOSTCONF}"
-		cd ${S}; cp ${FILES_DIR}/site.def ${HOSTCONF} || die
+		cd ${S}; cp ${FILES_DIR}/site.def ${HOSTCONF} || die "host.def copy failed"
 		echo "#define XVendorString \"Gentoo Linux (The X.Org Foundation ${PV}, revision ${PR}-${PATCH_VER})\"" \
 			>> ${HOSTCONF}
 
@@ -686,16 +686,14 @@ src_compile() {
 	if use debug
 	then
 		chmod u+x ${S}/config/util/makeg.sh
-		FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" || die
+		FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" || die "debug make World failed"
 	else
-		FAST=1 emake World WORLDOPTS="" || die
+		FAST=1 emake World WORLDOPTS="" || die "make World failed"
 	fi
 
 	if use nls
 	then
-		cd ${S}/nls
-		make || die
-		cd ${S}
+		emake -C ${S}/nls || die "nls build failed"
 	fi
 
 }
@@ -968,26 +966,26 @@ src_install() {
 		make install DESTDIR=${D} || \
 		make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
 			CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \
-			install DESTDIR=${D} || die
+			install DESTDIR=${D} || die "install failed"
 	else
-		make install DESTDIR=${D} || die
+		make install DESTDIR=${D} || die "install failed"
 	fi
 
 	if use sdk
 	then
 		einfo "Installing X.org X11 SDK..."
-		make install.sdk DESTDIR=${D} || die
+		make install.sdk DESTDIR=${D} || die "sdk install failed"
 	fi
 
 	einfo "Installing man pages..."
-	make install.man DESTDIR=${D} || die
+	make install.man DESTDIR=${D} || die "man page install failed"
 	einfo "Compressing man pages..."
 	prepman /usr
 
 	if use nls
 	then
 		cd ${S}/nls
-		make DESTDIR=${D} install || die
+		make DESTDIR=${D} install || die "nls install failed"
 	fi
 
 	backward_compat_setup