diff --git a/Manifest.files.gz b/Manifest.files.gz
index 98db53320854..1feece489660 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 7a3af71b258b..70a182646c74 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/janet/Manifest b/dev-lang/janet/Manifest
index e49a148c18a5..92e5ffa528d5 100644
--- a/dev-lang/janet/Manifest
+++ b/dev-lang/janet/Manifest
@@ -1,2 +1,2 @@
-DIST janet-1.11.1.tar.gz 550495 BLAKE2B 4f9e6f08aeb167f3cbb0afb635e4f9f9e904ad1f0bc937d7baa101e37b1f6aa23ef56549741c2c42d9b652f5bf46121b3467aa5a5ae1a3ee02b955387ef3c5a6 SHA512 75508255bce1b3b9af30fb6de14f8dbfaf5774838e5e400a97112100e2ae6b1dfb870cf95860a7d7b500385e8e7f585e3032492cac88fa7b356443314dc7a45a
+DIST janet-1.12.2.tar.gz 558788 BLAKE2B 0cdbc33d968b0b589cfc0ccd6dd5ffffe23932daa48e67c035d67d4bba0519083503693be470498c1f6d2811b164bfbb3d2fdb35967c6bd64808ec87f1fd9770 SHA512 bde3d516b0a1c55ad8edb2dc701a3afdb5e7c2bd028b132598d1a08796aca5f17f71dd2c760192a9703a07adb3450a7af6971611ae57005eafad1b741b0b69a6
 DIST janet-1.9.1.tar.gz 995046 BLAKE2B c65f59e874690b124b61811406670ed6bf9e23d930b5206a9fefebd64629a2287076a40db885b8a820d733a353237fea65dadccdf4efdd33f1537127f67e66b1 SHA512 4024b2f5bc52338b77c954e384157234ef3cecf21142ef60158adb656396b42accae3af8acb8e54f602f5fbce0e1e1f7f29030878ef2ac7055e933dd710db879
diff --git a/dev-lang/janet/janet-1.11.1.ebuild b/dev-lang/janet/janet-1.12.2.ebuild
similarity index 55%
rename from dev-lang/janet/janet-1.11.1.ebuild
rename to dev-lang/janet/janet-1.12.2.ebuild
index 134fe8b4a3cb..574832c06825 100644
--- a/dev-lang/janet/janet-1.11.1.ebuild
+++ b/dev-lang/janet/janet-1.12.2.ebuild
@@ -14,8 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
+MY_RELEASE="${PV::-2}"
+
 src_configure() {
-	append-ldflags -Wl,-soname,libjanet.so.1.11
+	append-ldflags -Wl,-soname,libjanet.so.1.${MY_RELEASE}
 	append-cflags -fPIC
 }
 
@@ -23,21 +25,23 @@ src_compile() {
 	# janet_build is the git hash of the commit related to the
 	# current release - it defines a constant which is then shown
 	# when starting janet
-	local janet_build='\"4cc68096\"'
-	emake PREFIX="/usr" JANET_BUILD="${janet_build}"
-	emake PREFIX="/usr" build/janet.pc JANET_BUILD="${janet_build}"
-	emake PREFIX="/usr" docs JANET_BUILD="${janet_build}"
+	local janet_build='\"1.12.2\"'
+	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" JANET_BUILD="${janet_build}"
+	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" build/janet.pc JANET_BUILD="${janet_build}"
+	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" docs JANET_BUILD="${janet_build}"
+	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" build/jpm JANET_BUILD="${janet_build}"
 }
 
 src_install() {
 	dobin "build/janet"
-	dobin "jpm"
+	dobin "build/jpm"
 	insinto "usr/include/janet"
 	doheader "src/include/janet.h"
 	doheader "src/conf/janetconf.h"
 
 	dolib.so "build/libjanet.so"
-	dosym libjanet.so /usr/$(get_libdir)/libjanet.so.1.11
+	dosym libjanet.so /usr/$(get_libdir)/libjanet.so.${MY_RELEASE}
+	dosym libjanet.so.${MY_RELEASE} /usr/$(get_libdir)/libjanet.so.${PV}
 
 	if use static-libs; then
 		dolib.a "build/libjanet.a"
@@ -49,4 +53,10 @@ src_install() {
 	doins "build/janet.pc"
 	dodoc -r examples
 	dodoc "build/doc.html"
+	# required for jpm
+	keepdir /usr/$(get_libdir)/janet/.cache
+}
+
+pkg_postinst() {
+	elog "Enable use flag \"static-libs\" for building stand-alone executables with jpm"
 }
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 2ca0a5d233c9..c2404e9918fc 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/snack/files/snack-2.2.10-test.patch b/dev-tcltk/snack/files/snack-2.2.10-test.patch
index 76c1ab17a9cd..2ba3a0e82d99 100644
--- a/dev-tcltk/snack/files/snack-2.2.10-test.patch
+++ b/dev-tcltk/snack/files/snack-2.2.10-test.patch
@@ -9,17 +9,23 @@
  
  test pitch-2.1 {pitch command, with missing argument for -start option} {
    set s [snack::sound snd -load ex1.wav]
---- a/tests/power.test	2018-12-02 21:58:19.319057755 +0100
-+++ b/tests/power.test	2018-12-02 21:56:48.303543173 +0100
-@@ -14,7 +14,7 @@
-   set res [$s power]
-   $s destroy
-   set res
--} {57.668 58.916 57.992 58.647 58.462 58.415 58.353 58.948 58.897 59.02 58.761 58.745 58.248 58.595 59.158 58.846 58.467 61.37 59.153 59.315 58.301 60.035 59.451 58.963 71.281 71.387 71.13 71.213 71.01 70.635 69.845 68.822 68.986 68.525 67.103 66.664 67.365 67.627 66.72 67.337 67.657 68.365 68.854 68.204 58.26 58.141 66.927 69.789 69.122 69.601 69.076 68.909 69.337 68.621 67.11 65.266 64.678 64.223 61.751 60.287 59.447 57.811 58.444 58.209 57.645 57.279 56.377 56.572 56.467 56.796 57.045 57.735 57.858 57.081 56.943 56.421 54.929 56.202 57.349 57.643 57.477 58.207 57.706 58.385 58.601 59.228 58.694 57.176 57.423 57.733 58.599 58.614 58.771 59.005 58.651 59.077 59.001 58.113 58.374}
-+} {57.668 58.916 57.992 58.647 58.463 58.415 58.353 58.948 58.897 59.02 58.761 58.745 58.248 58.595 59.158 58.846 58.467 61.37 59.153 59.315 58.301 60.035 59.451 58.963 71.281 71.387 71.13 71.213 71.01 70.635 69.845 68.822 68.986 68.525 67.103 66.664 67.365 67.627 66.72 67.337 67.657 68.365 68.854 68.204 58.26 58.141 66.927 69.789 69.122 69.601 69.076 68.909 69.337 68.621 67.11 65.266 64.678 64.223 61.751 60.287 59.447 57.811 58.444 58.209 57.645 57.279 56.377 56.572 56.467 56.796 57.045 57.735 57.858 57.081 56.943 56.421 54.929 56.202 57.349 57.643 57.477 58.207 57.706 58.385 58.601 59.228 58.694 57.176 57.423 57.733 58.599 58.614 58.771 59.005 58.651 59.077 59.001 58.113 58.374}
+--- a/tests/power.test	2020-10-12 21:45:55.843838864 +0200
++++ b/tests/power.test	2020-10-12 21:46:21.732387559 +0200
+@@ -8,14 +8,6 @@
+     namespace import ::tcltest::*
+ }
  
+-test power-1.1 {power command} {
+-  set s [snack::sound snd -load ex1.wav]
+-  set tcl_precision 5
+-  set res [$s power]
+-  $s destroy
+-  set res
+-} {57.668 58.916 57.992 58.647 58.462 58.415 58.353 58.948 58.897 59.02 58.761 58.745 58.248 58.595 59.158 58.846 58.467 61.37 59.153 59.315 58.301 60.035 59.451 58.963 71.281 71.387 71.13 71.213 71.01 70.635 69.845 68.822 68.986 68.525 67.103 66.664 67.365 67.627 66.72 67.337 67.657 68.365 68.854 68.204 58.26 58.141 66.927 69.789 69.122 69.601 69.076 68.909 69.337 68.621 67.11 65.266 64.678 64.223 61.751 60.287 59.447 57.811 58.444 58.209 57.645 57.279 56.377 56.572 56.467 56.796 57.045 57.735 57.858 57.081 56.943 56.421 54.929 56.202 57.349 57.643 57.477 58.207 57.706 58.385 58.601 59.228 58.694 57.176 57.423 57.733 58.599 58.614 58.771 59.005 58.651 59.077 59.001 58.113 58.374}
+-
  test power-1.2 {power command} {
    set s [snack::sound snd -load ex1.wav]
+   set tcl_precision 5
 --- a/tests/mixer.test	2019-05-15 08:41:24.761148030 +0200
 +++ b/tests/mixer.test	2019-05-15 08:41:37.902919720 +0200
 @@ -13,12 +13,6 @@
@@ -93,23 +99,6 @@
  test pitch-2.1 {pitch command, with missing argument for -start option} {
    set s [snack::sound snd -load ex1.wav]
    catch {$s pitch -start} msg
---- a/tests/power.test	2020-10-12 21:45:55.843838864 +0200
-+++ b/tests/power.test	2020-10-12 21:46:21.732387559 +0200
-@@ -8,14 +8,6 @@
-     namespace import ::tcltest::*
- }
- 
--test power-1.1 {power command} {
--  set s [snack::sound snd -load ex1.wav]
--  set tcl_precision 5
--  set res [$s power]
--  $s destroy
--  set res
--} {57.668 58.916 57.992 58.647 58.463 58.415 58.353 58.948 58.897 59.02 58.761 58.745 58.248 58.595 59.158 58.846 58.467 61.37 59.153 59.315 58.301 60.035 59.451 58.963 71.281 71.387 71.13 71.213 71.01 70.635 69.845 68.822 68.986 68.525 67.103 66.664 67.365 67.627 66.72 67.337 67.657 68.365 68.854 68.204 58.26 58.141 66.927 69.789 69.122 69.601 69.076 68.909 69.337 68.621 67.11 65.266 64.678 64.223 61.751 60.287 59.447 57.811 58.444 58.209 57.645 57.279 56.377 56.572 56.467 56.796 57.045 57.735 57.858 57.081 56.943 56.421 54.929 56.202 57.349 57.643 57.477 58.207 57.706 58.385 58.601 59.228 58.694 57.176 57.423 57.733 58.599 58.614 58.771 59.005 58.651 59.077 59.001 58.113 58.374}
--
- test power-1.2 {power command} {
-   set s [snack::sound snd -load ex1.wav]
-   set tcl_precision 5
 --- a/tests/dbpower.test	2020-10-14 19:03:17.821543729 +0200
 +++ b/tests/dbpower.test	2020-10-14 19:03:36.234218978 +0200
 @@ -17,15 +17,6 @@
diff --git a/dev-tcltk/snack/snack-2.2.10-r8.ebuild b/dev-tcltk/snack/snack-2.2.10-r8.ebuild
index b329e5cb565e..d7020cd2ef02 100644
--- a/dev-tcltk/snack/snack-2.2.10-r8.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.speech.kth.se/snack/"
 SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 SLOT="0"
 IUSE="alsa examples python vorbis"
 RESTRICT="!test? ( test )"
diff --git a/dev-tcltk/snack/snack-2.2.10-r9.ebuild b/dev-tcltk/snack/snack-2.2.10-r9.ebuild
index 5495854169d5..359d0ba8fe10 100644
--- a/dev-tcltk/snack/snack-2.2.10-r9.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r9.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.speech.kth.se/snack/"
 SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 hppa ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 SLOT="0"
 IUSE="alsa examples python vorbis"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 137a0979edd4..fcd4c4c06e40 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/hfstospell/Manifest b/dev-util/hfstospell/Manifest
index b659119c4458..d6cc1b658582 100644
--- a/dev-util/hfstospell/Manifest
+++ b/dev-util/hfstospell/Manifest
@@ -1 +1,2 @@
 DIST hfstospell-0.5.1.tar.gz 152056 BLAKE2B fa589908312bd4a4b40b88b221ee5f6bdc281d6151984a87b237372b0141157db87b3494e357d74a17f0ee137fd5ce35ec8caddb12d5bffe15930a74345cd3ee SHA512 bd8ffdd3ee822da2a57a3405b139ec1e635dc8bb293dbd9abd05912b8929df29633304e64b97522e4590a3907ddfa3aefec3e4da5ab709b9be1857cc2ecd2018
+DIST hfstospell-0.5.2.tar.gz 152115 BLAKE2B 667c01672fd6fd6ee743a6542677ffe74e3900c27ab2754f8fa7dcc57081074bd98e8d82827fe176b2a6c9abc4565efcb3204df43110906f5a333405ec8a6bf2 SHA512 307aff3aec91ac6ffed3ebabdc2baa1a6e913431f57a80a0d0254be57fbd72e28d7592c35e0d72e5979f7e0b4c585f11b8eb91183b0877f9670a9cd5206c0140
diff --git a/dev-util/hfstospell/hfstospell-0.5.2.ebuild b/dev-util/hfstospell/hfstospell-0.5.2.ebuild
new file mode 100644
index 000000000000..645a081e763b
--- /dev/null
+++ b/dev-util/hfstospell/hfstospell-0.5.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="HFST spell checker library and command line tool"
+HOMEPAGE="https://github.com/hfst/hfst-ospell"
+SRC_URI="https://github.com/hfst/hfst-ospell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/libarchive
+	dev-cpp/libxmlpp:2.6
+	dev-libs/icu:=
+	dev-libs/tinyxml2"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/hfst-ospell-${PV}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
+}
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 3e76bb695b11..01498bb33054 100644
Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index d1504938d4e5..fc829c5c34f5 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,2 +1 @@
-DIST hikari-2.1.1.tar.gz 1012598 BLAKE2B 189e7bd9271ed5af89f5039288334c16a33c049c504f57e05cfa11b20098650165bb655023d016a14f2b13ed94e819bece088ef8517b9114b80d6a5921000780 SHA512 6da547d957cc65ab040647209a865550b0cc2b3d79040fae507591c41e938826861e27034379c21a1b7ce18afa35dbb813e96e661f4bd1232eb932f032271dff
-DIST hikari-2.1.2.tar.gz 1012670 BLAKE2B 9ce3dc08b3b9377458eba7299d5921466983c64ef7a9eb16194c4cf4dcb482af1313b9378bf733e38fd5bb0b8154553d7ab57a7e45db69932a2bb201ff29b041 SHA512 e4c1328414a2b99657fbce58139d5f6432580182ee277bc1fb8d3de1fa875675d78606dc8defd7997025caeac36f533ea9f34fca56c15a9a64dfa05c9c3e51b7
+DIST hikari-2.2.1.tar.gz 1019168 BLAKE2B aa2ea50b665b3e5d62deba9565cab0d24694046d37dcd9aaa85d3581efbce339ea3f02630155fc731a7eb20dc7b4e4a301e5c6abfd1499ef962e6ef012184ca6 SHA512 640d4ef19cb445613e43fb3363ff00f13937ab256155129bbeba7adcd5f8aed1e4ddbcc6af13809c54ce14dc0d51933cc2763c8a990f44e49d6bfbf9daf62d80
diff --git a/gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch b/gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch
deleted file mode 100644
index 4fd6d468d481..000000000000
--- a/gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-explain steps to guide future me and other patchers
-(1) define common variables on top
-(2) remove conditions for doc and others to define VERSION
-(3) replace all ${*} by $(*)
-(4) replace pkg-config by $(PKG_CONFIG)
-(6) remove .PATH: src
-(5) remove main.c from OBJS because it is in different directory
-    - we will define a separate target for it
-(6) add $(OBJS) target + main.o target and add then to the end
-    of dependencies for hikari
-(7) add main.o to be cleaned-up
-(8) reorder the library orders in the $(CC) steps because gcc
-diff --git a/Makefile b/Makefile
-index cab013a..b72e74c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,22 @@
-+TARGET =	hikari
-+
-+DESTDIR	?=
-+
-+prefix ?=	/usr/local
-+exec_prefix ?=	$(prefix)
-+bindir ?=	$(exec_prefix)/bin
-+sysconfdir ?=	$(prefix)/etc
-+
-+PKG_CONFIG ?=	pkg-config
-+
-+VERSION ?=	"CURRENT"
-+
-+### Upstream variables
-+PREFIX ?=	$(DESTDIR)$(prefix)
-+ETC_PREFIX ?=	$(DESTDIR)$(sysconfdir)
-+
- OS != uname
--VERSION ?= "CURRENT"
--PREFIX ?= /usr/local
--ETC_PREFIX ?= ${PREFIX}
-+INSTALL_GROUP != id -gn
- 
- OBJS = \
- 	action.o \
-@@ -33,7 +48,6 @@ OBJS = \
- 	layout_select_mode.o \
- 	lock_indicator.o \
- 	lock_mode.o \
--	main.o \
- 	mark.o \
- 	mark_assign_mode.o \
- 	mark_select_mode.o \
-@@ -64,109 +78,124 @@ OBJS = \
- 
- WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
- 
--.PHONY: distclean clean clean-doc doc dist install uninstall
--.PATH: src
--
- # Allow specification of /extra/ CFLAGS and LDFLAGS
--CFLAGS += ${CFLAGS_EXTRA}
--LDFLAGS += ${LDFLAGS_EXTRA}
-+CFLAGS += $(CFLAGS_EXTRA)
-+LDFLAGS += $(LDFLAGS_EXTRA)
- 
--.ifdef DEBUG
-+ifeq ($(DEBUG),1)
- CFLAGS += -g -O0 -fsanitize=address
--.else
-+else
- CFLAGS += -DNDEBUG
--.endif
-+endif
- 
--.ifdef WITH_POSIX_C_SOURCE
-+ifeq ($(WITH_POSIX_C_SOURCE),1)
- CFLAGS += -D_POSIX_C_SOURCE=200809L
--.endif
-+endif
- 
--.ifdef WITH_XWAYLAND
-+ifeq ($(WITH_XWAYLAND),1)
- CFLAGS += -DHAVE_XWAYLAND=1
--.endif
-+endif
- 
--.ifdef WITH_GAMMACONTROL
-+ifeq ($(WITH_GAMMACONTROL),1)
- CFLAGS += -DHAVE_GAMMACONTROL=1
--.endif
-+endif
- 
--.ifdef WITH_SCREENCOPY
-+ifeq ($(WITH_SCREENCOPY),1)
- CFLAGS += -DHAVE_SCREENCOPY=1
--.endif
-+endif
- 
--.ifdef WITH_LAYERSHELL
-+ifeq ($(WITH_LAYERSHELL),1)
- CFLAGS += -DHAVE_LAYERSHELL=1
--.endif
-+endif
-+
-+ifeq ($(WITH_VIRTUAL_INPUT),1)
-+CFLAGS += -DHAVE_VIRTUAL_INPUT=1
-+endif
- 
--.ifdef WITHOUT_SUID
-+ifeq ($(WITHOUT_SUID),1)
- PERMS = 555
--.else
-+else
- PERMS = 4555
--.endif
-+endif
- 
--CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
-+CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=$(ETC_PREFIX)
- 
--WLROOTS_CFLAGS != pkg-config --cflags wlroots
--WLROOTS_LIBS != pkg-config --libs wlroots
-+WLROOTS_CFLAGS != $(PKG_CONFIG) --cflags wlroots
-+WLROOTS_LIBS != $(PKG_CONFIG) --libs wlroots
- 
- WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
- 
--PANGO_CFLAGS != pkg-config --cflags pangocairo
--PANGO_LIBS != pkg-config --libs pangocairo
-+PANGO_CFLAGS != $(PKG_CONFIG) --cflags pangocairo
-+PANGO_LIBS != $(PKG_CONFIG) --libs pangocairo
- 
--CAIRO_CFLAGS != pkg-config --cflags cairo
--CAIRO_LIBS != pkg-config --libs cairo
-+CAIRO_CFLAGS != $(PKG_CONFIG) --cflags cairo
-+CAIRO_LIBS != $(PKG_CONFIG) --libs cairo
- 
--PIXMAN_CFLAGS != pkg-config --cflags pixman-1
--PIXMAN_LIBS != pkg-config --libs pixman-1
-+PIXMAN_CFLAGS != $(PKG_CONFIG) --cflags pixman-1
-+PIXMAN_LIBS != $(PKG_CONFIG) --libs pixman-1
- 
--XKBCOMMON_CFLAGS != pkg-config --cflags xkbcommon
--XKBCOMMON_LIBS != pkg-config --libs xkbcommon
-+XKBCOMMON_CFLAGS != $(PKG_CONFIG) --cflags xkbcommon
-+XKBCOMMON_LIBS != $(PKG_CONFIG) --libs xkbcommon
- 
--WAYLAND_CFLAGS != pkg-config --cflags wayland-server
--WAYLAND_LIBS != pkg-config --libs wayland-server
-+WAYLAND_CFLAGS != $(PKG_CONFIG) --cflags wayland-server
-+WAYLAND_LIBS != $(PKG_CONFIG) --libs wayland-server
- 
--LIBINPUT_CFLAGS != pkg-config --cflags libinput
--LIBINPUT_LIBS != pkg-config --libs libinput
-+LIBINPUT_CFLAGS != $(PKG_CONFIG) --cflags libinput
-+LIBINPUT_LIBS != $(PKG_CONFIG) --libs libinput
- 
--UCL_CFLAGS != pkg-config --cflags libucl
--UCL_LIBS != pkg-config --libs libucl
-+UCL_CFLAGS != $(PKG_CONFIG) --cflags libucl
-+UCL_LIBS != $(PKG_CONFIG) --libs libucl
- 
- CFLAGS += \
--	${WLROOTS_CFLAGS} \
--	${PANGO_CFLAGS} \
--	${CAIRO_CFLAGS} \
--	${PIXMAN_CFLAGS} \
--	${XKBCOMMON_CFLAGS} \
--	${WAYLAND_CFLAGS} \
--	${LIBINPUT_CFLAGS} \
--	${UCL_CFLAGS}
-+	$(WLROOTS_CFLAGS) \
-+	$(PANGO_CFLAGS) \
-+	$(CAIRO_CFLAGS) \
-+	$(PIXMAN_CFLAGS) \
-+	$(XKBCOMMON_CFLAGS) \
-+	$(WAYLAND_CFLAGS) \
-+	$(LIBINPUT_CFLAGS) \
-+	$(UCL_CFLAGS)
- 
- LIBS = \
--	${WLROOTS_LIBS} \
--	${PANGO_LIBS} \
--	${CAIRO_LIBS} \
--	${PIXMAN_LIBS} \
--	${XKBCOMMON_LIBS} \
--	${WAYLAND_LIBS} \
--	${LIBINPUT_LIBS} \
--	${UCL_LIBS}
-+	$(WLROOTS_LIBS) \
-+	$(PANGO_LIBS) \
-+	$(CAIRO_LIBS) \
-+	$(PIXMAN_LIBS) \
-+	$(XKBCOMMON_LIBS) \
-+	$(WAYLAND_LIBS) \
-+	$(LIBINPUT_LIBS) \
-+	$(UCL_LIBS)
- 
--all: hikari hikari-unlocker
-+.PHONY: distclean clean clean-doc doc dist install uninstall
- 
- version.h:
--	echo "#define HIKARI_VERSION \"${VERSION}\"" >> version.h
-+	echo "#define HIKARI_VERSION \"$(VERSION)\"" >> version.h
- 
--hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h ${OBJS}
--	${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o ${.TARGET} ${OBJS} ${LIBS}
-+$(OBJS): %.o: src/%.c
-+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-+
-+main.o:
-+	$(CC) $(CFLAGS) $(INCLUDES) -c main.c -o main.o
- 
- xdg-shell-protocol.h:
--	wayland-scanner server-header ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml ${.TARGET}
-+	wayland-scanner server-header $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml xdg-shell-protocol.h
- 
- wlr-layer-shell-unstable-v1-protocol.h:
--	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
-+	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml wlr-layer-shell-unstable-v1-protocol.h
-+
-+hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h $(OBJS) main.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) $(OBJS) main.o $(LIBS) -o $(TARGET)
- 
- hikari-unlocker: hikari_unlocker.c
--	${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) hikari_unlocker.c -lpam $(LIBS) -o hikari-unlocker
-+
-+share/man/man1/hikari.1:
-+	pandoc -M title:"HIKARI(1) $(VERSION) | hikari - Wayland Compositor" -s \
-+		--to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
-+
-+doc: share/man/man1/hikari.1
-+
-+all: hikari hikari-unlocker
- 
- clean-doc:
- 	@test -e _darcs && echo "cleaning manpage" ||:
-@@ -178,66 +207,38 @@ clean: clean-doc
- 	@rm xdg-shell-protocol.h 2> /dev/null ||:
- 	@rm wlr-layer-shell-unstable-v1-protocol.h 2> /dev/null ||:
- 	@echo "cleaning object files"
--	@rm ${OBJS} 2> /dev/null ||:
-+	@rm $(OBJS) 2> /dev/null ||:
-+	@rm main.o 2> /dev/null ||:
- 	@echo "cleaning executables"
- 	@rm hikari 2> /dev/null ||:
- 	@rm hikari-unlocker 2> /dev/null ||:
- 
--share/man/man1/hikari.1:
--	pandoc -M title:"HIKARI(1) ${VERSION} | hikari - Wayland Compositor" -s \
--		--to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
--
--doc: share/man/man1/hikari.1
--
--hikari-${VERSION}.tar.gz: version.h share/man/man1/hikari.1
--	@darcs revert
--	@tar -s "#^#hikari-${VERSION}/#" -czf hikari-${VERSION}.tar.gz \
--		version.h \
--		main.c \
--		hikari_unlocker.c \
--		include/hikari/*.h \
--		src/*.c \
--		protocol/*.xml \
--		Makefile \
--		LICENSE \
--		README.md \
--		CHANGELOG.md \
--		share/man/man1/hikari.md \
--		share/man/man1/hikari.1 \
--		share/backgrounds/hikari/hikari_wallpaper.png \
--		share/wayland-sessions/hikari.desktop \
--		etc/hikari/hikari.conf \
--		etc/pam.d/hikari-unlocker.*
--
--distclean: clean-doc
--	@test -e _darcs && echo "cleaning version.h" ||:
--	@test -e _darcs && rm version.h ||:
--
--dist: distclean hikari-${VERSION}.tar.gz
--
--install: hikari hikari-unlocker share/man/man1/hikari.1
--	mkdir -p ${DESTDIR}/${PREFIX}/bin
--	mkdir -p ${DESTDIR}/${PREFIX}/share/man/man1
--	mkdir -p ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
--	mkdir -p ${DESTDIR}/${PREFIX}/share/wayland-sessions
--	mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/hikari
--	mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/pam.d
--	sed "s,PREFIX,${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
--	chmod 644 ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
--	install -m ${PERMS} hikari ${DESTDIR}/${PREFIX}/bin
--	install -m 4555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin
--	install -m 644 share/man/man1/hikari.1 ${DESTDIR}/${PREFIX}/share/man/man1
--	install -m 644 share/backgrounds/hikari/hikari_wallpaper.png ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
--	install -m 644 share/wayland-sessions/hikari.desktop ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
--	install -m 644 etc/pam.d/hikari-unlocker.${OS} ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
-+install-doc:
-+	install -m 644 share/man/man1/hikari.1 $(PREFIX)/share/man/man1
-+
-+install:
-+	mkdir -p $(PREFIX)/bin
-+	mkdir -p $(PREFIX)/share/man/man1
-+	mkdir -p $(PREFIX)/share/backgrounds/hikari
-+	mkdir -p $(PREFIX)/share/wayland-sessions
-+	mkdir -p $(ETC_PREFIX)/etc/hikari
-+	mkdir -p $(ETC_PREFIX)/etc/pam.d
-+	sed "s,PREFIX,$(prefix)," etc/hikari/hikari.conf > $(ETC_PREFIX)/etc/hikari/hikari.conf
-+	chmod 644 $(ETC_PREFIX)/etc/hikari/hikari.conf
-+	install -m $(PERMS) hikari $(PREFIX)/bin
-+	install -m 4555 hikari-unlocker $(PREFIX)/bin
-+	install -m 644 share/backgrounds/hikari/hikari_wallpaper.png $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png
-+	install -m 644 share/wayland-sessions/hikari.desktop $(PREFIX)/share/wayland-sessions/hikari.desktop
-+	install -m 644 etc/pam.d/hikari-unlocker.$(OS) $(ETC_PREFIX)/etc/pam.d/hikari-unlocker
- 
- uninstall:
--	-rm ${DESTDIR}/${PREFIX}/bin/hikari
--	-rm ${DESTDIR}/${PREFIX}/bin/hikari-unlocker
--	-rm ${DESTDIR}/${PREFIX}/share/man/man1/hikari.1
--	-rm ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
--	-rm ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
--	-rm ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
--	-rm ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
--	-rmdir ${DESTDIR}/${ETC_PREFIX}/etc/hikari
--	-rmdir ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
-+	-rm $(PREFIX)/bin/hikari
-+	-rm $(PREFIX)/bin/hikari-unlocker
-+	-rm $(PREFIX)/share/man/man1/hikari.1
-+	-rm $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png
-+	-rm $(PREFIX)/share/wayland-sessions/hikari.desktop
-+	-rm $(ETC_PREFIX)/etc/pam.d/hikari-unlocker
-+	-rm $(ETC_PREFIX)/etc/hikari/hikari.conf
-+	-rmdir $(ETC_PREFIX)/etc/hikari
-+	-rmdir $(PREFIX)/share/backgrounds/hikari
-+
diff --git a/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch b/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch
new file mode 100644
index 000000000000..472a9efa37df
--- /dev/null
+++ b/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch
@@ -0,0 +1,78 @@
+diff --git a/Makefile b/Makefile
+index 555b770..01025b9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,6 +13,7 @@ WITH_VIRTUAL_INPUT = YES
+ OS != uname
+ VERSION ?= "CURRENT"
+ PREFIX ?= /usr/local
++PKG_CONFIG ?= pkg-config
+ ETC_PREFIX ?= ${PREFIX}
+ 
+ OBJS = \
+@@ -78,7 +79,7 @@ OBJS += \
+ 	xwayland_view.o
+ .endif
+ 
+-WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
++WAYLAND_PROTOCOLS != ${PKG_CONFIG} --variable pkgdatadir wayland-protocols
+ 
+ .PHONY: distclean clean clean-doc doc dist install uninstall
+ .PATH: src
+@@ -125,31 +126,31 @@ CFLAGS += -DHAVE_VIRTUAL_INPUT=1
+ 
+ CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
+ 
+-WLROOTS_CFLAGS != pkg-config --cflags wlroots
+-WLROOTS_LIBS != pkg-config --libs wlroots
++WLROOTS_CFLAGS != ${PKG_CONFIG} --cflags wlroots
++WLROOTS_LIBS != ${PKG_CONFIG} --libs wlroots
+ 
+ WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
+ 
+-PANGO_CFLAGS != pkg-config --cflags pangocairo
+-PANGO_LIBS != pkg-config --libs pangocairo
++PANGO_CFLAGS != ${PKG_CONFIG} --cflags pangocairo
++PANGO_LIBS != ${PKG_CONFIG} --libs pangocairo
+ 
+-CAIRO_CFLAGS != pkg-config --cflags cairo
+-CAIRO_LIBS != pkg-config --libs cairo
++CAIRO_CFLAGS != ${PKG_CONFIG} --cflags cairo
++CAIRO_LIBS != ${PKG_CONFIG} --libs cairo
+ 
+-PIXMAN_CFLAGS != pkg-config --cflags pixman-1
+-PIXMAN_LIBS != pkg-config --libs pixman-1
++PIXMAN_CFLAGS != ${PKG_CONFIG} --cflags pixman-1
++PIXMAN_LIBS != ${PKG_CONFIG} --libs pixman-1
+ 
+-XKBCOMMON_CFLAGS != pkg-config --cflags xkbcommon
+-XKBCOMMON_LIBS != pkg-config --libs xkbcommon
++XKBCOMMON_CFLAGS != ${PKG_CONFIG} --cflags xkbcommon
++XKBCOMMON_LIBS != ${PKG_CONFIG} --libs xkbcommon
+ 
+-WAYLAND_CFLAGS != pkg-config --cflags wayland-server
+-WAYLAND_LIBS != pkg-config --libs wayland-server
++WAYLAND_CFLAGS != ${PKG_CONFIG} --cflags wayland-server
++WAYLAND_LIBS != ${PKG_CONFIG} --libs wayland-server
+ 
+-LIBINPUT_CFLAGS != pkg-config --cflags libinput
+-LIBINPUT_LIBS != pkg-config --libs libinput
++LIBINPUT_CFLAGS != ${PKG_CONFIG} --cflags libinput
++LIBINPUT_LIBS != ${PKG_CONFIG} --libs libinput
+ 
+-UCL_CFLAGS != pkg-config --cflags libucl
+-UCL_LIBS != pkg-config --libs libucl
++UCL_CFLAGS != ${PKG_CONFIG} --cflags libucl
++UCL_LIBS != ${PKG_CONFIG} --libs libucl
+ 
+ CFLAGS += \
+ 	${WLROOTS_CFLAGS} \
+@@ -192,7 +193,7 @@ wlr-layer-shell-unstable-v1-protocol.h:
+ 	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
+ 
+ hikari-unlocker: hikari_unlocker.c
+-	${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam
++	${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o hikari-unlocker hikari_unlocker.c -lpam
+ 
+ clean-doc:
+ 	@test -e _darcs && echo "cleaning manpage" ||:
diff --git a/gui-wm/hikari/hikari-2.1.1.ebuild b/gui-wm/hikari/hikari-2.1.1.ebuild
deleted file mode 100644
index b8ef028dff7f..000000000000
--- a/gui-wm/hikari/hikari-2.1.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wayland compositor inspired by CWM"
-HOMEPAGE="https://hikari.acmelabs.space/"
-SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="gamma layershell screencopy suid virtual-io +X"
-
-DEPEND="
-	dev-libs/libinput:=
-	dev-libs/libucl
-	>=gui-libs/wlroots-0.11.0
-	media-libs/libglvnd
-	x11-libs/cairo[X?,svg]
-	x11-libs/libxkbcommon[X?]
-	x11-libs/pango[X?]
-	x11-libs/pixman
-	sys-libs/pam
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-misc/xkeyboard-config
-"
-
-BDEPEND="
-	dev-libs/wayland-protocols
-	virtual/pkgconfig
-"
-
-# keep this as others OS's are using this as reference
-PATCHES=(
-	"${FILESDIR}/${P}-gnu-make.patch"
-)
-
-src_compile() {
-	emake VERSION="{PV}" \
-		  WITH_POSIX_C_SOURCE=1 \
-		  WITH_GAMMACONTROL=$(usex gamma 1 0) \
-		  WITH_LAYERSHELL=$(usex layershell 1 0) \
-		  WITH_SCREENCOPY=$(usex screencopy 1 0) \
-		  WITH_SUID=$(usex suid 1 0) \
-		  WITH_VIRTUAL_INPUT=$(usex virtual-io 1 0) \
-		  WITH_XWAYLAND=$(usex X 1 0) \
-		  all
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" ETC_PREFIX="${D}" prefix="${SYSROOT}/usr" install install-doc
-	doman share/man/man1/hikari.1
-}
diff --git a/gui-wm/hikari/hikari-2.1.2.ebuild b/gui-wm/hikari/hikari-2.2.1.ebuild
similarity index 89%
rename from gui-wm/hikari/hikari-2.1.2.ebuild
rename to gui-wm/hikari/hikari-2.2.1.ebuild
index 54f522c053ac..258f27273f51 100644
--- a/gui-wm/hikari/hikari-2.1.2.ebuild
+++ b/gui-wm/hikari/hikari-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multiprocessing
+inherit multiprocessing toolchain-funcs
 
 DESCRIPTION="Wayland compositor inspired by CWM"
 HOMEPAGE="https://hikari.acmelabs.space/"
@@ -37,12 +37,17 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${P}-pkgconfig.patch )
+
 pkg_setup() {
 	export MAKE=bmake
+	tc-export CC PKG_CONFIG
 }
 
 src_compile() {
+
 	${MAKE} -j$(makeopts_jobs) VERSION="{PV}" \
+		LDFLAGS="${LDFLAGS}" \
 		-DWITH_POSIX_C_SOURCE \
 		$(usex gamma -DWITH_GAMMACONTROL "") \
 		$(usex layershell -DWITH_LAYERSHELL "") \
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 5309f8c8139c..6f52ef8d3670 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 905f6981f434..d24d52d896e5 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -1,2 +1 @@
-DIST opendmarc-1.3.2.tar.gz 593448 BLAKE2B 80f47a82e38c6cdc5791a695485262c50e9363b81537a52d7af204bd6a830df6eea9e9b6f710b72b7934c3ab7df800def7d4b3e54f53b8908a7f1b42bcea2b2d SHA512 6045fb7d2be8f0ffdeca07324857d92908a41c6792749017c2fcc1058f05f55317b1919c67c780827dd7094ec8fff2e1fa4aeb5bab7ff7461537957af2652748
 DIST opendmarc-1.3.3.tar.gz 575319 BLAKE2B 72dae5553fea9a51d860aaac6d85171a245584a74134df2249217a88f3da04c4eb518141f6342e281c6a9186345d69a34b585dc3ed18bdb53313374db505f4f5 SHA512 bb4bf8e3ad2d1732b07e55316819d4fd708e529b54a336d7d00763e13bfc62580bb1b30f132fa786dbca15e526e8dd5e146c7be454e1c42714a9f57126fc5e12
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
deleted file mode 100644
index 480100bb10f5..000000000000
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user multilib systemd
-
-DESCRIPTION="Open source DMARC implementation "
-HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
-SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="spf +reports static-libs"
-
-DEPEND="reports? ( dev-perl/DBI )
-	|| ( mail-filter/libmilter mail-mta/sendmail )"
-RDEPEND="${DEPEND}
-	reports? (
-		dev-perl/DBD-mysql
-		dev-perl/HTTP-Message
-		dev-perl/Switch
-	)
-	spf? ( mail-filter/libspf2 )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-multiple-From.patch
-)
-
-pkg_setup() {
-	enewgroup milter
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	default
-	if use !reports ; then
-		sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_with spf) \
-		$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
-		$(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la
-
-	newinitd "${FILESDIR}"/opendmarc.initd opendmarc
-	newconfd "${FILESDIR}"/opendmarc.confd opendmarc
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	dodir /etc/opendmarc
-
-	# create config file
-	sed \
-		-e 's:^# UserID .*$:UserID milter:' \
-		-e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \
-		-e '/^# Socket /s:^# ::' \
-		"${S}"/opendmarc/opendmarc.conf.sample \
-		> "${ED}"/etc/opendmarc/opendmarc.conf \
-		|| die
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 681952db8a3f..6b4375356a60 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index cbc898e48269..8c5ca7b9559b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 16 Oct 2020 05:38:30 +0000
+Fri, 16 Oct 2020 07:08:26 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index cbc898e48269..8c5ca7b9559b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 16 Oct 2020 05:38:30 +0000
+Fri, 16 Oct 2020 07:08:26 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 43db32029df7..a8c19fe39b7e 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 5cd463127862..5194f580184b 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/janet-1.11.1 b/metadata/md5-cache/dev-lang/janet-1.12.2
similarity index 73%
rename from metadata/md5-cache/dev-lang/janet-1.11.1
rename to metadata/md5-cache/dev-lang/janet-1.12.2
index d2bc90079dd3..e525fb0b5723 100644
--- a/metadata/md5-cache/dev-lang/janet-1.11.1
+++ b/metadata/md5-cache/dev-lang/janet-1.12.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install
+DEFINED_PHASES=compile configure install postinst
 DESCRIPTION=A dynamic Lisp dialect and bytecode vm
 EAPI=7
 HOMEPAGE=https://janet-lang.org https://github.com/janet-lang/janet/
@@ -6,6 +6,6 @@ IUSE=static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
-SRC_URI=https://github.com/janet-lang/janet/archive/v1.11.1.tar.gz -> janet-1.11.1.tar.gz
+SRC_URI=https://github.com/janet-lang/janet/archive/v1.12.2.tar.gz -> janet-1.12.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=76b0efe3bbc9ccc5e73814e0bff45900
+_md5_=82f2d34840a35311ed58cb95c9e8fc44
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index da280a8d8789..d425837ec51e 100644
Binary files a/metadata/md5-cache/dev-tcltk/Manifest.gz and b/metadata/md5-cache/dev-tcltk/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r8 b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r8
index 4b125c3f00ab..7c4990bbd91c 100644
--- a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r8
+++ b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r8
@@ -4,7 +4,7 @@ DESCRIPTION=The Snack Sound Toolkit (Tcl)
 EAPI=6
 HOMEPAGE=http://www.speech.kth.se/snack/
 IUSE=alsa examples python vorbis python_targets_python2_7 test
-KEYWORDS=amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vorbis? ( media-libs/libvorbis ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8b720c71a10a1c384b448d2bcf070501
+_md5_=842ec52cd7836b86b73c0040b2d96b9a
diff --git a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9 b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
index 26fb30b43a51..8798c75f278a 100644
--- a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
+++ b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
@@ -5,7 +5,7 @@ DESCRIPTION=The Snack Sound Toolkit (Tcl)
 EAPI=7
 HOMEPAGE=http://www.speech.kth.se/snack/
 IUSE=alsa examples python vorbis python_targets_python3_7 test
-KEYWORDS=amd64 hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 hppa ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) vorbis? ( media-libs/libvorbis )
 REQUIRED_USE=|| ( python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=6712d8f3f2c922f6b2dab93dcd71fecb
+_md5_=be2494607fe5752376a453c24166e1a6
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index f24a71225f49..bd6ed2a61529 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/hfstospell-0.5.2 b/metadata/md5-cache/dev-util/hfstospell-0.5.2
new file mode 100644
index 000000000000..320166bebb7c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/hfstospell-0.5.2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/libarchive dev-cpp/libxmlpp:2.6 dev-libs/icu:= dev-libs/tinyxml2
+DESCRIPTION=HFST spell checker library and command line tool
+EAPI=7
+HOMEPAGE=https://github.com/hfst/hfst-ospell
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=app-arch/libarchive dev-cpp/libxmlpp:2.6 dev-libs/icu:= dev-libs/tinyxml2
+SLOT=0
+SRC_URI=https://github.com/hfst/hfst-ospell/archive/v0.5.2.tar.gz -> hfstospell-0.5.2.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a82baf862390831178407137748f5f4a
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index 06821c24cff1..9bc8bf5b4c32 100644
Binary files a/metadata/md5-cache/gui-wm/Manifest.gz and b/metadata/md5-cache/gui-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-wm/hikari-2.1.1 b/metadata/md5-cache/gui-wm/hikari-2.1.1
deleted file mode 100644
index 5e7a22613c9f..000000000000
--- a/metadata/md5-cache/gui-wm/hikari-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/libinput:= dev-libs/libucl >=gui-libs/wlroots-0.11.0 media-libs/libglvnd x11-libs/cairo[X?,svg] x11-libs/libxkbcommon[X?] x11-libs/pango[X?] x11-libs/pixman sys-libs/pam
-DESCRIPTION=Wayland compositor inspired by CWM
-EAPI=7
-HOMEPAGE=https://hikari.acmelabs.space/
-IUSE=gamma layershell screencopy suid virtual-io +X
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/libinput:= dev-libs/libucl >=gui-libs/wlroots-0.11.0 media-libs/libglvnd x11-libs/cairo[X?,svg] x11-libs/libxkbcommon[X?] x11-libs/pango[X?] x11-libs/pixman sys-libs/pam x11-misc/xkeyboard-config
-SLOT=0
-SRC_URI=https://hikari.acmelabs.space/releases/hikari-2.1.1.tar.gz
-_md5_=14c2c1a7e15230d70ab0f6ea867f8905
diff --git a/metadata/md5-cache/gui-wm/hikari-2.1.2 b/metadata/md5-cache/gui-wm/hikari-2.2.1
similarity index 73%
rename from metadata/md5-cache/gui-wm/hikari-2.1.2
rename to metadata/md5-cache/gui-wm/hikari-2.2.1
index a5a0814fcb55..65a8954133bc 100644
--- a/metadata/md5-cache/gui-wm/hikari-2.1.2
+++ b/metadata/md5-cache/gui-wm/hikari-2.2.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/libinput:= dev-libs/libucl >=gui-libs/wlroots-0.11.0[X?] media-libs/libglvnd x11-libs/cairo[X?,svg] x11-libs/libxkbcommon[X?] x11-libs/pango[X?] x11-libs/pixman sys-libs/pam x11-misc/xkeyboard-config
 SLOT=0
-SRC_URI=https://hikari.acmelabs.space/releases/hikari-2.1.2.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=8cc0b07e3fff48e9c9efc427df491c94
+SRC_URI=https://hikari.acmelabs.space/releases/hikari-2.2.1.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5aac48a3d1576f51661fe676181ab143
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 97aa35e50fea..714f4bf4ffb2 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r3 b/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r3
deleted file mode 100644
index efe7c59a9ab1..000000000000
--- a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=reports? ( dev-perl/DBI ) || ( mail-filter/libmilter mail-mta/sendmail ) virtual/pkgconfig
-DESCRIPTION=Open source DMARC implementation
-EAPI=6
-HOMEPAGE=http://www.trusteddomain.org/opendmarc/
-IUSE=spf +reports static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=reports? ( dev-perl/DBI ) || ( mail-filter/libmilter mail-mta/sendmail ) reports? ( dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/Switch ) spf? ( mail-filter/libspf2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/opendmarc/opendmarc-1.3.2.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=733a9f42a4c681e04100cf9d3c6c2fc1
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 4880836720b0..abad74d78e86 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/unrealircd-5.0.7 b/metadata/md5-cache/net-irc/unrealircd-5.0.7
new file mode 100644
index 000000000000..8ec19dd99581
--- /dev/null
+++ b/metadata/md5-cache/net-irc/unrealircd-5.0.7
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig || ( dev-libs/openssl:0 dev-libs/libressl:0 ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) curl? ( net-misc/curl[adns] )
+DESCRIPTION=An advanced Internet Relay Chat daemon
+EAPI=7
+HOMEPAGE=https://www.unrealircd.org/
+IUSE=class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) curl? ( net-misc/curl[adns] )
+SLOT=0
+SRC_URI=https://www.unrealircd.org/downloads/unrealircd-5.0.7.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1bcb5e3e453ede06b6b4fc03994269cf
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 703a72fc1705..7a1d3535be11 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/ethtool-5.6-r1 b/metadata/md5-cache/sys-apps/ethtool-5.6-r1
deleted file mode 100644
index 54405fb18264..000000000000
--- a/metadata/md5-cache/sys-apps/ethtool-5.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Utility for examining and tuning ethernet-based network interfaces
-EAPI=7
-HOMEPAGE=https://www.kernel.org/pub/software/network/ethtool/
-IUSE=+netlink
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libmnl )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/network/ethtool/ethtool-5.6.tar.xz
-_md5_=d5e6c2116c85585ade823c09840ee6a2
diff --git a/metadata/md5-cache/sys-apps/ethtool-5.7 b/metadata/md5-cache/sys-apps/ethtool-5.9
similarity index 96%
rename from metadata/md5-cache/sys-apps/ethtool-5.7
rename to metadata/md5-cache/sys-apps/ethtool-5.9
index f82d3ae01f5d..5adcc56a593b 100644
--- a/metadata/md5-cache/sys-apps/ethtool-5.7
+++ b/metadata/md5-cache/sys-apps/ethtool-5.9
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libmnl )
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/network/ethtool/ethtool-5.7.tar.xz
+SRC_URI=https://www.kernel.org/pub/software/network/ethtool/ethtool-5.9.tar.xz
 _md5_=d5e6c2116c85585ade823c09840ee6a2
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index cbc898e48269..8c5ca7b9559b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 16 Oct 2020 05:38:30 +0000
+Fri, 16 Oct 2020 07:08:26 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 1979caf44f0e..eb86e8b637ae 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri 16 Oct 2020 05:38:30 AM UTC
+Fri 16 Oct 2020 07:08:26 AM UTC
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f088593c575e..ee5cabc5fe15 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 16 Oct 2020 06:00:01 +0000
+Fri, 16 Oct 2020 07:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index bb639b4286cf..b0df21a46a82 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d1a57a91ac61238da9c49a0db6e81e540c330669 1602823688 2020-10-16T04:48:08+00:00
+31d3f3cfcaf6e41124c9ccb20756be5efb744bec 1602829301 2020-10-16T06:21:41+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index eae1aee5a49f..aa96defeb159 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1602826501 Fri 16 Oct 2020 05:35:01 AM UTC
+1602831901 Fri 16 Oct 2020 07:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index cbc898e48269..8c5ca7b9559b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 16 Oct 2020 05:38:30 +0000
+Fri, 16 Oct 2020 07:08:26 +0000
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 3cf743c26c48..500edb9278cf 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index e77178f4559d..fb6957efdf5f 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,2 +1,3 @@
 DIST unrealircd-4.2.4.1.tar.gz 6090725 BLAKE2B 817a7c2a13a495944676d08ed90b36f6795fe43ee171efc6661980e6da9a8cc8d98c4fb0eb8221ac6af85ab1a9b5578a2e992d7b41696434430e58918bc30145 SHA512 752573c4af1f92a10739bb2b0cdaade1948207b46d28ae5177e1dfd6b0663044bc22dce5ffe8549882cd70325e3ef7e3296182fffbb84e08d59dbbdd6551a686
 DIST unrealircd-5.0.6.tar.gz 4975195 BLAKE2B 3ba459e0ec932e9f240825ba9f1fa40e300fe7958f999de86d5653f2e6e4940be8b8da9c885c97bd738abefef601d61da6c4e6c7199c7052d29a74fcf5048828 SHA512 7532e9ab2e039f21796ae813881aec9d34b502ab64efc4323c938232c8901ce882dbcce497ad93df270e4b5fa2e9633c0971f2a6b3213ad458756aea92aa1612
+DIST unrealircd-5.0.7.tar.gz 4995220 BLAKE2B a2996f62b3fe943f9af2cd570866101a501d24f7966378d8e651cf84b9b9d0981fad441b785c6293f4a0668a914cdf191dec52cc6b1e86aac2a51640ca32dbfe SHA512 0b851af26da2ea5d3a04d2ef324d7bd3d3fc820f24d7dfd7e975d6bf1f3954884eb98dc348d291a118d98a214922d3ca1132800381e6f025264856aa06498779
diff --git a/net-irc/unrealircd/unrealircd-5.0.7.ebuild b/net-irc/unrealircd/unrealircd-5.0.7.ebuild
new file mode 100644
index 000000000000..438a6541a211
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-5.0.7.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SSL_CERT_MANDATORY=1
+inherit ssl-cert systemd
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
+
+RDEPEND="
+	acct-group/unrealircd
+	acct-user/unrealircd
+	>=app-crypt/argon2-20171227-r1:=
+	dev-libs/libpcre2
+	>=net-dns/c-ares-1.7:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	curl? ( net-misc/curl[adns] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
+
+src_prepare() {
+	# QA check against bundled pkgs
+	rm -r extras || die
+
+	# building third-party modules (which we don't do) cause a sandbox violation
+	# bug 704444
+	echo "" > src/buildmod || die
+
+	sed -e 's/$(MODULEFLAGS)/$(LDFLAGS) &/' -i src/modules/{,*/}Makefile.in || die
+
+	if use class-nofakelag; then
+		sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# Default value for privatelibdir adds a build path to -Wl,-rpath.
+	econf \
+		--with-bindir="${EPREFIX}"/usr/bin \
+		--with-cachedir="${EPREFIX}"/var/lib/${PN} \
+		--with-confdir="${EPREFIX}"/etc/${PN} \
+		--with-datadir="${EPREFIX}"/var/lib/${PN} \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-logdir="${EPREFIX}"/var/log/${PN} \
+		--with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
+		--without-privatelibdir \
+		--with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
+		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
+		--with-maxconnections=1024 \
+		--with-nick-history=2000 \
+		--with-permissions=0640 \
+		--with-system-argon2 \
+		--with-system-cares \
+		--with-system-pcre2 \
+		--enable-dynamic-linking \
+		--enable-ssl="${EPREFIX}"/usr \
+		$(use_enable curl libcurl "${EPREFIX}"/usr) \
+		$(use_enable prefixaq) \
+		$(use_with showlistmodes) \
+		$(use_with !operoverride no-operoverride) \
+		$(use_with operoverride-verify)
+}
+
+src_install() {
+	keepdir /var/log/${PN}
+	keepdir /var/lib/${PN}/tmp
+
+	newbin src/ircd ${PN}
+
+	(
+		cd src/modules || die
+		for subdir in $(find . -type d -print); do
+			if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
+				exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
+				doexe "${subdir}"/*.so
+			fi
+		done
+	)
+
+	insinto /etc/${PN}
+	# Purposefully omitting the examples/ and ssl/ subdirectories. ssl
+	# is redundant with app-misc/ca-certificates and examples will all
+	# be in docs anyway.
+	doins -r doc/conf/{aliases,help}
+	doins doc/conf/*.conf
+	newins doc/conf/examples/example.conf ${PN}.conf
+	keepdir /etc/${PN}/tls
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
+
+	# config should be read-only
+	fperms -R 0640 /etc/${PN}
+	fperms 0750 /etc/${PN}{,/aliases,/help}
+	fperms 0750 /etc/${PN}/tls
+	# state is editable but not owned by unrealircd directly
+	fperms 0770 /var/log/${PN}
+	fperms 0770 /var/lib/${PN}{,/tmp}
+	fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
+
+	# By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
+	# that to look for ca-certificates-provided file instead. %s is
+	# CONFDIR. #618066
+	dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
+
+	insinto $(systemd_get_systemunitdir)
+	doins "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	# Move docert call from src_install() to install_cert in pkg_postinst for
+	# bug #201682
+	if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
+		if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
+			ewarn "The location ${PN} looks for SSL certificates has changed"
+			ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
+			ewarn "Please move your existing certificates."
+		else
+			(
+				umask 0037
+				install_cert /etc/${PN}/tls/server.cert
+				chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
+				ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
+			)
+		fi
+	fi
+
+	local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
+	# Fix up the default cloak keys.
+	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
+		ebegin "Generating cloak-keys"
+		local keys=(
+			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
+		)
+		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
+		eend $?
+
+		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
+		sed -i \
+			-e '/cloak-keys/ {
+n
+s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
+n
+s/"and another one";/"'"${keys[1]}"'";/
+n
+s/"and another one";/"'"${keys[2]}"'";/
+}' \
+			"${unrealircd_conf}"
+		eend $?
+	fi
+
+	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+	elog
+	elog "You can also configure ${PN} start at boot with rc-update(1)."
+	elog "It is recommended to run unrealircd as an unprivileged user."
+	elog "The provided init.d script does this for you."
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 6c65b8a41b6c..2f4d5869a73b 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 35d182609148..f268e5eb4d6b 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,4 +1,3 @@
 DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5ebe44cd4d1dc351885d2d9957eb206a96bda9efadb5faa0e15a3f0ba07923d7e29b27694e3e3f605151a940d SHA512 c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b
-DIST ethtool-5.6.tar.xz 281084 BLAKE2B 1fecc52e9031a3d13cbe6b3c508ebd7fc6dc03b02d4126b3ddd9ef40eedbef151b66f52e80b6570d45ebba09437b587124d2c22817da7d4f3658bd1ff1d3c8a1 SHA512 9308f8e4a297d842a7a5a51419e408951e669da1f58cb1eed41f52be4cd2f32f811d1d19e9bee59d8297938a6d5a4abff2b9bbf789d0c49ed5074a78826d3199
-DIST ethtool-5.7.tar.xz 283048 BLAKE2B 1f265ea452ec0d37b4bd4bb4e602a27d2d26144d750940b2c61638524626fffb59c3fbf054472e31ff755260d7cce8f6cdc31ef74a512a3656830b546b4bbe6d SHA512 195e24c48201412e0eaad7d7ca4e530c3a8cf50f3518cfe49d299fd091cf9198007c5d23be95109c735ceb2ccad37ac9f2e9cde0fb36ea426ab17b1dd064d4a9
 DIST ethtool-5.8.tar.xz 299416 BLAKE2B ea7433205eba831b6ba56e140c73cfe283cc5dc56ced963414a017b0d6b6fbde9d0195ff64ebdc060351e5e9844af8beb8f00f7e04d76b04f958b166cda7e589 SHA512 5eada909f82573ad93bc5476e6f8d50f68ce2c9948558877eb6ace8dc17aee895b2f27343592f5f23eaef0e0fc70b5f776f76e75d9614bab305a2819ca82370e
+DIST ethtool-5.9.tar.xz 307792 BLAKE2B 0cb5b56f6367bba18c92b1d420471be0b203e05d36fec1495f18de7a2e793fb12cd57b3f2f79369327be1b76a9ec749a65b91801c90da79de9d23da62e628fcb SHA512 9166a06b823373188e754b3085cf8e8f71455d83d1bcfcaf1350433b21bdbc6ae851f62108d3d2e3bbbca33ca595382cd2c68966ce4824b55f7f59eb0996bf36
diff --git a/sys-apps/ethtool/ethtool-5.7.ebuild b/sys-apps/ethtool/ethtool-5.7.ebuild
deleted file mode 100644
index 804cce9dde3e..000000000000
--- a/sys-apps/ethtool/ethtool-5.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
-HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
-SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+netlink"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND="netlink? ( net-libs/libmnl )"
-
-src_configure() {
-	econf $(use_enable netlink)
-}
diff --git a/sys-apps/ethtool/ethtool-5.6-r1.ebuild b/sys-apps/ethtool/ethtool-5.9.ebuild
similarity index 100%
rename from sys-apps/ethtool/ethtool-5.6-r1.ebuild
rename to sys-apps/ethtool/ethtool-5.9.ebuild