move net-zope/simpletal dev-python/simpletal
move x11-base/xfree x11-base/xorg-x11
move net-dialup/hsflinmodem net-dialup/hsfmodem
move dev-libs/memcached-api-perl dev-perl/Cache-Memcached
move games-emulation/blight-uhleaudio games-emulation/mupen-blight-uhleaudio
move games-emulation/blight-tr64gl games-emulation/mupen64-blight-tr64gl
move games-emulation/blight-glN64 games-emulation/mupen64-blight-glN64
move games-emulation/blight_input games-emulation/mupen64-blight-input
move games-emulation/mupen-blight-uhleaudio games-emulation/mupen64-blight-uhleaudio
move games-emulation/mupen64-blight-glN64 games-emulation/mupen64-glN64
move sci-biology/njplot-unrooted sci-biology/njplot
move www-proxy/dnrd net-dns/dnrd
move net-mail/poppassd_pam net-mail/poppassd_ceti
move sys-kernel/pegasos-dev-sources sys-kernel/pegasos-sources
move sys-kernel/hppa-headers sys-kernel/linux-headers
move dev-libs/uclibc sys-libs/uclibc
move net-libs/aqhbci-wizard-kde net-libs/aqhbci-qt-wizard
move app-text/itext dev-java/itext
move net-news/bnr2 net-nntp/bnr2
move net-news/nntpswitch net-nntp/nntpswitch
move net-news/inn net-nntp/inn
move net-news/brag net-nntp/brag
move net-news/glitter net-nntp/glitter
move net-news/gnewspost net-nntp/gnewspost
move net-news/klibido net-nntp/klibido
move net-news/leafnode net-nntp/leafnode
move net-news/knews net-nntp/knews
move net-news/newspost net-nntp/newspost
move net-news/nget net-nntp/nget
move net-news/nzbget net-nntp/nzbget
move net-news/pan net-nntp/pan
move net-news/sn net-nntp/sn
move net-news/slrn net-nntp/slrn
move net-news/slrnconf net-nntp/slrnconf
move net-news/suck net-nntp/suck
move net-news/tin net-nntp/tin
move net-news/ubh net-nntp/ubh
move net-news/xrn net-nntp/xrn
move app-editors/quanta kde-base/kdewebdev
move app-text/kfilereplace kde-base/kdewebdev
move media-gfx/kimagemapeditor kde-base/kdewebdev
move net-libs/aqhbci-qt-wizard net-libs/aqhbci-qt-tools
move app-misc/mindterm-bin net-misc/mindterm
slotmove =dev-java/rhino-1.5* 0 1.5
slotmove =dev-java/rhino-1.6* 0 1.6
slotmove sys-libs/libchipcard 0 1
move net-misc/ksambaplugin kde-base/kdenetwork
move media-gfx/kolourpaint kde-base/kdegraphics
move x11-misc/kmousetool kde-base/kdeaccessibility
move net-www/drupal www-apps/drupal
slotmove sys-libs/chipcard-client 0 2
slotmove sys-libs/chipcard-server 0 2
move sys-libs/chipcard-client sys-libs/libchipcard
move sys-libs/chipcard-server sys-libs/libchipcard
move app-misc/tinyca app-crypt/tinyca
move sci-biology/MrBayes sci-biology/mrbayes
slotmove =kde-base/kdebase-pam-3.4.0_beta1 3.4 0
slotmove =dev-java/jdom-1.0_beta9* 0 1.0_beta9
slotmove =dev-java/jdom-1.0_beta10* 0 1.0_beta10
move app-i18n/scim-chinese app-i18n/scim-pinyin
move kde-base/libksvg kde-base/ksvg
move kde-base/ksvgplugin kde-base/ksvg
move kde-base/kaddressbook-xxports-kworldclock kde-base/kaddressbook-plugins
move kde-base/kfile-desktop kde-base/kdeaddons-kfile-plugins
move kde-base/kfile-folder kde-base/kdeaddons-kfile-plugins
move kde-base/kfile-html kde-base/kdeaddons-kfile-plugins
move kde-base/kfile-lnk kde-base/kdeaddons-kfile-plugins
move kde-base/kfile-txt kde-base/kdeaddons-kfile-plugins
move kde-base/kfile-cert kde-base/kdeaddons-kfile-plugins
move kde-base/kfile-mhtml kde-base/kdeaddons-kfile-plugins
move kde-base/kicker-kbinaryclock kde-base/kicker-applets
move kde-base/kicker-kolourpicker kde-base/kicker-applets
move kde-base/kicker-ktimemon kde-base/kicker-applets
move kde-base/kicker-math kde-base/kicker-applets
move kde-base/kicker-mediacontrol kde-base/kicker-applets
move kde-base/kate-cppsymbolviewer kde-base/kate-plugins
move kde-base/kate-filelistloader kde-base/kate-plugins
move kde-base/kate-filetemplates kde-base/kate-plugins
move kde-base/kate-helloworld kde-base/kate-plugins
move kde-base/kate-htmltools kde-base/kate-plugins
move kde-base/kate-insertcommand kde-base/kate-plugins
move kde-base/kate-kjswrapper kde-base/kate-plugins
move kde-base/kate-kpybrowser kde-base/kate-plugins
move kde-base/kate-make kde-base/kate-plugins
move kde-base/kate-modeline kde-base/kate-plugins
move kde-base/kate-openheader kde-base/kate-plugins
move kde-base/kate-scripts kde-base/kate-plugins
move kde-base/kate-snippets kde-base/kate-plugins
move kde-base/kate-tabbarextension kde-base/kate-plugins
move kde-base/kate-textfilter kde-base/kate-plugins
move kde-base/kate-xmlcheck kde-base/kate-plugins
move kde-base/kate-xmltools kde-base/kate-plugins
move kde-base/noatun-alsaplayer kde-base/noatun-plugins
move kde-base/noatun-blurscope kde-base/noatun-plugins
move kde-base/noatun-charlatan kde-base/noatun-plugins
move kde-base/noatun-dub kde-base/noatun-plugins
move kde-base/noatun-ffrs kde-base/noatun-plugins
move kde-base/noatun-luckytag kde-base/noatun-plugins
move kde-base/noatun-lyrics kde-base/noatun-plugins
move kde-base/noatun-nexscope kde-base/noatun-plugins
move kde-base/noatun-noatunmadness kde-base/noatun-plugins
move kde-base/noatun-oblique kde-base/noatun-plugins
move kde-base/noatun-pitchablespeed kde-base/noatun-plugins
move kde-base/noatun-synaescope kde-base/noatun-plugins
move kde-base/noatun-tippercanoe kde-base/noatun-plugins
move kde-base/noatun-tyler kde-base/noatun-plugins
move kde-base/noatun-wavecapture kde-base/noatun-plugins
move kde-base/kdeaddons-docs-kate-plugins kde-base/kate-plugins
move kde-base/kdeaddons-docs-kicker-applets kde-base/kicker-applets
move app-vim/xsl app-vim/xsl-syntax
slotmove =kde-base/dcopperl-3.3* 3.3 0
slotmove =kde-base/dcopperl-3.4* 3.4 0
slotmove =kde-base/dcopython-3.3* 3.3 0
slotmove =kde-base/dcopython-3.4* 3.4 0
slotmove =kde-base/qtruby-3.3* 3.3 0
slotmove =kde-base/qtruby-3.4* 3.4 0
slotmove =kde-base/korundum-3.3* 3.3 0
slotmove =kde-base/korundum-3.4* 3.4 0
slotmove =media-libs/libmusepack-1.1 1.1 0
slotmove =media-libs/flac-1.2 1.2 0
move net-analyzer/ucd-snmp net-analyzer/net-snmp
slotmove =x11-libs/openmotif-2.1* 0 2.1
slotmove =x11-libs/openmotif-2.2* 0 2.2
move sys-apps/lm-sensors sys-apps/lm_sensors
move kde-base/konqueror-arkplugin kde-base/konq-plugins
move kde-base/konqueror-autorefresh kde-base/konq-plugins
move kde-base/konqueror-babelfish kde-base/konq-plugins
move kde-base/konqueror-crashes kde-base/konq-plugins
move kde-base/konqueror-dirfilter kde-base/konq-plugins
move kde-base/konqueror-domtreeviewer kde-base/konq-plugins
move kde-base/konqueror-fsview kde-base/konq-plugins
move kde-base/konqueror-imagerotation kde-base/konq-plugins
move kde-base/konqueror-khtmlsettingsplugin kde-base/konq-plugins
move kde-base/konqueror-kimgalleryplugin kde-base/konq-plugins
move kde-base/konqueror-kuick kde-base/konq-plugins
move kde-base/konqueror-minitools kde-base/konq-plugins
move kde-base/konqueror-rellinks kde-base/konq-plugins
move kde-base/konqueror-searchbar kde-base/konq-plugins
move kde-base/konqueror-sidebar kde-base/konq-plugins
move kde-base/konqueror-smbmounter kde-base/konq-plugins
move kde-base/konqueror-uachanger kde-base/konq-plugins
move kde-base/konqueror-validators kde-base/konq-plugins
move kde-base/konqueror-webarchiver kde-base/konq-plugins
move sys-libs/device-mapper sys-fs/device-mapper
move sys-apps/mdadm sys-fs/mdadm
move net-analyzer/snort_inline net-analyzer/snort
slotmove x11-libs/lesstif 0 2.1
move sys-apps/lsof sys-process/lsof
move sys-apps/htop sys-process/htop
move sys-apps/acctail sys-process/acctail
move sys-apps/acct sys-process/acct
move sys-apps/atop sys-process/atop
move sys-apps/time sys-process/time
move sys-apps/minit sys-process/minit
move sys-apps/runit sys-process/runit
move sys-apps/schedtool sys-process/schedtool
move sys-apps/schedutils sys-process/schedutils
move sys-apps/watchpid sys-process/watchpid
move sys-apps/psmisc sys-process/psmisc
move sys-apps/procps sys-process/procps
move sys-apps/supervise-scripts sys-process/supervise-scripts
move sys-apps/anacron sys-process/anacron
move sys-apps/at sys-process/at
move sys-apps/daemontools-scripts sys-process/daemontools-scripts
move sys-apps/daemontools sys-process/daemontools
move sys-apps/cronbase sys-process/cronbase
move sys-apps/dcron sys-process/dcron
move sys-apps/fcron sys-process/fcron
move sys-apps/vixie-cron sys-process/vixie-cron
move sys-apps/subterfugue sys-devel/subterfugue
move sys-apps/showconsole app-admin/showconsole
move sys-apps/tmpreaper app-admin/tmpreaper
move sys-apps/tic98 media-gfx/tic98
move sys-apps/buffer sys-block/buffer
move sys-apps/disktype sys-block/disktype
move sys-apps/tw_cli sys-block/tw_cli
move sys-apps/mbuffer sys-block/mbuffer
move sys-apps/nwutil sys-block/nwutil
move sys-apps/nbd sys-block/nbd
move sys-apps/gpart sys-block/gpart
move sys-apps/partimage sys-block/partimage
move sys-apps/di sys-block/di
move sys-apps/noflushd sys-block/noflushd
move media-libs/panotools media-libs/libpano12
move dev-dotnet/nemerle dev-lang/nemerle
move dev-dotnet/mono dev-lang/mono
move kde-base/kdebase-l10n kde-base/kdebase-data
move kde-base/kdebase-pics kde-base/kdebase-data
move kde-base/kdebase-applnk kde-base/kdebase-data
move net-www/links www-client/links
move sys-apps/gcloop sys-block/gcloop
move sys-apps/speedfreq sys-power/speedfreq
move sys-apps/powernowd sys-power/powernowd
move sys-apps/nvram-wakeup sys-power/nvram-wakeup
move sys-apps/nvram-reboot sys-power/nvram-reboot
move sys-apps/cpudyn sys-power/cpudyn
move sys-apps/cpufreqd sys-power/cpufreqd
move sys-apps/athcool sys-power/athcool
move sys-apps/gtk-cpuspeedy sys-power/gtk-cpuspeedy
move sys-apps/hibernate-script sys-power/hibernate-script
move sys-apps/powermgmt-base sys-power/powermgmt-base
move sys-apps/apcupsd sys-power/apcupsd
move sys-apps/cpufrequtils sys-power/cpufrequtils
move net-fs/idmapd net-libs/nfsidmap
move net-www/lynx www-client/lynx
move net-www/amaya www-client/amaya
move net-www/opera www-client/opera
move sys-apps/cpuspeedy sys-power/cpuspeedy
move sys-apps/acpid sys-power/acpid
move sys-apps/mtx sys-block/mtx
move net-www/netscape-communicator www-client/netscape-communicator
move net-www/netscape-navigator www-client/netscape-navigator
move net-www/skipstone www-client/skipstone
move net-www/prozgui www-client/prozgui
move net-www/elinks www-client/elinks
move net-www/downman www-client/downman
move net-www/fetch www-client/fetch
move net-www/galeon www-client/galeon
move net-www/straw net-news/straw
move net-www/snownews net-news/snownews
move net-www/liferea net-news/liferea
move net-www/httrack www-client/httrack
move net-www/surfraw www-client/surfraw
move media-gfx/pfaedit media-gfx/fontforge
move net-www/w3mir www-client/w3mir
move net-www/kazehakase-cvs www-client/kazehakase-cvs
move net-www/mozilla-bin www-client/mozilla-bin
move net-www/mozilla-firefox-bin www-client/mozilla-firefox-bin
move net-www/epiphany-extensions www-client/epiphany-extensions
move net-www/khttrack www-client/khttrack
move net-www/kazehakase www-client/kazehakase
move net-www/mozilla-firefox www-client/mozilla-firefox
slotmove =dev-java/batik-1.5.1* 0 1.5.1 
move net-misc/gtk-imonc net-dialup/gtk-imonc
move www-client/w3m-m17n www-client/w3m
move net-www/charm net-news/charm
move net-www/nvu app-editors/nvu
move net-www/netrik www-client/netrik
move net-www/rawdog net-news/rawdog
move net-www/mozilla www-client/mozilla
move net-www/epiphany www-client/epiphany
move net-www/mozilla-launcher www-client/mozilla-launcher
move sys-kernel/gentoo-dev-sources sys-kernel/gentoo-sources
move sys-kernel/hardened-dev-sources sys-kernel/hardened-sources
move sys-kernel/rsbac-dev-sources sys-kernel/rsbac-sources
move sys-kernel/development-sources sys-kernel/vanilla-sources
move sys-kernel/linux26-headers sys-kernel/linux-headers
move net-misc/zebra net-misc/quagga