Cleanup after bootstrapping. Depend on openmotif explicitely for USE=motif.

Package-Manager: portage-2.1.5.2

5 files changed, 28 insertions, 20 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index d7a4ef4b150a..f0b627eeebff 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.205 2008/05/15 15:31:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.206 2008/06/01 11:33:58 ulm Exp $
+
+  01 Jun 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.2.9999.ebuild,
+  emacs-cvs-23.0.50_pre20080201.ebuild, emacs-cvs-23.0.9999.ebuild:
+  Cleanup after bootstrapping, to prevent dumping emacs again in src_install.
+  Depend on x11-libs/openmotif explicitely for USE=motif.
 
   28 Mar 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.2.9999.ebuild,
   emacs-cvs-23.0.50_pre20080201.ebuild, emacs-cvs-23.0.9999.ebuild:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 7f152c56faf2..613306118f2a 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -4,15 +4,15 @@ Hash: SHA1
 AUX emacs-cvs-Xaw3d-headers.patch 2045 RMD160 96b8ce942b83a5177c965a9a3a485496eb672c67 SHA1 a04c98c22ed9608ac6d81db0b9031da9a5b115db SHA256 ed1ad532e6476a0c2311e2c76db82035455948ace4dffb17b3e6493ec22af59c
 AUX emacs-cvs-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 SHA1 71c6d9ee3b3e5149a33d440373a212b56fbd064c SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b
 DIST emacs-cvs-23.0.50_pre20080201.tar.bz2 21883295 RMD160 fa6f3b46fd642d4168018298e63f43afd4949233 SHA1 1b649cb9f3e9eafbe7e2fbe1e4523a92bf9dc72e SHA256 6aff7cf61e3873aa8620b0f491a5186dd449a8f3b9a321b2abab63807be4d5b9
-EBUILD emacs-cvs-22.2.9999.ebuild 8084 RMD160 6e54111d9d1f20ad7cf406720753891a923f57d7 SHA1 5a8ce9f06bc571c831d6627c3720bc360f234f47 SHA256 7617b371d13a3a0369efa00fa930dcac23345bea02c7d29892c447fff7f9cdc2
-EBUILD emacs-cvs-23.0.50_pre20080201.ebuild 7632 RMD160 faa0f788b5b3f63fe99edee397c027635b7a656f SHA1 80a3cdf7672f8003cab04ca75b9fdc80bbf5af15 SHA256 7a1dba12ec62a370bec5ae47bab76d455822ba989c696519a2f2ed9f551be14d
-EBUILD emacs-cvs-23.0.9999.ebuild 8569 RMD160 1da31dc6e7568c3b79c345c84b813e4cff07c61f SHA1 e1e4b0466110bb4f4e29dc5f3245e752ce196367 SHA256 a8f3c065811a4eb6367a2b640c6adf558292191c379db68d8e8c679a50c6af04
-MISC ChangeLog 39302 RMD160 f2acaa0c33ffd36f4c2f3b4ce44d27886431b8bc SHA1 8c88c9d99729bc78d0bf12c02bfded93f613d724 SHA256 101d9d549510ae1c37061a2398405619c10e95b5a1e3d820007f7f4362e7e9f6
+EBUILD emacs-cvs-22.2.9999.ebuild 8222 RMD160 f7f86ffd6618a92c9505c844ceb0145c4cf8bf6d SHA1 77039643da5b68c879b4a86aa03e5c289b70cf53 SHA256 fdb640f26d2a1e0540f1b0434d2f518a06294a684eacf983d82dc76348e83886
+EBUILD emacs-cvs-23.0.50_pre20080201.ebuild 7770 RMD160 a987e43111c2efccd24647b314373fb0011c2fb7 SHA1 f8d8ea68c492646a6d1e92c3b84127b6dbd89f2a SHA256 f7867103ec36f725de65533a85779eb3129bbb067fd4c1f0e9f4036c80f1a0eb
+EBUILD emacs-cvs-23.0.9999.ebuild 8707 RMD160 4ef23ec2f4abcb33476f77bcfe4a697e90bda519 SHA1 e8eea344e2a5261f36c9c6495cdb21789f743a34 SHA256 b61f02fe2ebc170c37b45380051eb7d9f99832f7eda4c51bf099c7ccfa116e95
+MISC ChangeLog 39582 RMD160 d96a7f9204487d180bb2adf2056e7bc115c0f0a4 SHA1 e5edb7c7f87fa69bf0ca87825a8abbd92ccc403c SHA256 0dda9824ff12a3ff81d14413764d5e06dfa48b87108df534f304945d6a58bf7c
 MISC metadata.xml 1213 RMD160 7df0bb43f41ecf811a37b60ee3cbefc7f798e840 SHA1 e545b177be5578569de6410bfea01cffe6003611 SHA256 1e71985b81478302fb03a9af91293f7dfad07aa7b31c4cc226170b45d573ce13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkgsV2cACgkQOeoy/oIi7uwwAACfVXMavhseFJIIe7DFni+16eZ9
-pZAAn39ElDbe2mIvtlNzmpV23jHvwrkp
-=yfI4
+iEYEARECAAYFAkhCiVQACgkQOeoy/oIi7uySBgCeOV+6KZQcsD4KY1rJFcmtXtQc
+ZiUAnjBCxGK6gn4VUjApvsm8r+HgP3yy
+=ULQH
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild
index d58e118765d5..59ab367fa4d4 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild,v 1.5 2008/04/22 17:49:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild,v 1.6 2008/06/01 11:33:58 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -43,9 +43,7 @@ RDEPEND="sys-libs/ncurses
 		gtk? ( =x11-libs/gtk+-2* )
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? (
-				motif? ( virtual/motif )
-			)
+			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
 		)
 	)"
 
@@ -159,6 +157,9 @@ src_compile() {
 		${myconf} || die "econf emacs failed"
 
 	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
+	# cleanup, otherwise emacs will be dumped again in src_install
+	(cd src; emake versionclean)
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install () {
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild
index 77030432236c..4dfc9d322af6 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild,v 1.7 2008/04/22 17:49:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild,v 1.8 2008/06/01 11:33:58 ulm Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -40,9 +40,7 @@ RDEPEND="sys-libs/ncurses
 		gtk? ( =x11-libs/gtk+-2* )
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? (
-				motif? ( virtual/motif )
-			)
+			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
 		)
 	)"
 
@@ -144,6 +142,9 @@ src_compile() {
 		${myconf} || die "econf emacs failed"
 
 	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
+	# cleanup, otherwise emacs will be dumped again in src_install
+	(cd src; emake versionclean)
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install () {
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
index f512b9b2c12b..cca490b309ca 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.4 2008/04/22 17:49:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.5 2008/06/01 11:33:58 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -56,9 +56,7 @@ RDEPEND="sys-libs/ncurses
 		gtk? ( =x11-libs/gtk+-2* )
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? (
-				motif? ( virtual/motif )
-			)
+			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
 		)
 	)"
 
@@ -179,6 +177,9 @@ src_compile() {
 		${myconf} || die "econf emacs failed"
 
 	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
+	# cleanup, otherwise emacs will be dumped again in src_install
+	(cd src; emake versionclean)
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install () {