When trying to emerge app-misc/kdiff3, emerge always selects v0.931 despite of
having the more recent v0.96.1 (unmasked) in the tree.

This happens because the author of the application changed the versioning scheme
with v0.95:

For versions < v0.95, versioning was done like v0.93 < v0.931 < v0.94 < v0.941
and so on...

For versions > v0.95, versioning was done like v0.95 < v0.95.1 < v0.96 < v0.96.1
and so on...

The portage system and emerge consider v0.931 newer than v0.96.1, which
unfortunately is wrong.

Reproducible: Always
Steps to Reproduce:
1. emerge -p app-misc/kdiff3

Actual Results:  
emerge tries to merge v0.931

Expected Results:  
emerge should try to merge v0.96.1

hostname # emerge info
Portage 2.0.49-r3 (default-x86-1.4, gcc-3.2.3, glibc-2.3.2-r1, 2.4.20-gentoo-r6)
=================================================================
System uname: 2.4.20-gentoo-r6 i686 AMD Athlon(tm) Processor
ACCEPT_KEYWORDS="x86"
AUTOCLEAN="yes"
CFLAGS="-march=athlon -O2 -fomit-frame-pointer -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="-march=athlon -O2 -fomit-frame-pointer -pipe"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs buildpkg ccache notitles sandbox"
GENTOO_MIRRORS="http://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/
http://gentoo.linux.no/ http://www.ibiblio.org/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 avi crypt cups encode gif jpeg libwww mad mmx mpeg ncurses nls pdflib
png quicktime spell truetype xml2 xv zlib berkdb readline arts X sdl gpm tcpd
pam ssl perl esd imlib oggvorbis gtk qt kde motif opengl ldap cdr 3dnow acl acpi
alsa -apm dvd fbcon -foomaticdb -gdbm -gnome gtk2 imap -java jikes lcms -libg++
maildir -mikmod mpi oav -oss pda -python samba -slang -svga usb -xmms"