Undo yesterday's change since today the patch is already applied upstream.

Package-Manager: portage-2.1.3_rc1

4 files changed, 17 insertions, 29 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 75e26861a122..d3b174b5502d 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.138 2007/06/14 18:53:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.139 2007/06/15 14:17:06 ulm Exp $
+
+  15 Jun 2007; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-cvs-temacs-prerequisite.patch, emacs-cvs-23.0.0-r6.ebuild:
+  Undo yesterday's change since today the patch is already applied upstream.
 
   14 Jun 2007; Ulrich Mueller <ulm@gentoo.org>
   +files/emacs-cvs-temacs-prerequisite.patch, emacs-cvs-23.0.0-r6.ebuild:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index a5f4377f981e..61bafb3c6342 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -17,10 +17,6 @@ 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
@@ -30,14 +26,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 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
+EBUILD emacs-cvs-23.0.0-r6.ebuild 7802 RMD160 3a54e60854a253fcbb35fbbf3ab340e85bc2f735 SHA1 5aabd5f1393a52ff0f9af8219f1a07c4c874effb SHA256 b8b02417b5dea5f12576c61f903735a0bc4e8df90e8c3adb5ea8547feb3e59c7
+MD5 e4dd951a5f9c196f96d5fcd1b58eba2e emacs-cvs-23.0.0-r6.ebuild 7802
+RMD160 3a54e60854a253fcbb35fbbf3ab340e85bc2f735 emacs-cvs-23.0.0-r6.ebuild 7802
+SHA256 b8b02417b5dea5f12576c61f903735a0bc4e8df90e8c3adb5ea8547feb3e59c7 emacs-cvs-23.0.0-r6.ebuild 7802
+MISC ChangeLog 26632 RMD160 c35a1c8be968bcca5f2f665b5655e54ee0ed3873 SHA1 fc3b021ab24bd32548d61b6018c80b44679e7656 SHA256 f8cfa1fe4955d6e3672daa08325a5a364d0e72ba7071597072956a692fd822c4
+MD5 b84360ec63efd01b33e75e29d0f6a1a6 ChangeLog 26632
+RMD160 c35a1c8be968bcca5f2f665b5655e54ee0ed3873 ChangeLog 26632
+SHA256 f8cfa1fe4955d6e3672daa08325a5a364d0e72ba7071597072956a692fd822c4 ChangeLog 26632
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -54,7 +50,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGcY6sOeoy/oIi7uwRAnTbAJ44f7CE59+LlxYEe0PWGsdz8183WwCcDxnQ
-greJfn/IpFIDH0xwkfZ9MSY=
-=9l8O
+iD8DBQFGcp9sOeoy/oIi7uwRAsP4AJ9WcI+h/uqk4aVzn1ad8g5pqC8RJACglc6I
+94QnqsL7qMXX3up50IC7pYo=
+=515b
 -----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 237ebdd40a58..52a02f839dc9 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.23 2007/06/14 18:53:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.24 2007/06/15 14:17:06 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -88,7 +88,6 @@ 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
deleted file mode 100644
index c194a9f0bea3..000000000000
--- a/app-editors/emacs-cvs/files/emacs-cvs-temacs-prerequisite.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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) \