summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2007-06-15 14:17:06 +0000
committerUlrich Müller <ulm@gentoo.org>2007-06-15 14:17:06 +0000
commit9f95eda198bc8351fa8a5e104f6644f63cb571a1 (patch)
tree531992291b9fa1d9d6236d5182021048ddd2a24a /app-editors/emacs-cvs
parentFix classpath statement for other libdirs (diff)
downloadgentoo-2-9f95eda198bc8351fa8a5e104f6644f63cb571a1.tar.gz
gentoo-2-9f95eda198bc8351fa8a5e104f6644f63cb571a1.tar.bz2
gentoo-2-9f95eda198bc8351fa8a5e104f6644f63cb571a1.zip
Undo yesterday's change since today the patch is already applied upstream.
(Portage version: 2.1.3_rc1)
Diffstat (limited to 'app-editors/emacs-cvs')
-rw-r--r--app-editors/emacs-cvs/ChangeLog6
-rw-r--r--app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild3
-rw-r--r--app-editors/emacs-cvs/files/emacs-cvs-temacs-prerequisite.patch11
3 files changed, 6 insertions, 14 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/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) \