">>> Emerging (10 of 11) media-tv/mythtv-0.21_p18314-r1 to / * checking ebuild checksums ;-) ... [ ok ] * checking auxfile checksums ;-) ... [ ok ] * checking miscfile checksums ;-) ... [ ok ] * This ebuild now uses a heavily stripped down version of your CFLAGS >>> Unpacking source... * subversion update start --> * repository: http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythtv@18314 At revision 18314. * working copy: /usr/portage/distfiles/svn-src/mythtv/mythtv * Applying mythtv-0.21-mythflix-naming-collision.patch ... * Failed Patch: mythtv-0.21-mythflix-naming-collision.patch ! * ( /usr/portage/media-tv/mythtv/files/mythtv-0.21-mythflix-naming-collision.patch ) * * Include in your bugreport the contents of: * * /var/tmp/portage/media-tv/mythtv-0.21_p18314-r1/temp/mythtv-0.21-mythflix-naming-collision.patch-2966.out" I will post the other files (and emerge --info) next. Thanks.
***** mythtv-0.21-mythflix-naming-collision.patch ***** ======================================================= PATCH COMMAND: patch -p0 -g0 -E --no-backup-if-mismatch < /usr/portage/media-tv/mythtv/files/mythtv-0.21-mythflix-naming-collision.patch ======================================================= patching file themes/default-wide/netflix-ui.xml Hunk #1 FAILED at 267. 1 out of 1 hunk FAILED -- saving rejects to file themes/default-wide/netflix-ui.xml.rej ======================================================= PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch < /usr/portage/media-tv/mythtv/files/mythtv-0.21-mythflix-naming-collision.patch ======================================================= can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: themes/default-wide/netflix-ui.xml |=================================================================== |--- themes/default-wide/netflix-ui.xml (revision 14295) |+++ themes/default-wide/netflix-ui.xml (revision 19046) -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ======================================================= PATCH COMMAND: patch -p2 -g0 -E --no-backup-if-mismatch < /usr/portage/media-tv/mythtv/files/mythtv-0.21-mythflix-naming-collision.patch ======================================================= can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: themes/default-wide/netflix-ui.xml |=================================================================== |--- themes/default-wide/netflix-ui.xml (revision 14295) |+++ themes/default-wide/netflix-ui.xml (revision 19046) -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ======================================================= PATCH COMMAND: patch -p3 -g0 -E --no-backup-if-mismatch < /usr/portage/media-tv/mythtv/files/mythtv-0.21-mythflix-naming-collision.patch ======================================================= missing header for unified diff at line 5 of patch can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: themes/default-wide/netflix-ui.xml |=================================================================== |--- themes/default-wide/netflix-ui.xml (revision 14295) |+++ themes/default-wide/netflix-ui.xml (revision 19046) -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ======================================================= PATCH COMMAND: patch -p4 -g0 -E --no-backup-if-mismatch < /usr/portage/media-tv/mythtv/files/mythtv-0.21-mythflix-naming-collision.patch ======================================================= missing header for unified diff at line 5 of patch can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: themes/default-wide/netflix-ui.xml |=================================================================== |--- themes/default-wide/netflix-ui.xml (revision 14295) |+++ themes/default-wide/netflix-ui.xml (revision 19046) -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored
Build log contents: mythtvbox ~ # less /var/log/portage/media-tv:mythtv-0.21_p18314-r1:20081111-204732.log * This ebuild now uses a heavily stripped down version of your CFLAGS >>> Unpacking source... * subversion update start --> * repository: http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythtv@18314 At revision 18314. * working copy: /usr/portage/distfiles/svn-src/mythtv/mythtv * Applying mythtv-0.21-mythflix-naming-collision.patch ... * Failed Patch: mythtv-0.21-mythflix-naming-collision.patch ! * ( /usr/portage/media-tv/mythtv/files/mythtv-0.21-mythflix-naming-collision.patch ) * * Include in your bugreport the contents of: * * /var/tmp/portage/media-tv/mythtv-0.21_p18314-r1/temp/mythtv-0.21-mythflix-naming-collision.patch-2966.out * * ERROR: media-tv/mythtv-0.21_p18314-r1 failed. * Call stack: * ebuild.sh, line 49: Called src_unpack * environment, line 3478: Called epatch 'src_unpack' * environment, line 1785: Called die * The specific snippet of code: * die "Failed Patch: ${patchname}!"; * The die message: * Failed Patch: mythtv-0.21-mythflix-naming-collision.patch! * * If you need support, post the topmost build error, and the call stack if relevant. * A complete build log is located at '/var/log/portage/media-tv:mythtv-0.21_p18314-r1:20081111-204732.log'. * The ebuild environment file is located at '/var/tmp/portage/media-tv/mythtv-0.21_p18314-r1/temp/environment'. *
emerge --info: mythtvbox ~ # emerge --info Portage 2.1.4.5 (default-linux/x86/2007.0/desktop, gcc-4.1.2, glibc-2.6.1-r0, 2.6.24-gentoo-r4 i686) ================================================================= System uname: 2.6.24-gentoo-r4 i686 AMD Athlon(tm) Timestamp of tree: Tue, 11 Nov 2008 17:45:01 +0000 distcc 2.18.3 i686-pc-linux-gnu (protocols 1 and 2) (default port 3632) [enabled] ccache version 2.4 [disabled] app-shells/bash: 3.2_p33 dev-lang/python: 2.4.4-r13, 2.5.2-r7 dev-python/pycrypto: 2.0.1-r6 dev-util/ccache: 2.4-r7 sys-apps/baselayout: 1.12.11.1 sys-apps/sandbox: 1.2.18.1-r2 sys-devel/autoconf: 2.13, 2.61-r2 sys-devel/automake: 1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r2, 1.10.1-r1 sys-devel/binutils: 2.18-r3 sys-devel/gcc-config: 1.4.0-r4 sys-devel/libtool: 1.5.26 virtual/os-headers: 2.6.23-r3 ACCEPT_KEYWORDS="x86" CBUILD="i686-pc-linux-gnu" CFLAGS="-march=athlon-xp -O2 -pipe" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/share/config" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/php/apache2-php4/ext-active/ /etc/php/apache2-php5/ext-active/ /etc/php/cgi-php4/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/cli-php4/ext-active/ /etc/php/cli-php5/ext-active/ /etc/revdep-rebuild /etc/terminfo /etc/udev/rules.d" CXXFLAGS="-march=athlon-xp -O2 -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="distcc distlocks metadata-transfer parallel-fetch sandbox sfperms strict unmerge-orphans userfetch" GENTOO_MIRRORS="http://gentoo.arcticnetwork.ca/source/ http://gentoo.llarian.net/ http://gentoo.mirrors.tera-byte.com/ http://cudlug.cudenver.edu/gentoo/ http://gentoo.mirrors.easynews.com/linux/gentoo/" MAKEOPTS="-j8" PKGDIR="/usr/portage/packages" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/usr/local/portage" SYNC="rsync://homeserver-02/gentoo-portage" USE="3dnow 3dnowext X a52 aac acl acpi acpi4linux alsa apache2 audiofile bash-completion berkdb bzip2 cairo cdparanoia cdr cgi chroot cli cpudetection cracklib crypt cscope ctype cups curl dba dbus dga dnd dri dts dv dvd dvdr dvdread eds emboss encode esd ethereal evms2 evo exif expat faad fam fastcgi fbcon ffmpeg fftw firefox flac font-server foomaticdb force-cgi-redirect freetype gd gdbm ggi gif glut gmp gphoto2 gpm gstreamer gtk hal httpd iconv idn imagemagick inode isdnlog ivtv jdepend joystick jp2 jpeg jsch junit kde latin1 lcd lcms lirc live lm_sensors logrotate lzo lzw lzw-tiff mad maildir matroska memlimit mhash midi mikmod mime mjpeg mmx mmxext mng mp2 mp3 mpeg mpeg2 mpm-worker mysql mythtv na_dd na_icons nagios-dns nagios-ntp nagios-ping nagios-ssh ncurses net network network-cron nls nptl nptlonly numeric offensive ogg opengl openmp optional-tasks oro oscar oss pam pcap pcre pdf perl php png posix ppds pppd python qt3 qt3support quicktime readline reflection regexp rtc ruby samba sdl session silc slang slp snmp soap sockets spell spl sse ssl stream svg svga tga theora threads tiff tokenizer transcode truetype unicode usb utf8 v4l v4l2 vhosts vlm vorbis win32codecs wmf x86 xalan xchatnogtk xchattext xerces xfs xine xinerama xml xml2 xmlrpc xorg xpm xsl xv xvid yahoo yv12 zip zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1 emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="actions alias auth_basic auth_digest authn_anon authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache dav dav_fs dav_lock dbd deflate dir disk_cache env expires ext_filter file_cache filter headers ident imagemap include info log_config logio mem_cache mime mime_magic negotiation proxy proxy_ajp proxy_balancer proxy_connect proxy_http rewrite setenvif so speling status unique_id userdir usertrack vhost_alias" ELIBC="glibc" INPUT_DEVICES="keyboard mouse joystick evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIRC_DEVICES="hauppauge" USERLAND="GNU" VIDEO_CARDS="vga vesa ivtvdev nvidia nv fbdev" Unset: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, LANG, LC_ALL, LDFLAGS, LINGUAS, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
Same here. I'm upgrading from 0.21_p18314 to 0.21_p18314-r1, and the emerge fails on the very same place. I routinely clean up /usr/portage/distfiles, so I can be sure it downloaded a fresh copy from mythtv svn before applying the mythflix patch. My emerge --info: Portage 2.1.4.5 (default/linux/amd64/2008.0/desktop, gcc-4.2.3, glibc-2.6.1-r0, 2.6.25-gentoo-r7 x86_64) ================================================================= System uname: 2.6.25-gentoo-r7 x86_64 AMD Athlon(tm) 64 Processor 3800+ Timestamp of tree: Thu, 13 Nov 2008 07:30:01 +0000 app-shells/bash: 3.2_p33 dev-lang/python: 2.5.2-r7 dev-util/cmake: 2.4.6-r1 sys-apps/baselayout: 2.0.0 sys-apps/openrc: 0.3.0-r1 sys-apps/sandbox: 1.2.18.1-r2 sys-devel/autoconf: 2.61-r2 sys-devel/automake: 1.7.9-r1, 1.8.5-r3, 1.9.6-r2, 1.10.1-r1 sys-devel/binutils: 2.18-r3 sys-devel/gcc-config: 1.4.0-r4 sys-devel/libtool: 1.5.26 virtual/os-headers: 2.6.23-r3 ACCEPT_KEYWORDS="amd64" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-march=k8 -O2 -pipe" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /home/mythtv/ /usr/kde/3.5/share/config/kdm/" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/cli-php5/ext-active/ /etc/revdep-rebuild /etc/splash /etc/terminfo /etc/udev/rules.d" CXXFLAGS="-march=k8 -O2 -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="distlocks metadata-transfer parallel-fetch sfperms strict unmerge-orphans userfetch" GENTOO_MIRRORS="http://mirror.qubenet.net/mirror/gentoo/ http://mirror.bytemark.co.uk/gentoo/ http://mirror.switch.ch/ftp/mirror/gentoo/" LANG="es_ES.utf8" LC_ALL="es_ES.utf8" LDFLAGS="-Wl,-O1" LINGUAS="es ca es_ES ca_ES" MAKEOPTS="-j2" PKGDIR="/usr/portage/packages" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/home/root/custom" SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage" USE="3dnow 3dnowext 7zip X a52 aac aalib acl acpi aiglx alsa amd64 asf avahi berkdb bluetooth branding bzip2 cairo cdda cddb cdparanoia cdr cli cracklib crypt cups dbus djvu dri dts dv dvb dvd dvdr dvdread eds effects emboss encode esd evo exif fam fat fbcondecor ffmpeg fftw firefox flac flash fortran freetype gdbm gif glitz gpm gstreamer hal hddtemp iconv ieee1394 imagemagick imlib ipv6 isdnlog jfs jpeg jpeg2k lame libnotify lirc lm_sensors mad mdnsresponder-compat midi mikmod mjpeg mmx mmxext mp3 mp4 mpeg mudflap multilib mysql mythtv ncurses network nls nptl nptlonly nptonly ntfs nuv nvidia ogg opengl openmp pam pcre pdf perl png ppds pppd pulseaudio python qt3 qt3support quicktime radio readline reflection samba sdl session spell spl srt sse sse2 ssl startup-notification svg sysfs tcpd threads tiff truetype udev unicode usb v4l v4l2 vcd vorbis wifi wmf x264 xfs xine xml xorg xscreensaver xv xvid xvmc zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="actions alias auth_basic auth_digest authn_anon authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache dav dav_fs dav_lock dbd deflate dir disk_cache env expires ext_filter file_cache filter headers ident imagemap include info log_config logio mem_cache mime mime_magic negotiation proxy proxy_ajp proxy_balancer proxy_connect proxy_http rewrite setenvif so speling status unique_id userdir usertrack vhost_alias" ELIBC="glibc" INPUT_DEVICES="evdev keyboard mouse void" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="es ca es_ES ca_ES" LIRC_DEVICES="devinput" USERLAND="GNU" VIDEO_CARDS="nvidia nv dummy vesa vga" Unset: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
At a loss here guys. That patch is generated straight from MythTV's SVN and I built it on my MythTV box before committing it.
Last time that file changes is before 0.21 even came out, so you shouldn't have any patch hunks that fail.
(In reply to comment #5) > At a loss here guys. That patch is generated straight from MythTV's SVN and I > built it on my MythTV box before committing it. > try with the stable version of sys-devel/patch
(In reply to comment #7) > try with the stable version of sys-devel/patch Right! Emerge fails with patch-2.5.9 but is successful with patch-2.5.9-r1.
This is because of the patch having dos line endings. See bug 112544 and bug 238311 for reference.
I had this problem too! I dug around and discovered that epatch was not trying hard enough to find the file. It needs to try one more "-p" level in order to find a match. Increase the number of "-p" levels tried. The following change to epatch worked for me: --- /usr/portage/eclass/eutils.eclass.orig 2008-11-13 14:10:12.000000000 -0600 +++ /usr/portage/eclass/eutils.eclass 2008-11-13 13:48:35.000000000 -0600 @@ -276,7 +276,7 @@ fi # Allow for prefix to differ ... im lazy, so shoot me :/ - while [ "${count}" -lt 5 ] + while [ "${count}" -lt 6 ] do # Generate some useful debug info ... _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} This works, but I don't think it is the correct solution. The problem may instead be "mythtv/mythtv" in this pathname to the file to patch: /usr/portage/distfiles/svn-src/mythtv/mythtv/themes/default-wide/netflix-ui.xml The redundant mythtv directory makes the pathname too long for epatch to handle. A third solution that might work is to prepend "mythtv/" to the patch internal partial pathname, then no changes are needed in epatch.
It's not actually patching /usr/portage/distfiles/svn-src/mythtv/mythtv/themes/default-wide/netflix-ui.xml The files are copied to /var/tmp/portage/, where all packages are extracted and built. The "mythtv/mythtv" is redundant because the first one is the name of the Portage package and the 2nd one is the name of the svn checkout. I don't understand how that actually fixed the problem for you since the actual issue was the DOS line endings in the patch that came out of MythTV's svn. I forgot that they set a repository wide settings to make the line ends DOS based. Committed the fix and git-ified the file names anyway for clarity and tested with old patch and new patch.
