Bugzilla Bug 29581

I can't emerge games-puzzle/enigma version 0.80_beta1.
following output:
 * Failed Patch: enigma-0.80-beta.patch!
 *
 * Include in your bugreport the contents of:
 *
 *   /var/tmp/portage/enigma-0.80_beta1/temp/enigma-0.80-beta.patch-8059.out



Reproducible: Sometimes
Steps to Reproduce:
1. emerge -u games-puzzle/enigma

Actual Results:  
content of /var/tmp/portage/enigma-0.80_beta1/temp/enigma-0.80-beta.patch-
8059.out:
***** enigma-0.80-beta.patch *****

==================================

PATCH COMMAND:  patch -g0 -p0 < /usr/portage/games-puzzle/enigma/files/enigma-
0.80-beta.patch

==================================
patching file src/display.cc
Hunk #1 FAILED at 15.
1 out of 2 hunks FAILED -- saving rejects to file src/display.cc.rej
==================================

PATCH COMMAND:  patch -g0 -p1 < /usr/portage/games-puzzle/enigma/files/enigma-
0.80-beta.patch

==================================
can't find file to patch at input line 9
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: src/display.cc
|===================================================================
|RCS file: /cvsroot/enigma/enigma/src/display.cc,v
|retrieving revision 1.34
|retrieving revision 1.35
|diff -c -u -r1.34 -r1.35
|--- src/display.cc     17 Jul 2003 20:22:01 -0000      1.34
|+++ src/display.cc     17 Sep 2003 17:06:26 -0000      1.35
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
==================================

PATCH COMMAND:  patch -g0 -p2 < /usr/portage/games-puzzle/enigma/files/enigma-
0.80-beta.patch

==================================
missing header for unified diff at line 9 of patch
can't find file to patch at input line 9
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: src/display.cc
|===================================================================
|RCS file: /cvsroot/enigma/enigma/src/display.cc,v
|retrieving revision 1.34
|retrieving revision 1.35
|diff -c -u -r1.34 -r1.35
|--- src/display.cc     17 Jul 2003 20:22:01 -0000      1.34
|+++ src/display.cc     17 Sep 2003 17:06:26 -0000      1.35
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
==================================

PATCH COMMAND:  patch -g0 -p3 < /usr/portage/games-puzzle/enigma/files/enigma-
0.80-beta.patch

==================================
missing header for unified diff at line 9 of patch
can't find file to patch at input line 9
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: src/display.cc
|===================================================================
|RCS file: /cvsroot/enigma/enigma/src/display.cc,v
|retrieving revision 1.34
|retrieving revision 1.35
|diff -c -u -r1.34 -r1.35
|--- src/display.cc     17 Jul 2003 20:22:01 -0000      1.34
|+++ src/display.cc     17 Sep 2003 17:06:26 -0000      1.35
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
==================================

PATCH COMMAND:  patch -g0 -p4 < /usr/portage/games-puzzle/enigma/files/enigma-
0.80-beta.patch

==================================
missing header for unified diff at line 9 of patch
can't find file to patch at input line 9
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: src/display.cc
|===================================================================
|RCS file: /cvsroot/enigma/enigma/src/display.cc,v
|retrieving revision 1.34
|retrieving revision 1.35
|diff -c -u -r1.34 -r1.35
|--- src/display.cc     17 Jul 2003 20:22:01 -0000      1.34
|+++ src/display.cc     17 Sep 2003 17:06:26 -0000      1.35
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored


Expected Results:  
should be successful

Portage 2.0.49-r6 (default-x86-1.4, gcc-3.3.1, glibc-2.3.2-r1, 2.4.20-gentoo-
r6)
=================================================================
System uname: 2.4.20-gentoo-r6 i686 Pentium III (Coppermine)
ACCEPT_KEYWORDS="x86 ~x86"
AUTOCLEAN="yes"
CFLAGS="-mcpu=pentium3 -O3 -pipe"
CHOST="i686-pc-linux-gnu"
COMPILER="gcc3"
CONFIG_PROTECT="/etc /var/qmail/control /usr/kde/2/share/config /usr/kde/3/shar
e/config /usr/X11R6/lib/X11/xkb /usr/kde/3.1/share/config /usr/share/config"
CONFIG_PROTECT_MASK="/etc/gconf /etc/env.d"
CXXFLAGS="-mcpu=pentium3 -O3 -pipe"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs sandbox buildpkg ccache distcc userpriv usersandbox 
notitles noclean noauto cvs keeptemp keepwork"
GENTOO_MIRRORS="http://sunsite.cnlab-switch.ch/ftp/mirror/gentoo 
http://gentoo.oregonstate.edu 
http://www.ibiblio.org/pub/Linux/distributions/gentoo"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="x86 oss apm avi crypt cups encode foomaticdb gif jpeg libg++ libwww mad 
mikmod mmx mpeg ncurses nls pdflib png quicktime spell truetype xml2 xmms xv 
zlib gdbm berkdb slang readline arts svga java X sdl gpm tcpd pam ssl perl 
python esd imlib oggvorbis gtk qt motif opengl mozilla -kde -gnome gtk2 sasl 
tiff wmf -tcltk"

I'm an idiot.  I've fixed the patch file so it actually applies now.
Give it another shot.

Thanks for the bug report.