Bugzilla Bug 36420

I tried to emerge cdrdao-1.1.7-r3 using:
ACCEPT_KEYWORDS=~x86 USE="kde qt cdr -*" emerge cdrdao
When it gets to the point of applying the cdrdao-1.1.7-gentoo-version.patch patch, it fails with:
 * Applying cdrdao-1.1.7-gentoo-version.patch...

 * Failed Patch: cdrdao-1.1.7-gentoo-version.patch!
 *
 * Include in your bugreport the contents of:
 *
 *   /var/tmp/portage/cdrdao-1.1.7-r3/temp/cdrdao-1.1.7-gentoo-version.patch-3672.out
!!! ERROR: app-cdr/cdrdao-1.1.7-r3 failed.
!!! Function epatch, Line 322, Exitcode 0
!!! Failed Patch: cdrdao-1.1.7-gentoo-version.patch! 

I noticed how trivial the content of the patch was, and tried to apply it manually. However, not being very familiar with portage (I've used Gentoo for 48 hours so far), I must've done something it didn't like, because cdrdao showed up as version 1.1.7 (and not 1.1.7-gentoo).

Reproducible: Always
Steps to Reproduce:
1. emerge sync
2. ACCEPT_KEYWORDS=~x86 USE="kde qt cdr -*" emerge cdrdao
Note: I've talked to some people on IRC who say the patch applied cleanly for them.

Actual Results:  
sempiterna root # ACCEPT_KEYWORDS=~x86 USE="kde qt cdr -*" emerge cdrdao
Calculating dependencies ...done!
>>> emerge (1 of 1) app-cdr/cdrdao-1.1.7-r3 to /
>>> md5 src_uri ;-) cdrdao-1.1.7.src.tar.gz
>>> Unpacking source...
>>> Unpacking cdrdao-1.1.7.src.tar.gz to /var/tmp/portage/cdrdao-1.1.7-r3/work
 * Applying cdrdao-1.1.7-r2-mp32dao-gentoo.diff...                        [ ok ]
 * Applying cdrdao-1.1.7-gentoo-version.patch...

 * Failed Patch: cdrdao-1.1.7-gentoo-version.patch!
 *
 * Include in your bugreport the contents of:
 *
 *  
/var/tmp/portage/cdrdao-1.1.7-r3/temp/cdrdao-1.1.7-gentoo-version.patch-3672.out


!!! ERROR: app-cdr/cdrdao-1.1.7-r3 failed.
!!! Function epatch, Line 322, Exitcode 0
!!! Failed Patch: cdrdao-1.1.7-gentoo-version.patch! 

Expected Results:  
The patch should successfully apply, and emerge should go on configuring and
building cdrdao.

sempiterna cdrdao # emerge info
Portage 2.0.49-r15 (default-x86-1.4, gcc-3.2.3, glibc-2.3.2-r3, 2.6.0-gspr1)
=================================================================
System uname: 2.6.0-gspr1 i686 AMD Athlon(tm) XP
Gentoo Base System version 1.4.3.10
ACCEPT_KEYWORDS="x86"
AUTOCLEAN="yes"
CFLAGS="-march=athlon-xp -fomit-frame-pointer -O3 -pipe"
CHOST="i686-pc-linux-gnu"
COMPILER="gcc3"
CONFIG_PROTECT="/etc /var/qmail/control /usr/kde/2/share/config
/usr/kde/3/share/config /usr/X11R6/lib/X11/xkb /usr/kde/3.1/share/config
/usr/share/config"
CONFIG_PROTECT_MASK="/etc/gconf /etc/env.d"
CXXFLAGS=""
DISTDIR="/usr/portage/distfiles"
FEATURES="sandbox ccache autoaddcvs"
GENTOO_MIRRORS="ftp://gentoo.linux.no/pub/gentoo/
ftp://ftp.uninett.no/pub/linux/Gentoo ftp://mirror.pudas.net/gentoo"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY=""
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="x86 oss apm avi crypt encode foomaticdb gif gtk2 imlib jpeg libg++ libwww
mad mikmod mpeg ncurses pdflib png quicktime spell truetype xml2 xmms xv zlib
gdbm berkdb slang readline arts svga sdl gpm tcpd pam ssl perl python oggvorbis
motif opengl X qt kde alsa dvd cdr cups -gtk -gnome -nls"

Note: Used a different USE for the actual emerge.

Created an attachment (id=22614) [edit]
Error log of the patch failing to apply.

The emerge error message told me to include this.

I am very sorry if I did something wrong in this report, btw. It's the first
time I'm using a bugzilla.

Looks like what was happening was that we weren't always in the correct source
directory when the patch was being applied.  Added a fix for it which works on
a couple of system where it didn't previously.