diff --git a/paludis/keywords.conf b/paludis/keywords.conf
index e7b5028..62fa56d 100644
--- a/paludis/keywords.conf
+++ b/paludis/keywords.conf
@@ -8,880 +8,3 @@
 ## sec bugs
 ~media-libs/libmodplug-0.8.8.5 ~amd64
 
-## my testing packages
-dev-libs/angelscript ~amd64
-mail-client/geary ~amd64
-app-backup/fsarchiver ~amd64
-app-backup/qt4-fsarchiver ~amd64
-dev-python/watchdog ~amd64
-dev-python/pathtools ~amd64
-dev-python/argh ~amd64
-net-im/dianara ~amd64
-dev-libs/libuv ~amd64
-net-im/bitlbee ~amd64
-x11-plugins/bitlbee-steam ~amd64
-net-irc/hexchat ~amd64
-~sci-mathematics/rstudio-0.98.490 ~amd64
-net-misc/megatools ~amd64
-dev-python/pyopenal ~amd64
-dev-python/pyvorbis ~amd64
-sci-libs/libspatialindex ~amd64
-dev-python/pyode ~amd64
-sci-geosciences/osgearth ~amd64
-www-apps/hiawatha-monitor ~amd64
-dev-lang/php ~amd64
-x11-plugins/hexchat-javascript ~amd64
-dev-lang/io ~amd64
-x11-libs/pixman ~amd64
-games-engines/love *
-games-arcade/lix *
-media-libs/libsfml ~amd64
-dev-python/cryptography ~amd64
-mail-filter/spamassassin ~amd64
-media-sound/teamspeak-client-bin ~amd64
-app-crypt/zuluCrypt ~amd64
-net-libs/iojs ~amd64
-net-irc/znc ~amd64
-x11-misc/devilspie2 ~amd64
-sci-geosciences/libtcd ~amd64
-sci-geosciences/seawater ~amd64
-sci-geosciences/xtide ~amd64
-x11-misc/sddm ~amd64
-media-libs/libebur128 ~amd64
-media-libs/libgroove ~amd64
-media-sound/helm:0::gentoo ~amd64
-dev-php/* ~amd64
-www-servers/apache ~amd64
-app-admin/apache-tools ~amd64
-media-libs/libsoundio ~amd64
-dev-util/cmake ~amd64
-
-
-
-# pydio-sync
-dev-python/memory_profiler ~amd64
-www-misc/pydio-sync ~amd64
-dev-python/keyring ~amd64
-dev-python/pydispatcher ~amd64
-dev-python/xmltodict ~amd64
-
-# blender
-media-gfx/blender *
-~media-video/ffmpeg-2.2.14 ~amd64
-dev-cpp/gflags ~amd64
-dev-cpp/glog ~amd64
-
-# git-cola
-dev-vcs/git-cola ~amd64
-~dev-python/jsonpickle-0.7.2 ~amd64
-~dev-python/simplejson-3.6.0 ~amd64
-mail-filter/postgrey ~amd64
-www-servers/hiawatha ~amd64
-dev-python/pathlib ~amd64
-
-# tox
-net-libs/tox *
-dev-libs/libsodium ~amd64
-net-im/venom-av *
-net-im/venom *
-#net-im/qtox *
-~x11-libs/libxkbcommon-0.4.1 ~amd64
-net-im/tox-prpl *
-#net-im/tox-gui-qt *
-net-im/utox *
-net-im/toxic *
-media-libs/libfilteraudio *
-
-
-~sys-devel/bison-2.7.1 ~amd64
-~media-libs/xvid-1.3.2 ~amd64
-~media-libs/speex-1.2_rc1 ~amd64
-~media-libs/libao-1.1.0 ~amd64
-~media-libs/a52dec-0.7.4 ~amd64
-~dev-libs/fribidi-0.19.5 ~amd64
-~media-libs/libv4l-1.0.0 ~amd64
-~media-sound/lame-3.99.5 ~amd64
-~media-sound/gsm-1.0.13 ~amd64
-
-~media-libs/faad2-2.7 ~amd64
-~media-libs/glew-1.10.0 ~amd64
-~media-libs/openjpeg-1.5.1 ~amd64
-~media-libs/libmodplug-0.8.8.4 ~amd64
-~media-libs/vo-aacenc-0.1.3 ~amd64
-~media-libs/libdv-1.0.0 ~amd64
-~media-libs/lcms-2.5 ~amd64
-
-dev-util/kbuild ~amd64
-sys-devel/gdb ~amd64
-#<net-p2p/retroshare-0.6.0 ~amd64
-# for kernel-3.12
-#sys-fs/zfs *
-#sys-fs/zfs-kmod *
-#sys-kernel/spl *
-# cpu too recent?
-dev-util/valgrind ~amd64
-x11-terms/terra *
-dev-python/simplegui ~amd64
-dev-db/firebird ~amd64
-app-emulation/virtualbox ~amd64
-app-emulation/virtualbox-additions ~amd64
-app-emulation/virtualbox-extpack-oracle ~amd64
-app-emulation/virtualbox-modules ~amd64
-
-media-libs/smpeg2 ~amd64
-
-media-libs/sdl2-net ~amd64
-
-media-libs/sdl2-mixer ~amd64
-media-libs/libsdl2 ~amd64
-media-libs/sdl2-image ~amd64
-media-libs/sdl2-ttf ~amd64
-media-libs/sdl2-gfx ~amd64
-
-# netsurf
-www-client/netsurf ~amd64
-
-dev-util/codeblocks ~amd64
-dev-util/geany ~amd64
-dev-util/geany-plugins ~amd64
-
-# perl unmasking
-~dev-perl/Gentoo-PerlMod-Version-0.6.0 ~amd64
-~dev-perl/Text-Markdown-1.0.31 ~amd64
-
-net-im/tox
-net-im/toxic
-
-# required by games-action/teeworlds (argument)
-=media-libs/pnglite-0.1.17 ~amd64
-
-# linphone
-~net-voip/linphone-3.6.1::gentoo ~amd64
-~net-libs/libeXosip-4.0.0::gentoo ~amd64
-#net-libs/libeXosip ~amd64
-#net-libs/ortp ~amd64
-#media-libs/mediastreamer ~amd64
-#net-libs/belle-sip ~amd64
-dev-libs/antlr-c ~amd64
-
-#games-engines/openmw *
-x11-misc/openbox-menu ~amd64
-# tahoe-lafs
-net-fs/tahoe-lafs ~amd64
-dev-python/pycryptopp ~amd64
-dev-python/pyutil ~amd64
-dev-python/zbase32 ~amd64
-dev-python/zfec ~amd64
-=dev-python/twisted-conch-13.0.0-r1 ~amd64
-=net-zope/zope-interface-4.0.5 ~amd64
-
-=dev-libs/libffi-3.0.13-r1 ~amd64
-
-=virtual/libffi-3.0.13-r1 ~amd64
-
-sys-apps/etckeeper ~amd64
-dev-python/mpi4py ~amd64
-xfce-extra/xfce4-whiskermenu-plugin *
-virtual/pypy ~amd64
-x11-plugins/pidgin-otr ~amd64
-net-libs/libotr ~amd64
-net-p2p/pybitmessage *
-
-x11-misc/vym ~amd64
-
-net-misc/dropbox-cli ~amd64
-
-net-libs/miniupnpc ~amd64
-dev-python/pypy ~amd64
-app-portage/gentoopm ~amd64
-net-misc/openconnect ~amd64
-www-client/pybugz ~amd64
-sys-fs/zfs ~amd64
-sys-kernel/spl ~amd64
-sys-fs/zfs-kmod ~amd64
-app-vim/nerdtree ~amd64
-
-xfce-extra/xfce4-timer-plugin ~amd64
-=media-gfx/inkscape-0.48.4-r1 ~amd64
-
-# elogv
-app-portage/elogv ~amd64
-=dev-python/pyliblzma-0.5.3-r1 ~amd64
-dev-python/jedi ~amd64
-dev-util/cloc ~amd64
-sys-devel/bmake
-
-# libpng testing
-=media-libs/libpng-1.6* ~amd64
-media-libs/libpng:1.5 ~amd64
-
-# required by sci-mathematics/wxmaxima-12.09.0
-# required by wxmaxima (argument)
-=media-fonts/jsmath-1.0 ~amd64
-sci-mathematics/wxmaxima ~amd64
-sci-mathematics/maxima ~amd64
-
-dev-python/pyatspi ~amd64
-dev-vcs/svn2git ~amd64
-
-media-libs/desurium-cef *
-games-util/desurium *
-
-games-engines/gambatte *
-
-# python3_3 and eclass unlocking
-# required by games-engines/renpy-6.15.0::hasufell-overlay
-app-eselect/eselect-renpy ~amd64
-dev-python/pygame_sdl2 ~amd64
-
-dev-lang/python:3.3 *
-
-games-engines/residualvm *
-
-x11-misc/sunflower ~amd64
-dev-util/a8 ~amd64
-
-media-sound/pnmixer ~amd64
-app-admin/mcelog ~amd64
-media-gfx/pornview ~amd64 *
-
-dev-util/ninja-ide ~amd64
-net-misc/remmina ~amd64
-
-# lolcat dep
-games-strategy/openra ~amd64
-sys-apps/pacman ~amd64
-net-libs/libuv ~amd64
-net-libs/http-parser ~amd64
-net-misc/pglinux ~amd64
-x11-misc/spacefm-plugins *
-app-text/jpdftweak ~amd64
-
-# for sumwars
-dev-libs/poco ~amd64
-x11-misc/compton *
-
-# bluefish abiword
-gnome-extra/gucharmap ~amd64
-
-# cegui
-dev-games/ogre *
-dev-games/cegui ~amd64
-media-libs/glm ~amd64
-games-rpg/sumwars ~amd64
-
-# torbrowser
-www-client/torbrowser ~amd64
-www-misc/torbrowser-profile ~amd64
-~dev-libs/nss-3.16.2 ~amd64
-~dev-libs/nspr-4.10.6 ~amd64
-
-sys-apps/portage *
-
-dev-lang/dmd:1 ~amd64
-dev-lang/dmd:2 ~amd64
-
-# by libmediainfo
-net-im/purple-events ~amd64
-x11-plugins/purple-libnotify-plus ~amd64
-
-# desura testing
-#=x11-libs/wxGTK-2.9.4.1 ~amd64
-x11-libs/wxGTK:2.9 ~amd64
-
-=media-libs/devil-1.7.8-r1
-net-libs/enet:1.3 ~amd64
-sys-devel/automake:1.12 ~amd64
-sys-devel/automake:1.13 ~amd64
-
-=x11-plugins/pidgin-birthday-reminder-1.7 ~amd64
-
-# for cdemu
-sys-fs/vhba ~amd64
-app-cdr/cdemu ~amd64
-app-cdr/cdemu-daemon ~amd64
-app-cdr/gcdemu ~amd64
-
-# unconditional ~amd64
-app-admin/conkyguayadeque ~amd64
-app-admin/cpu-g ~amd64
-app-antivirus/avast4workstation ~amd64
-app-arch/innoextract ~amd64
-app-editors/bluefish ~amd64
-app-editors/efte ~amd64
-app-emulation/vboxgtk ~amd64
-app-misc/g15stats ~amd64
-app-admin/hardinfo ~amd64
-app-misc/lolcat ~amd64
-app-misc/rainlendar-lite ~amd64
-app-misc/trash-cli ~amd64
-app-misc/xmind-portable ~amd64
-app-portage/autodep ~amd64
-app-portage/eclass-manpages ~amd64
-#app-portage/eix ~amd64
-app-portage/euscan *
-app-portage/overlay-utils ~amd64
-app-portage/pfl ~amd64
-app-portage/smart-live-rebuild ~amd64
-app-shells/mksh ~amd64
-app-text/focuswriter ~amd64
-app-text/jist ~amd64
-app-text/keepnote ~amd64
-dev-games/* ~amd64
-dev-java/oracle-jdk-bin ~amd64
-dev-lang/lazarus ~amd64
-
-# for cdemu
-dev-libs/libmirage ~amd64
-dev-libs/tinyxml2 ~amd64
-dev-perl/Linux-DesktopFiles ~amd64
-dev-util/bluej ~amd64
-dev-util/checkbashisms ~amd64
-dev-util/gquilt ~amd64
-
-# for googleearth
-dev-util/patchelf ~amd64
-
-dev-vcs/git ~amd64
-
-# accept all games stuff
-games-action/* ~amd64
-games-adventure/* ~amd64
-games-arcade/* ~amd64
-games-board/* ~amd64
-games-emulation/* ~amd64
-games-engines/* ~amd64
-games-fps/* ~amd64
-games-kids/* ~amd64
-games-misc/* ~amd64
-games-mud/* ~amd64
-games-puzzle/* ~amd64
-games-roguelike/* ~amd64
-games-rpg/* ~amd64
-games-server/* ~amd64
-games-simulation/* ~amd64
-games-sports/* ~amd64
-games-strategy/* ~amd64
-games-util/* ~amd64
-
-media-gfx/nvidia-cg-toolkit ~amd64
-media-gfx/nvidia-texture-tools ~amd64
-~media-gfx/pinta-1.5_pre20121118 ~amd64
-media-fonts/unifont ~amd64
-media-libs/libmediainfo ~amd64
-
-# for "link" useflag of VBAM
-~media-libs/libsfml-1.6 ~amd64
-
-media-sound/guayadeque ~amd64
-media-sound/teamspeak-client-bin ~amd64
-media-video/mediainfo ~amd64
-net-im/pidgin ~amd64
-net-im/skype ~amd64
-net-im/skypetab-ng ~amd64
-net-irc/xchat-otr ~amd64
-net-irc/xchatosd ~amd64
-
-# required by pidgin
-net-libs/farstream ~amd64
-net-news/PenguinTV ~amd64
-net-firewall/pglinux ~amd64
-net-misc/dropbox ~amd64
-sci-geosciences/googleearth ~amd64
-sci-misc/boinc ~amd64
-sys-apps/modprobed_db ~amd64
-sys-apps/paludis ~amd64
-sys-apps/udevil ~amd64
-sys-boot/os-prober ~amd64
-sys-devel/clang ~amd64
-sys-devel/dragonegg ~amd64
-sys-devel/llvm ~amd64
-sys-devel/spl ~amd64
-sys-fs/zfs ~amd64
-
-#sys-kernel/gentoo-sources ~amd64
-sys-power/cpufreqd ~amd64
-virtual/jdk ~amd64
-virtual/jre ~amd64
-www-misc/abloadtool ~amd64
-www-misc/profile-sync-daemon ~amd64
-x11-themes/clearlooks-phenix ~amd64
-x11-misc/idesk-extras ~amd64
-x11-misc/obapps ~amd64
-x11-misc/obmenugen ~amd64
-x11-misc/obmenu-generator ~amd64
-x11-misc/obtheme ~amd64
-
-x11-misc/redshift ~amd64
-~dev-python/pyxdg-0.25 ~amd64
-
-x11-misc/ktsuss ~amd64
-x11-misc/tudor-volumed ~amd64
-x11-misc/wbar ~amd64
-x11-misc/wbarconf ~amd64
-x11-misc/x11vnc ~amd64
-x11-plugins/pidgin-facebookchat ~amd64
-x11-plugins/pidgin-opensteamworks ~amd64
-x11-plugins/pidgin-window_merge ~amd64
-x11-themes/geany-themes ~amd64
-x11-themes/human-icon-theme ~amd64
-x11-themes/yasis-icon-theme ~amd64
-x11-wm/openbox ~amd64
-
-sys-devel/gcc:4.7 ~amd64
-sys-devel/gcc:4.8 ~amd64
-sys-devel/gcc:4.8 ~amd64
-sys-devel/gcc:4.9 ~amd64
-
-
-#conditional *
-<sys-boot/grub-9999 *
-
-#unconditional *
-app-office/writerscafe *
-app-vim/simple-bookmarks *
-app-vim/solarized *
-dev-python/snakeoil *
-sys-apps/pkgcore *
-dev-util/pkgcore-checks *
-games-arcade/clonekeenplus *
-games-engines/gemrb *
-games-engines/stratagus *
-games-misc/limbs-off *
-games-strategy/freeorion *
-games-strategy/opendungeons *
-games-strategy/opendungeons-data *
-games-strategy/freesynd *
-#games-strategy/s25rttr *
-#games-strategy/wargus *
-#games-strategy/wargus-data *
-games-mud/wxmud *
-media-sound/gmusicbrowser *
-media-sound/guayadeque *
-sys-apps/pkgcore *
-x11-misc/spacefm *
-#x11-wm/openbox *
-#x11-misc/obconf *
-x11-terms/terminator *
-
-# netbeans
-dev-java/netbeans-cnd ~amd64
-dev-java/netbeans-harness ~amd64
-dev-java/netbeans-platform ~amd64
-dev-java/netbeans-apisupport ~amd64
-dev-java/netbeans-webcommon ~amd64
-dev-java/netbeans-websvccommon ~amd64
-dev-java/netbeans-mobility ~amd64
-dev-java/smack ~amd64
-dev-java/netbeans-javacard ~amd64
-dev-java/netbeans-ide ~amd64
-dev-java/netbeans-javafx ~amd64
-dev-java/netbeans-nb ~amd64
-dev-java/netbeans-profiler ~amd64
-dev-java/netbeans-groovy ~amd64
-dev-java/netbeans-php ~amd64
-dev-java/ws-commons-util ~amd64
-dev-java/saxon ~amd64
-dev-java/netbeans-java ~amd64
-dev-java/netbeans-javadoc ~amd64
-dev-java/netbeans-dlight ~amd64
-dev-java/netbeans-enterprise ~amd64
-dev-java/netbeans-ergonomics ~amd64
-dev-java/jboss-logging ~amd64
-dev-java/jboss-logmanager ~amd64
-dev-java/jboss-modules ~amd64
-dev-java/netbeans-extide ~amd64
-dev-util/netbeans ~amd64
-
-# for vim
-app-vim/exheres-syntax ~amd64
-app-vim/csound-syntax ~amd64
-app-vim/tt2-syntax ~amd64
-app-editors/gvim ~amd64
-app-editors/vim ~amd64
-app-editors/vim-core ~amd64
-app-vim/conque ~amd64
-app-vim/delimitMate *
-app-vim/* ~amd64
-app-vim/undotree *
-
-# youcompleteme
-app-vim/youcompleteme *
-dev-python/waitress ~amd64
-dev-python/sh ~amd64
-
-# blender
-dev-cpp/eigen:3 ~amd64
-=media-gfx/blender-2.69-r1 ~amd64
-sci-physics/bullet ~amd64
-sci-libs/ldl ~amd64
-sci-libs/suitesparseconfig ~amd64
-
-sys-kernel/vanilla-sources ~amd64
-app-portage/gentoolkit ~amd64
-dev-vcs/tig ~amd64
-=app-portage/flaggie-9999 *
-dev-lua/luvit *
-games-strategy/freeserf *
-games-arcade/mars-game *
-x11-wm/i3 *
-net-misc/teamviewer ~amd64
-app-editors/focuswriter ~amd64
-x11-misc/i3status ~amd64
-sys-apps/keyfuzz ~amd64
-sys-apps/hprofile ~amd64
-net-misc/tor ~amd64
-net-proxy/torsocks ~amd64
-net-print/samsungs-unified-linux-driver ~amd64
-dev-util/bin_replace_string ~amd64
-net-print/gnome-manual-duplex ~amd64
-x11-libs/wxGTK:3.0 ~amd64
-=x11-libs/libva-vdpau-driver-0.7.4-r1 ~amd64
-dev-libs/wayland ~amd64
-=dev-libs/weston-1.5.0 ~amd64
-dev-lang/luajit ~amd64
-net-libs/polarssl ~amd64
-sys-apps/gentoo-functions ~amd64
-=media-video/mplayer-1.2_pre20130729 ~amd64
-=media-video/mplayer2-2.0_p20130428-r1 ~amd64
-
-# ffmpeg
-=virtual/ffmpeg-9 ~amd64
-~media-video/ffmpeg-0.10.15:0.10 ~amd64
-
-app-misc/task ~amd64
-dev-lang/python:3.4 ~amd64
-media-video/mpv ~amd64
-sci-libs/gsl ~amd64
-sci-mathematics/flint ~amd64
-dev-python/pypy-bin:0 ~amd64
-virtual/pypy:0 ~amd64
-dev-lang/elixir ~amd64
-dev-lang/erlang ~amd64
-dev-python/g-pypi ~amd64
-www-plugins/lightspark ~amd64
-media-gfx/xpaint ~amd64
-x11-libs/libXaw3dXft ~amd64
-dev-libs/libuv ~amd64
-dev-games/stormlib ~amd64
-=sys-libs/slang-2.2.4-r1 ~amd64
-media-libs/giflib ~amd64
-=media-libs/imlib2-1.4.6-r2 ~amd64
-=media-libs/libcaca-0.99_beta18-r2 ~amd64
-=media-libs/sdl-image-1.2.12-r1 ~amd64
-=media-libs/smpeg-0.4.4-r10 ~amd64
-=media-libs/sdl-net-1.2.8-r1 ~amd64
-=media-libs/sdl-ttf-2.0.11-r1 ~amd64
-=media-libs/freealut-1.1.0-r3 ~amd64
-=media-libs/sdl-sound-1.0.3-r1 ~amd64
-media-libs/sdl-gfx ~amd64
-dev-embedded/gnome-avrdude ~amd64
-www-client/xombrero ~amd64
-dev-lang/spidermonkey:24 ~amd64
-=media-libs/sdl-mixer-1.2.12-r4 ~amd64
-sci-mathematics/singular ~amd64
-=dev-python/cython-0.20.1 ~amd64
-media-sound/mumble ~amd64
-net-libs/nacl ~amd64
-=dev-libs/openssl-1.0.1h-r2 ~amd64
-app-portage/overlint ~amd64
-=dev-libs/yajl-2.0.4-r3 ~amd64
-dev-db/mariadb ~amd64
-=dev-cpp/gmock-1.7.0-r1 ~amd64
-media-libs/libsdl ~amd64
-dev-util/abi-compliance-checker ~amd64
-=net-misc/curl-7.37.0 ~amd64
-=dev-python/twisted-core-13.0.0-r3 ~amd64
-=dev-dotnet/libgdiplus-2.10.9-r2 ~amd64
-=net-libs/gnutls-3.3.4-r1 ~amd64
-=virtual/perl-Module-Build-0.420.0 ~amd64
-=perl-core/Module-Build-0.420.0-r1 ~amd64
-sys-devel/bmake ~amd64
-=dev-tex/dot2tex-2.8.7-r1 ~amd64
-media-sound/pnmixer *
-=virtual/libintl-0-r1 ~amd64
-~dev-libs/libgcrypt-1.6.3 ~amd64
-=x11-libs/pango-1.36.3-r2 ~amd64
-=x11-libs/cairo-1.12.16-r2 ~amd64
-=dev-db/sqlite-3.8.4.3 ~amd64
-=sys-libs/gdbm-1.11 ~amd64
-=dev-libs/libgpg-error-1.12-r1 ~amd64
-=dev-libs/libxslt-1.1.28-r2 ~amd64
-=dev-libs/nettle-2.7.1-r1 ~amd64
-=media-gfx/graphite2-1.2.4-r1 ~amd64
-=media-libs/jasper-1.900.1-r6 ~amd64
-=virtual/acl-0-r2 ~amd64
-=x11-libs/cairo-1.12.16-r2 ~amd64
-=x11-libs/pango-1.36.3-r2 ~amd64
-dev-libs/libRocket ~amd64
-
-app-crypt/signify *
-dev-libs/libbsd ~amd64
-
-
-# minetest
-games-action/minetest *
-games-action/minetest_game *
-dev-libs/hiredis ~amd64
-=media-libs/x264-0.0.20140308 ~amd64
-
-# wine
-app-emulation/wine ~amd64
-app-emulation/winetricks ~amd64
-
-
-dev-vcs/hub ~amd64
-
-
-
-
-
-~dev-python/simplejson-3.6.3 ~amd64
-
-# mercurial
-dev-vcs/tortoisehg ~amd64
-dev-vcs/mercurial ~amd64
-dev-vcs/hg-git ~amd64
-dev-python/dulwich ~amd64
-
-
-app-portage/fquery ~amd64
-
-#net-p2p/qbittorrent ~amd64
-
-
-# needed by torbrowser
-~media-libs/mesa-10.2.8 ~amd64
-~x11-libs/libdrm-2.4.54 ~amd64
-
-
-net-p2p/rtorrent ~amd64
-net-libs/libtorrent ~amd64
-
-dev-libs/libntru ~amd64
-
-dev-games/aseprite ~amd64
-
-~dev-libs/libltdl-2.4.3 ~amd64
-~sys-devel/libtool-2.4.3 ~amd64
-
-
-
-x11-misc/notify-osd ~amd64
-x11-themes/notify-osd-icons ~amd64
-#x11-misc/qtnotifydaemon ~amd64
-x11-misc/dunst ~amd64
-
-sys-boot/bootinfoscript ~amd64
-
-sys-kernel/genkernel ~amd64
-
-
-
-# libressl compatibility
-dev-libs/libressl ~amd64
-~dev-perl/Net-SSLeay-1.650.0 ~amd64
-net-libs/gloox ~amd64
-~net-libs/libssh-0.6.4 ~amd64
-~www-servers/apache-2.4.10 ~amd64
-~app-admin/apache-tools-2.4.10 ~amd64
-~dev-libs/apr-1.5.1 ~amd64
-dev-python/enum34 ~amd64
-mail-filter/spamassassin ~amd64
-www-servers/nginx ~amd64
-~dev-lang/python-2.7.10:2.7 ~amd64
-
-
-sys-devel/automake:1.14 ~amd64
-
-# livestreamer
-net-misc/livestreamer *
-dev-python/futures ~amd64
-dev-python/singledispatch ~amd64
-virtual/python-futures ~amd64
-virtual/python-singledispatch ~amd64
-
-net-misc/onioncat ~amd64
-
-
-
-app-office/ganttproject-bin ~amd64
-
-net-im/skype ~amd64
-
-dev-lua/luasec ~amd64
-
-
-
-
-games-emulation/dosbox *
-
-
-
-
-sys-apps/hprofile ~amd64
-net-misc/remmina ~amd64
-net-misc/freerdp ~amd64
-dev-util/kbuild ~amd64
-x11-drivers/xf86-video-virtualbox ~amd64
-media-gfx/brother-brscan2 ~amd64
-app-text/diffpdf ~amd64
-dev-libs/libndef ~amd64 
-
-
-app-misc/ca-certificates ~amd64
-
-
-
-net-misc/curl ~amd64
-app-misc/c_rehash ~amd64
-
-
-net-libs/mbedtls ~amd64
-
-dev-vcs/bfg ~amd64
-
-
-sys-fs/squashfs-tools ~amd64
-
-app-misc/cacerts ~amd64
-
-
-dev-libs/msgpack ~amd64
-
-
-dev-util/gquilt ~amd64
-
-
-dev-libs/protobuf-c ~amd64
-
-# gpaste
-~dev-libs/gobject-introspection-1.42.0 ~amd64
-~dev-libs/gobject-introspection-common-1.42.0 ~amd64
-~dev-libs/glib-2.42.1 ~amd64
-~dev-util/gdbus-codegen-2.42.1 ~amd64
-~x11-misc/gpaste-3.14 ~amd64
-
-# for mediastreamer
-~media-libs/libmatroska-1.4.2 ~amd64
-~dev-libs/libebml-1.3.1 ~amd64
-
-~net-libs/libsrtp-1.5.2 ~amd64
-
-
-app-editors/texworks ~amd64
-
-
-
-net-im/mu-conference ~amd64
-
-
-
-
-sys-apps/memtest86+ ~amd64
-
-app-text/apvlv ~amd64
-
-
-# OpenJK
-media-libs/jpeg ~amd64
-
-
-dev-vcs/darcs
-
-~sys-fs/lvm2-2.02.109 ~amd64
-
-
-# nuget for openra packaging
-dev-lang/mono ~amd64
-
-app-admin/aws-as-tools ~amd64
-
-dev-vcs/darcs ~amd64
-
-net-dns/ldns-utils ~amd64
-
-
-# dev-python/cryptography
-dev-python/idna ~amd64
-dev-python/ipaddress ~amd64
-dev-python/cffi ~amd64
-
-
-# mpv mplayer
-~media-libs/libass-0.12.2 ~amd64
-
-# torbrowser
-~dev-libs/nss-3.19.1 ~amd64
-
-
-# libressl
-dev-libs/openssl ~amd64
-
-
-
-
-dev-lang/idris ~amd64
-
-
-app-crypt/johntheripper ~amd64
-
-
-# pioneer
-media-libs/assimp ~amd64
-
-
-
-# tex
-app-text/teckit ~amd64
-app-text/ttf2pk2 ~amd64
-app-text/xdvik ~amd64
-
-
-# tahoe-lafs
-dev-python/pyasn1 ~amd64
-dev-python/foolscap ~amd64
-
-
-# libressl testing
-#app-admin/apache-tools ~amd64
-#dev-db/mysql ~amd64
-#virtual/mysql ~amd64
-#virtual/libmysqlclient ~amd64
-#dev-lang/python ~amd64
-#dev-python/pycurl ~amd64
-#mail-filter/spamassassin ~amd64
-#net-mail/dovecot ~amd64
-#net-misc/wget ~amd64
-#www-client/links ~amd64
-#www-servers/apache ~amd64
-
-dev-vcs/git-imerge ~amd64
-
-
-# texlive-core qtgui, libass
-media-libs/harfbuzz ~amd64
-
-
-# youtube-viewer
-net-misc/youtube-viewer *
-dev-perl/Mozilla-CA ~amd64
-dev-perl/LWP-UserAgent-Cached ~amd64
-
-~dev-db/mysql-5.6.26 ~amd64
-=virtual/mysql-5.6-r6 ~amd64
-~virtual/libmysqlclient-18 ~amd64
-
-~net-libs/libmnl-1.0.3 ~amd64
-
-~net-misc/wget-1.16.3 ~amd64
-www-client/links ~amd64
-
-
-
-
-~sys-libs/ncurses-6.0:5
-
-
-
-media-video/guvcview ~amd64
diff --git a/paludis/keywords.conf.d/desktop.conf b/paludis/keywords.conf.d/desktop.conf
new file mode 100644
index 0000000..387ce5a
--- /dev/null
+++ b/paludis/keywords.conf.d/desktop.conf
@@ -0,0 +1,104 @@
+# netsurf
+www-client/netsurf ~amd64
+
+# linphone
+~net-voip/linphone-3.6.1::gentoo ~amd64
+~net-libs/libeXosip-4.0.0::gentoo ~amd64
+#net-libs/libeXosip ~amd64
+#net-libs/ortp ~amd64
+#media-libs/mediastreamer ~amd64
+#net-libs/belle-sip ~amd64
+dev-libs/antlr-c ~amd64
+
+
+# elogv
+app-portage/elogv ~amd64
+
+net-misc/openconnect ~amd64
+
+
+# blender
+media-gfx/blender *
+~media-video/ffmpeg-2.2.14 ~amd64
+dev-cpp/gflags ~amd64
+dev-cpp/glog ~amd64
+dev-cpp/eigen:3 ~amd64
+sci-physics/bullet ~amd64
+sci-libs/ldl ~amd64
+sci-libs/suitesparseconfig ~amd64
+
+# git-cola
+dev-vcs/git-cola ~amd64
+~dev-python/jsonpickle-0.7.2 ~amd64
+~dev-python/simplejson-3.6.0 ~amd64
+mail-filter/postgrey ~amd64
+www-servers/hiawatha ~amd64
+dev-python/pathlib ~amd64
+
+
+media-sound/pnmixer ~amd64
+
+x11-misc/sunflower ~amd64
+
+
+# tor/torbrowser
+net-misc/tor ~amd64
+www-client/torbrowser ~amd64
+www-misc/torbrowser-profile ~amd64
+~dev-libs/nss-3.16.2 ~amd64
+~dev-libs/nspr-4.10.6 ~amd64
+
+
+# for cdemu
+sys-fs/vhba ~amd64
+app-cdr/cdemu ~amd64
+app-cdr/cdemu-daemon ~amd64
+app-cdr/gcdemu ~amd64
+
+
+app-admin/hardinfo ~amd64
+
+~media-gfx/pinta-1.5_pre20121118 ~amd64
+
+x11-themes/clearlooks-phenix ~amd64
+
+x11-misc/redshift ~amd64
+
+x11-misc/x11vnc ~amd64
+
+
+x11-terms/terminator *
+x11-misc/spacefm *
+
+
+x11-wm/i3 *
+x11-misc/i3status ~amd64
+
+
+# livestreamer
+net-misc/livestreamer *
+dev-python/futures ~amd64
+dev-python/singledispatch ~amd64
+virtual/python-futures ~amd64
+virtual/python-singledispatch ~amd64
+
+
+# gpaste
+~dev-libs/gobject-introspection-1.42.0 ~amd64
+~dev-libs/gobject-introspection-common-1.42.0 ~amd64
+~dev-libs/glib-2.42.1 ~amd64
+~dev-util/gdbus-codegen-2.42.1 ~amd64
+~x11-misc/gpaste-3.14 ~amd64
+
+
+# mpv mplayer
+~media-libs/libass-0.12.2 ~amd64
+
+# youtube-viewer
+net-misc/youtube-viewer *
+dev-perl/Mozilla-CA ~amd64
+dev-perl/LWP-UserAgent-Cached ~amd64
+
+
+media-video/guvcview ~amd64
+
diff --git a/paludis/keywords.conf.d/development.conf b/paludis/keywords.conf.d/development.conf
new file mode 100644
index 0000000..b50a152
--- /dev/null
+++ b/paludis/keywords.conf.d/development.conf
@@ -0,0 +1,71 @@
+# gcc
+sys-devel/gcc:4.7 ~amd64
+sys-devel/gcc:4.8 ~amd64
+sys-devel/gcc:4.8 ~amd64
+sys-devel/gcc:4.9 ~amd64
+
+dev-lang/dmd:1 ~amd64
+dev-lang/dmd:2 ~amd64
+
+dev-lang/elixir ~amd64
+dev-lang/erlang ~amd64
+
+dev-lang/idri~amd64
+
+
+dev-util/codeblocks ~amd64
+dev-util/geany ~amd64
+dev-util/geany-plugins ~amd64
+x11-themes/geany-themes ~amd64
+
+
+dev-util/valgrind ~amd64
+
+# required by sci-mathematics/wxmaxima-12.09.0
+# required by wxmaxima (argument)
+=media-fonts/jsmath-1.0 ~amd64
+sci-mathematics/wxmaxima ~amd64
+sci-mathematics/maxima ~amd64
+
+sys-devel/gdb ~amd64
+
+dev-util/ninja-ide ~amd64
+
+dev-util/a8 ~amd64
+
+# bluefish abiword
+gnome-extra/gucharmap ~amd64
+
+app-text/jist ~amd64
+
+dev-lang/lazarus ~amd64
+
+
+dev-vcs/git ~amd64
+dev-vcs/tig ~amd64
+
+dev-vcs/darcs
+
+
+
+# vim
+app-vim/solarized *
+app-vim/exheres-syntax ~amd64
+app-vim/csound-syntax ~amd64
+app-vim/tt2-syntax ~amd64
+app-editors/gvim ~amd64
+app-editors/vim ~amd64
+app-editors/vim-core ~amd64
+app-vim/conque ~amd64
+app-vim/delimitMate *
+app-vim/* ~amd64
+app-vim/undotree *
+
+# youcompleteme
+app-vim/youcompleteme *
+dev-python/waitress ~amd64
+dev-python/sh ~amd64
+
+
+# pqc
+sci-mathematics/flint ~amd64
diff --git a/paludis/keywords.conf.d/docker.conf b/paludis/keywords.conf.d/emulation.conf
similarity index 56%
rename from paludis/keywords.conf.d/docker.conf
rename to paludis/keywords.conf.d/emulation.conf
index a17739f..8189e91 100644
--- a/paludis/keywords.conf.d/docker.conf
+++ b/paludis/keywords.conf.d/emulation.conf
@@ -10,3 +10,17 @@ dev-python/docker-py ~amd64
 app-emulation/docker-compose ~amd64
 dev-python/requests ~amd64
 dev-python/websocket-client ~amd64
+
+# wine
+app-emulation/wine ~amd64
+app-emulation/winetricks ~amd64
+
+
+app-emulation/virtualbox ~amd64
+app-emulation/virtualbox-additions ~amd64
+app-emulation/virtualbox-extpack-oracle ~amd64
+app-emulation/virtualbox-modules ~amd64
+
+
+games-emulation/dosbox *
+
diff --git a/paludis/keywords.conf.d/games.conf b/paludis/keywords.conf.d/games.conf
new file mode 100644
index 0000000..796fd14
--- /dev/null
+++ b/paludis/keywords.conf.d/games.conf
@@ -0,0 +1,67 @@
+# accept all games stuff
+games-action/* ~amd64
+games-adventure/* ~amd64
+games-arcade/* ~amd64
+games-board/* ~amd64
+games-emulation/* ~amd64
+games-engines/* ~amd64
+games-fps/* ~amd64
+games-kids/* ~amd64
+games-misc/* ~amd64
+games-mud/* ~amd64
+games-puzzle/* ~amd64
+games-roguelike/* ~amd64
+games-rpg/* ~amd64
+games-server/* ~amd64
+games-simulation/* ~amd64
+games-sports/* ~amd64
+games-strategy/* ~amd64
+games-util/* ~amd64
+
+
+# required by games-action/teeworlds (argument)
+=media-libs/pnglite-0.1.17 ~amd64
+
+# desura testing
+#=x11-libs/wxGTK-2.9.4.1 ~amd64
+x11-libs/wxGTK:2.9 ~amd64
+media-libs/desurium-cef *
+games-util/desurium *
+
+games-engines/gambatte *
+
+# python3_3 and eclass unlocking
+# required by games-engines/renpy-6.15.0::hasufell-overlay
+app-eselect/eselect-renpy ~amd64
+dev-python/pygame_sdl2 ~amd64
+
+games-engines/residualvm *
+
+
+# for sumwars
+dev-libs/poco ~amd64
+x11-misc/compton *
+
+
+# cegui
+dev-games/ogre *
+dev-games/cegui ~amd64
+media-libs/glm ~amd64
+games-rpg/sumwars ~amd64
+
+
+app-arch/innoextract ~amd64
+
+
+media-gfx/nvidia-cg-toolkit ~amd64
+media-gfx/nvidia-texture-tools ~amd64
+
+# minetest
+dev-libs/hiredis ~amd64
+=media-libs/x264-0.0.20140308 ~amd64
+
+# OpenJK
+media-libs/jpeg ~amd64
+
+# pioneer
+media-libs/assimp ~amd64
diff --git a/paludis/keywords.conf.d/libressl.conf b/paludis/keywords.conf.d/libressl.conf
new file mode 100644
index 0000000..9a13924
--- /dev/null
+++ b/paludis/keywords.conf.d/libressl.conf
@@ -0,0 +1,22 @@
+# libressl
+app-crypt/signify *
+
+
+# libressl compatibility
+dev-libs/libressl ~amd64
+~dev-perl/Net-SSLeay-1.650.0 ~amd64
+net-libs/gloox ~amd64
+~net-libs/libssh-0.6.4 ~amd64
+~www-servers/apache-2.4.10 ~amd64
+~app-admin/apache-tools-2.4.10 ~amd64
+~dev-libs/apr-1.5.1 ~amd64
+dev-python/enum34 ~amd64
+mail-filter/spamassassin ~amd64
+www-servers/nginx ~amd64
+~dev-lang/python-2.7.10:2.7 ~amd64
+
+app-misc/ca-certificates ~amd64
+app-misc/c_rehash ~amd64
+
+dev-libs/openssl ~amd64
+
diff --git a/paludis/keywords.conf.d/netbeans.conf b/paludis/keywords.conf.d/netbeans.conf
new file mode 100644
index 0000000..5e5187b
--- /dev/null
+++ b/paludis/keywords.conf.d/netbeans.conf
@@ -0,0 +1,28 @@
+# netbeans
+dev-java/netbeans-cnd ~amd64
+dev-java/netbeans-harness ~amd64
+dev-java/netbeans-platform ~amd64
+dev-java/netbeans-apisupport ~amd64
+dev-java/netbeans-webcommon ~amd64
+dev-java/netbeans-websvccommon ~amd64
+dev-java/netbeans-mobility ~amd64
+dev-java/smack ~amd64
+dev-java/netbeans-javacard ~amd64
+dev-java/netbeans-ide ~amd64
+dev-java/netbeans-javafx ~amd64
+dev-java/netbeans-nb ~amd64
+dev-java/netbeans-profiler ~amd64
+dev-java/netbeans-groovy ~amd64
+dev-java/netbeans-php ~amd64
+dev-java/ws-commons-util ~amd64
+dev-java/saxon ~amd64
+dev-java/netbeans-java ~amd64
+dev-java/netbeans-javadoc ~amd64
+dev-java/netbeans-dlight ~amd64
+dev-java/netbeans-enterprise ~amd64
+dev-java/netbeans-ergonomics ~amd64
+dev-java/jboss-logging ~amd64
+dev-java/jboss-logmanager ~amd64
+dev-java/jboss-modules ~amd64
+dev-java/netbeans-extide ~amd64
+dev-util/netbeans ~amd64
diff --git a/paludis/keywords.conf.d/pydio.conf b/paludis/keywords.conf.d/pydio.conf
new file mode 100644
index 0000000..9d5bdc9
--- /dev/null
+++ b/paludis/keywords.conf.d/pydio.conf
@@ -0,0 +1,6 @@
+# pydio-sync
+dev-python/memory_profiler ~amd64
+www-misc/pydio-sync ~amd64
+dev-python/keyring ~amd64
+dev-python/pydispatcher ~amd64
+dev-python/xmltodict ~amd64
diff --git a/paludis/keywords.conf.d/system.conf b/paludis/keywords.conf.d/system.conf
new file mode 100644
index 0000000..4c1d536
--- /dev/null
+++ b/paludis/keywords.conf.d/system.conf
@@ -0,0 +1,12 @@
+sys-apps/paludis ~amd64
+sys-kernel/vanilla-sources ~amd64
+app-portage/gentoolkit ~amd64
+
+net-libs/polarssl ~amd64
+sys-apps/gentoo-functions ~amd64
+
+sys-apps/memtest86+ ~amd64
+
+~sys-fs/lvm2-2.02.109 ~amd64
+
+sys-apps/etckeeper ~amd64
diff --git a/paludis/keywords.conf.d/testing.conf b/paludis/keywords.conf.d/testing.conf
new file mode 100644
index 0000000..46191d1
--- /dev/null
+++ b/paludis/keywords.conf.d/testing.conf
@@ -0,0 +1,66 @@
+## my testing packages
+dev-libs/angelscript ~amd64
+mail-client/geary ~amd64
+app-backup/fsarchiver ~amd64
+app-backup/qt4-fsarchiver ~amd64
+dev-python/watchdog ~amd64
+dev-python/pathtools ~amd64
+dev-python/argh ~amd64
+net-im/dianara ~amd64
+dev-libs/libuv ~amd64
+net-im/bitlbee ~amd64
+x11-plugins/bitlbee-steam ~amd64
+net-irc/hexchat ~amd64
+~sci-mathematics/rstudio-0.98.490 ~amd64
+net-misc/megatools ~amd64
+dev-python/pyopenal ~amd64
+dev-python/pyvorbis ~amd64
+sci-libs/libspatialindex ~amd64
+dev-python/pyode ~amd64
+sci-geosciences/osgearth ~amd64
+www-apps/hiawatha-monitor ~amd64
+dev-lang/php ~amd64
+x11-plugins/hexchat-javascript ~amd64
+dev-lang/io ~amd64
+x11-libs/pixman ~amd64
+games-engines/love *
+games-arcade/lix *
+media-libs/libsfml ~amd64
+dev-python/cryptography ~amd64
+mail-filter/spamassassin ~amd64
+media-sound/teamspeak-client-bin ~amd64
+app-crypt/zuluCrypt ~amd64
+net-libs/iojs ~amd64
+net-irc/znc ~amd64
+x11-misc/devilspie2 ~amd64
+sci-geosciences/libtcd ~amd64
+sci-geosciences/seawater ~amd64
+sci-geosciences/xtide ~amd64
+x11-misc/sddm ~amd64
+media-libs/libebur128 ~amd64
+media-libs/libgroove ~amd64
+media-sound/helm:0::gentoo ~amd64
+dev-php/* ~amd64
+www-servers/apache ~amd64
+app-admin/apache-tools ~amd64
+media-libs/libsoundio ~amd64
+dev-libs/libntru ~amd64
+net-libs/mbedtls ~amd64
+
+dev-util/cmake ~amd64
+
+
+# tahoe-lafs
+net-fs/tahoe-lafs ~amd64
+dev-python/pycryptopp ~amd64
+dev-python/pyutil ~amd64
+dev-python/zbase32 ~amd64
+dev-python/zfec ~amd64
+=dev-python/twisted-conch-13.0.0-r1 ~amd64
+=net-zope/zope-interface-4.0.5 ~amd64
+
+x11-terms/terra *
+
+app-admin/mcelog ~amd64
+
+media-gfx/pornview ~amd64 *
diff --git a/paludis/keywords.conf.d/tex.conf b/paludis/keywords.conf.d/tex.conf
index 595977d..82fdee7 100644
--- a/paludis/keywords.conf.d/tex.conf
+++ b/paludis/keywords.conf.d/tex.conf
@@ -13,3 +13,10 @@ dev-tex/luatex ~amd64
 dev-texlive/texlive-documentation-base ~amd64
 app-text/texlive ~amd64
 app-text/texlive-core ~amd64
+
+app-text/teckit ~amd64
+app-text/ttf2pk2 ~amd64
+app-text/xdvik ~amd64
+
+# texlive-core qtgui, libass
+media-libs/harfbuzz ~amd64
diff --git a/paludis/keywords.conf.d/tox.conf b/paludis/keywords.conf.d/tox.conf
new file mode 100644
index 0000000..19874f0
--- /dev/null
+++ b/paludis/keywords.conf.d/tox.conf
@@ -0,0 +1,12 @@
+# tox
+net-libs/tox *
+dev-libs/libsodium ~amd64
+net-im/venom-av *
+net-im/venom *
+#net-im/qtox *
+~x11-libs/libxkbcommon-0.4.1 ~amd64
+net-im/tox-prpl *
+#net-im/tox-gui-qt *
+net-im/utox *
+net-im/toxic *
+media-libs/libfilteraudio *
diff --git a/paludis/sets/test.conf b/paludis/sets/testing.conf
similarity index 100%
rename from paludis/sets/test.conf
rename to paludis/sets/testing.conf
diff --git a/paludis/use.conf b/paludis/use.conf
index 87e5b29..4e58470 100644
--- a/paludis/use.conf
+++ b/paludis/use.conf
@@ -15,3 +15,4 @@
 */* NETBEANS_MODULES: apisupport cnd dlight enterprise ergonomics groovy java javacard javafx profiler webcommon websvccommon php mobility extide
 */* CPU_FLAGS_X86: aes avx avx2 fma mmxext mmx popcnt sse sse2 sse3 ssse3 sse4_1 sse4_2
 #*/* CPU_FLAGS_X86: sse
+
diff --git a/paludis/use.conf.d/clang.conf b/paludis/use.conf.d/clang.conf
index 726633a..9672f6a 100644
--- a/paludis/use.conf.d/clang.conf
+++ b/paludis/use.conf.d/clang.conf
@@ -1,2 +1,3 @@
 app-portage/eix clang
-sys-devel/llvm clang
+sys-devel/llvm clang gold static-analyzer
+sys-devel/clang multitarget static-analyzer
diff --git a/paludis/use.conf.d/desktop.conf b/paludis/use.conf.d/desktop.conf
new file mode 100644
index 0000000..998b40e
--- /dev/null
+++ b/paludis/use.conf.d/desktop.conf
@@ -0,0 +1,106 @@
+x11-base/xorg-server xvfb  
+
+
+# because of wayland
+media-libs/cogl gles2
+media-libs/gst-plugins-bad egl -gles2
+media-libs/clutter egl
+
+
+gnome-extra/zenity -webkit
+
+
+www-client/netsurf gtk
+# required by media-libs/libsvgtiny-0.1.0
+# required by www-client/netsurf-3.0-r1[svg,svgtiny]
+# required by netsurf (argument)
+net-libs/libdom xml
+
+# required by net-p2p/retroshare-0.5.4e::hasufell-overlay[cli]
+net-libs/libssh server
+
+# linphone
+net-voip/linphone gtk assistant tools video sqlite upnp
+media-libs/mediastreamer video upnp
+
+
+net-p2p/retroshare qt4 feedreader links-cloud voip
+
+kde-base/marble -kde -python -handbook
+
+
+# leak
+net-im/pidgin -dbus spell -gstreamer
+
+
+app-misc/bashstyle-ng -acpi 
+
+app-office/abiword plugins
+app-office/libreoffice gtk mysql -nsplugin 
+app-office/libreoffice-bin java
+app-office/writerscafe gtk2
+app-text/evince djvu dvi
+
+app-crypt/pinentry gtk 
+
+
+gnome-base/gvfs cdda fuse http udisks
+mail-client/thunderbird -custom-cflags -custom-optimization -crypt system-icu system-cairo system-jpeg
+media-gfx/blender game-engine boost bullet player openal
+media-gfx/gthumb -cdr slideshow
+media-gfx/imagemagick corefonts truetype
+media-libs/devil nvtt mng glut
+media-libs/mesa gles1 gles2 -llvm gbm
+
+
+media-sound/audacity id3tag -ffmpeg
+media-sound/gmusicbrowser doc
+media-sound/mumble speech
+
+## ffmpeg and mplayer shit
+media-video/ffmpeg avx theora vaapi mmxext -bindist
+virtual/ffmpeg theora vaapi
+media-video/mplayer mmxext
+media-video/mplayer2 mmxext
+
+x11-misc/redshift gtk
+x11-misc/wbar gtk
+
+xfce-base/xfdesktop thunar
+
+www-client/midori -unique
+www-client/opera gtk
+www-client/firefox libnotify -custom-cflags -custom-optimization system-icu system-cairo system-jpeg
+www-client/w3m gtk imlib fbcon nntp
+
+
+media-video/gnome-mplayer libnotify
+media-video/mediainfo wxwidgets
+media-video/vlc X a52 alsa dts dvd flac fbcon ffmpeg lua matroska mp3 mpeg musepack ncurses ogg opengl png sdl skins speex sse svg theora truetype vorbis win32codecs wxwindows xinerama xv x264
+net-analyzer/nmap gtk
+net-irc/hexchat libcanberra libnotify perl plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo theme-manager spell
+net-misc/youtube-viewer gtk
+net-p2p/transmission gtk
+
+
+# tor/torbrowser
+net-misc/tor tor-hardening
+www-client/torbrowser system-icu system-cairo system-jpeg
+
+
+x11-wm/i3 icons
+
+net-misc/networkmanager -ppp -modemmanager -wext -wifi
+
+media-libs/phonon -vlc
+
+
+# inox
+media-libs/libvpx postproc
+
+# by qtgui:5
+x11-libs/libxcb xkb
+
+app-text/ghostscript-gpl gtk
+
+
diff --git a/paludis/use.conf.d/development.conf b/paludis/use.conf.d/development.conf
new file mode 100644
index 0000000..359a40e
--- /dev/null
+++ b/paludis/use.conf.d/development.conf
@@ -0,0 +1,29 @@
+sys-devel/gcc objc objc-gc
+
+dev-util/codeblocks contrib
+
+app-editors/editra spell
+app-editors/gvim cscope gtk perl
+app-editors/vim cscope perl
+
+# for lazarus
+dev-lang/fpc source
+
+dev-util/geany-plugins debugger enchant gpg gtkspell lua nls soup -webkit scope
+
+dev-util/anjuta devhelp doc
+dev-util/netbeans debug doc
+dev-vcs/git gtk tk
+dev-vcs/mercurial tk gpg
+
+# for wxmaxima
+sci-visualization/gnuplot wxwidgets
+
+app-editors/neovim perl
+
+sci-mathematics/flint doc
+
+dev-embedded/arduino doc examples
+
+dev-util/nemiver memoryview
+
diff --git a/paludis/use.conf.d/emulation.conf b/paludis/use.conf.d/emulation.conf
new file mode 100644
index 0000000..2df7a0e
--- /dev/null
+++ b/paludis/use.conf.d/emulation.conf
@@ -0,0 +1,16 @@
+app-emulation/winetricks gtk
+
+# required by sys-devel/prelink-20110511
+# required by app-emulation/wine-1.7.0[prelink]
+# required by @games
+# required by @selected
+# required by @world (argument)
+>=dev-libs/elfutils-0.156 static-libs
+
+app-emulation/qemu gtk
+app-emulation/virtualbox python qt4 vnc
+
+app-emulation/wine mono -gstreamer -xml -dbus
+
+app-emulation/docker lxc
+
diff --git a/paludis/use.conf.d/games.conf b/paludis/use.conf.d/games.conf
new file mode 100644
index 0000000..67fe52e
--- /dev/null
+++ b/paludis/use.conf.d/games.conf
@@ -0,0 +1,112 @@
+# required by virtual/python-imaging-2
+# required by games-board/pysolfc-2.0-r2
+dev-python/pillow tk
+
+games-strategy/wesnoth server
+
+games-misc/fortune-mod offensive
+
+# fixme
+games-emulation/vbam -ffmpeg
+
+#temp
+games-engines/stratagus doc
+
+games-strategy/ja2-stracciatella cdinstall
+games-strategy/ja2-stracciatella LINGUAS: -* de
+
+games-util/desurium-meta -games-deps
+
+games-emulation/higan profile_accuracy -profile_balanced
+
+games-emulation/gambatte qt4 sdl
+games-emulation/gambatte BUILD_OPTIONS: optional_tests
+
+
+games-action/trine2 system-libs bundled-libs
+
+#required by games-action/d2x-rebirth-0.57.3, required by d2x-rebirth (argument)
+dev-games/physfs hog
+
+games-fps/eduke32 cdinstall gtk offensive textures sc55-musicpack
+games-fps/duke3d-data gog
+
+
+dev-games/gigi ogre ois sdl
+
+dev-games/cegui ogre devil tinyxml irrlicht lua zip 
+
+## for mana world
+dev-games/guichan sdl  
+dev-games/ode double-precision
+dev-games/ogre cg ois -boost freeimage opengl zip -threads tools doc gles2
+
+games-board/awale tk
+games-board/cockatrice server
+games-board/pysolfc extra-cardsets
+
+
+games-emulation/vbam gtk link
+games-emulation/visualboyadvance gtk
+
+# crash with opengl
+games-emulation/zsnes -opengl
+
+games-engines/openmw devtools
+games-engines/stratagus theora
+games-fps/urbanterror server
+games-fps/warsow openal irc server
+games-roguelike/stone-soup tiles ncurses luajit
+games-rpg/arx-libertatis c++0x tools
+games-rpg/arx-fatalis-data gog
+games-strategy/0ad editor
+games-strategy/freeorion cg
+games-strategy/s25rttr debug glfw
+games-strategy/uqm remix music voice
+
+media-gfx/nvidia-texture-tools cg glew glut openexr
+
+media-libs/sdl-mixer mikmod mod timidity midi mp3 smpeg 
+media-libs/sdl2-mixer mikmod mod timidity midi mp3 smpeg
+
+
+sys-libs/zlib minizip
+
+
+media-libs/libsdl2 xscreensaver gles
+
+media-gfx/nvidia-cg-toolkit -multilib
+
+games-rpg/wasteland2 symbols=preserve
+
+
+# icu causes problems with gmaes-strategy/0ad, jit improves performance
+dev-lang/spidermonkey -icu -system-icu
+
+games-rpg/a-bird-story bundled-libs
+
+media-libs/sdl-sound physfs speex mikmod modplug
+
+# graphical glitches without bundled-libs
+games-rpg/baldurs-gate-ee bundled-libs
+games-rpg/baldurs-gate-2-ee bundled-libs
+
+games-rpg/pillars-of-eternity dlc3
+
+# for debugging
+games-engines/OpenJK BUILD_OPTIONS: work=preserve
+
+games-fps/unvanquished BUILD_OPTIONS: symbols=preserve
+games-fps/unvanquished-data BUILD_OPTIONS: symbols=preserve
+games-fps/unvanquished -optimization
+
+
+# minetest?
+dev-lang/luajit lua52compat
+
+games-util/desurium -bundled-wxgtk
+
+games-action/hotline-miami bundled-libs
+
+games-board/xboard -default-font
+
diff --git a/paludis/use.conf.d/haskell.conf b/paludis/use.conf.d/haskell.conf
new file mode 100644
index 0000000..bcec660
--- /dev/null
+++ b/paludis/use.conf.d/haskell.conf
@@ -0,0 +1,7 @@
+# doc for app-vim/haskellmode
+dev-lang/ghc doc
+
+dev-haskell/polynomial doc
+
+# stack GHC
+sys-libs/ncurses tinfo
diff --git a/paludis/use.conf.d/libressl.conf b/paludis/use.conf.d/libressl.conf
new file mode 100644
index 0000000..04e3516
--- /dev/null
+++ b/paludis/use.conf.d/libressl.conf
@@ -0,0 +1,2 @@
+# libressl
+dev-db/mysql client-libs
diff --git a/paludis/use.conf.d/netbeans.conf b/paludis/use.conf.d/netbeans.conf
new file mode 100644
index 0000000..768ced7
--- /dev/null
+++ b/paludis/use.conf.d/netbeans.conf
@@ -0,0 +1,5 @@
+# netbeans
+dev-java/swing-layout source
+
+#required by dev-java/commons-beanutils-1.8.0[test], required by dev-java/commons-digester-1.8.1-r1, required by dev-java/netbeans-enterprise-7.1.2, required by dev-java/netbeans-mobility-7.1.2, required by dev-java/netbeans-javadoc-7.1.2, required by dev-util/netbeans-7.1.2[doc], required by dev-util/netbeans (argument)
+>=dev-java/commons-collections-3.2.1 test-framework
diff --git a/paludis/use.conf.d/some.use.conf b/paludis/use.conf.d/some.use.conf
deleted file mode 100644
index 677ae40..0000000
--- a/paludis/use.conf.d/some.use.conf
+++ /dev/null
@@ -1,507 +0,0 @@
-## needed by my testing packages
-#media-libs/sdl-mixer modplug
-app-backup/fsarchiver lzma lzo
-#net-misc/openconnect gssapi
-sci-mathematics/rstudio server
-games-action/super-hexagon BUILD_OPTIONS: symbols=preserve
-#www-servers/hiawatha -ssl
-games-engines/solarus doc
-dev-libs/libuv ABI_X86: 64 32
-dev-libs/libuv static-libs
-#dev-libs/libuv BUILD_OPTIONS: optional_tests
-dev-games/mygui -opengl ogre samples
-app-crypt/gcr vala gtk
-games-strategy/liquidwar6 doc
-sci-libs/gdal geos
-dev-python/PyQt4 sql
-games-simulation/corsix-th -* opengl mapeditor
-#x11-libs/pixman mmxext loongson2f neon
-games-fps/sauerbraten server
-games-strategy/hedgewars -server
-games-action/minetest doc
-
-
-
-# tox
-net-libs/tox ntox logging daemon
-media-plugins/gst-plugins-meta vpx opus
-dev-qt/qtmultimedia:5 widgets
-dev-libs/libpcre:3 pcre16
-net-im/utox -dbus
-net-im/venom djbdns
-
-
-
-# because of wayland
-media-libs/cogl gles2
-media-libs/gst-plugins-bad egl -gles2
-media-libs/clutter egl
-
-
-gnome-extra/zenity -webkit
-
-# required by sys-devel/prelink-20110511
-# required by app-emulation/wine-1.7.0[prelink]
-# required by @games
-# required by @selected
-# required by @world (argument)
->=dev-libs/elfutils-0.156 static-libs
-
-
-net-misc/spice-gtk gtk3
-
-app-emulation/winetricks gtk
-
-dev-java/icedtea -webstart -nsplugin
-
-dev-db/firebird doc
-net-fs/cifs-utils ads
-net-fs/samba winbind
-
-www-client/netsurf gtk
-# required by media-libs/libsvgtiny-0.1.0
-# required by www-client/netsurf-3.0-r1[svg,svgtiny]
-# required by netsurf (argument)
-net-libs/libdom xml
-
-
-dev-util/codeblocks contrib
-
-# required by net-p2p/retroshare-0.5.4e::hasufell-overlay[cli]
-net-libs/libssh server
-
-# required by virtual/python-imaging-2
-# required by games-board/pysolfc-2.0-r2
-dev-python/pillow tk
-
-net-voip/linphone gtk assistant tools video sqlite upnp
-media-libs/mediastreamer video upnp
-
-
-dev-libs/openssl vanilla
-
-dev-vcs/git-annex feed
-net-p2p/retroshare qt4 feedreader links-cloud voip
-dev-qt/qt-mobility multimedia
-
-sci-libs/hdf5 -threads -mpi
-kde-base/marble -kde -python -handbook
-
-sys-boot/grub:2 -libzfs device-mapper
-
-dev-games/openscenegraph qt4 curl
-sci-geosciences/osgearth qt4
-
-media-gfx/pngcrush -system-libs
-
-games-strategy/wesnoth server
-
-games-misc/fortune-mod offensive
-
-virtual/python-imaging tk
-
-sys-apps/portage python3
-
-dev-python/pypy sqlite
-mail-client/mutt gpg imap mbox pop smime smtp
-mail-filter/procmail mbox
-net-mail/fetchmail tk
-
-games-emulation/higan profile_accuracy -profile_balanced
-
-mail-client/claws-mail pdf perl pgp smime spamassassin spell -webkit
-# required by mail-client/claws-mail-3.9.1-r1[notification,libindicate]
-# required by claws-mail (argument)
->=dev-libs/libindicate-12.10.1 gtk
-
-
-sys-process/lsof rpc
-# required by media-sound/teamspeak-client-bin-3.0.10
-# required by media-sound/teamspeak-client-bin (argument)
-dev-qt/qtgui xinerama
-
-games-util/desurium-meta -games-deps
-
-# threads? ( !adns )
-net-misc/curl adns -threads
-
-games-emulation/gambatte qt4 sdl
-games-emulation/gambatte BUILD_OPTIONS: optional_tests
-
-dev-cpp/glog gflags
-
-games-action/trine2 system-libs bundled-libs
-#required by games-action/d2x-rebirth-0.57.3, required by d2x-rebirth (argument)
-dev-games/physfs hog
-
-games-fps/eduke32 cdinstall gtk offensive textures sc55-musicpack
-games-fps/duke3d-data gog
-media-libs/alsa-lib alisp
-
-# fixme
-games-emulation/vbam -ffmpeg
-
-#temp
-games-engines/stratagus doc
-
-games-strategy/ja2-stracciatella cdinstall
-games-strategy/ja2-stracciatella LINGUAS: -* de
-dev-python/imaging tk
-
-dev-util/eclipse-sdk doc gnome
-
-dev-games/gigi ogre ois sdl
-
-# leak
-net-im/pidgin -dbus spell -gstreamer
-
-# for awesomewm
-x11-libs/cairo xcb 
-
-sys-block/gparted jfs
-# x11-misc/spacefm gtk3
-
-app-admin/conky nvidia audacious curl rss
-app-arch/p7zip wxwidgets rar -pch
-# thunderbird/enigmail
-app-crypt/pinentry gtk 
-app-editors/editra spell
-app-editors/gvim cscope gtk perl
-app-editors/vim cscope perl
-app-emulation/qemu gtk
-app-emulation/virtualbox python qt4 vnc
-# installs sys-power/acpi otherwise
-app-misc/bashstyle-ng -acpi 
-app-office/abiword plugins
-app-office/libreoffice gtk mysql -nsplugin 
-app-office/libreoffice-bin java
-app-office/openoffice-bin java
-app-office/writerscafe gtk2
-app-text/evince djvu dvi
-app-text/texlive dvi2tty dvipdfm extra graphics png pstricks science truetype xml X luatex xetex
-app-text/texlive-core xetex
-app-text/poppler qt4
-#dev-db/mysql embedded ## für amarok
-# for games-arcade/smc
-dev-games/cegui ogre devil tinyxml irrlicht lua zip 
-## for mana world
-dev-games/guichan sdl  
-dev-games/ode double-precision
-dev-games/ogre cg ois -boost freeimage opengl zip -threads tools doc gles2
-# sqlite for firefox7
-dev-lang/python sqlite tk  
-# for lazarus
-dev-lang/fpc source 
-# required_use of cxx
-dev-libs/beecrypt threads 
-dev-libs/libdbusmenu gtk
-# for suspend/hibernate-script
-dev-libs/libgcrypt static-libs  
-## for suspend/hibernate-script
-dev-libs/libgpg-error static-libs 
-## for suspend/hibernate-script
-dev-libs/lzo static-libs 
-dev-python/numpy lapack
-dev-python/PyQt4 declarative -webkit
-dev-util/anjuta devhelp doc
-dev-util/geany-plugins debugger enchant gpg gtkspell lua nls soup -webkit scope
-dev-util/netbeans debug doc
-dev-vcs/git gtk tk
-dev-vcs/mercurial tk gpg
-games-board/awale tk
-games-board/cockatrice server
-games-board/pysolfc extra-cardsets
-app-emulation/emul-linux-x86-baselibs development
-app-emulation/emul-linux-x86-gtklibs development
-app-emulation/emul-linux-x86-opengl development
-app-emulation/emul-linux-x86-sdl development
-app-emulation/emul-linux-x86-soundlibs development -pulseaudio 
-app-emulation/emul-linux-x86-xlibs development
-games-emulation/vbam gtk link
-games-emulation/visualboyadvance gtk
-# crash with opengl
-games-emulation/zsnes -opengl  
-games-engines/openmw devtools
-games-engines/stratagus theora
-games-fps/urbanterror server
-games-fps/warsow openal irc server
-games-roguelike/stone-soup tiles ncurses luajit
-games-rpg/arx-libertatis c++0x tools
-games-rpg/arx-fatalis-data gog
-games-strategy/0ad editor
-games-strategy/freeorion cg
-games-strategy/s25rttr debug glfw
-games-strategy/uqm remix music voice
-# for thunarr
-gnome-base/gvfs cdda fuse http udisks
-mail-client/thunderbird -custom-cflags -custom-optimization -crypt system-icu system-cairo system-jpeg
-media-gfx/blender game-engine boost bullet player openal
-media-gfx/gthumb -cdr slideshow
-media-gfx/imagemagick corefonts truetype
-media-gfx/nvidia-texture-tools cg glew glut openexr
-media-libs/devil nvtt mng glut
-media-libs/mesa gles1 gles2 -llvm gbm
-# for frozenbubble
-media-libs/sdl-mixer mikmod mod timidity midi mp3 smpeg 
-media-libs/sdl2-mixer mikmod mod timidity midi mp3 smpeg
-media-sound/audacity id3tag -ffmpeg
-media-sound/gmusicbrowser doc
-media-sound/mumble speech
-
-## ffmpeg and mplayer shit
-media-video/ffmpeg avx theora vaapi mmxext -bindist
-virtual/ffmpeg theora vaapi
-media-video/mplayer mmxext
-media-video/mplayer2 mmxext
-
-media-video/gnome-mplayer libnotify
-media-video/mediainfo wxwidgets
-media-video/vlc X a52 alsa dts dvd flac fbcon ffmpeg lua matroska mp3 mpeg musepack ncurses ogg opengl png sdl skins speex sse svg theora truetype vorbis win32codecs wxwindows xinerama xv x264
-net-analyzer/nmap gtk
-net-im/skype qt-static
-net-irc/hexchat libcanberra libnotify perl plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo theme-manager spell
-net-irc/xchat libnotify otr osd perl
-net-irc/xchat-xsys audacious
-net-misc/dropbox librsync-bundled
-net-misc/rsync xattr
-net-misc/youtube-viewer gtk
-net-irc/irssi perl ssl
-net-p2p/transmission gtk
-sci-astronomy/celestia gtk
-sci-geosciences/googleearth qt-bundled -mdns-bundled
-sci-misc/boinc cuda
-# for wxmaxima
-sci-visualization/gnuplot wxwidgets  
-sys-apps/man-pages LINGUAS: -de
-sys-apps/pkgcore doc
-sys-apps/smartmontools minimal
-sys-devel/distcc gtk
-sys-devel/gcc:4.5 gcj
-sys-devel/llvm gold multitarget
-#sys-fs/ntfs3g-acl
-sys-fs/ntfs3g ntfsprogs
-sys-fs/eudev gudev hwdb kmod keymap static-libs
-# gudev for thunar
-virtual/udev gudev static-libs
-sys-libs/zlib minizip
-www-client/midori -unique
-www-client/opera gtk
-www-client/firefox libnotify -custom-cflags -custom-optimization system-icu system-cairo system-jpeg
-www-client/w3m gtk imlib fbcon nntp
-www-plugins/adobe-flash 32bit
-#www-plugins/lightspark
-xfce-base/xfdesktop thunar
-# for FF
-x11-base/xorg-server xvfb  
-x11-misc/redshift gtk
-x11-misc/wbar gtk
-x11-drivers/nvidia-drivers acpi
-#icon support
-x11-wm/openbox imlib xdg 
-
-#### for splashutils
-#media-libs/lcms static-libs
-#media-libs/freetype static-libs
-#app-arch/bzip2 static-libs
-#media-libs/libpng static-libs
-#media-libs/jpeg static-libs
-#virtual/jpeg static-libs
-#media-libs/libmng static-libs
-#sys-apps/fbset static
-sys-apps/busybox static -pam
-
-# netbeans
-dev-java/swing-layout source
-
-#required by dev-java/commons-beanutils-1.8.0[test], required by dev-java/commons-digester-1.8.1-r1, required by dev-java/netbeans-enterprise-7.1.2, required by dev-java/netbeans-mobility-7.1.2, required by dev-java/netbeans-javadoc-7.1.2, required by dev-util/netbeans-7.1.2[doc], required by dev-util/netbeans (argument)
->=dev-java/commons-collections-3.2.1 test-framework
-
-
-
-
-
-#media-libs/libsdl custom-cflags
-
-media-libs/libsdl2 xscreensaver xinerama gles
-#media-libs/libsdl2 -* X video static-libs
-#media-libs/libsdl2 -* X video opengl
-#media-libs/libsdl2 -*
-
-media-gfx/nvidia-cg-toolkit -multilib
-
-sys-libs/glibc nscd
-sys-apps/paludis xml search-index pbins
-sys-apps/paludis BUILD_OPTIONS: optional_tests
-app-arch/libarchive -xattr
-sys-fs/lvm2 static
-x11-misc/dzen xft xpm
-www-plugins/gnash gtk -nsplugin curl vaapi egl
-www-plugins/lightspark curl
-net-misc/tor tor-hardening
-x11-terms/rxvt-unicode xft 256-color fading-colors blink
-www-client/torbrowser system-icu system-cairo system-jpeg
-app-text/ghostscript-gpl gtk
-games-util/desurium -bundled-wxgtk
-sys-devel/gcc objc objc-gc
-dev-lang/luajit lua52compat
-net-libs/polarssl havege
-net-libs/mbedtls havege
-dev-libs/libtommath doc
-games-board/xboard -default-font
-dev-embedded/arduino doc examples
-sys-power/suspend -crypt
-sys-devel/clang multitarget
-x11-libs/libxcb xkb
-sci-mathematics/flint doc
-virtual/pypy tk
-dev-python/pypy-bin tk
-dev-util/nemiver memoryview
-virtual/libudev static-libs
-virtual/libgudev static-libs
-app-emulation/wine mono -gstreamer -xml -dbus
-games-action/hotline-miami bundled-libs
-
-
-
-
-# doc for app-vim/haskellmode
-dev-lang/ghc doc
-
-sys-apps/util-linux static-libs
-
-
-dev-haskell/polynomial doc
-
-games-rpg/wasteland2 symbols=preserve
-
-dev-lang/php apache2 berkdb bzip2 cli crypt ctype curl fileinfo filter gd gmp hash iconv -imap ipv6 json mysql mysqli opcache pcntl pdo posix readline session simplexml sockets ssl unicode xml xmlwriter zlib xslt
-app-eselect/eselect-php apache2
-net-libs/c-client chappa kerberos topal static-libs
-
-
-
-# icu causes problems with gmaes-strategy/0ad, jit improves performance
-dev-lang/spidermonkey -icu -system-icu
-
-
-net-p2p/rtorrent daemon
-
-games-rpg/a-bird-story bundled-libs
-
-media-libs/sdl-sound physfs speex mikmod modplug
-
-
-dev-libs/libntru examples static-libs
-dev-libs/libntru BUILD_OPTIONS: optional_tests
-
-
-# libressl compatibiliy
-#net-libs/gloox gnutls
-
-app-crypt/zuluCrypt udev gui gnome kde
-
-dev-libs/poco odbc
-
-
-#x11-libs/gdk-pixbuf BUILD_OPTIONS: work=preserve
-
-
-x11-drivers/nvidia-drivers gtk3 uvm
-
-x11-wm/i3 icons
-
-
-
-
-
-
-net-dns/bind -threads dlz
-
-
-# graphical glitches without bundled-libs
-games-rpg/baldurs-gate-ee bundled-libs
-games-rpg/baldurs-gate-2-ee bundled-libs
-
-
-media-libs/phonon -vlc
-
-net-misc/networkmanager -ppp -modemmanager -wext -wifi
-
-
-games-rpg/pillars-of-eternity dlc3
-
-sci-mathematics/glpk gmp
-
-app-text/apvlv html
-
-
-# for debugging
-games-engines/OpenJK BUILD_OPTIONS: work=preserve
-
-
-# ruby testing
-#virtual/rubygems RUBY_TARGETS: ruby22
-#dev-ruby/minitest RUBY_TARGETS: ruby22
-#dev-ruby/power_assert RUBY_TARGETS: ruby22
-#dev-ruby/rake RUBY_TARGETS: ruby22
-#dev-ruby/json RUBY_TARGETS: ruby22
-#dev-ruby/test-unit:2 RUBY_TARGETS: ruby22
-#dev-ruby/rdoc RUBY_TARGETS: ruby22
-#dev-ruby/rubygems RUBY_TARGETS: ruby22
-#dev-ruby/racc RUBY_TARGETS: ruby22
-
-
-# darcsden
-dev-haskell/transformers-compat three
-
-
-
-
-games-fps/unvanquished BUILD_OPTIONS: symbols=preserve
-games-fps/unvanquished-data BUILD_OPTIONS: symbols=preserve
-games-fps/unvanquished -optimization
-
-
-app-editors/neovim perl
-
-
-net-irc/znc -python
-
-
-dev-util/cmake qt5
-
-
-app-crypt/johntheripper -openmp
-
-# inox
-media-libs/libvpx postproc
-
-
-net-im/dianara -qt4 qt5
-app-crypt/qca qt5
-
-
-# libressl
-dev-db/mysql client-libs
-
-sci-geosciences/osgearth qt5
-dev-games/openscenegraph -qt4 qt5
-
-media-gfx/exiv2 xmp
-
-
-# ekiga
-net-libs/ptlib xml wav
-net-libs/opal xml sip sipim
-
-
-app-emulation/docker lxc
-
-
-
-#media-libs/libsoundio BUILD_OPTIONS: optional_tests
-media-libs/libsoundio -pulseaudio
-
-
-# stack GHC
-sys-libs/ncurses tinfo
diff --git a/paludis/use.conf.d/system.conf b/paludis/use.conf.d/system.conf
new file mode 100644
index 0000000..ade1907
--- /dev/null
+++ b/paludis/use.conf.d/system.conf
@@ -0,0 +1,63 @@
+sys-devel/llvm gold multitarget
+
+sys-apps/pkgcore doc
+sys-apps/smartmontools minimal
+sys-devel/distcc gtk
+sys-fs/ntfs3g ntfsprogs
+sys-fs/eudev gudev hwdb kmod keymap static-libs
+# gudev for thunar
+virtual/udev gudev static-libs
+
+sys-libs/glibc nscd
+sys-apps/paludis xml search-index pbins
+sys-apps/paludis BUILD_OPTIONS: optional_tests
+app-arch/libarchive -xattr
+sys-fs/lvm2 static
+
+
+net-fs/samba winbind
+net-fs/cifs-utils ads
+
+
+dev-libs/lzo static-libs
+
+dev-libs/openssl vanilla
+net-libs/polarssl havege
+net-libs/mbedtls havege
+
+sys-boot/grub:2 -libzfs device-mapper
+
+media-gfx/pngcrush -system-libs
+
+sys-apps/portage python3
+
+# threads? ( !adns )
+net-misc/curl adns -threads
+
+sys-process/lsof rpc
+
+sys-block/gparted jfs
+
+app-arch/p7zip wxwidgets rar -pch
+
+dev-lang/python sqlite tk  
+
+# for suspend/hibernate-script
+dev-libs/libgcrypt static-libs
+dev-libs/libgpg-error static-libs 
+
+
+sys-apps/busybox static -pam
+
+x11-drivers/nvidia-drivers acpi gtk3 uvm
+
+net-misc/rsync xattr
+
+sys-apps/man-pages LINGUAS: -de
+
+sys-apps/util-linux static-libs
+
+sys-power/suspend -crypt
+
+virtual/libudev static-libs
+virtual/libgudev static-libs
diff --git a/paludis/use.conf.d/testing.conf b/paludis/use.conf.d/testing.conf
new file mode 100644
index 0000000..badd0b0
--- /dev/null
+++ b/paludis/use.conf.d/testing.conf
@@ -0,0 +1,27 @@
+## needed by my testing packages
+#media-libs/sdl-mixer modplug
+app-backup/fsarchiver lzma lzo
+#net-misc/openconnect gssapi
+sci-mathematics/rstudio server
+games-action/super-hexagon BUILD_OPTIONS: symbols=preserve
+#www-servers/hiawatha -ssl
+games-engines/solarus doc
+dev-libs/libuv ABI_X86: 64 32
+dev-libs/libuv static-libs
+#dev-libs/libuv BUILD_OPTIONS: optional_tests
+dev-games/mygui -opengl ogre samples
+app-crypt/gcr vala gtk
+games-strategy/liquidwar6 doc
+sci-libs/gdal geos
+dev-python/PyQt4 sql
+games-simulation/corsix-th -* opengl mapeditor
+#x11-libs/pixman mmxext loongson2f neon
+games-fps/sauerbraten server
+games-strategy/hedgewars -server
+games-action/minetest doc
+dev-libs/libntru examples static-libs
+dev-libs/libntru BUILD_OPTIONS: optional_tests
+app-crypt/zuluCrypt udev gui gnome kde
+
+#media-libs/libsoundio BUILD_OPTIONS: optional_tests
+media-libs/libsoundio -pulseaudio
diff --git a/paludis/use.conf.d/tex.conf b/paludis/use.conf.d/tex.conf
new file mode 100644
index 0000000..5090aad
--- /dev/null
+++ b/paludis/use.conf.d/tex.conf
@@ -0,0 +1,5 @@
+app-text/texlive dvi2tty dvipdfm extra graphics png pstricks science truetype xml X luatex xetex
+app-text/texlive-core xetex
+
+# texmaker
+app-text/poppler qt4
diff --git a/paludis/use.conf.d/tox.conf b/paludis/use.conf.d/tox.conf
new file mode 100644
index 0000000..f3dd296
--- /dev/null
+++ b/paludis/use.conf.d/tox.conf
@@ -0,0 +1,10 @@
+
+# tox
+net-libs/tox ntox logging daemon
+media-plugins/gst-plugins-meta vpx opus
+dev-qt/qtmultimedia:5 widgets
+dev-libs/libpcre:3 pcre16
+net-im/utox -dbus
+net-im/venom djbdns
+
+