Add messages to "die" commands.

Package-Manager: portage-2.2_rc85/cvs/Linux x86_64

3 files changed, 22 insertions, 19 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 47dbd806979d..93bd8b12d51d 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.24 2010/09/13 08:44:13 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.25 2010/09/22 20:35:57 ulm Exp $
+
+  22 Sep 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-24.0.9999.ebuild:
+  Add messages to "die" commands.
 
   13 Sep 2010; Christian Faulhammer <fauli@gentoo.org>
   emacs-vcs-24.0.9999.ebuild, metadata.xml:
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index a75b3e28ac38..d95e8214df55 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 EBUILD emacs-vcs-23.2.9999.ebuild 9850 RMD160 16e5a2f9cc4d308faf915a13bbced4ce00b3ae60 SHA1 d0b07d6315741151d7dde3e1e5b18c796ea30b03 SHA256 6ac70fba801be0ae346201e7a7f57e5770a2827bdb65681c086cd2ab4fdcb5c0
-EBUILD emacs-vcs-24.0.9999.ebuild 10034 RMD160 4526f0019be918604501b856a7d37ffd942b8b39 SHA1 5b55579247305703a4512500d8c05d238c2b3fb8 SHA256 674c195e54d7d9295abb24530f095ad18fc6f9f635289f9905c8bb1874b90919
-MISC ChangeLog 53503 RMD160 1cbae734307ef18efdb5d60973cff33351e87a96 SHA1 11b0044234582bc51cf2fb7ac43f000653001645 SHA256 42336af2fd545e3f23a14aa485254a4e03ef0d26be48fb411b16ea6ef7c34594
+EBUILD emacs-vcs-24.0.9999.ebuild 10333 RMD160 0af6154b33c83677a742874d93775bb6add5efe6 SHA1 4df454e09197dbcc92f77c040b489cf817132c5a SHA256 9ead146d8e2df7bb9730a782270f750861a8a33163bb47c3c2fe1af25c64001d
+MISC ChangeLog 53611 RMD160 92beff8e4cdbc745c4481fbf15f26d0b1de0792b SHA1 b3852853c1606533147541922336664431153df6 SHA256 3e72ca26152f665a0d93f336b08ec80118a6209733a6c52cd742268871bebdf9
 MISC metadata.xml 1842 RMD160 57ca3c2d25e695ead4faa6cb01b4d7a03939b511 SHA1 1960513308596b38c3ad7cd248924c903611d39b SHA256 9ebd8972aea68e7b3fd62915725ca35d0678b218d922a467a2c978fe44312ddb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyOgoMACgkQOeoy/oIi7uygtQCgnkMddLyw96kOW1SHhlRMshKP
-zZAAn2qlD+C0xRuj8i4vuZmHhcPHv+L2
-=a5Dn
+iEYEARECAAYFAkyaaP4ACgkQOeoy/oIi7uw6CgCgqPOj75i2P+JXmKxkfHYhMzBF
+GuMAoMErpqk8kv0QLsoFxW7uvgM0vInV
+=Wu1H
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
index b450f0c88e49..4db8325805d5 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.10 2010/09/13 08:44:13 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.11 2010/09/22 20:35:57 ulm Exp $
 
 EAPI=2
 
@@ -104,20 +104,20 @@ src_prepare() {
 
 	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
 		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
-		"${S}"/src/s/freebsd.h || die
+		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
 
 	if ! use alsa; then
 		# ALSA is detected even if not requested by its USE flag.
 		# Suppress it by supplying pkg-config with a wrong library name.
 		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die
+			|| die "unable to sed configure.in"
 	fi
 	if ! use gzip-el; then
 		# Emacs' build system automatically detects the gzip binary and
 		# compresses el files. We don't want that so confuse it with a
 		# wrong binary name
 		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die
+			|| die "unable to sed configure.in"
 	fi
 
 	eautoreconf
@@ -202,37 +202,37 @@ src_configure() {
 		--infodir=/usr/share/info/${EMACS_SUFFIX} \
 		--with-crt-dir=/usr/$(get_libdir) \
 		--without-compress-info \
-		${myconf} || die
+		${myconf} || die "econf emacs failed"
 }
 
 src_compile() {
 	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
 	if [ "${PV##*.}" = "9999" ]; then
-		emake CC="$(tc-getCC)" bootstrap || die
+		emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
 		# cleanup, otherwise emacs will be dumped again in src_install
 		(cd src; emake versionclean)
 	fi
-	emake CC="$(tc-getCC)" || die
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install () {
 	local i m
 
-	emake install DESTDIR="${D}" || die
+	emake install DESTDIR="${D}" || die "make install failed"
 
 	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die
+		|| die "removing duplicate emacs executable failed"
 	mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
-		|| die
+		|| die "moving Emacs executable failed"
 
 	# move info documentation to the correct place
 	for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
-		mv "${i}" "${i}.info" || die
+		mv "${i}" "${i}.info" || die "mv info failed"
 	done
 
 	# move man pages to the correct place
 	for m in "${D}"/usr/share/man/man1/* ; do
-		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die
+		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
 	done
 
 	# avoid collision between slots, see bug #169033 e.g.
@@ -270,7 +270,7 @@ src_install () {
 	EOF
 	elisp-site-file-install "${T}/${SITEFILE}" || die
 
-	dodoc README BUGS || die
+	dodoc README BUGS || die "dodoc failed"
 }
 
 emacs-infodir-rebuild() {