Packages changing names - what do I do ?

[lyallp]

I have packages app-editors/emacs and net-www/apache installed
Now, portage thinks that app-editors/emacs-21.3-r3 is a new package even when I say emerge --update --verbose --pretend world
Portage also thinks that subversion is blocked due to net-www/apache-2 when I have apache 2 installed as well.

If I do 'qpkg -f /usr/sbin/apache' it tells me its in net-www/apache
If I do 'qpkg -I -i net-www/apache' it tells me I have net-www/apache-2.0.51 installed.
'emerge --pretend --verbose --update world' obviously thinks I have net-www/apache installed and so thinks that net-www/apache-2 is blocking subversion.

If I do 'qpkg -f /usr/bin/emacs' it tells me its in app-editors/emacs
If I do 'qpkg -I -i emacs' it tells me its in app-editors/emacs-21.3--r2
'emerge --pretend --verbose --update world' thinks that app-editors/emacs-21.3-r3 is a New install rather than an Update.

Am I misinterpreting things?
How do I 'fix' this?
I thought I could 'inject' the packages I know are installed but that just produces a 'package already exists' message.

Any help would be appreciated.
_________________
...Lyall

[kallamej]

Moved from Portage & Programming. Please post any follow ups in

emacs: https://forums.gentoo.org/viewtopic.php?t=227742
apache+subversion: https://forums.gentoo.org/viewtopic.php?t=173052
_________________
Please read our FAQ Forum, it answers many of your questions.
irc: #gentoo-forums on irc.libera.chat