Since recently the emacs-subdirs-el-gentoo.diff no longer applies to the latest emacs CVS build as per emacs-cvs-22.0.50-r1 Partial output of emerge emacs-cvs: [..] * Copying emacs from /usr/portage/distfiles/cvs-src ... * CVS module emacs is now in /var/tmp/portage/emacs-cvs-22.0.50-r1/work * Applying emacs-subdirs-el-gentoo.diff ... * Failed Patch: emacs-subdirs-el-gentoo.diff ! * ( /usr/portage/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff ) [..] !!! Function epatch, Line 350, Exitcode 0 !!! Failed Patch: emacs-subdirs-el-gentoo.diff! [..] Contents of the file mentioned: ***** emacs-subdirs-el-gentoo.diff ***** ======================================== PATCH COMMAND: patch -p0 -g0 --no-backup-if-mismatch < /usr/portage/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff ======================================== patching file Makefile.in Hunk #1 FAILED at 387. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.in.rej ======================================== PATCH COMMAND: patch -p1 -g0 --no-backup-if-mismatch < /usr/portage/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff ======================================== missing header for unified diff at line 3 of patch can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- Makefile.in 2002-10-19 10:21:01.000000000 +0900 |+++ Makefile.in.subdirs-el 2004-08-02 17:01:35.852417016 +0900 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ======================================== PATCH COMMAND: patch -p2 -g0 --no-backup-if-mismatch < /usr/portage/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff ======================================== missing header for unified diff at line 3 of patch can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- Makefile.in 2002-10-19 10:21:01.000000000 +0900 |+++ Makefile.in.subdirs-el 2004-08-02 17:01:35.852417016 +0900 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ======================================== PATCH COMMAND: patch -p3 -g0 --no-backup-if-mismatch < /usr/portage/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff ======================================== missing header for unified diff at line 3 of patch can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- Makefile.in 2002-10-19 10:21:01.000000000 +0900 |+++ Makefile.in.subdirs-el 2004-08-02 17:01:35.852417016 +0900 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ======================================== PATCH COMMAND: patch -p4 -g0 --no-backup-if-mismatch < /usr/portage/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff ======================================== missing header for unified diff at line 3 of patch can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- Makefile.in 2002-10-19 10:21:01.000000000 +0900 |+++ Makefile.in.subdirs-el 2004-08-02 17:01:35.852417016 +0900 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored Output of emerge --info: Gentoo Base System version 1.12.0_pre16 Portage 2.0.54 (default-linux/x86/2005.1, gcc-3.4.5, glibc-2.3.5-r2, 2.6.14-gentoo-r4 i686) ================================================================= System uname: 2.6.14-gentoo-r4 i686 Intel(R) Pentium(R) 4 CPU 2.80GHz dev-lang/python: 2.3.5-r2, 2.4.2 sys-apps/sandbox: 1.2.12 sys-devel/autoconf: 2.13, 2.59-r6 sys-devel/automake: 1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r1 sys-devel/binutils: 2.16.1 sys-devel/libtool: 1.5.22 virtual/os-headers: 2.6.11-r2 ACCEPT_KEYWORDS="x86" AUTOCLEAN="yes" CBUILD="i686-pc-linux-gnu" CFLAGS="-Os -march=pentium4 -fomit-frame-pointer -pipe" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3/share/config /usr/lib/X11/xkb /usr/share/config /usr/share/texmf/dvipdfm/config/ /usr/share/texmf/dvips/config/ /usr/share/texmf/tex/generic/config/ /usr/share/texmf/tex/platex/config/ /usr/share/texmf/xdvi/ /var/qmail/control" CONFIG_PROTECT_MASK="/etc/gconf /etc/splash /etc/terminfo /etc/env.d" CXXFLAGS="-Os -march=pentium4 -fomit-frame-pointer -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="autoconfig distlocks sandbox sfperms strict" GENTOO_MIRRORS="http://ftp.easynet.nl/mirror/gentoo/ http://ftp.snt.utwente.nl/pub/os/linux/gentoo" LANG="en_US" MAKEOPTS="-j3" PKGDIR="/usr/portage/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" SYNC="rsync://inferno/gentoo-portage" USE="x86 GAPING_SECURITY_HOLE X Xaw3d a52 aac aalib acpi alsa apm audiofile avi berkdb bitmap-fonts bzip2 bzlib c++ cdparanoia cdr cjk crypt cups curl directfb disablexmb doc dvb dvd dvdr edl emacs emboss encode esd ethereal exif expat fam fbcon ffmpeg flac flash font-server foomaticdb fortran gcj gd gdbm gif glut gmp gstreamer gtk gtk2 guile idn imagemagick imlib java joystick jpeg lcms leim libcaca libg++ libwww lm_sensors lzo mad matroska mhash mikmod mmx mng motif mozilla mp3 mpeg msn mythtv ncurses nethack network nls nowin nsplugin nvidia offensive ogg oggvorbis opengl oss pam pcre pdflib perl pic png python quicktime readline real recode rtc ruby scanner sdl slang smp spell sse sse2 ssl svg tcltk tcpd tetex tiff truetype truetype-fonts type1-fonts udev unicode usb userlocales v4l v4l2 videos vorbis xanim xml xml2 xmms xosd xpm xprint xv xvid xvmc zlib video_cards_nvidia video_cards_vesa video_cards_fbdev input_devices_keyboard input_devices_mouse userland_GNU kernel_linux elibc_glibc" Unset: ASFLAGS, CTARGET, LC_ALL, LDFLAGS, LINGUAS, PORTDIR_OVERLAY
*** Bug 125026 has been marked as a duplicate of this bug. ***
*** Bug 125057 has been marked as a duplicate of this bug. ***
Thanks for the note. Fixed in CVS
*** Bug 125255 has been marked as a duplicate of this bug. ***
Created attachment 81658 [details] emacs-subdirs-el-gentoo.diff-5512.out I've got the new patch (dated March 7th) and it seems to apply. But if I use the XFT branch than the new patch doesn't work for me. (.out file attached). I guess it doesn't matter since the xft stuff is commented out in the ebuild but thought I'd report it anyway.
