I cant merge latest (1.3.18) wine version on my machine with Gentoo ~x86. Here is build log: http://wklej.org/id/524662/txt/ Reproducible: Always Steps to Reproduce: 1. Merge latest wine Expected Results: Should merge successfully.. Portage 2.1.9.46 (default/linux/x86/10.0/desktop, gcc-4.5.2, libc-0-r0, 2.6.38-gentoo-r4 i686) ================================================================= System uname: Linux-2.6.38-gentoo-r4-i686-Pentium-R-_Dual-Core_CPU_E5300_@_2.60GHz-with-gentoo-2.0.2 Timestamp of tree: Thu, 05 May 2011 18:00:01 +0000 ccache version 3.1.4 [disabled] app-shells/bash: 4.2_p8-r1 dev-java/java-config: 2.1.11-r3 dev-lang/python: 2.7.1-r1, 3.1.3-r1 dev-util/ccache: 3.1.4 dev-util/cmake: 2.8.4-r1 sys-apps/baselayout: 2.0.2 sys-apps/openrc: 0.8.2-r1 sys-apps/sandbox: 2.5 sys-devel/autoconf: 2.13, 2.68 sys-devel/automake: 1.9.6-r3, 1.10.3, 1.11.1-r1 sys-devel/binutils: 2.21 sys-devel/gcc: 4.5.2 sys-devel/gcc-config: 1.4.1-r1 sys-devel/libtool: 2.4-r1 sys-devel/make: 3.82 sys-kernel/linux-headers: 2.6.38 sys-libs/glibc: 2.13-r2 virtual/os-headers: 0 ACCEPT_KEYWORDS="x86 ~x86" ACCEPT_LICENSE="*" CBUILD="i686-pc-linux-gnu" CFLAGS="-O2 -march=i686 -pipe" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/share/config /usr/share/gnupg/qualified.txt" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/cli-php5.3/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo" CXXFLAGS="-O2 -march=i686 -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="assume-digests binpkg-logs distlocks fixlafiles fixpackages news parallel-fetch protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch" FFLAGS="" GENTOO_MIRRORS="http://gentoo.po.opole.pl rsync://ftp.vectranet.pl/gentoo/ http://gentoo.mirror.pw.edu.pl/" LANG="pl_PL.utf8@euro" LC_ALL="pl_PL.UTF-8" LDFLAGS="-Wl,-O1 -Wl,--as-needed" LINGUAS="pl" MAKEOPTS="-j3" PKGDIR="/usr/portage/packages" PORTAGE_CONFIGROOT="/" 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="/var/lib/layman/sunrise /var/lib/layman/piczu /var/lib/layman/wirelay /var/lib/layman/enlightenment /var/lib/layman/klondike" SYNC="rsync://rsync.gentoo.org/gentoo-portage" USE="X a52 aac acl acpi alsa apng bash-completion bazaar berkdb branding bzip2 cairo cli consolekit cracklib crypt cups cvs cxx dbus device-mapper dri dts dvd dvdr emboss encode exif extras fam ffmpeg firefox flac fortran gadu gdbm gdu gif git gpm gstreamer gtk iconv ipv6 jpeg kde lame lcms ldap libnotify mad melt mercurial mng modules mp3 mp4 mpeg mplayer mudflap ncurses nls nptl nptlonly ntfs ogg openal opengl openmp pam pango pcre pdf perl php png policykit ppds pppd python qt3support qt4 readline samba sdl session spell ssl startup-notification subversion svg sysfs tcpd theora tiff tordns truetype udev unicode usb vorbis webkit win32codecs x264 x86 xcb xml xorg xulrunner xv xvid 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 authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CAMERAS="ptp2" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ubx" INPUT_DEVICES="evdev mouse keyboard tslib synaptics" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="pl" PHP_TARGETS="php5-3" RUBY_TARGETS="ruby18" USERLAND="GNU" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account" Unset: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
Created attachment 272227 [details] wine-1.3.18 build log
[ebuild U ] app-emulation/wine-1.3.18 [1.3.17] USE="X alsa cups dbus gecko gstreamer jpeg lcms ldap mp3 ncurses nls openal opengl oss perl png samba ssl threads truetype win32 xml -capi -custom-cflags -esd -fontconfig -gnutls -gphoto2 -gsm (-hal) -jack -nas -pulseaudio -scanner -test -v4l% (-win64) -xcomposite -xinerama (-mousewarp%)"
For the future: no pastebins for bugzilla reports. I can only make a guess: you've "fixed" linux/videodev.h problem on 2.6.38 by symlinking it to linux/videodev2.h. If that's the case, it just broke and the pieces are yours to keep.
You're right it was my fault that i linked linux/videodev.h to linux/videodev2.h Thank you. Bug closed.
