Fix "temacs: command not found" build problem.

Package-Manager: portage-2.1.2.9

4 files changed, 33 insertions, 13 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index af32b773c2ea..75e26861a122 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.137 2007/06/14 18:27:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.138 2007/06/14 18:53:24 ulm Exp $
+
+  14 Jun 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-cvs-temacs-prerequisite.patch, emacs-cvs-23.0.0-r6.ebuild:
+  Fix "temacs: command not found" build problem.
 
   14 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50.ebuild:
   Skip Xaw3d headers patch since it was applied upstream.
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 38953ebdd9ec..a5f4377f981e 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -17,6 +17,10 @@ AUX emacs-cvs-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c
 MD5 33cdd958f1be433095a69bff6be18148 files/emacs-cvs-freebsd-sparc.patch 475
 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 files/emacs-cvs-freebsd-sparc.patch 475
 SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b files/emacs-cvs-freebsd-sparc.patch 475
+AUX emacs-cvs-temacs-prerequisite.patch 380 RMD160 32079a298d6cc8d402a8b28ab5d8c407b3261e3d SHA1 2f67315dcd7c94d25dfff26010be8ad803d49380 SHA256 1ec728903d39697c725df6837b96a88288063e1c316c1c1f198f1f9976f44968
+MD5 e68439aa781edf9c79d1b6a594b447ab files/emacs-cvs-temacs-prerequisite.patch 380
+RMD160 32079a298d6cc8d402a8b28ab5d8c407b3261e3d files/emacs-cvs-temacs-prerequisite.patch 380
+SHA256 1ec728903d39697c725df6837b96a88288063e1c316c1c1f198f1f9976f44968 files/emacs-cvs-temacs-prerequisite.patch 380
 DIST emacs-22.0.990.tar.gz 38184881 RMD160 5c86b66a429c7291a5e6d89a94c6804b36037068 SHA1 d6ccf5ae41e3d3382fd43c0524ea660a497f9053 SHA256 5621de0c29a55a6f2b57e9c2da101b4e2c69a6b30c3c7238c62b08fd7081c67c
 EBUILD emacs-cvs-22.0.990.ebuild 7426 RMD160 d2481b5cab9ca400c4d749f6468ab4038fd5d186 SHA1 da90a70b6efed5d35b8ed09e46b4d611bb0b55d4 SHA256 ff7bce0d62ef6e8e73de1eae048c4b9f505553b0054fe755b5736e367752df1e
 MD5 923a512c786c0f667600a277ddf7070e emacs-cvs-22.0.990.ebuild 7426
@@ -26,14 +30,14 @@ EBUILD emacs-cvs-22.1.50.ebuild 7587 RMD160 5c96a0affe4791f24f1139bdee07da1e3018
 MD5 59e5126efe31d70015d152bcdba25e1d emacs-cvs-22.1.50.ebuild 7587
 RMD160 5c96a0affe4791f24f1139bdee07da1e301817e1 emacs-cvs-22.1.50.ebuild 7587
 SHA256 58312c39ab8b43a07a58cc8365a9bce019cbc8e9ffb74b56c9d28fffc9b85361 emacs-cvs-22.1.50.ebuild 7587
-EBUILD emacs-cvs-23.0.0-r6.ebuild 7802 RMD160 7748a42cca56d0d2639d1d057880206526386202 SHA1 8eb74fcfa6fc873086908650f07aee77c1344c6f SHA256 f71c954b673f7407021bc9be036888b454fd16cc064eeed74b5d69fddd235520
-MD5 8a69bb2528b33b414d558ad6c1b9fe5b emacs-cvs-23.0.0-r6.ebuild 7802
-RMD160 7748a42cca56d0d2639d1d057880206526386202 emacs-cvs-23.0.0-r6.ebuild 7802
-SHA256 f71c954b673f7407021bc9be036888b454fd16cc064eeed74b5d69fddd235520 emacs-cvs-23.0.0-r6.ebuild 7802
-MISC ChangeLog 26262 RMD160 72beda45684111b9963db733ab077c6668ea8f63 SHA1 1f9fc876f31efa54b5bf5cbc409495dfdcd210e9 SHA256 94dcae01f17784acaf1ff6009c2b0e92f1d9544bfdc42ef8f06af0eba32d8b09
-MD5 0872221afffa1e617b4d2c8fcb38338e ChangeLog 26262
-RMD160 72beda45684111b9963db733ab077c6668ea8f63 ChangeLog 26262
-SHA256 94dcae01f17784acaf1ff6009c2b0e92f1d9544bfdc42ef8f06af0eba32d8b09 ChangeLog 26262
+EBUILD emacs-cvs-23.0.0-r6.ebuild 7856 RMD160 57653602c298c46de23438e8a5a3ccbc99c3bc2e SHA1 96c242fcf64e0f3dfd3124c1b4cabd30f63746eb SHA256 8cde8c234a4d951435647880cf6ab2f7680e9cdd3529cf4a309a89d3838d97a6
+MD5 65b2c055b1f430a08380ef7aeb001940 emacs-cvs-23.0.0-r6.ebuild 7856
+RMD160 57653602c298c46de23438e8a5a3ccbc99c3bc2e emacs-cvs-23.0.0-r6.ebuild 7856
+SHA256 8cde8c234a4d951435647880cf6ab2f7680e9cdd3529cf4a309a89d3838d97a6 emacs-cvs-23.0.0-r6.ebuild 7856
+MISC ChangeLog 26433 RMD160 8818d888928eacde62452a3664bc78229f18f489 SHA1 76e3416ae381dbcaee9131070bfc7f56e4f2e842 SHA256 0dd339e1c708173df3ad92bc641bc6d950b1027fb3fa93519ed892a97da7b609
+MD5 d7854b57c50abcc8cc2cb53fadcd4170 ChangeLog 26433
+RMD160 8818d888928eacde62452a3664bc78229f18f489 ChangeLog 26433
+SHA256 0dd339e1c708173df3ad92bc641bc6d950b1027fb3fa93519ed892a97da7b609 ChangeLog 26433
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -50,7 +54,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGcYifOeoy/oIi7uwRApczAKDSKGHIMgc9Tku6VviIe5jh+Rt7DgCgrrqT
-U2Gb4RpQht9K5OvPRMooZeQ=
-=04hC
+iD8DBQFGcY6sOeoy/oIi7uwRAnTbAJ44f7CE59+LlxYEe0PWGsdz8183WwCcDxnQ
+greJfn/IpFIDH0xwkfZ9MSY=
+=9l8O
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
index b7edcfa65fc8..237ebdd40a58 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.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-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.22 2007/06/13 17:40:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.23 2007/06/14 18:53:24 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -88,6 +88,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PN}-Xaw3d-headers.patch"
 	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
+	epatch "${FILESDIR}/${PN}-temacs-prerequisite.patch"
 	# ALSA is detected and used even if not requested by the USE=alsa flag.
 	# So remove the automagic check
 	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch"
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-temacs-prerequisite.patch b/app-editors/emacs-cvs/files/emacs-cvs-temacs-prerequisite.patch
new file mode 100644
index 000000000000..c194a9f0bea3
--- /dev/null
+++ b/app-editors/emacs-cvs/files/emacs-cvs-temacs-prerequisite.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.in	11 Jun 2007 00:57:42 -0000	1.279.2.44
++++ src/Makefile.in	12 Jun 2007 22:34:23 -0000
+@@ -1000,7 +1000,7 @@
+ UNIDATA=${admindir}unidata/UnicodeData.txt
+ #endif
+ 
+-${lispsource}international/charprop.el: ${UNIDATA}
++${lispsource}international/charprop.el: temacs${EXEEXT} ${UNIDATA}
+ 	RUNEMACS="$(RUN_TEMACS)"; \
+ 	cd ${admindir}unidata; \
+ 	$(MAKE) $(MFLAGS) \