Catch errors in subdir make processes, fixes bug 299108.

Package-Manager: portage-2.2_rc61/cvs/Linux i686

4 files changed, 46 insertions, 9 deletions

diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index f07895952176..2433cc3fde35 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/vm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.84 2010/01/04 22:21:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.85 2010/01/04 22:45:42 ulm Exp $
+
+  04 Jan 2010; Ulrich Mueller <ulm@gentoo.org> vm-8.1.0_beta.ebuild,
+  +files/vm-8.1.0_beta-submake-errors.patch:
+  Catch errors in subdir make processes, fixes bug 299108.
 
   04 Jan 2010; Markus Meier <maekke@gentoo.org> vm-8.0.12-r6.ebuild:
   amd64 stable, bug #297885
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index 18a0b07f2f46..639c6c3e8cb8 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -13,6 +13,7 @@ AUX vm-8.0.12-emacs-23.patch 3704 RMD160 ad0a36c08968566d7abac86801c7ea072e8e122
 AUX vm-8.0.12-folder-corruption.patch 635 RMD160 1dc3454b6df2bfd9944c63e0e90b23ea18f45b03 SHA1 b11b9fb8de22f879313c5cd203cbf2cf76bd8f64 SHA256 f78007ef176ea9e8dd98ed01e2edec4055b9ef9356b0d85f8e3ca6341198febc
 AUX vm-8.0.12-supercite-yank-1.patch 733 RMD160 0cb7bae7019165d75b0c691aab37745f956053c0 SHA1 cde1312c400a6013739bd52400debcc0b8cfb8cc SHA256 49b3006d7dacbf17e334f4fae97cb35170e1a0c52ad11888d2dd40e7dfff0ac6
 AUX vm-8.0.12-supercite-yank.patch 642 RMD160 9a590b66a7ec907809fff3dedf8f7098c86b02cb SHA1 92ea521824b1f06dacb8cc463dca962c438eed8d SHA256 0b8f8242c31761b5dd0bb6510984e2099eff958acfe376dc16de7d6876bd910c
+AUX vm-8.1.0_beta-submake-errors.patch 911 RMD160 dac05bebc1ff0c732b6df8704c0ba9880fb5ccac SHA1 52213731de991c62cdcd7da37af8a5993c81f980 SHA256 fd138e9e29ffe87c3f864a59b212b9890a88a121b8ae0ca82b0b3aa5d28da286
 AUX vm-info-dir-fix-gentoo.patch 325 RMD160 51f59c36d9c0ae13eca4db61dc76ef1dabdd6d31 SHA1 3a1bce1bd3e91ef3b2403bab54bb47569933e88d SHA256 8320c7ae7c51a5985bb344ec04a153e263af87de3ff2d95a0a55814e2377d276
 DIST vm-7.19.tar.gz 381658 RMD160 7a28c0a096f1f8093cffb9fc621cd270dd67b432 SHA1 0fe9012b8988ebdec7641f48aca0ef365549c590 SHA256 54bdd076bb98cad57a71fb986d131963e97a13cc71f15819d32691e3c0c5bdb0
 DIST vm-8.0.12.tgz 547048 RMD160 b2e0976d349a182111dc928073dbbb9327087f6e SHA1 f7016a33c9ef8b8c291aa0c16ccc73adeb8e7c43 SHA256 1e7b6e3c7401a825d288420c5a7820a004eff4b0f8838018a5598c95a0d5de57
@@ -20,13 +21,13 @@ DIST vm-8.1.0-beta.tgz 682201 RMD160 8d4325ddd667f5671938df41e1e58e6c1cb7c927 SH
 EBUILD vm-7.19-r4.ebuild 1249 RMD160 cce2daf9056af80464421a39333a165dc5960c91 SHA1 bfcd041bedbf950d2c60d4bd5c0fb97d2852bd33 SHA256 5f95b9365e5081d690ea8f6d9ccd7343405673c0504af55dc856c89339761873
 EBUILD vm-8.0.12-r4.ebuild 1389 RMD160 5cd6435f2098b690f127317338589ba5bfb8bf20 SHA1 010bb91aebfb525d5c2faa9dc68b6d4b48b1f4c6 SHA256 9d012c84d8d0584606f7774fa25eca55526399caf2c67262d69dd265629eafb9
 EBUILD vm-8.0.12-r6.ebuild 1428 RMD160 8874f625c9d65d48d272ac9e250ff36db3c8f43a SHA1 b728d0ce230fbb3a7a596fe7185c83ba8b631919 SHA256 0de67e50fc61b751599b68f23605fb582b9a7101b1dc3db5a47ef7d3964175e0
-EBUILD vm-8.1.0_beta.ebuild 1249 RMD160 e9e6f2dc49d5abb031554d4eb70eaadaa22b39b3 SHA1 b7b8690dc4b78ada24c605be9dc6776fbe7ff094 SHA256 b5707031de417c408e51636d49a6aa6ea0c4903bef1925a69f6b2dbe85dc6773
-MISC ChangeLog 11716 RMD160 b59a91774f60b8f6721689e60fea60648562ff94 SHA1 543f43fa280b9e931c95d2ab38a5cfd645425e2e SHA256 7a287628ef3c25f31a1b48ea1c7fed65cfc1dacdb94b7671a1de2b6d3b639b74
+EBUILD vm-8.1.0_beta.ebuild 1298 RMD160 446e27dc06d39f613b419dc783489934660fb8db SHA1 948cbf63cd510693d76c3db4c83ff29a943757c2 SHA256 46ce49c28ad36124d4ef088918627193082d76a7504b2c783f73d6b1893da083
+MISC ChangeLog 11887 RMD160 252b79143547c53c09d313291b683e96b1c2de24 SHA1 3b4f5e8d54ab9405a09258a2c2281f3099a79e3e SHA256 656f73f2e9544d26f1eb4d56a67ed0d4da04f12009ce53d36838aff000c802ce
 MISC metadata.xml 616 RMD160 0671bc015f427662d3614403112ee15d0c457125 SHA1 27754651e0a70d9c85c159cb1e6175bc44c85de6 SHA256 9f491a8f5a4adb6bebc5ce9d5177a87d3daff04c7fa9cb3aad9a6a8e4909dec7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAktCaewACgkQkKaRLQcq0GL8vACfbCM3ZFpFBPLUEaupfu6eDr6M
-04UAn34OGm6tg5NKbSuhudmBe/SyUj4V
-=egx9
+iEYEARECAAYFAktCcDsACgkQOeoy/oIi7uydJACgmA9q74W/UxZTr9m/rc97FZy+
+4NQAnj86V6IGmW244Ghg5ba5bgOrk/4J
+=Yg7a
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/vm/files/vm-8.1.0_beta-submake-errors.patch b/app-emacs/vm/files/vm-8.1.0_beta-submake-errors.patch
new file mode 100644
index 000000000000..00136538e33d
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.1.0_beta-submake-errors.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/299108
+
+--- Makefile.in	2009-12-04 17:39:55 +0000
++++ Makefile.in	2009-12-31 15:32:51 +0000
+@@ -12,7 +12,7 @@
+ 
+ ##############################################################################
+ all: vm-load.el
+-	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i); done
++	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i) || exit 1; done
+ 
+ Makefile vm-load.el: %: config.status @srcdir@/%.in
+ 	./config.status $@
+@@ -25,13 +25,13 @@
+ 	./config.status --recheck
+ 
+ install:
+-	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i install); done
++	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i install) || exit 1; done
+ 
+ clean:
+-	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i clean); done
++	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i clean) || exit 1; done
+ 
+ distclean:
+-	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i distclean); done
++	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i distclean) || exit 1; done
+ 
+ push:
+ 	$(BZR) push
diff --git a/app-emacs/vm/vm-8.1.0_beta.ebuild b/app-emacs/vm/vm-8.1.0_beta.ebuild
index b1187d6a473d..080ceb533081 100644
--- a/app-emacs/vm/vm-8.1.0_beta.ebuild
+++ b/app-emacs/vm/vm-8.1.0_beta.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.0_beta.ebuild,v 1.2 2009/12/22 10:25:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.0_beta.ebuild,v 1.3 2010/01/04 22:45:42 ulm Exp $
 
 inherit elisp eutils
 
@@ -27,6 +27,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}/${P}-submake-errors.patch"
+
 	if ! use bbdb; then
 		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
 		epatch "${FILESDIR}/vm-8.0-no-pcrisis.patch"