Just recently (Aug 12 2006, cca 15:36 CEST) I have updated portage and the updated file /usr/portage/profiles/package.mask seems to contain CVS conflict, i.e. there are lines: <<<<<<< package.mask # Fernando J. Pereda <ferdy@gentoo.org> (18 May 2006) # This ebuild is for patch testing purposes. Things might break. >=mail-client/mutt-1.5.11-r30 # Chris Gianelloni <wolf31o2@gentoo.org> (11 May 2006) # These are masked, since they only work with the 0.0.8 version of openal with # the split out freealut. They will *not* work with the "best version" stable # or ~arch openal in the tree. These are perfectly safe to use if you have # openal-0.0.8 and freealut installed. =games-action/chromium-0.9.12-r6 =games-arcade/excido-0.1.5c-r1 =games-fps/blackshades-cvs-20031110-r1 =games-rps/eternal-lands-1.2.0_p1-r2 =games-sports/torcs-1.2.4-r1 =games-sports/trigger-0.5.2-r1 =games-sports/ultimatestunts-0.6.1-r1 =games-strategy/boson-0.11-r1 =games-strategy/scorched3d-39.1-r1 ======= >>>>>>> 1.5723 Running emerge/equery/other part of portage then complains: --- Invalid atom in /usr/portage/profiles/package.mask: >>>>>>> 1.5723 --- Invalid atom in /usr/portage/profiles/package.mask: ======= --- Invalid atom in /usr/portage/profiles/package.mask: <<<<<<< package.mask Header of /usr/portage/profiles/package.mask: $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.5724 2006/08/12 13:20:08 lu_zero Exp $ ----- emerge --info: ----- Gentoo Base System version 1.6.14 Portage 2.1-r1 (default-linux/x86, gcc-hardenednossp, glibc-2.3.6-r3, 2.6.14.6-grsec i686) ================================================================= System uname: 2.6.14.6-grsec i686 AMD Athlon(tm) XP 2500+ app-admin/eselect-compiler: [Not Present] dev-lang/python: 2.3.5-r2, 2.4.2 dev-python/pycrypto: 2.0.1-r5 dev-util/ccache: [Not Present] dev-util/confcache: [Not Present] sys-apps/sandbox: 1.2.17 sys-devel/autoconf: 2.13, 2.59-r7 sys-devel/automake: 1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r1 sys-devel/binutils: 2.16.1-r2 sys-devel/gcc-config: 1.3.13-r2 sys-devel/libtool: 1.5.22 virtual/os-headers: 2.4.19-r1, 2.6.11-r2 ACCEPT_KEYWORDS="x86" AUTOCLEAN="yes" CBUILD="i686-pc-linux-gnu" CFLAGS="-O2 -march=athlon-xp -funroll-loops -pipe" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/3.3/env /usr/kde/3.3/share/config /usr/kde/3.3/shutdown /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/lib/X11/xkb /usr/share/config /usr/share/texmf/dvipdfm/config/ /usr/share/texmf/dvips/config/ /usr/share/texmf/tex/generic/config/ /usr/share/texmf/tex/platex/config/ /usr/share/texmf/xdvi/" CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf /etc/terminfo" CXXFLAGS="-O2 -march=athlon-xp -funroll-loops -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="autoconfig distlocks metadata-transfer sandbox sfperms strict" GENTOO_MIRRORS="ftp://gentoo.inode.at/source/ http://gentoo.inode.at/ ftp://ftp.nyx.hu/gentoo http://ftp.belnet.be/mirror/rsync.gentoo.org/gentoo/" MAKEOPTS="-j1" 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/local/portage" SYNC="rsync://rsync.gentoo.org/gentoo-portage" USE="x86 3dnow 3dnowext X acl alsa apache2 apm avi bash-completion berkdb bitmap-fonts cli crypt cups dga divx4linux dlloader dri firefox foomatic gnome gtk gtk2 hardened isdnlog jpeg kdehiddenvisibility libwww mmx mmx2 mmxext mp3 mpeg mysql ncurses nls opengl pam pcre pda perl pic png pppd python qt quicktime readline reflection samba sdl session spl sse sse2 ssl tcpd tiff truetype truetype-fonts type1-fonts unicode usb xinerama xmms xorg xv zlib elibc_glibc input_devices_keyboard input_devices_mouse input_devices_evdev kernel_linux userland_GNU" Unset: CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LANG, LC_ALL, LDFLAGS, LINGUAS, PORTAGE_RSYNC_EXTRA_OPTS
*** This bug has been marked as a duplicate of 143676 ***
