Do "emake versionclean" before dumping again. Add some die messages.

Package-Manager: portage-2.1.3.6

4 files changed, 29 insertions, 25 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 4f1e03ae4fb6..b8c792fef42b 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.172 2007/08/24 07:25:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.173 2007/08/25 12:35:48 ulm Exp $
+
+  25 Aug 2007; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r12.ebuild,
+  emacs-22.1-r1.ebuild:
+  Do "emake versionclean" before dumping again. Add some die messages.
 
 *emacs-22.1-r1 (24 Aug 2007)
 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 5aa6325ccb16..17f30b3e05ad 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -33,10 +33,10 @@ EBUILD emacs-18.59-r4.ebuild 2550 RMD160 7ca1968659bccb05eadd4ae05a65fec1680dcfd
 MD5 8d0aa7f3f3145cfb8fe4246216c70ed5 emacs-18.59-r4.ebuild 2550
 RMD160 7ca1968659bccb05eadd4ae05a65fec1680dcfd3 emacs-18.59-r4.ebuild 2550
 SHA256 c5e4a6cd90ca3b9125b6bde38f71e8095ede50ab1549f936748434e71bb51432 emacs-18.59-r4.ebuild 2550
-EBUILD emacs-21.4-r12.ebuild 6106 RMD160 5eaca0a501957d68b54b62653f601f30bfe1355a SHA1 58bb1dd88828c42de2b4b9c7f0459c1deaba67ff SHA256 359939917f2ea2da2408f3a2036d489cddc672592ac834e826d240f85f915cb0
-MD5 681b5880e1d872343be069a6ef6073e2 emacs-21.4-r12.ebuild 6106
-RMD160 5eaca0a501957d68b54b62653f601f30bfe1355a emacs-21.4-r12.ebuild 6106
-SHA256 359939917f2ea2da2408f3a2036d489cddc672592ac834e826d240f85f915cb0 emacs-21.4-r12.ebuild 6106
+EBUILD emacs-21.4-r12.ebuild 6214 RMD160 a913bd778c0e876fcca20ff975cb50c4f784b2d2 SHA1 e6ce46e2f8f876b4919727de94bc055098a493ea SHA256 545864bda751bc1b82d1231df21faa946e85d58872944a519c1b3989d8db8352
+MD5 b5cd1dce8ca642b4bf8f270c0af7534e emacs-21.4-r12.ebuild 6214
+RMD160 a913bd778c0e876fcca20ff975cb50c4f784b2d2 emacs-21.4-r12.ebuild 6214
+SHA256 545864bda751bc1b82d1231df21faa946e85d58872944a519c1b3989d8db8352 emacs-21.4-r12.ebuild 6214
 EBUILD emacs-21.4-r4.ebuild 4625 RMD160 526f8f16439908c07f39eb8ae65bad357234a43e SHA1 9df81608fd1c3e9817399b41a4f79e823f708cd2 SHA256 a98d86b02d36117e75fb0a0f48389d33d1a4ebe876a6195c8bc86f19ccdd00b5
 MD5 d6db2499cec98058defca14809636f20 emacs-21.4-r4.ebuild 4625
 RMD160 526f8f16439908c07f39eb8ae65bad357234a43e emacs-21.4-r4.ebuild 4625
@@ -45,18 +45,18 @@ EBUILD emacs-21.4-r8.ebuild 5783 RMD160 5f958c0db0594b20a417515b2b14cbb916fe8663
 MD5 e93f47faa2a921593465884e74379463 emacs-21.4-r8.ebuild 5783
 RMD160 5f958c0db0594b20a417515b2b14cbb916fe8663 emacs-21.4-r8.ebuild 5783
 SHA256 7e712990db400349e5ac52ac576c43a5ac22039e170816ff811965bab5cc7466 emacs-21.4-r8.ebuild 5783
-EBUILD emacs-22.1-r1.ebuild 7567 RMD160 8f17baf4f3399b12b85537721d89a10e93eca241 SHA1 2fef4dc82294281ee6d2266fa0fb7b4e811ef7fa SHA256 44e77e716145be111f10b6739f4469582700a60e72fb80b6337a0471f27dc454
-MD5 554047de32f58b732793303c7a15c2b2 emacs-22.1-r1.ebuild 7567
-RMD160 8f17baf4f3399b12b85537721d89a10e93eca241 emacs-22.1-r1.ebuild 7567
-SHA256 44e77e716145be111f10b6739f4469582700a60e72fb80b6337a0471f27dc454 emacs-22.1-r1.ebuild 7567
+EBUILD emacs-22.1-r1.ebuild 7583 RMD160 5b1995d68aa592a58480444c1dcd5d0f1f43e10e SHA1 8ddd6faee35e945cde3d57e705000041cf6cce50 SHA256 e7e575fdc89c93778749dc905dfcc671629beced7833b5d9c402ca5be8ae6e08
+MD5 c75cb84830e3d0afcbc96b984bbfec14 emacs-22.1-r1.ebuild 7583
+RMD160 5b1995d68aa592a58480444c1dcd5d0f1f43e10e emacs-22.1-r1.ebuild 7583
+SHA256 e7e575fdc89c93778749dc905dfcc671629beced7833b5d9c402ca5be8ae6e08 emacs-22.1-r1.ebuild 7583
 EBUILD emacs-22.1.ebuild 7354 RMD160 031695fbbc7c686f6d705a51c18bfb147abcca02 SHA1 eeb6e87b9db5bc8e66df0ce0da80591c23138cc5 SHA256 57ebc66410dc6e8a53ce6867ee6c8bc7f2d36d71fec37619c18608c388cebe8b
 MD5 3a0239ef3d2b9ae089476d8f2f141331 emacs-22.1.ebuild 7354
 RMD160 031695fbbc7c686f6d705a51c18bfb147abcca02 emacs-22.1.ebuild 7354
 SHA256 57ebc66410dc6e8a53ce6867ee6c8bc7f2d36d71fec37619c18608c388cebe8b emacs-22.1.ebuild 7354
-MISC ChangeLog 26448 RMD160 a644fdcad699196fc0d7617181eb327e5b39f922 SHA1 49ab171509af4c9d3a66d9545567f29585f3a41c SHA256 08ede1ad735fffe0d9f32645abfe56d6abd8c252234b88033d96d2d727201a17
-MD5 4683a10cecc927468b5e3000d2b28f8f ChangeLog 26448
-RMD160 a644fdcad699196fc0d7617181eb327e5b39f922 ChangeLog 26448
-SHA256 08ede1ad735fffe0d9f32645abfe56d6abd8c252234b88033d96d2d727201a17 ChangeLog 26448
+MISC ChangeLog 26614 RMD160 bf3ff0bf1d74d77391685966df66faf8a6e36089 SHA1 3879a4a5afe953eefd35603ce4631d4d9b51c24c SHA256 25a22db3c12cbe500cd2cfb3da9dab0263d0fd8df9fd37580e49a82050a7abd2
+MD5 aac28b75571e80c2a3a980e884ad1038 ChangeLog 26614
+RMD160 bf3ff0bf1d74d77391685966df66faf8a6e36089 ChangeLog 26614
+SHA256 25a22db3c12cbe500cd2cfb3da9dab0263d0fd8df9fd37580e49a82050a7abd2 ChangeLog 26614
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -82,7 +82,7 @@ SHA256 fade317ca7642c607422c8f3a829728969542fe5996e6ec5015fdea0bccf64e4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGzof3Oeoy/oIi7uwRArT8AJwMZoRZThE7eHRDpK4faQuuxXF14wCgtNhX
-x+HxGXzH1KVVDUxc+fTrXfU=
-=7XDN
+iD8DBQFG0CIyOeoy/oIi7uwRAo8sAKC9SmJbv34I8Nf5L7p6pSgmliG6tQCgl8u1
+4uLia/yXzu6Gpj4kM9PWa4k=
+=Rokw
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r12.ebuild b/app-editors/emacs/emacs-21.4-r12.ebuild
index 9cd8c9eab457..961bf1982c45 100644
--- a/app-editors/emacs/emacs-21.4-r12.ebuild
+++ b/app-editors/emacs/emacs-21.4-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.28 2007/08/24 07:25:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.29 2007/08/25 12:35:48 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -120,17 +120,17 @@ src_compile() {
 	else
 		myconf="${myconf} --without-x"
 	fi
-	econf ${myconf} || die
-	emake CC="$(tc-getCC)" || die
+	econf ${myconf} || die "econf failed"
+	emake CC="$(tc-getCC)" || die "emake failed"
 
 	einfo "Recompiling patched lisp files..."
-	(cd lisp; emake recompile) || die
-	rm etc/DOC-*
-	emake CC="$(tc-getCC)" || die
+	(cd lisp; emake recompile) || die "emake recompile failed"
+	(cd src; emake versionclean)
+	emake CC="$(tc-getCC)" || die "die emake failed"
 }
 
 src_install() {
-	einstall || die
+	einstall || die "einstall failed"
 	for i in "${D}"/usr/bin/* ; do
 		mv ${i} ${i}-emacs-${SLOT} || die "mv ${i} failed"
 	done
diff --git a/app-editors/emacs/emacs-22.1-r1.ebuild b/app-editors/emacs/emacs-22.1-r1.ebuild
index d8ffbd9ccc57..0e270322ccbe 100644
--- a/app-editors/emacs/emacs-22.1-r1.ebuild
+++ b/app-editors/emacs/emacs-22.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r1.ebuild,v 1.1 2007/08/24 07:25:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r1.ebuild,v 1.2 2007/08/25 12:35:48 ulm Exp $
 
 WANT_AUTOCONF="2.61"
 WANT_AUTOMAKE="latest"
@@ -141,7 +141,7 @@ src_compile() {
 
 	einfo "Recompiling patched lisp files..."
 	(cd lisp; emake recompile) || die "emake recompile failed"
-	rm etc/DOC-*
+	(cd src; emake versionclean)
 	emake CC="$(tc-getCC)" || die "emake failed"
 }