move net-p2p/dcgui-qt net-p2p/valknut
move net-p2p/bittorrent-theshadow net-p2p/bittornado
move media-libs/sidplay-libs media-libs/libsidplay
slotmove >=media-libs/libsidplay-2.0 0 2
move dev-python/wxPython dev-python/wxpython
slotmove app-editors/emacs 21.3 21
slotmove app-editors/emacs 0 21
move net-im/guifications x11-plugins/guifications
move net-im/gaim-encryption x11-plugins/gaim-encryption
move net-www/memcached net-misc/memcached
move net-misc/freeswan net-misc/openswan
move dev-lisp/gauche-gtk dev-scheme/gauche-gtk
move net-irc/ptlink net-irc/ptlink-ircd
move dev-lisp/gauche-gl dev-scheme/gauche-gl
move dev-lisp/gauche dev-lang/gauche
move app-admin/wasabi app-admin/tenshi
move dev-python/pyOpenSSL dev-python/pyopenssl
move dev-python/omniORBpy dev-python/omniorbpy
move net-mail/qmail-scanner mail-filter/qmail-scanner
move net-im/meanwhile-gaim net-im/gaim-meanwhile
move dev-python/Imaging dev-python/imaging
move dev-python/Imaging-py21 dev-python/imaging-py21
move dev-python/PyXML-py21 dev-python/pyxml-py21
move dev-python/ScientificPython dev-python/scientificpython
move dev-python/PyOpenGL dev-python/pyopengl
move app-gnustep/affiche gnustep-apps/affiche
move app-gnustep/easydiff gnustep-apps/easydiff
move app-gnustep/gridlock gnustep-apps/gridlock
move app-gnustep/gnumail gnustep-apps/gnumail
move app-gnustep/gorm gnustep-apps/gorm
move app-gnustep/gworkspace gnustep-apps/gworkspace
move app-gnustep/helpviewer gnustep-apps/helpviewer
move app-gnustep/imageviewer gnustep-apps/imageviewer
move app-gnustep/projectcenter gnustep-apps/projectcenter
move app-gnustep/talksoup gnustep-apps/talksoup
move app-gnustep/terminal gnustep-apps/terminal
move app-gnustep/jigs gnustep-libs/jigs
move app-gnustep/pantomime gnustep-libs/pantomime
move app-gnustep/renaissance gnustep-libs/renaissance
move dev-util/gnustep-make gnustep-base/gnustep-make
move dev-util/gnustep-base gnustep-base/gnustep-base
move dev-util/gnustep-gui gnustep-base/gnustep-gui
move dev-util/gnustep-back gnustep-base/gnustep-back
move dev-util/gnustep-guile gnustep-libs/gnustep-guile
move x11-wm/gnustep-env gnustep-base/gnustep-env
move media-sound/xmmsd media-plugins/xmms-xmmsd
move dev-util/poedit app-i18n/poedit
slotmove <net-www/tomcat-4.1.30 0 4  
slotmove <net-www/tomcat-5.0.27 0 5
move dev-java/blackdown-java3d dev-java/blackdown-java3d-bin
move dev-java/bluej dev-java/bluej-bin
move dev-java/dbconnectionbroker dev-java/dbconnectionbroker-bin
move dev-java/infobus dev-java/infobus-bin
move dev-java/jad dev-java/jad-bin
move dev-java/jai dev-java/jai-bin
move dev-java/jess dev-java/jess-bin
move dev-java/jmf dev-java/jmf-bin
move dev-java/maven dev-java/maven-bin
move dev-java/snipsnap dev-java/snipsnap-bin
move dev-java/sun-java3d dev-java/sun-java3d-bin
move net-www/boa www-servers/boa
move net-www/fnord www-servers/fnord
move net-www/jboss www-servers/jboss
move net-www/jetty www-servers/jetty
move net-www/lighttpd www-servers/lighttpd
move net-www/mini_httpd www-servers/mini_httpd
move net-www/monkeyd www-servers/monkeyd
move net-www/ncsa-httpd www-servers/ncsa-httpd
move net-www/orion www-servers/orion
move net-www/plb www-servers/plb
move net-www/pound www-servers/pound
move net-www/privoxy www-proxy/privoxy
move net-www/publicfile www-servers/publicfile
move net-www/resin www-servers/resin
move net-www/resin-ee www-servers/resin-ee
move net-www/thttpd www-servers/thttpd
move net-www/tomcat www-servers/tomcat
move net-www/tux www-servers/tux
move net-www/webfs www-servers/webfs
move net-www/bozohttpd www-servers/bozohttpd
move app-misc/glabels app-office/glabels
move dev-perl/Apache-Gallery www-apps/Apache-Gallery
move net-www/browser-config www-apps/browser-config
move net-www/bugzilla www-apps/bugzilla
move net-www/curator www-apps/curator
move net-www/diaria www-apps/diaria
move app-misc/gallery www-apps/gallery
move net-www/horde www-apps/horde
move net-www/horde-accounts www-apps/horde-accounts
move net-www/horde-chora www-apps/horde-chora
move net-www/horde-forwards www-apps/horde-forwards
move net-www/horde-imp www-apps/horde-imp
move net-www/horde-kronolith www-apps/horde-kronolith
move net-www/horde-mnemo www-apps/horde-mnemo
move net-www/horde-nag www-apps/horde-nag
move net-www/horde-passwd www-apps/horde-passwd
move net-www/horde-pear www-apps/horde-pear
move net-www/horde-sork www-apps/horde-sork
move net-www/horde-turba www-apps/horde-turba
move net-www/horde-vacation www-apps/horde-vacation
move net-www/ids www-apps/ids
move net-www/issue-tracker www-apps/issue-tracker
move net-www/lxr www-apps/lxr
move net-www/moinmoin www-apps/moinmoin
move net-www/mypictures www-apps/mypictures
move net-www/mythweb www-apps/mythweb
move net-misc/nut www-apps/nut
move net-www/online-bookmarks www-apps/online-bookmarks
move net-www/pcgi www-apps/pcgi
move net-www/phpBB www-apps/phpBB
move net-www/phpmp www-apps/phpmp
move net-www/phpwebsite www-apps/phpwebsite
move net-www/roundup www-apps/roundup
move net-www/scgi www-apps/scgi
move net-www/swish-e www-apps/swish-e
move net-www/tikiwiki www-apps/tikiwiki
move net-www/trac www-apps/trac
move net-www/twiki www-apps/twiki
move net-www/viewcvs www-apps/viewcvs
move net-www/wordpress www-apps/wordpress
move net-www/cocoon dev-java/cocoon
move net-www/mod_mono www-apache/mod_mono
move net-www/mod_lisp www-apache/mod_lisp
move net-www/mod_tcl www-apache/mod_tcl
move net-www/cvsweb dev-util/cvsweb
move net-www/linklint dev-util/linklint
move net-www/screem dev-util/screem
move net-www/webcpp dev-util/webcpp
move net-www/prozilla www-client/prozilla
move net-www/davfs2 net-fs/davfs2
move net-www/bookmarksync www-misc/bookmarksync
move net-www/gurlchecker www-misc/gurlchecker
move net-www/htdig www-misc/htdig
move net-www/log-toolkit www-misc/log-toolkit
move net-www/mergelog www-misc/mergelog
move net-www/squidalyser www-misc/squidalyser
move net-www/visitors www-misc/visitors
move net-www/wsmake www-misc/wsmake
move net-www/zoneminder www-misc/zoneminder
move net-www/adzapper www-proxy/adzapper
move net-www/amphetadesk www-proxy/amphetadesk
move net-www/dansguardian www-proxy/dansguardian
move net-www/junkbuster www-proxy/junkbuster
move net-www/middleman www-proxy/middleman
move net-www/ntlmaps www-proxy/ntlmaps
move net-www/oops www-proxy/oops
move net-www/squid www-proxy/squid
move net-www/squidguard www-proxy/squidguard
move net-www/squirm www-proxy/squirm
move net-www/tinyproxy www-proxy/tinyproxy
move net-www/wwwoffle www-proxy/wwwoffle
move dev-php/egroupware www-apps/egroupware
move dev-php/phpgroupware www-apps/phpgroupware
move app-office/phprojekt www-apps/phprojekt
move media-sound/libdsp media-libs/libdsp
slotmove gnome-base/ORBit 0 1
slotmove gnome-base/ORBit2 0 2
move gnome-base/ORBit gnome-base/orbit
move gnome-base/ORBit2 gnome-base/orbit
move net-misc/gwget2 net-misc/gwget
move net-www/dspam-web www-apps/dspam-web
move dev-tcltk/mmucl games-mud/mmucl
move app-editors/xemacs-packages-sumo app-xemacs/xemacs-packages-sumo
move x11-base/xfree-drm x11-base/x11-drm
move dev-java/regexp-bin dev-java/regexp
move dev-java/ant-optional dev-java/ant-tasks
move net-www/ci www-client/ci
move net-www/ochusha www-client/ochusha
move net-www/kita www-client/kita
move net-www/gorua www-client/gorua
move net-www/dillo www-client/dillo
move net-www/raggle www-client/raggle
move net-www/w3m www-client/w3m
move net-www/w3m-m17n www-client/w3m-m17n
move net-www/w3mmee www-client/w3mmee
slotmove <sys-libs/libstdc++-v3-3.4 3.3.3 5
move app-admin/sleuthkit app-forensics/sleuthkit
move dev-util/examiner app-forensics/examiner
move app-admin/foremost app-forensics/foremost
move sys-apps/air app-forensics/air
move app-admin/chkrootkit app-forensics/chkrootkit
move app-admin/rkhunter app-forensics/rkhunter
move app-admin/aide app-forensics/aide
move app-admin/autopsy app-forensics/autopsy
move dev-ruby/mod-ruby dev-ruby/mod_ruby
move dev-libs/bio2jack media-libs/bio2jack
move sys-fs/linux-ntfs sys-fs/ntfsprogs
move net-misc/ltsp-core net-misc/ltsp
move app-xemacs/eterm app-xemacs/xemacs-eterm
move sys-apps/quota sys-fs/quota
move sys-apps/quotatool sys-fs/quotatool