From 03f672e9703d1fcfc4815b98d7dc119a2351215f Mon Sep 17 00:00:00 2001
From: Wolfgang Müller
Date: Wed, 1 May 2019 00:48:34 +0200
Subject: Include full role name in the file names

The name is now comprised of the full role name along with its order
number. This is more consistent overall, and makes it easier at a glance
to see which role a file is from.
---
 app-atom/package.accept_keywords/30-app-atom       |  5 +++
 app-atom/package.accept_keywords/30-atom           |  5 ---
 app-atom/package.use/30-app-atom                   |  8 ++++
 app-atom/package.use/30-atom                       |  8 ----
 app-gandi/package.accept_keywords/30-app-gandi     |  1 +
 app-gandi/package.accept_keywords/30-gandi         |  1 -
 app-mozilla/package.accept_keywords/30-app-mozilla | 15 ++++++++
 app-mozilla/package.accept_keywords/30-mozilla     | 15 --------
 app-mozilla/package.use/30-app-mozilla             |  7 ++++
 app-mozilla/package.use/30-mozilla                 |  7 ----
 .../package.accept_keywords/30-app-openssl-1.1     |  6 +++
 .../package.accept_keywords/30-openssl-1.1         |  6 ---
 app-openssl-1.1/package.unmask/30-app-openssl-1.1  |  1 +
 app-openssl-1.1/package.unmask/30-openssl-1.1      |  1 -
 app-signal/package.accept_keywords/30-app-signal   |  1 +
 app-signal/package.accept_keywords/30-signal       |  1 -
 app-signal/package.use/30-app-signal               |  1 +
 app-signal/package.use/30-signal                   |  1 -
 .../package.accept_keywords/80-dev-weltschmerz     |  2 +
 .../package.accept_keywords/80-weltschmerz         |  2 -
 dev-weltschmerz/package.use/80-dev-weltschmerz     |  2 +
 dev-weltschmerz/package.use/80-weltschmerz         |  2 -
 group-base/package.accept_keywords/00-base         | 42 --------------------
 group-base/package.accept_keywords/00-group-base   | 42 ++++++++++++++++++++
 group-base/package.use/00-base                     | 41 --------------------
 group-base/package.use/00-group-base               | 41 ++++++++++++++++++++
 group-desktop/package.accept_keywords/01-desktop   |  7 ----
 .../package.accept_keywords/01-group-desktop       |  7 ++++
 group-desktop/package.use/01-desktop               | 45 ----------------------
 group-desktop/package.use/01-group-desktop         | 45 ++++++++++++++++++++++
 group-musl/package.accept_keywords/02-group-musl   |  4 ++
 group-musl/package.accept_keywords/02-musl         |  4 --
 group-musl/package.mask/02-group-musl              |  1 +
 group-musl/package.mask/02-musl                    |  1 -
 host-coleridge/package.use/90-coleridge            |  5 ---
 host-coleridge/package.use/90-host-coleridge       |  5 +++
 .../package.accept_keywords/90-host-tithonus       |  2 +
 host-tithonus/package.accept_keywords/90-tithonus  |  2 -
 host-tithonus/package.use/90-host-tithonus         |  4 ++
 host-tithonus/package.use/90-tithonus              |  4 --
 lang-dlang/package.use/10-dlang                    |  2 -
 lang-dlang/package.use/10-lang-dlang               |  2 +
 lang-java/package.license/10-java                  |  1 -
 lang-java/package.license/10-lang-java             |  1 +
 lang-rust/package.accept_keywords/10-lang-rust     |  3 ++
 lang-rust/package.accept_keywords/10-rust          |  3 --
 service-guix/package.accept_keywords/20-guix       |  7 ----
 .../package.accept_keywords/20-service-guix        |  7 ++++
 service-guix/package.use/20-guix                   |  2 -
 service-guix/package.use/20-service-guix           |  2 +
 service-mail/package.accept_keywords/20-mail       |  1 -
 .../package.accept_keywords/20-service-mail        |  1 +
 service-mail/package.use/20-mail                   |  5 ---
 service-mail/package.use/20-service-mail           |  5 +++
 .../package.accept_keywords/20-quasselcore         |  2 -
 .../package.accept_keywords/20-service-quasselcore |  2 +
 service-quasselcore/package.use/20-quasselcore     |  3 --
 .../package.use/20-service-quasselcore             |  3 ++
 service-samba/package.accept_keywords/20-samba     |  7 ----
 .../package.accept_keywords/20-service-samba       |  7 ++++
 service-samba/package.use/20-samba                 |  5 ---
 service-samba/package.use/20-service-samba         |  5 +++
 62 files changed, 238 insertions(+), 238 deletions(-)
 create mode 100644 app-atom/package.accept_keywords/30-app-atom
 delete mode 100644 app-atom/package.accept_keywords/30-atom
 create mode 100644 app-atom/package.use/30-app-atom
 delete mode 100644 app-atom/package.use/30-atom
 create mode 100644 app-gandi/package.accept_keywords/30-app-gandi
 delete mode 100644 app-gandi/package.accept_keywords/30-gandi
 create mode 100644 app-mozilla/package.accept_keywords/30-app-mozilla
 delete mode 100644 app-mozilla/package.accept_keywords/30-mozilla
 create mode 100644 app-mozilla/package.use/30-app-mozilla
 delete mode 100644 app-mozilla/package.use/30-mozilla
 create mode 100644 app-openssl-1.1/package.accept_keywords/30-app-openssl-1.1
 delete mode 100644 app-openssl-1.1/package.accept_keywords/30-openssl-1.1
 create mode 100644 app-openssl-1.1/package.unmask/30-app-openssl-1.1
 delete mode 100644 app-openssl-1.1/package.unmask/30-openssl-1.1
 create mode 100644 app-signal/package.accept_keywords/30-app-signal
 delete mode 100644 app-signal/package.accept_keywords/30-signal
 create mode 100644 app-signal/package.use/30-app-signal
 delete mode 100644 app-signal/package.use/30-signal
 create mode 100644 dev-weltschmerz/package.accept_keywords/80-dev-weltschmerz
 delete mode 100644 dev-weltschmerz/package.accept_keywords/80-weltschmerz
 create mode 100644 dev-weltschmerz/package.use/80-dev-weltschmerz
 delete mode 100644 dev-weltschmerz/package.use/80-weltschmerz
 delete mode 100644 group-base/package.accept_keywords/00-base
 create mode 100644 group-base/package.accept_keywords/00-group-base
 delete mode 100644 group-base/package.use/00-base
 create mode 100644 group-base/package.use/00-group-base
 delete mode 100644 group-desktop/package.accept_keywords/01-desktop
 create mode 100644 group-desktop/package.accept_keywords/01-group-desktop
 delete mode 100644 group-desktop/package.use/01-desktop
 create mode 100644 group-desktop/package.use/01-group-desktop
 create mode 100644 group-musl/package.accept_keywords/02-group-musl
 delete mode 100644 group-musl/package.accept_keywords/02-musl
 create mode 100644 group-musl/package.mask/02-group-musl
 delete mode 100644 group-musl/package.mask/02-musl
 delete mode 100644 host-coleridge/package.use/90-coleridge
 create mode 100644 host-coleridge/package.use/90-host-coleridge
 create mode 100644 host-tithonus/package.accept_keywords/90-host-tithonus
 delete mode 100644 host-tithonus/package.accept_keywords/90-tithonus
 create mode 100644 host-tithonus/package.use/90-host-tithonus
 delete mode 100644 host-tithonus/package.use/90-tithonus
 delete mode 100644 lang-dlang/package.use/10-dlang
 create mode 100644 lang-dlang/package.use/10-lang-dlang
 delete mode 100644 lang-java/package.license/10-java
 create mode 100644 lang-java/package.license/10-lang-java
 create mode 100644 lang-rust/package.accept_keywords/10-lang-rust
 delete mode 100644 lang-rust/package.accept_keywords/10-rust
 delete mode 100644 service-guix/package.accept_keywords/20-guix
 create mode 100644 service-guix/package.accept_keywords/20-service-guix
 delete mode 100644 service-guix/package.use/20-guix
 create mode 100644 service-guix/package.use/20-service-guix
 delete mode 100644 service-mail/package.accept_keywords/20-mail
 create mode 100644 service-mail/package.accept_keywords/20-service-mail
 delete mode 100644 service-mail/package.use/20-mail
 create mode 100644 service-mail/package.use/20-service-mail
 delete mode 100644 service-quasselcore/package.accept_keywords/20-quasselcore
 create mode 100644 service-quasselcore/package.accept_keywords/20-service-quasselcore
 delete mode 100644 service-quasselcore/package.use/20-quasselcore
 create mode 100644 service-quasselcore/package.use/20-service-quasselcore
 delete mode 100644 service-samba/package.accept_keywords/20-samba
 create mode 100644 service-samba/package.accept_keywords/20-service-samba
 delete mode 100644 service-samba/package.use/20-samba
 create mode 100644 service-samba/package.use/20-service-samba

diff --git a/app-atom/package.accept_keywords/30-app-atom b/app-atom/package.accept_keywords/30-app-atom
new file mode 100644
index 0000000..64ab2ec
--- /dev/null
+++ b/app-atom/package.accept_keywords/30-app-atom
@@ -0,0 +1,5 @@
+app-editors/atom
+
+app-eselect/eselect-electron
+dev-util/electron
+media-libs/libvpx
diff --git a/app-atom/package.accept_keywords/30-atom b/app-atom/package.accept_keywords/30-atom
deleted file mode 100644
index 64ab2ec..0000000
--- a/app-atom/package.accept_keywords/30-atom
+++ /dev/null
@@ -1,5 +0,0 @@
-app-editors/atom
-
-app-eselect/eselect-electron
-dev-util/electron
-media-libs/libvpx
diff --git a/app-atom/package.use/30-app-atom b/app-atom/package.use/30-app-atom
new file mode 100644
index 0000000..5998957
--- /dev/null
+++ b/app-atom/package.use/30-app-atom
@@ -0,0 +1,8 @@
+app-crypt/gcr gtk
+app-crypt/pinentry gnome-keyring
+dev-libs/libpcre2 jit
+dev-libs/libxml2 icu
+dev-util/electron -system-ffmpeg
+media-libs/harfbuzz icu
+media-libs/libvpx svc
+sys-libs/zlib minizip
diff --git a/app-atom/package.use/30-atom b/app-atom/package.use/30-atom
deleted file mode 100644
index 5998957..0000000
--- a/app-atom/package.use/30-atom
+++ /dev/null
@@ -1,8 +0,0 @@
-app-crypt/gcr gtk
-app-crypt/pinentry gnome-keyring
-dev-libs/libpcre2 jit
-dev-libs/libxml2 icu
-dev-util/electron -system-ffmpeg
-media-libs/harfbuzz icu
-media-libs/libvpx svc
-sys-libs/zlib minizip
diff --git a/app-gandi/package.accept_keywords/30-app-gandi b/app-gandi/package.accept_keywords/30-app-gandi
new file mode 100644
index 0000000..fdb4f88
--- /dev/null
+++ b/app-gandi/package.accept_keywords/30-app-gandi
@@ -0,0 +1 @@
+dev-python/click
diff --git a/app-gandi/package.accept_keywords/30-gandi b/app-gandi/package.accept_keywords/30-gandi
deleted file mode 100644
index fdb4f88..0000000
--- a/app-gandi/package.accept_keywords/30-gandi
+++ /dev/null
@@ -1 +0,0 @@
-dev-python/click
diff --git a/app-mozilla/package.accept_keywords/30-app-mozilla b/app-mozilla/package.accept_keywords/30-app-mozilla
new file mode 100644
index 0000000..2d32fa2
--- /dev/null
+++ b/app-mozilla/package.accept_keywords/30-app-mozilla
@@ -0,0 +1,15 @@
+mail-client/thunderbird
+www-client/firefox
+
+<media-libs/libvpx-1.8
+dev-db/sqlite
+dev-lang/rust-bin
+dev-libs/nspr
+dev-libs/nss
+dev-util/cbindgen
+media-libs/dav1d
+media-libs/libaom
+media-libs/libpng
+media-libs/libwebp
+virtual/cargo
+virtual/rust
diff --git a/app-mozilla/package.accept_keywords/30-mozilla b/app-mozilla/package.accept_keywords/30-mozilla
deleted file mode 100644
index 2d32fa2..0000000
--- a/app-mozilla/package.accept_keywords/30-mozilla
+++ /dev/null
@@ -1,15 +0,0 @@
-mail-client/thunderbird
-www-client/firefox
-
-<media-libs/libvpx-1.8
-dev-db/sqlite
-dev-lang/rust-bin
-dev-libs/nspr
-dev-libs/nss
-dev-util/cbindgen
-media-libs/dav1d
-media-libs/libaom
-media-libs/libpng
-media-libs/libwebp
-virtual/cargo
-virtual/rust
diff --git a/app-mozilla/package.use/30-app-mozilla b/app-mozilla/package.use/30-app-mozilla
new file mode 100644
index 0000000..74e96da
--- /dev/null
+++ b/app-mozilla/package.use/30-app-mozilla
@@ -0,0 +1,7 @@
+mail-client/thunderbird system-jpeg system-libvpx system-harfbuzz system-libevent system-sqlite system-icu
+www-client/firefox system-jpeg system-libvpx system-harfbuzz system-libevent system-sqlite system-icu
+
+dev-db/sqlite secure-delete
+dev-lang/python sqlite
+media-libs/libpng apng
+media-libs/libvpx postproc
diff --git a/app-mozilla/package.use/30-mozilla b/app-mozilla/package.use/30-mozilla
deleted file mode 100644
index 74e96da..0000000
--- a/app-mozilla/package.use/30-mozilla
+++ /dev/null
@@ -1,7 +0,0 @@
-mail-client/thunderbird system-jpeg system-libvpx system-harfbuzz system-libevent system-sqlite system-icu
-www-client/firefox system-jpeg system-libvpx system-harfbuzz system-libevent system-sqlite system-icu
-
-dev-db/sqlite secure-delete
-dev-lang/python sqlite
-media-libs/libpng apng
-media-libs/libvpx postproc
diff --git a/app-openssl-1.1/package.accept_keywords/30-app-openssl-1.1 b/app-openssl-1.1/package.accept_keywords/30-app-openssl-1.1
new file mode 100644
index 0000000..db74c2d
--- /dev/null
+++ b/app-openssl-1.1/package.accept_keywords/30-app-openssl-1.1
@@ -0,0 +1,6 @@
+dev-libs/openssl **
+
+dev-libs/cyrus-sasl
+media-libs/libshout
+net-misc/openssh
+www-client/elinks
diff --git a/app-openssl-1.1/package.accept_keywords/30-openssl-1.1 b/app-openssl-1.1/package.accept_keywords/30-openssl-1.1
deleted file mode 100644
index db74c2d..0000000
--- a/app-openssl-1.1/package.accept_keywords/30-openssl-1.1
+++ /dev/null
@@ -1,6 +0,0 @@
-dev-libs/openssl **
-
-dev-libs/cyrus-sasl
-media-libs/libshout
-net-misc/openssh
-www-client/elinks
diff --git a/app-openssl-1.1/package.unmask/30-app-openssl-1.1 b/app-openssl-1.1/package.unmask/30-app-openssl-1.1
new file mode 100644
index 0000000..5b5c1d1
--- /dev/null
+++ b/app-openssl-1.1/package.unmask/30-app-openssl-1.1
@@ -0,0 +1 @@
+dev-libs/openssl
diff --git a/app-openssl-1.1/package.unmask/30-openssl-1.1 b/app-openssl-1.1/package.unmask/30-openssl-1.1
deleted file mode 100644
index 5b5c1d1..0000000
--- a/app-openssl-1.1/package.unmask/30-openssl-1.1
+++ /dev/null
@@ -1 +0,0 @@
-dev-libs/openssl
diff --git a/app-signal/package.accept_keywords/30-app-signal b/app-signal/package.accept_keywords/30-app-signal
new file mode 100644
index 0000000..bd33048
--- /dev/null
+++ b/app-signal/package.accept_keywords/30-app-signal
@@ -0,0 +1 @@
+net-im/signal-desktop-bin
diff --git a/app-signal/package.accept_keywords/30-signal b/app-signal/package.accept_keywords/30-signal
deleted file mode 100644
index bd33048..0000000
--- a/app-signal/package.accept_keywords/30-signal
+++ /dev/null
@@ -1 +0,0 @@
-net-im/signal-desktop-bin
diff --git a/app-signal/package.use/30-app-signal b/app-signal/package.use/30-app-signal
new file mode 100644
index 0000000..53a5b85
--- /dev/null
+++ b/app-signal/package.use/30-app-signal
@@ -0,0 +1 @@
+app-text/ghostscript-gpl cups
diff --git a/app-signal/package.use/30-signal b/app-signal/package.use/30-signal
deleted file mode 100644
index 53a5b85..0000000
--- a/app-signal/package.use/30-signal
+++ /dev/null
@@ -1 +0,0 @@
-app-text/ghostscript-gpl cups
diff --git a/dev-weltschmerz/package.accept_keywords/80-dev-weltschmerz b/dev-weltschmerz/package.accept_keywords/80-dev-weltschmerz
new file mode 100644
index 0000000..2e4d5a3
--- /dev/null
+++ b/dev-weltschmerz/package.accept_keywords/80-dev-weltschmerz
@@ -0,0 +1,2 @@
+dev-lang/vala
+dev-libs/vala-common
diff --git a/dev-weltschmerz/package.accept_keywords/80-weltschmerz b/dev-weltschmerz/package.accept_keywords/80-weltschmerz
deleted file mode 100644
index 2e4d5a3..0000000
--- a/dev-weltschmerz/package.accept_keywords/80-weltschmerz
+++ /dev/null
@@ -1,2 +0,0 @@
-dev-lang/vala
-dev-libs/vala-common
diff --git a/dev-weltschmerz/package.use/80-dev-weltschmerz b/dev-weltschmerz/package.use/80-dev-weltschmerz
new file mode 100644
index 0000000..f4ebe67
--- /dev/null
+++ b/dev-weltschmerz/package.use/80-dev-weltschmerz
@@ -0,0 +1,2 @@
+dev-lang/vala valadoc
+x11-libs/vte glade
diff --git a/dev-weltschmerz/package.use/80-weltschmerz b/dev-weltschmerz/package.use/80-weltschmerz
deleted file mode 100644
index f4ebe67..0000000
--- a/dev-weltschmerz/package.use/80-weltschmerz
+++ /dev/null
@@ -1,2 +0,0 @@
-dev-lang/vala valadoc
-x11-libs/vte glade
diff --git a/group-base/package.accept_keywords/00-base b/group-base/package.accept_keywords/00-base
deleted file mode 100644
index f304cb9..0000000
--- a/group-base/package.accept_keywords/00-base
+++ /dev/null
@@ -1,42 +0,0 @@
-app-editors/vis **
-
-app-admin/entr
-app-admin/stow
-app-backup/restic
-app-crypt/signify
-app-editors/neovim
-app-editors/vim
-app-editors/vim-core
-app-misc/ranger
-app-misc/tmux
-app-portage/portage-utils
-app-portage/rolectl
-app-shells/fish
-app-shells/mksh
-app-text/manpager
-app-text/par
-dev-java/gradle-bin
-dev-util/radare2
-dev-vcs/git
-media-gfx/maim
-media-libs/mutagen
-media-sound/abcde
-media-sound/mpd
-media-video/ffmpeg
-media-video/mpv
-net-irc/weechat
-net-irc/znc
-net-misc/chrony
-net-misc/youtube-dl
-sys-apps/ed
-sys-apps/mandoc
-sys-apps/ripgrep
-sys-devel/bmake
-sys-process/cronie
-
-# needed for neovim
-dev-libs/msgpack
-dev-libs/unibilium
-dev-python/msgpack
-dev-python/neovim-python-client
-dev-python/neovim-remote
diff --git a/group-base/package.accept_keywords/00-group-base b/group-base/package.accept_keywords/00-group-base
new file mode 100644
index 0000000..f304cb9
--- /dev/null
+++ b/group-base/package.accept_keywords/00-group-base
@@ -0,0 +1,42 @@
+app-editors/vis **
+
+app-admin/entr
+app-admin/stow
+app-backup/restic
+app-crypt/signify
+app-editors/neovim
+app-editors/vim
+app-editors/vim-core
+app-misc/ranger
+app-misc/tmux
+app-portage/portage-utils
+app-portage/rolectl
+app-shells/fish
+app-shells/mksh
+app-text/manpager
+app-text/par
+dev-java/gradle-bin
+dev-util/radare2
+dev-vcs/git
+media-gfx/maim
+media-libs/mutagen
+media-sound/abcde
+media-sound/mpd
+media-video/ffmpeg
+media-video/mpv
+net-irc/weechat
+net-irc/znc
+net-misc/chrony
+net-misc/youtube-dl
+sys-apps/ed
+sys-apps/mandoc
+sys-apps/ripgrep
+sys-devel/bmake
+sys-process/cronie
+
+# needed for neovim
+dev-libs/msgpack
+dev-libs/unibilium
+dev-python/msgpack
+dev-python/neovim-python-client
+dev-python/neovim-remote
diff --git a/group-base/package.use/00-base b/group-base/package.use/00-base
deleted file mode 100644
index 5f29589..0000000
--- a/group-base/package.use/00-base
+++ /dev/null
@@ -1,41 +0,0 @@
-*/* acl
-*/* logrotate
-*/* threads
-*/* iproute2
-
-*/* -alsa
-*/* -bindist
-*/* -bluetooth
-*/* -branding
-*/* -consolekit
-*/* -cups
-*/* -dbus
-*/* -ldap
-*/* -policy-kit
-*/* -spell
-*/* -systemd
-
-app-crypt/gnupg -smartcard
-app-editors/neovim -clipboard -nvimpager python
-app-editors/vis tre
-mail-client/mutt imap sasl smtp gpgme -smime
-media-sound/abcde cdr cdparanoia -vorbis -id3tag -lame
-media-sound/mpd inotify opus vorbis -cue -curl -fifo -flac -mad -zlib
-media-sound/ncmpcpp taglib
-media-video/ffmpeg mp3 openssl opus theora vorbis vpx x264 x265 FFTOOLS: -*
-net-analyzer/nmap ncat nping
-net-misc/chrony caps
-net-misc/youtube-dl offensive
-sys-apps/busybox -savedconfig
-sys-kernel/linux-firmware savedconfig
-
-# needed for ncmpcpp
-dev-libs/boost icu
-
-# needed for qtcore & fish
-dev-libs/libpcre2 pcre16 pcre32
-dev-libs/libpcre pcre16 pcre32
-
-# needed for neovim
-dev-lua/lpeg luajit
-dev-lua/mpack luajit
diff --git a/group-base/package.use/00-group-base b/group-base/package.use/00-group-base
new file mode 100644
index 0000000..5f29589
--- /dev/null
+++ b/group-base/package.use/00-group-base
@@ -0,0 +1,41 @@
+*/* acl
+*/* logrotate
+*/* threads
+*/* iproute2
+
+*/* -alsa
+*/* -bindist
+*/* -bluetooth
+*/* -branding
+*/* -consolekit
+*/* -cups
+*/* -dbus
+*/* -ldap
+*/* -policy-kit
+*/* -spell
+*/* -systemd
+
+app-crypt/gnupg -smartcard
+app-editors/neovim -clipboard -nvimpager python
+app-editors/vis tre
+mail-client/mutt imap sasl smtp gpgme -smime
+media-sound/abcde cdr cdparanoia -vorbis -id3tag -lame
+media-sound/mpd inotify opus vorbis -cue -curl -fifo -flac -mad -zlib
+media-sound/ncmpcpp taglib
+media-video/ffmpeg mp3 openssl opus theora vorbis vpx x264 x265 FFTOOLS: -*
+net-analyzer/nmap ncat nping
+net-misc/chrony caps
+net-misc/youtube-dl offensive
+sys-apps/busybox -savedconfig
+sys-kernel/linux-firmware savedconfig
+
+# needed for ncmpcpp
+dev-libs/boost icu
+
+# needed for qtcore & fish
+dev-libs/libpcre2 pcre16 pcre32
+dev-libs/libpcre pcre16 pcre32
+
+# needed for neovim
+dev-lua/lpeg luajit
+dev-lua/mpack luajit
diff --git a/group-desktop/package.accept_keywords/01-desktop b/group-desktop/package.accept_keywords/01-desktop
deleted file mode 100644
index 027e66d..0000000
--- a/group-desktop/package.accept_keywords/01-desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-media-gfx/maim
-media-libs/nv-codec-headers
-net-irc/quassel
-x11-drivers/nvidia-drivers
-x11-libs/cairo
-x11-libs/vte
-x11-misc/slop
diff --git a/group-desktop/package.accept_keywords/01-group-desktop b/group-desktop/package.accept_keywords/01-group-desktop
new file mode 100644
index 0000000..027e66d
--- /dev/null
+++ b/group-desktop/package.accept_keywords/01-group-desktop
@@ -0,0 +1,7 @@
+media-gfx/maim
+media-libs/nv-codec-headers
+net-irc/quassel
+x11-drivers/nvidia-drivers
+x11-libs/cairo
+x11-libs/vte
+x11-misc/slop
diff --git a/group-desktop/package.use/01-desktop b/group-desktop/package.use/01-desktop
deleted file mode 100644
index 5399370..0000000
--- a/group-desktop/package.use/01-desktop
+++ /dev/null
@@ -1,45 +0,0 @@
-*/* alsa
-*/* dri
-*/* exif
-*/* flac
-*/* gif
-*/* gpm
-*/* jpeg
-*/* ogg
-*/* opengl
-*/* pdf
-*/* png
-*/* sdl
-*/* truetype
-*/* udev
-*/* vorbis
-*/* X
-*/* x264
-*/* xcb
-*/* xinerama
-*/* xkb
-
-app-crypt/pinentry gtk
-app-editors/neovim clipboard
-media-fonts/terminus-font -pcf-unicode-only
-media-gfx/sxiv savedconfig
-media-video/mpv -enca -encode -jpeg -lcms -mpg123 -xscreensaver -xv vaapi cli lua
-net-analyzer/wireshark adns lua nghttp2 smi sshdump tfshark
-net-irc/quassel -crypt -server bundled-icons dbus
-net-p2p/transmission gtk
-net-p2p/transmission-remote-gtk libnotify
-x11-drivers/nvidia-drivers -multilib -abi_x86_32
-x11-misc/lightdm -gnome
-
-# needed for qemu
-media-libs/mesa gles2
-
-# needed for xdg-open
-app-text/xmlto text
-
-# needed for zathura
-app-text/poppler cairo
-dev-libs/libxml2 python
-
-# needed for weltschmerz
-x11-libs/vte vala vanilla
diff --git a/group-desktop/package.use/01-group-desktop b/group-desktop/package.use/01-group-desktop
new file mode 100644
index 0000000..5399370
--- /dev/null
+++ b/group-desktop/package.use/01-group-desktop
@@ -0,0 +1,45 @@
+*/* alsa
+*/* dri
+*/* exif
+*/* flac
+*/* gif
+*/* gpm
+*/* jpeg
+*/* ogg
+*/* opengl
+*/* pdf
+*/* png
+*/* sdl
+*/* truetype
+*/* udev
+*/* vorbis
+*/* X
+*/* x264
+*/* xcb
+*/* xinerama
+*/* xkb
+
+app-crypt/pinentry gtk
+app-editors/neovim clipboard
+media-fonts/terminus-font -pcf-unicode-only
+media-gfx/sxiv savedconfig
+media-video/mpv -enca -encode -jpeg -lcms -mpg123 -xscreensaver -xv vaapi cli lua
+net-analyzer/wireshark adns lua nghttp2 smi sshdump tfshark
+net-irc/quassel -crypt -server bundled-icons dbus
+net-p2p/transmission gtk
+net-p2p/transmission-remote-gtk libnotify
+x11-drivers/nvidia-drivers -multilib -abi_x86_32
+x11-misc/lightdm -gnome
+
+# needed for qemu
+media-libs/mesa gles2
+
+# needed for xdg-open
+app-text/xmlto text
+
+# needed for zathura
+app-text/poppler cairo
+dev-libs/libxml2 python
+
+# needed for weltschmerz
+x11-libs/vte vala vanilla
diff --git a/group-musl/package.accept_keywords/02-group-musl b/group-musl/package.accept_keywords/02-group-musl
new file mode 100644
index 0000000..a71d122
--- /dev/null
+++ b/group-musl/package.accept_keywords/02-group-musl
@@ -0,0 +1,4 @@
+dev-libs/icu
+net-analyzer/mtr
+net-dns/libidn2
+sys-apps/smartmontools
diff --git a/group-musl/package.accept_keywords/02-musl b/group-musl/package.accept_keywords/02-musl
deleted file mode 100644
index a71d122..0000000
--- a/group-musl/package.accept_keywords/02-musl
+++ /dev/null
@@ -1,4 +0,0 @@
-dev-libs/icu
-net-analyzer/mtr
-net-dns/libidn2
-sys-apps/smartmontools
diff --git a/group-musl/package.mask/02-group-musl b/group-musl/package.mask/02-group-musl
new file mode 100644
index 0000000..dd302c5
--- /dev/null
+++ b/group-musl/package.mask/02-group-musl
@@ -0,0 +1 @@
+=net-misc/rsync-3.1.3::gentoo
diff --git a/group-musl/package.mask/02-musl b/group-musl/package.mask/02-musl
deleted file mode 100644
index dd302c5..0000000
--- a/group-musl/package.mask/02-musl
+++ /dev/null
@@ -1 +0,0 @@
-=net-misc/rsync-3.1.3::gentoo
diff --git a/host-coleridge/package.use/90-coleridge b/host-coleridge/package.use/90-coleridge
deleted file mode 100644
index bb9942b..0000000
--- a/host-coleridge/package.use/90-coleridge
+++ /dev/null
@@ -1,5 +0,0 @@
-net-irc/weechat -exec -fifo -perl -relay
-sys-fs/mdadm static
-
-# musl removes cracklib default for some reason?
-sys-libs/pam cracklib
diff --git a/host-coleridge/package.use/90-host-coleridge b/host-coleridge/package.use/90-host-coleridge
new file mode 100644
index 0000000..bb9942b
--- /dev/null
+++ b/host-coleridge/package.use/90-host-coleridge
@@ -0,0 +1,5 @@
+net-irc/weechat -exec -fifo -perl -relay
+sys-fs/mdadm static
+
+# musl removes cracklib default for some reason?
+sys-libs/pam cracklib
diff --git a/host-tithonus/package.accept_keywords/90-host-tithonus b/host-tithonus/package.accept_keywords/90-host-tithonus
new file mode 100644
index 0000000..457f4a5
--- /dev/null
+++ b/host-tithonus/package.accept_keywords/90-host-tithonus
@@ -0,0 +1,2 @@
+sys-devel/gcc
+<sys-kernel/gentoo-sources-4.20.0
diff --git a/host-tithonus/package.accept_keywords/90-tithonus b/host-tithonus/package.accept_keywords/90-tithonus
deleted file mode 100644
index 457f4a5..0000000
--- a/host-tithonus/package.accept_keywords/90-tithonus
+++ /dev/null
@@ -1,2 +0,0 @@
-sys-devel/gcc
-<sys-kernel/gentoo-sources-4.20.0
diff --git a/host-tithonus/package.use/90-host-tithonus b/host-tithonus/package.use/90-host-tithonus
new file mode 100644
index 0000000..424f203
--- /dev/null
+++ b/host-tithonus/package.use/90-host-tithonus
@@ -0,0 +1,4 @@
+*/* vdpau
+*/* nvenc
+*/* cuda
+*/* uvm
diff --git a/host-tithonus/package.use/90-tithonus b/host-tithonus/package.use/90-tithonus
deleted file mode 100644
index 424f203..0000000
--- a/host-tithonus/package.use/90-tithonus
+++ /dev/null
@@ -1,4 +0,0 @@
-*/* vdpau
-*/* nvenc
-*/* cuda
-*/* uvm
diff --git a/lang-dlang/package.use/10-dlang b/lang-dlang/package.use/10-dlang
deleted file mode 100644
index 83581bc..0000000
--- a/lang-dlang/package.use/10-dlang
+++ /dev/null
@@ -1,2 +0,0 @@
-*/*::dlang dmd-2_084
-dev-lang/dmd -selfhost
diff --git a/lang-dlang/package.use/10-lang-dlang b/lang-dlang/package.use/10-lang-dlang
new file mode 100644
index 0000000..83581bc
--- /dev/null
+++ b/lang-dlang/package.use/10-lang-dlang
@@ -0,0 +1,2 @@
+*/*::dlang dmd-2_084
+dev-lang/dmd -selfhost
diff --git a/lang-java/package.license/10-java b/lang-java/package.license/10-java
deleted file mode 100644
index deaf3c8..0000000
--- a/lang-java/package.license/10-java
+++ /dev/null
@@ -1 +0,0 @@
-dev-java/oracle-jdk-bin Oracle-BCLA-JavaSE
diff --git a/lang-java/package.license/10-lang-java b/lang-java/package.license/10-lang-java
new file mode 100644
index 0000000..deaf3c8
--- /dev/null
+++ b/lang-java/package.license/10-lang-java
@@ -0,0 +1 @@
+dev-java/oracle-jdk-bin Oracle-BCLA-JavaSE
diff --git a/lang-rust/package.accept_keywords/10-lang-rust b/lang-rust/package.accept_keywords/10-lang-rust
new file mode 100644
index 0000000..c5b3037
--- /dev/null
+++ b/lang-rust/package.accept_keywords/10-lang-rust
@@ -0,0 +1,3 @@
+dev-lang/rust-bin
+virtual/cargo
+virtual/rust
diff --git a/lang-rust/package.accept_keywords/10-rust b/lang-rust/package.accept_keywords/10-rust
deleted file mode 100644
index c5b3037..0000000
--- a/lang-rust/package.accept_keywords/10-rust
+++ /dev/null
@@ -1,3 +0,0 @@
-dev-lang/rust-bin
-virtual/cargo
-virtual/rust
diff --git a/service-guix/package.accept_keywords/20-guix b/service-guix/package.accept_keywords/20-guix
deleted file mode 100644
index d3d808b..0000000
--- a/service-guix/package.accept_keywords/20-guix
+++ /dev/null
@@ -1,7 +0,0 @@
-dev-scheme/bytestructures
-dev-scheme/guile-gcrypt
-dev-scheme/guile-git
-dev-scheme/guile-json
-dev-scheme/guile-sqlite3
-
-sys-apps/guix
diff --git a/service-guix/package.accept_keywords/20-service-guix b/service-guix/package.accept_keywords/20-service-guix
new file mode 100644
index 0000000..d3d808b
--- /dev/null
+++ b/service-guix/package.accept_keywords/20-service-guix
@@ -0,0 +1,7 @@
+dev-scheme/bytestructures
+dev-scheme/guile-gcrypt
+dev-scheme/guile-git
+dev-scheme/guile-json
+dev-scheme/guile-sqlite3
+
+sys-apps/guix
diff --git a/service-guix/package.use/20-guix b/service-guix/package.use/20-guix
deleted file mode 100644
index 3bd4374..0000000
--- a/service-guix/package.use/20-guix
+++ /dev/null
@@ -1,2 +0,0 @@
-net-libs/gnutls guile
-sys-libs/glibc nscd
diff --git a/service-guix/package.use/20-service-guix b/service-guix/package.use/20-service-guix
new file mode 100644
index 0000000..3bd4374
--- /dev/null
+++ b/service-guix/package.use/20-service-guix
@@ -0,0 +1,2 @@
+net-libs/gnutls guile
+sys-libs/glibc nscd
diff --git a/service-mail/package.accept_keywords/20-mail b/service-mail/package.accept_keywords/20-mail
deleted file mode 100644
index c4d7480..0000000
--- a/service-mail/package.accept_keywords/20-mail
+++ /dev/null
@@ -1 +0,0 @@
-mail-filter/postgrey
diff --git a/service-mail/package.accept_keywords/20-service-mail b/service-mail/package.accept_keywords/20-service-mail
new file mode 100644
index 0000000..c4d7480
--- /dev/null
+++ b/service-mail/package.accept_keywords/20-service-mail
@@ -0,0 +1 @@
+mail-filter/postgrey
diff --git a/service-mail/package.use/20-mail b/service-mail/package.use/20-mail
deleted file mode 100644
index d5382ab..0000000
--- a/service-mail/package.use/20-mail
+++ /dev/null
@@ -1,5 +0,0 @@
-mail-mta/postfix berkdb dovecot-sasl
-net-mail/dovecot managesieve sieve
-
-# pulled in by postgrey, minimal reduces dep count considerably
-dev-perl/Net-DNS minimal
diff --git a/service-mail/package.use/20-service-mail b/service-mail/package.use/20-service-mail
new file mode 100644
index 0000000..d5382ab
--- /dev/null
+++ b/service-mail/package.use/20-service-mail
@@ -0,0 +1,5 @@
+mail-mta/postfix berkdb dovecot-sasl
+net-mail/dovecot managesieve sieve
+
+# pulled in by postgrey, minimal reduces dep count considerably
+dev-perl/Net-DNS minimal
diff --git a/service-quasselcore/package.accept_keywords/20-quasselcore b/service-quasselcore/package.accept_keywords/20-quasselcore
deleted file mode 100644
index 085a0dc..0000000
--- a/service-quasselcore/package.accept_keywords/20-quasselcore
+++ /dev/null
@@ -1,2 +0,0 @@
-net-irc/quassel
-net-misc/oidentd
diff --git a/service-quasselcore/package.accept_keywords/20-service-quasselcore b/service-quasselcore/package.accept_keywords/20-service-quasselcore
new file mode 100644
index 0000000..085a0dc
--- /dev/null
+++ b/service-quasselcore/package.accept_keywords/20-service-quasselcore
@@ -0,0 +1,2 @@
+net-irc/quassel
+net-misc/oidentd
diff --git a/service-quasselcore/package.use/20-quasselcore b/service-quasselcore/package.use/20-quasselcore
deleted file mode 100644
index f3a5ccb..0000000
--- a/service-quasselcore/package.use/20-quasselcore
+++ /dev/null
@@ -1,3 +0,0 @@
-net-irc/quassel postgres server syslog
-
-dev-qt/qtsql postgres
diff --git a/service-quasselcore/package.use/20-service-quasselcore b/service-quasselcore/package.use/20-service-quasselcore
new file mode 100644
index 0000000..f3a5ccb
--- /dev/null
+++ b/service-quasselcore/package.use/20-service-quasselcore
@@ -0,0 +1,3 @@
+net-irc/quassel postgres server syslog
+
+dev-qt/qtsql postgres
diff --git a/service-samba/package.accept_keywords/20-samba b/service-samba/package.accept_keywords/20-samba
deleted file mode 100644
index 531c60e..0000000
--- a/service-samba/package.accept_keywords/20-samba
+++ /dev/null
@@ -1,7 +0,0 @@
-net-fs/samba
-
-dev-util/cmocka
-sys-libs/ldb
-sys-libs/talloc
-sys-libs/tdb
-sys-libs/tevent
diff --git a/service-samba/package.accept_keywords/20-service-samba b/service-samba/package.accept_keywords/20-service-samba
new file mode 100644
index 0000000..531c60e
--- /dev/null
+++ b/service-samba/package.accept_keywords/20-service-samba
@@ -0,0 +1,7 @@
+net-fs/samba
+
+dev-util/cmocka
+sys-libs/ldb
+sys-libs/talloc
+sys-libs/tdb
+sys-libs/tevent
diff --git a/service-samba/package.use/20-samba b/service-samba/package.use/20-samba
deleted file mode 100644
index b8e744e..0000000
--- a/service-samba/package.use/20-samba
+++ /dev/null
@@ -1,5 +0,0 @@
-net-fs/samba syslog
-
-sys-libs/tdb python
-sys-libs/ntdb python
-sys-libs/tevent python
diff --git a/service-samba/package.use/20-service-samba b/service-samba/package.use/20-service-samba
new file mode 100644
index 0000000..b8e744e
--- /dev/null
+++ b/service-samba/package.use/20-service-samba
@@ -0,0 +1,5 @@
+net-fs/samba syslog
+
+sys-libs/tdb python
+sys-libs/ntdb python
+sys-libs/tevent python
-- 
cgit v1.2.3-2-gb3c3