Bug 145036 – Cannot merge mail-client/evolution-2.7.92

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description Sebastian Bergmann (RETIRED) 2006-08-24 22:44:07 UTC]

* Failed Patch: evolution-2.7.91-64-bit.patch !
 *  ( /usr/portage/local/layman/gnome-experimental/mail-client/evolution/files/evolution-2.7.91-64-bit.patch )
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/evolution-2.7.92/temp/evolution-2.7.91-64-bit.patch-23409.out

-- 

Portage 2.1.1_pre5-r3 (default-linux/x86/2006.0, gcc-4.1.1/vanilla, glibc-2.4-r3, 2.6.17-gentoo-r5 i686)
=================================================================
System uname: 2.6.17-gentoo-r5 i686 Genuine Intel(R) CPU           L2400  @ 1.66GHz
Gentoo Base System version 1.12.4
Last Sync: Fri, 25 Aug 2006 04:30:09 +0000
ccache version 2.4 [disabled]
app-admin/eselect-compiler: 2.0.0_rc2-r1
dev-lang/python:     2.4.3-r1
dev-python/pycrypto: 2.0.1-r5
dev-util/ccache:     2.4-r2
dev-util/confcache:  [Not Present]
sys-apps/sandbox:    1.2.18.1
sys-devel/autoconf:  2.13, 2.60
sys-devel/automake:  1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r2
sys-devel/binutils:  2.17
sys-devel/gcc-config: 1.3.13-r3
sys-devel/libtool:   1.5.22
virtual/os-headers:  2.6.17
ACCEPT_KEYWORDS="x86 ~x86"
AUTOCLEAN="yes"
CBUILD="i686-pc-linux-gnu"
CFLAGS="-march=pentium-m -O2 -pipe"
CHOST="i686-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/X11/xkb"
CONFIG_PROTECT_MASK="/etc/env.d /etc/env.d/java/ /etc/eselect/compiler /etc/gconf /etc/java-config/vms/ /etc/revdep-rebuild /etc/terminfo /etc/texmf/web2c"
CXXFLAGS="-march=pentium-m -O2 -pipe"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs autoconfig cvs digest distlocks fixpackages metadata-transfer parallel-fetch sandbox sfperms sign strict"
GENTOO_MIRRORS="http://mirror.gentoo.no/ ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/gentoo ftp://trumpetti.atm.tut.fi/gentoo http://gentoo.oregonstate.edu"
LINGUAS=""
MAKEOPTS="-j3"
PKGDIR="/usr/portage/packages"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --delete-after --stats --timeout=180 --exclude='/distfiles' --exclude='/local' --exclude='/packages'"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/portage/local/layman/gnome-experimental"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="x86 X a52 aac acpi alsa asf avi berkdb bitmap-fonts bluetooth browserplugin bzip2 cairo cdr cli crypt cups dbus divx4linux dlloader dri dvd dvdr dvdread eds elibc_glibc emboss encode exif fame firefox flac foomaticdb fortran gaim galago gdbm gif glitz gnome gpm graphviz gstreamer gtk gtk2 hal imlib input_devices_evdev input_devices_keyboard input_devices_mouse iproute2 ipv6 isdnlog java jpeg kdeenablefinal kdehiddenvisibility kernel_linux libg++ libnotify libsexy libwww lzo mad matroska mikmod mjpeg mmx mng mono moznocompose moznoirc moznomail mozsvg mp3 mpeg ncurses nls nomotif nptl nsplugin ogg oggvorbis opengl oss pam pam_console pcre pdf pdflib perl png pppd python quicktime readline reflection samba session smp spell spl sse sse2 ssl startup-notification svg tcpd tetex theora tiff truetype truetype-fonts type1-fonts udev unicode usb userland_GNU video_cards_i810 vorbis win32codecs wmf xml xml2 xorg xv xvid zlib"
Unset:  CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LANG, LC_ALL, LDFLAGS, PORTAGE_RSYNC_EXTRA_OPTS

[Comment 1 Sebastian Bergmann (RETIRED) 2006-08-24 22:44:58 UTC]

Created attachment 95043 [details]
/var/tmp/portage/evolution-2.7.92/temp/evolution-2.7.91-64-bit.patch-23409.out

[Comment 2 Sebastian Bergmann (RETIRED) 2006-08-26 01:41:31 UTC]

Index: mail-client/evolution/evolution-2.7.92.ebuild
===================================================================
--- mail-client/evolution/evolution-2.7.92.ebuild       (revision 594)
+++ mail-client/evolution/evolution-2.7.92.ebuild       (working copy)
@@ -158,9 +158,6 @@
        # Fix random ml core
        epatch ${FILESDIR}/${PN}-2.7.90-ml_tree_value_at.patch
 
-       # Fix 64-bit warnings
-       epatch ${FILESDIR}/${PN}-2.7.91-64-bit.patch
-
        # Fix missing includes
        epatch ${FILESDIR}/${PN}-2.7.91-includes.patch

[Comment 3 Daniel Gryniewicz (RETIRED) 2006-08-26 13:26:16 UTC]

Not the correct fix.  Some of the hunks were applied upstream between .91 and .92.  It's already fixed in the overlay.