Update

Needed for git as well.

bashrc

@@ -2,9 +2,27 @@ CHOST="x86_64-pc-linux-gnu"
 x86_64_pc_linux_gnu_CFLAGS="-march=native -pipe -O2"
 x86_64_pc_linux_gnu_CXXFLAGS="-march=native -pipe -O2"
 x86_64_pc_linux_gnu_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
-i686_pc_linux_gnu_CFLAGS="-march=native -pipe -O2"
-i686_pc_linux_gnu_CXXFLAGS="-march=native -pipe -O2"
+i686_pc_linux_gnu_CFLAGS="-march=i686 -pipe -O2"
+i686_pc_linux_gnu_CXXFLAGS="-march=i686 -pipe -O2"
 i686_pc_linux_gnu_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
+armv7_unknown_linux_gnueabi_CFLAGS="-march=armv7-a -pipe -O2"
+armv7_unknown_linux_gnueabi_CXXFLAGS="-march=armv7-a -pipe -O2"
+armv7_unknown_linux_gnueabi_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
+armv7_unknown_linux_gnueabihf_CFLAGS="-march=armv7-a -mfpu=neon -pipe -O2"
+armv7_unknown_linux_gnueabihf_CXXFLAGS="-march=armv7-a -mfpu=neon -pipe -O2"
+armv7_unknown_linux_gnueabihf_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
+aarch64_unknown_linux_gnueabi_CFLAGS="-march=armv8-a -pipe -O2"
+aarch64_unknown_linux_gnueabi_CXXFLAGS="-march=armv8-a -pipe -O2"
+aarch64_unknown_linux_gnueabi_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
+aarch64_unknown_linux_musleabi_CFLAGS="-march=armv8-a -pipe -O2"
+aarch64_unknown_linux_musleabi_CXXFLAGS="-march=armv8-a -pipe -O2"
+aarch64_unknown_linux_musleabi_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
+ia64_unknown_linux_gnu_CFLAGS="-march=native -pipe -O2"
+ia64_unknown_linux_gnu_CXXFLAGS="-march=native -pipe -O2"
+ia64_unknown_linux_gnu_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
+powerpc64_unknown_linux_gnu_CFLAGS="-march=native -pipe -O2"
+powerpc64_unknown_linux_gnu_CXXFLAGS="-march=native -pipe -O2"
+powerpc64_unknown_linux_gnu_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
 
 
 #GIT_WRAPPER="sudo -u hasufell -g paludisbuild"
@@ -16,7 +34,8 @@ i686_pc_linux_gnu_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
 case "${CATEGORY}/${PN}" in
     x11-wm/i3)
         scm_user_customize () {
-            SCM_REPOSITORY="https://github.com/hasufell/i3wm.git"
+            SCM_REPOSITORY="https://github.com/hasufell/i3-window-icons.git"
+            SCM_BRANCH="4.17.1/icons"
         }
         ;;
 	games-fps/urbanterror)
@@ -24,5 +43,11 @@ case "${CATEGORY}/${PN}" in
 		;;
 esac
 
+case "${REPOSITORY}" in
+	hasufell-binhost)
+		EXTRA_WGET="--no-check-certificate"
+		;;
+esac
+
 # idiotic mysql package dies in pkg_pretend otherwise
 MYSQL_MAJOR_UPGRADE="YesPlease"

hooks/ebuild_install_post/prune_libtool_files.bash

@@ -70,7 +70,7 @@ prune_libtool_files() {
 					local pc_libs=()
 					if [[ ! ${removing_all} ]]; then
 						local pc
-						local tf=${T}/prune-lt-files.pc
+						local tf=${TEMP}/prune-lt-files.pc
 						local pkgconf=${PKG_CONFIG}
 
 						while IFS= read -r -d '' pc; do # for all .pc files
@@ -138,6 +138,7 @@ if [[ "${CATEGORY}/${PN}" != "sys-devel/gcc" &&
 		"${CATEGORY}/${PN}" != "sys-apps/dbus" &&
 		"${CATEGORY}/${PN}" != "sys-apps/util-linux" &&
 		"${CATEGORY}/${PN}" != "media-libs/freetype" &&
+		"${CATEGORY}/${PN}" != "dev-libs/libunistring" &&
 		"${CATEGORY}/${PN}" != "dev-libs/expat"
 	]] ; then
 	prune_libtool_files --all

hooks/ebuild_install_post/xflock4.bash

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+source "${PALUDIS_EBUILD_DIR}/echo_functions.bash"
+
+if [[ "${CATEGORY}/${PN}" == "xfce-base/xfce4-session" ]] ; then
+	elog "Replacing /usr/$(exhost --target)/bin/xflock4!"
+
+	cat << EOF > "${IMAGE}"/usr/$(exhost --target)/bin/xflock4
+#!/bin/sh
+
+PATH=/bin:/usr/bin
+export PATH
+
+# else run another access locking utility, if installed
+for lock_cmd in \
+  "i3lock -c 000000"
+  do
+    set -- \$lock_cmd
+    if command -v -- \$1 >/dev/null 2>&1; then
+        \$lock_cmd >/dev/null 2>&1 &
+	# turn off display backlight:
+	xset dpms force off
+        exit
+    fi
+done
+
+# else access locking failed
+exit 1
+EOF
+
+fi

options.conf

@@ -1,5 +1,5 @@
 # system, general, other
-*/*  -gnutls acpi bash-completion cdr cscope css dv fat glib gobject-introspection gpm hddtemp icq icu ipv6 jabber libnotify lm_sensors nsplugin ntfs oscar pdf python raw sse sse2 ssse3 tcpd threads udev unicode usb vim-syntax zsh-completion
+*/*  -gnutls acpi bash-completion cdr cscope css dv efi fat glib gobject-introspection gpm hddtemp icq icu ipv6 jabber libnotify lm_sensors nsplugin ntfs oscar pdf postscript python raw sse sse2 ssse3 tcpd threads udev unicode usb vim-syntax zsh-completion
 
 # parts
 */* parts: openrc
@@ -12,9 +12,10 @@
 
 # video, ffmpeg, streaming
 */* a52 dvd dvdr ffmpeg gstreamer h264 matroska mp4 mpeg v4l vcd vdpau x264 xvid
+*/* providers: ffmpeg -libav
 
 # opengl, video, X
-*/* dri opengl sdl -wayland xv xvmc X
+*/* dri opengl sdl wayland xv xvmc X
 */* video_drivers: nouveau intel vesa
 
 # image formats
@@ -34,16 +35,24 @@
 */* build_options: symbols=split jobs=8 -optional_tests -recommended_tests -expensive_tests
 
 # targets
-*/* targets: x86_64-pc-linux-gnu
+*/* targets: x86_64-pc-linux-gnu armv7-unknown-linux-gnueabihf aarch64-unknown-linux-gnueabi i686-pc-linux-gnu
+dev-lang/rust targets: -* x86_64-pc-linux-gnu
 
 # SSL
 */* providers: -openssl libressl
 
+*/* providers: -krb5 heimdal
+
 # jpeg
 */* providers: -ijg-jpeg jpeg-turbo
 
 # no systemd
-*/* providers: -systemd eudev rsyslog
+*/* providers: -systemd eudev rsyslog -systemd-logind
 */* -systemd consolekit
 */* providers: -runit -sinit sysvinit
 
+# sql
+*/* providers: -percona mysql -mariadb
+
+# GHC
+virtual/GHC providers: -* GHC

options.conf.d/desktop.conf

@@ -1,3 +1,8 @@
+media-libs/libsndfile opus
+
+# phone mounting
+gnome-desktop/gvfs mtp
+
 # evince, gimp
 app-text/poppler glib
 
@@ -16,7 +21,7 @@ x11-libs/wxGTK:3.0 providers: gtk2 gtk3
 dev-lang/python sqlite
 
 # libsoup, dep-cycle of GPaste
-dev-libs/glib-networking gnutls
+dev-libs/glib-networking providers: -libressl -openssl gnutls
 
 gnome-desktop/GPaste applet
 
@@ -28,19 +33,19 @@ net-im/pidgin-opensteamworks providers: libressl
 media/mplayer LINGUAS: -* de
 
 # gnome
-media-sound/audacious-plugins gtk
-media-sound/audacious gtk
+media-sound/audacious-plugins gtk qt5 notify osd
+media-sound/audacious gtk qt5
 dev-libs/vte gnutls
 
 # no systemd
 x11-libs/qtbase -journald
+net-analyzer/wireshark -journald
 
 # kde
 x11-libs/qtbase sql sqlite
 media-libs/phonon qt4
 
 # xfce
-xfce-base/libxfce4ui gtk3
 x11-apps/xscreensaver gtk
 
 # qt stuff
@@ -51,13 +56,14 @@ x11-libs/qt sql sqlite opengl ssl
 x11-libs/qt webkit
 
 x11-wm/i3 icons
+x11-misc/polybar i3 network curl
 
 # teamspeak
 app-arch/quazip qt5
 
 # blink
 x11-libs/qt qt3support
-dev-python/PyQt5 webkit
+dev-python/PyQt5 webkit webchannel
 media/ffmpeg h264
 
 net-misc/youtube-viewer gtk
@@ -141,3 +147,26 @@ app-crypt/zuluCrypt -polkit gui
 
 # xfce4-pulseaudio-plugin
 xfce-base/xfce4-panel gtk3
+
+media-gfx/xsane lcms gimp
+
+# media-video/peek
+media-plugins/gst-plugins-good GSTREAMER_PLUGINS: vpx
+media/ffmpeg vpx
+
+# firefox
+dev-lang/node bundled-openssl
+net-www/firefox eme
+
+x11-dri/mesa opencl llvm xa va sensors
+
+# because of dconf-editor
+gnome-desktop/dconf vapi
+
+# net-www/qutebrowser
+dev-python/PyQt5 sql
+
+net-irc/weechat perl python
+
+# cheese
+media-plugins/gst-plugins-good GSTREAMER_PLUGINS: v4l

options.conf.d/development.conf

@@ -5,10 +5,7 @@ dev-lang/ghc llvm bootstrap
 sys-libs/ncurses compat-libs
 
 # haskell
-*/* profile hscolour
-#dev-haskell/* doc
-#dev-lang/ghc doc
-
+dev-lang/GHC llvm
 
 dev-scm/git tk
 
@@ -31,6 +28,8 @@ dev-lang/rust internal-llvm force-bootstrap
 app-editors/emacs freetype xim
 app-editors/emacs providers: gtk3
 
+# node
+dev-lang/node bundled-openssl
 
 # monodevelop
 dev-dotnet/mono-addins gui
@@ -39,3 +38,8 @@ app-editors/vim ruby
 app-editors/gvim ruby
 
 dev-util/universal-ctags json xml yaml
+
+dev-db/sqlite readline
+
+# java
+=virtual/jdk-12.0 providers: openjdk-bin

options.conf.d/emulation.conf

@@ -1,2 +1,9 @@
 # Exactly one of options ( multibuild_c:32, multibuild_c:64 ) must be met
 app-emulation/wine MULTIBUILD_C: -* 64
+app-emulation/wine ffmpeg staging vulkan
+
+
+app-virtualization/qemu amd64 mips mipsel arm aarch64 ppc ppc64 x86 virtio-gpu virtfs vde usb-passthrough usb-redirection ssh-block-dev spice snappy smartcard sdl2 sdl-image sasl rbd nfs lzo gtk3 bluetooth async xattr
+media-plugins/gst-plugins-ugly GSTREAMER_PLUGINS: h264
+virtualization-lib/spice smartcard
+sys-cluster/ceph client

options.conf.d/games.conf

@@ -13,7 +13,7 @@ games-roguelike/dungeon-crawl-stone-soup tiles
 
 games-rpg/pillars-of-eternity pre-order-items white-march-1 white-march-2
 
-games-strategy/freeciv lua_abis: 5.2
+games-strategy/freeciv lua_abis: -* 5.3
 games-strategy/freeciv gtk3
 
 games-fps/eduke32 offensive hires-textures -tools vpx
@@ -29,3 +29,8 @@ games-rpg/gemrb opengl sdl2
 
 
 games-roguelike/FTL gog
+
+# teeworlds
+dev-util/bam lua_abis: -* 5.1
+
+x11-dri/mesa vulkan-overlay

options.conf.d/networking.conf

@@ -1,7 +1,12 @@
-net-apps/NetworkManager compat-libs connection-check wifi
-net-apps/NetworkManager providers: nss consolekit -dhcpcd dhcp
+net-apps/NetworkManager compat-libs connection-check wifi -journald
+net-apps/NetworkManager providers: -gnutls nss consolekit -dhcpcd dhcp wpa_supplicant
 net-wireless/wpa_supplicant nl80211
 net-scanner/nmap gtk utils
 
 # broken parallel build
 net-fs/samba build_options: jobs=1
+
+net-analyzer/wireshark -journald
+
+# for gns3
+dev-python/PyQt5 websockets

options.conf.d/python-abis.conf

@@ -1,23 +1,43 @@
 # python
-*/* python_abis: 2.7 3.6
+*/* python_abis: -* 2.7 3.6
 
 # exactly one of
-app-virtualization/docker-compose python_abis: -* 3.6
-dev-lang/llvm      python_abis: -* 3.6
-dev-libs/libxml2   python_abis: -* 3.6
-dev-python/Sphinx  python_abis: -* 3.6
-dev-scm/subversion python_abis: -* 3.6
-dev-util/itstool   python_abis: -* 3.6
-sys-process/ctop   python_abis: -* 2.7
-sys-apps/paludis   python_abis: -* 2.7
-app-editors/gvim   python_abis: -* 2.7
-app-editors/vim    python_abis: -* 2.7
-net-libs/miniupnpc python_abis: -* 2.7
 app-crypt/volume_key python_abis: -* 2.7
-base/libblockdev python_abis: -* 2.7
-games-board/pysolfc python_abis: -* 2.7
-dev-libs/gexiv2 python_abis: -* 3.6
 app-doc/gtk-doc-autotools python_abis: -* 3.6
+app-editors/gvim python_abis: -* 3.6
+app-editors/vim python_abis: -* 3.6
+app-office/libreoffice python_abis: -* 3.6
+app-text/calibre python_abis: -* 2.7
+app-virtualization/docker-compose python_abis: -* 3.6
+base/libblockdev python_abis: -* 2.7
+dev-db/postgresql python_abis: -* 3.6
+dev-lang/clang python_abis: -* 3.6
+dev-lang/llvm python_abis: -* 2.7
+dev-libs/gexiv2 python_abis: -* 3.6
+dev-libs/libxml2 python_abis: -* 2.7 3.6
+dev-python/Sphinx python_abis: -* 3.6
+dev-scm/mercurial python_abis: -* 3.6
+dev-scm/subversion python_abis: -* 2.7
+dev-util/itstool python_abis: -* 3.6
+dev-util/meld python_abis: -* 3.6
+games-board/pysolfc python_abis: -* 2.7
+media-gfx/fontforge python_abis: -* 3.6
+media-gfx/graphviz python_abis: -* 3.6
+media-sound/pulseeffects python_abis: -* 3.6
+net-libs/miniupnpc python_abis: -* 2.7
+net-wireless/blueman python_abis: -* 3.6
+sys-apps/paludis python_abis: -* 2.7
+sys-devel/meson python_abis: -* 3.6 
+sys-fs/btrfs-progs python_abis: -* 3.6
+sys-fs/fuse python_abis: -* 3.6
+sys-libs/newt python_abis: -* 3.6
+sys-process/ctop python_abis: -* 2.7
+sys-sound/alsa-lib python_abis: -* 3.6
+x11-dri/mesa python_abis: -* 3.6
+x11-misc/zim python_abis: -* 3.6
+sys-libs/openmp python_abis: -* 3.6
+dev-lang/coconut python_abis: -* 3.6
+app-editors/vint python_abis: -* 3.6
 
 # inox
 app-speech/speechd python_abis: -* 3.6
@@ -31,3 +51,9 @@ net-im/pidgin python_abis: -* 2.7
 dev-util/glade python_abis: -* 2.7
 
 dev-libs/compiler-rt python_abis: -* 2.7
+
+# sqlitebrowser
+app-editors/QScintilla python_abis: -* 2.7
+
+# peter
+dev-libs/mbedtls python_abis: -* 3.6

options.conf.d/system.conf

@@ -14,10 +14,12 @@ x11-drivers/nvidia-drivers tools
 
 sys-auth/ConsoleKit2 cgroups polkit
 
-dev-lang/python tk
+dev-lang/python tk readline
 
 # needed for valgrind
 sys-libs/glibc build_options: symbols=preserve
 
 # dracut
 sys-apps/coreutils xattr
+
+sys-apps/man-db berkdb

options.conf.d/wayland.conf

@@ -0,0 +1,10 @@
+x11-server/xorg-server xwayland
+compositor/sway xwayland tray gdk-pixbuf
+wayland-apps/swaybg gdk-pixbuf
+sys-libs/wlroots xwayland
+
+
+sys-auth/elogind providers: -* openrc
+compositor/sway providers: eudev elogind
+
+wayland-apps/Waybar tray network

package_env.conf

@@ -6,3 +6,4 @@ dev-db/wxsqlite3 debug
 net-www/inox fpermissive
 
 base/syslinux no-as-needed
+net-im/purple-xmpp-http-upload no-as-needed

package_mask.conf

@@ -5,9 +5,14 @@
 >=sys-apps/iproute2-3.19
 
 # steam
->x11-drivers/nvidia-drivers-364.20
+#>x11-drivers/nvidia-drivers-396.24
 
 # breaks tahoma font
 #>=media-libs/fontconfig-2.12
 #>=media-libs/freetype-2.6.4
 
+# incompatible with signal
+#>=dev-lang/node-9
+
+# keruspe committing broken crap
+>=virtual/mysql-8.0

package_unmask.conf

@@ -6,6 +6,9 @@ x11-apps/dzen2
 media-libs/SDL:2
 
 # scm unmask
+x11-plugins/i3status[~scm]
+sys-fs/simple-mtpfs[~scm]
+x11-misc/fsearch[~scm]
 app-editors/neovim[~scm]
 app-vim/vim-colors-solarized[~scm]
 games-emulation/gambatte[~scm]
@@ -39,6 +42,11 @@ games-rpg/flare[~scm]
 sci-apps/z3[~scm]
 dev-lang/fstar[~scm]
 dev-lang/fsharp[~scm]
+x11-drivers/xf86-video-wayland[~scm]
+wayland-apps/Waybar[~scm]
+x11-misc/polybar[~scm]
+dev-util/universal-ctags[~scm]
+net-im/purple-xmpp-http-upload[~scm]
 
 # valyriatear
 media-libs/SDL_ttf:2
@@ -71,3 +79,26 @@ dev-lang/guile:1.8
 
 # pnmixer-rs
 dev-lang/rust:nightly
+
+# neovim-gtk
+app-editors/neovim-gtk[~scm]
+
+virtual/jre:9.0
+virtual/jdk:9.0
+virtual/jre:10.0
+virtual/jdk:10.0
+
+# security vulnerability
+media-libs/giflib:5.1
+net-dns/libidn2:4.0
+
+# deprecated
+x11-libs/qt:4
+dev-lang/openjdk10
+dev-lang/openjdk9
+virtual/jre:12.0
+virtual/jdk:12.0
+dev-lang/openjdk-bin:12.0
+dev-lang/openjdk12:12.0
+
+dev-db/mysql

sets/desktop.conf

@@ -1,14 +1,10 @@
 * app-admin/hardinfo
-* app-diagram/dia
 * app-editors/gvim
+* app-diagram/dia
 * app-ergonomics/workrave
-* app-office/abiword
-* app-office/gnucash
 * app-text/texmaker
-* gnome-desktop/GPaste
 * gnome-desktop/evince
 * kde/marble
-* kde/okular
 * mail-client/thunderbird
 * media-gfx/gimp
 * media-gfx/gthumb
@@ -20,27 +16,25 @@
 * media-sound/pnmixer-rs
 * media-video/guvcview
 * media/livestreamer
+* media/smplayer
 * media/mpv
 * net-ftp/filezilla
 * net-misc/remmina
 * net-misc/x11vnc
 * net-misc/youtube-viewer
-* net-p2p/pybitmessage
+#* net-p2p/pybitmessage
 * net-www/firefox
-* net-www/inox
-* net-www/inox-widevine-plugin
+* net-www/google-chrome-bin
 * net-www/links
 * voip/blink
 * voip/mumble
 * voip/teamspeak-client-bin
-* x11-apps/dzen2
+* x11-apps/alacritty
 * x11-apps/redshift
 * x11-apps/sakura
 * x11-apps/setxkbmap
-
 * x11-apps/spacefm
 * sys-apps/udevil
-
 * x11-apps/xbindkeys
 * x11-apps/xdotool
 * x11-apps/xhost
@@ -52,11 +46,23 @@
 * x11-drivers/xf86-input-keyboard
 * x11-drivers/xf86-input-mouse
 * x11-drivers/xf86-video-nouveau
-* x11-misc/dmenu
 * x11-misc/zim
 * x11-utils/xclip
+
+# i3
+* x11-apps/i3lock
+* x11-apps/picom
+* x11-misc/rofi
 * x11-wm/i3
 
+# polybar
+* dev-python/fontawesome
+* dev-python/i3ipc
+* fonts/fontawesome
+* fonts/unifont
+* x11-misc/polybar
+
+
 # unpacking
 * app-arch/p7zip
 * app-arch/unrar
@@ -71,7 +77,6 @@
 * net-wireless/blueman
 * net-wireless/bluez
 * media-sound/pulseaudio
-* media-sound/pulseeffects
 
 # password management
 * app-admin/keepassxc
@@ -84,6 +89,61 @@
 * net-im/pidgin-otr
 * net-im/pidgin-save-conv-order
 * net-im/lurch
+* net-im/telegram-purple
+* net-im/purple-gowhatsapp
+* net-im/purple-xmpp-http-upload
 
 * voip/skypeforlinux
 * voip/umurmur
+* net-im/signal-desktop
+
+* net-misc/seafile-client
+
+* net-www/google-chrome-bin
+
+* media-gfx/xsane
+
+* media-video/peek
+
+* media-sound/pavucontrol
+
+* net-www/brave-browser-dev
+
+* net-misc/dropbox
+
+* net-im/slack
+* net-im/telegram-desktop
+* app-crypt/keybase
+
+# epub
+* app-text/calibre
+
+* sys-apps/lsd
+* app-misc/hunter
+
+* app-misc/ripgrep-all
+
+* app-shells/fish
+
+# neomutt
+* mail-client/notmuch
+* dev-db/lmdb
+* net-dns/libidn2
+* dev-libs/libunistring
+* dev-libs/pcre2
+* dev-db/sqlite
+* app-arch/lz4
+* sys-libs/zlib
+* net-www/w3m
+
+# weechat
+* net-irc/weechat
+* net-libs/cyrus-sasl
+* mail-client/notmuch
+
+# weechat slack
+* dev-python/websocket-client
+
+* app-misc/tree
+
+

sets/development.conf

@@ -1,27 +1,27 @@
 # exherbo
 * app-vim/exheres-syntax
-#* app-emacs/exheres-mode
-#* dev-util/exherbo-cabal
 
 # haskell
-* dev-haskell/Cabal
-* dev-haskell/cabal-install
-* dev-lang/ghc
-* dev-haskell/haddock
+* dev-lang/GHC:8.6.5
+* dev-haskell/cabal-install-bin
 
 # VCSes and VCS-tools
 * dev-scm/mercurial
 * dev-util/tig
+* dev-scm/git-imerge
+* dev-scm/git-interactive-rebase-tool
 
 # C
-* dev-util/cloc
-* dev-util/cunit
-* dev-util/nemiver
-* dev-util/splint
 * app-doc/doxygen
-* media-gfx/graphviz
 * dev-util/astyle
+* dev-util/cflow
+* dev-util/cloc
+* dev-util/cppcheck
+* dev-util/cunit
+* dev-util/splint
 * dev-util/valgrind
+* media-gfx/graphviz
+* sys-devel/gdb
 
 # GTK
 * dev-util/glade
@@ -49,30 +49,19 @@
 * app-doc/doxygen
 * media-gfx/graphviz
 
-# java
-* virtual/jdk
-
 # font
 * fonts/FiraCode
 
 # rust
 * dev-lang/rust:stable
 * dev-lang/rust:nightly
-
-# scala
-* dev-lang/scala-bin
-* dev-scala/sbt
-
-# erlang
-* dev-erlang/rebar
-* dev-lang/erlang
-
-# leksah
-#* net-libs/webkit:3.0
+# cargo seems to link against it, wtf
+* dev-libs/libunwind
+* dev-util/rusty-tags
 
 # js
 * dev-lang/node
-
+* dev-node/yarn
 
 # java
 * virtual/jdk
@@ -80,26 +69,54 @@
 # font
 * fonts/FiraCode
 
-# fstar
-* dev-lang/fstar
-* dev-lang/fsharp
-
 # python
 * dev-lang/python:2.7
 * dev-lang/python:3.6
 * dev-lang/python
 * dev-lang/coconut
 * dev-python/mypy
+* dev-python/flake8
+* dev-python/pylint
+* dev-python/autopep8
+* dev-python/pep8
+* dev-util/jedi
+* app-editors/python-language-server
 
 # databases
 * dev-db/mysql-workbench
-* dev-db/mysql
+* virtual/mysql
 * dev-db/pgmodeler
 * dev-db/postgresql
 
-# clojure
-* dev-lang/clojure
-
 # others
-* dev-lang/elixir
 * dev-lang/openjdk8
+
+# vim
+* app-editors/gvim
+* app-editors/vim
+# * app-editors/vint # TODO: broken
+* app-editors/efm-langserver
+
+# neovim
+#* app-editors/neovim
+#* dev-python/neovim-python
+#* dev-ruby/neovim-ruby
+#* app-editors/neovim-gtk
+
+* dev-util/the_silver_searcher
+
+* sys-apps/fd
+* app-text/jq
+
+# IDEs
+* app-editors/vscode-bin
+ 
+* dev-util/universal-ctags
+
+
+# vim
+* app-editors/vint
+
+* dev-util/gitui
+
+* db/sqlitebrowser

sets/emulation.conf

@@ -1,6 +1,5 @@
 * app-emulation/dosbox
 * app-emulation/wine
 * app-virtualization/moby
-* app-virtualization/docker-compose
 * app-virtualization/virtualbox-bin
 * sys-process/ctop

sets/games-proprietary.conf

@@ -1,3 +1,2 @@
-* games-roguelike/FTL
+#* games-roguelike/FTL
 * games-rpg/pillars-of-eternity
-

sets/games.conf

@@ -1,42 +1,23 @@
-* games-action/supertuxkart
-* games-action/trosh
-* games-arcade/Commander-Genius
 * games-board/awale
-* games-board/capicity
 * games-board/pioneers
 * games-board/pysolfc
-* games-emulation/gambatte
 * games-engines/openmw
 * games-engines/renpy
-* games-engines/renpy:6.99
 * games-roguelike/dungeon-crawl-stone-soup
-* games-roguelike/tome4
 * games-rpg/arx-libertatis
-* games-rpg/flare
 * games-rpg/gemrb
 * games-rpg/sumwars
-* games-rpg/valyriatear
-* games-rpg/zsdx
-* games-rpg/zsxd
 * games-simulation/minetest
 * games-strategy/0ad
 * games-strategy/dunelegacy
-* games-strategy/freeciv
-* games-strategy/freecol
-* games-strategy/freeorion
-* games-strategy/freeserf
 * games-strategy/freesynd
 * games-strategy/ja2-stracciatella
 * games-strategy/openra:release
-* games-strategy/openra:playtest
 * games-strategy/s25rttr
 
 * games-action/teeworlds
-* games-engines/OpenJK
-* games-puzzle/larry
-* games-rpg/freedink
-* games-rpg/punch-club
-* games-rpg/zelda-roth-se
-* games-strategy/wargus
-* games-strategy/wesnoth
 * games-strategy/zod-engine
+
+# peter
+* games-rpg/exult
+

sets/laptop.conf

@@ -1,11 +1,20 @@
 # laptop specific stuff
 
 * firmware/linux-firmware
-* x11-apps/gsynaptics
 * x11-misc/cbatticon
 
 # networkmanager
 * net-apps/NetworkManager
 * net-apps/NetworkManager-openvpn
 * net-apps/NetworkManager-vpnc
-* net-misc/NetworkManager-openconnect
+# * net-misc/NetworkManager-openconnect # broken dep
+
+# crypt
+* sys-fs/cryptsetup
+
+# input
+* sys-libs/libinput
+* x11-drivers/xf86-input-libinput
+
+* x11-drivers/xf86-video-intel
+* x11-drivers/intel-driver

sets/mysystem.conf

@@ -1,3 +1,4 @@
+* sys-apps/evrouter
 * app-admin/ktsuss
 * app-admin/sudo
 * app-admin/verynice
@@ -55,3 +56,13 @@
 
 * net-fs/davfs2
 * sys-apps/usbutils
+
+# X seems to link against it
+* dev-libs/libbsd
+
+* sys-apps/earlyoom
+
+* monitor/s-tui
+* sys-apps/man-db
+
+* sys-apps/dmidecode

sets/networking.conf

@@ -3,8 +3,7 @@
 * net-analyzer/traceroute
 * net-analyzer/wireshark
 * net-firewall/iptables
-* net-fs/samba
-* net-mail/swaks
+#* net-fs/samba
 * net-misc/iputils
 * net-scanner/nmap
 * sys-apps/net-tools
@@ -16,7 +15,7 @@
 * net-dns/bind-tools
 
 * net-wireless/bluez-firmware
-* firmware/intel-bluetooth
+* firmware/linux-firmware
 * net-wireless/wireless_tools
 
 # tor

sets/non-laptop.conf

@@ -1,19 +1,3 @@
-* games-action/openclonk
-* games-arcade/duckmarines
-* games-arcade/hawkthorne-journey
-* games-arcade/mari0
-* games-arcade/mrrescue
-* games-arcade/notpacman
-* games-arcade/nottetris2
-* games-arcade/opensonic
-* games-arcade/orthorobot
-* games-engines/stratagus
-* games-fps/eduke32
-* games-fps/sauerbraten
-* games-fps/urbanterror
-* games-fps/warsow
-* games-fps/xonotic
-
 * net-misc/dhcpcd
 * net-misc/netifrc
 * sys-apps/ethtool

sets/themes-and-icons.conf

@@ -1,8 +1,10 @@
 * fonts/font-bitstream-100dpi
 * fonts/font-bitstream-75dpi
+* fonts/google-web-fonts
 * fonts/liberation-fonts
+* fonts/noto
 * x11-themes/clearlooks-phenix
 * x11-themes/hicolor-icon-theme
-* x11-themes/human-icon-theme
+* x11-themes/papirus-icon-theme
 * x11-themes/tango-icon-theme
 * xfce-base/xfce4-icon-theme

sets/wayland.conf

@@ -0,0 +1,3 @@
+* compositor/sway
+* x11-apps/xkeyboard-config
+* wayland-apps/Waybar

sets/xfce-set.conf

@@ -18,3 +18,6 @@
 * xfce-extra/xfce4-screenshooter
 * xfce-extra/xfce4-pulseaudio-plugin
 * xfce-extra/xfce4-notifyd
+
+# peter
+* xfce-extra/xfce4-whiskermenu-plugin

suggestions.conf

@@ -0,0 +1,2 @@
+# sys-apps/coreutils[acl] causes paludis errors
+sys-apps/acl -sys-apps/coreutils