diff --git a/Manifest.files.gz b/Manifest.files.gz
index 43fe63bbeccd..83750cc001f1 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e46569a951f5..29ef6ffb6307 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/tdfsb/files/tdfsb-0.0.10-void-return.patch b/app-misc/tdfsb/files/tdfsb-0.0.10-void-return.patch
new file mode 100644
index 000000000000..f092363f01cd
--- /dev/null
+++ b/app-misc/tdfsb/files/tdfsb-0.0.10-void-return.patch
@@ -0,0 +1,13 @@
+As the code below the altered block shows, this was redundant to begin with.
+
+--- a/tdfsb.c
++++ b/tdfsb.c
+@@ -2794,8 +2794,6 @@
+                             else
+                             {
+                                 strcpy(TDFSB_CURRENTPATH,temp_trunc);        
+-                                TDFSB_FUNC_IDLE=nullDisplay; TDFSB_FUNC_DISP=noDisplay; 
+-                                return;
+                             }
+ 			    TDFSB_FUNC_IDLE=nullDisplay;
+                             TDFSB_FUNC_DISP=noDisplay;
diff --git a/app-misc/tdfsb/tdfsb-0.0.10-r2.ebuild b/app-misc/tdfsb/tdfsb-0.0.10-r2.ebuild
new file mode 100644
index 000000000000..cae3e543ef20
--- /dev/null
+++ b/app-misc/tdfsb/tdfsb-0.0.10-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="SDL based graphical file browser"
+HOMEPAGE="https://www.determinate.net/webdata/seg/tdfsb.html"
+SRC_URI="https://www.determinate.net/webdata/data/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-libs/freeglut
+	media-libs/sdl-image
+	media-libs/smpeg
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-asneeded.patch
+	"${FILESDIR}"/${P}-debugging.patch
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-void-return.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "s|-O2|${CFLAGS} ${LDFLAGS}|" \
+		-e "s:gcc:$(tc-getCC):" "${S}"/compile.sh || die
+}
+
+src_compile() {
+	./compile.sh || die "compile failed"
+}
+
+src_install() {
+	dobin tdfsb
+	dodoc ChangeLog README
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index ed641900ecfa..db06d9e3395e 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/epkg/epkg-0.4-r2.ebuild b/app-portage/epkg/epkg-0.4-r2.ebuild
new file mode 100644
index 000000000000..489131a2d8f7
--- /dev/null
+++ b/app-portage/epkg/epkg-0.4-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A simple portage wrapper which works like other package managers"
+HOMEPAGE="https://github.com/jdhore/epkg"
+SRC_URI="https://github.com/jdhore/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-portage/eix
+	app-portage/gentoolkit
+	sys-apps/portage"
+
+S="${WORKDIR}"/${PN}-${P}
+
+src_install() {
+	dobin epkg
+	doman doc/epkg.1
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9c36070c452b..25437ba9c26d 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/fec/fec-1.0.4-r3.ebuild b/dev-java/fec/fec-1.0.4-r3.ebuild
index 11b1f1df74fb..8785863a4756 100644
--- a/dev-java/fec/fec-1.0.4-r3.ebuild
+++ b/dev-java/fec/fec-1.0.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 CDEPEND="dev-java/log4j:0"
diff --git a/dev-java/lzma/lzma-19.00.ebuild b/dev-java/lzma/lzma-19.00.ebuild
index 88e381330a05..5cc79607bae6 100644
--- a/dev-java/lzma/lzma-19.00.ebuild
+++ b/dev-java/lzma/lzma-19.00.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.7-zip.org/a/${PN}${PV/./}.7z"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/lzmajio/lzmajio-0.95-r3.ebuild b/dev-java/lzmajio/lzmajio-0.95-r3.ebuild
index e4b47cccb1e9..f7582eed9a59 100644
--- a/dev-java/lzmajio/lzmajio-0.95-r3.ebuild
+++ b/dev-java/lzmajio/lzmajio-0.95-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/league/${P}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 CDEPEND="dev-java/lzma:0"
 
diff --git a/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild b/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild
index 8fe643d64cd1..a487e604af4b 100644
--- a/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild
+++ b/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 96775b5a9ddb..2a8154974f99 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/rubberband/rubberband-2.0.0.ebuild b/media-libs/rubberband/rubberband-2.0.0.ebuild
index c364d1398383..8a1c77033e89 100644
--- a/media-libs/rubberband/rubberband-2.0.0.ebuild
+++ b/media-libs/rubberband/rubberband-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="ladspa jni static-libs +programs vamp"
 
 BDEPEND="
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 3a6d2f30b0a3..4ea811eadb5a 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/mpg123/mpg123-1.29.2.ebuild b/media-sound/mpg123/mpg123-1.29.2.ebuild
index 29a2b1f3de75..02a5a54e5594 100644
--- a/media-sound/mpg123/mpg123-1.29.2.ebuild
+++ b/media-sound/mpg123/mpg123-1.29.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 4b08164a171e..10bf767bc8d2 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 3206a03b5c2d..c0ab228376cf 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 23 Nov 2021 08:39:12 +0000
+Tue, 23 Nov 2021 10:09:12 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3206a03b5c2d..c0ab228376cf 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 23 Nov 2021 08:39:12 +0000
+Tue, 23 Nov 2021 10:09:12 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index f000e4ec3c9a..4d02ad738471 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 1428e41d4694..471502b09f23 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/tdfsb-0.0.10-r2 b/metadata/md5-cache/app-misc/tdfsb-0.0.10-r2
new file mode 100644
index 000000000000..81de13736a4b
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tdfsb-0.0.10-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/freeglut media-libs/sdl-image media-libs/smpeg virtual/glu x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu
+DESCRIPTION=SDL based graphical file browser
+EAPI=8
+HOMEPAGE=https://www.determinate.net/webdata/seg/tdfsb.html
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/freeglut media-libs/sdl-image media-libs/smpeg virtual/glu x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu
+SLOT=0
+SRC_URI=https://www.determinate.net/webdata/data/tdfsb-0.0.10.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e3d9e31623e512637679367eda35be4b
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index eb59ea6b396a..07426c9670ae 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/epkg-0.4-r2 b/metadata/md5-cache/app-portage/epkg-0.4-r2
new file mode 100644
index 000000000000..ec2b70454118
--- /dev/null
+++ b/metadata/md5-cache/app-portage/epkg-0.4-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=A simple portage wrapper which works like other package managers
+EAPI=8
+HOMEPAGE=https://github.com/jdhore/epkg
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=app-portage/eix app-portage/gentoolkit sys-apps/portage
+SLOT=0
+SRC_URI=https://github.com/jdhore/epkg/archive/refs/tags/epkg-0.4.tar.gz
+_md5_=f5f20d32587a685cdc673489e7097305
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index abd952987b60..059352b82257 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/fec-1.0.4-r3 b/metadata/md5-cache/dev-java/fec-1.0.4-r3
index 73c19516723f..91a54ab610f2 100644
--- a/metadata/md5-cache/dev-java/fec-1.0.4-r3
+++ b/metadata/md5-cache/dev-java/fec-1.0.4-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Forward Error Correction library in Java
 EAPI=7
 HOMEPAGE=https://bitbucket.org/onionnetworks/
 IUSE=elibc_FreeBSD doc source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=dev-java/log4j:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/fec-1.0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=718bfaf0e6fbc196a999cbc8530d3d93
+_md5_=3cdb961f50acd23f5f5b5d822c3a8847
diff --git a/metadata/md5-cache/dev-java/lzma-19.00 b/metadata/md5-cache/dev-java/lzma-19.00
index c0b0d8b3898a..482875fdc806 100644
--- a/metadata/md5-cache/dev-java/lzma-19.00
+++ b/metadata/md5-cache/dev-java/lzma-19.00
@@ -5,10 +5,10 @@ DESCRIPTION=Java code for LZMA compression and decompression
 EAPI=7
 HOMEPAGE=https://www.7-zip.org/
 IUSE=elibc_FreeBSD doc source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://www.7-zip.org/a/lzma1900.7z
 _eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=204d843bd5952f27a32264b4f396b7ca
+_md5_=5aac5e2e5e0ff89ff6b6a097306ba462
diff --git a/metadata/md5-cache/dev-java/lzmajio-0.95-r3 b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
index 890650ff7277..f8334974acf0 100644
--- a/metadata/md5-cache/dev-java/lzmajio-0.95-r3
+++ b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
@@ -4,10 +4,10 @@ DESCRIPTION=LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en
 EAPI=7
 HOMEPAGE=https://contrapunctus.net/league/haques/lzmajio/ https://github.com/league/lzmajio
 IUSE=elibc_FreeBSD doc source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-java/lzma:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/league/lzmajio-0.95/archive/0.95.tar.gz -> lzmajio-0.95.tar.gz
 _eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=198427cf9617e8543064b00ed329ca3b
+_md5_=288df90ccb49d7c7d9ae0883216eeb02
diff --git a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2 b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
index f19d9d30bf68..5d2f251c9500 100644
--- a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
+++ b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Modified MersenneTwister java port for Freenet
 EAPI=7
 HOMEPAGE=http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
 IUSE=elibc_FreeBSD doc source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/mersennetwister-0_pre23765.tar.bz2
 _eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=9964f30c3f1b2ba511ea861c21cba61f
+_md5_=ac6c0fc3903c0f995461ba9ad1e2bb5c
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 604b6cd2e9d0..5fdc87ddb1a4 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/rubberband-2.0.0 b/metadata/md5-cache/media-libs/rubberband-2.0.0
index ee8be2121402..1a31bf0db556 100644
--- a/metadata/md5-cache/media-libs/rubberband-2.0.0
+++ b/metadata/md5-cache/media-libs/rubberband-2.0.0
@@ -5,10 +5,10 @@ DESCRIPTION=An audio time-stretching and pitch-shifting library and utility prog
 EAPI=8
 HOMEPAGE=https://www.breakfastquay.com/rubberband/
 IUSE=ladspa jni static-libs +programs vamp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( >=virtual/jdk-1.8:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://breakfastquay.com/files/releases/rubberband-2.0.0.tar.bz2
 _eclasses_=meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3770716f02d521f2f252eed2ca8cfa8e
+_md5_=374dceffd0e2a01f199b1d6d1c68970d
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 2255b280e4fa..248bcbe3a177 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/mpg123-1.29.2 b/metadata/md5-cache/media-sound/mpg123-1.29.2
index 489cacf38387..692fec796afd 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.29.2
+++ b/metadata/md5-cache/media-sound/mpg123-1.29.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.mpg123.org/
 IDEPEND=app-eselect/eselect-mpg123
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
 SLOT=0
 SRC_URI=https://www.mpg123.org/download/mpg123-1.29.2.tar.bz2
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d20083453e92da5ecfef14f78488bae9
+_md5_=ecb5bd9bd4168325281982e951e902ad
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 5bf334f4a1cc..be1b21ef8689 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/knot-3.1.2 b/metadata/md5-cache/net-dns/knot-3.1.2
deleted file mode 100644
index cf2a4f9a6137..000000000000
--- a/metadata/md5-cache/net-dns/knot-3.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=High-performance authoritative-only DNS server
-EAPI=7
-HOMEPAGE=https://www.knot-dns.cz/
-IUSE=doc caps +fastparser idn +libidn2 systemd +utils +cookies +dnsproxy dnstap geoip +noudp +onlinesign +queryacl +rrl +stats +synthrecord +whoami
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=GPL-3
-RDEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
-SLOT=0
-SRC_URI=https://secure.nic.cz/files/knot-dns/knot-3.1.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=244573f4971f6358f6645bb8a2777408
diff --git a/metadata/md5-cache/net-dns/knot-3.1.1 b/metadata/md5-cache/net-dns/knot-3.1.4
similarity index 70%
rename from metadata/md5-cache/net-dns/knot-3.1.1
rename to metadata/md5-cache/net-dns/knot-3.1.4
index aed6138ea381..1b6e2858b559 100644
--- a/metadata/md5-cache/net-dns/knot-3.1.1
+++ b/metadata/md5-cache/net-dns/knot-3.1.4
@@ -2,13 +2,13 @@ BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install test
 DEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
 DESCRIPTION=High-performance authoritative-only DNS server
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.knot-dns.cz/
 IUSE=doc caps +fastparser idn +libidn2 systemd +utils +cookies +dnsproxy dnstap geoip +noudp +onlinesign +queryacl +rrl +stats +synthrecord +whoami
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
 SLOT=0
-SRC_URI=https://secure.nic.cz/files/knot-dns/knot-3.1.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=244573f4971f6358f6645bb8a2777408
+SRC_URI=https://secure.nic.cz/files/knot-dns/knot-3.1.4.tar.xz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=132d9f17b2638194fcd404a1c2e9c157
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 5cba52390344..3425b7a81eb6 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.15.1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
new file mode 100644
index 000000000000..2c64c128629f
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
+DESCRIPTION=Btrfs filesystem utilities
+EAPI=7
+HOMEPAGE=https://btrfs.wiki.kernel.org
+IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RESTRICT=test
+SLOT=0/0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.15.1.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=305d9910882b05518339e2288c24a104
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.36 b/metadata/md5-cache/sys-fs/mtools-4.0.36
new file mode 100644
index 000000000000..65dad770f979
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
+DESCRIPTION=utilities to access MS-DOS disks from Unix without mounting them
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
+IUSE=X elibc_glibc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris
+LICENSE=GPL-3
+RDEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
+SLOT=0
+SRC_URI=mirror://gnu/mtools/mtools-4.0.36.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=33622ddcb9e63ddd9adba1ad8e2e7bd8
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3206a03b5c2d..c0ab228376cf 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 23 Nov 2021 08:39:12 +0000
+Tue, 23 Nov 2021 10:09:12 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 7b968d949adc..40bb1404dc2c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Nov 23 08:39:12 AM UTC 2021
+Tue Nov 23 10:09:12 AM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6e507bb7d60c..3a430df920b0 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 23 Nov 2021 09:00:01 +0000
+Tue, 23 Nov 2021 10:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index a12625217bec..24dc553048e2 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ccb18547178ad609081398a3754616da52290f9f 1637655735 2021-11-23T08:22:15+00:00
+2028e9f255bfc19c99d654ce4a32ca87bfe6727f 1637661004 2021-11-23T09:50:04+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f7cf3f894c69..061cdfcb5bdb 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1637656501 Tue 23 Nov 2021 08:35:01 AM UTC
+1637661901 Tue 23 Nov 2021 10:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 3206a03b5c2d..c0ab228376cf 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 23 Nov 2021 08:39:12 +0000
+Tue, 23 Nov 2021 10:09:12 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 88a6b9a4a8e5..8992cd34fd9d 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 6c122ea04df1..14f3e9d7e6a6 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,3 +1,2 @@
-DIST knot-3.1.1.tar.xz 1402352 BLAKE2B d6f9d29de153b5bdea8a294ae3d65131a0bdcc339ecdc507a9e1429a9cc50752e91f14ea84a7446de76869c6f129d571e9b6b4f9b048618941c4f4c0d667dbff SHA512 44c2973025e752f73ebd6bc78dad5c48c1c1432b62ec3b6d75b5876af4dd21aeed94f78523ef85cd6a986ff27789143a0a67450819c0b75ffa627d06b98e1b0b
-DIST knot-3.1.2.tar.xz 1406684 BLAKE2B a849bf651357e462c5a0afb16e42bcd85bb310980c83b4c642bcf99ddfd17a59e5f5fd5f9fd58b21bcac2e287c57351b3b09cf3f4054ef51243b5226bf0bcc88 SHA512 e72f249f6291980cc69f90dca54cd8ba3ffbc617a1e69e441a48bdcbf46afb9fc202bbb1f88a93887fd264ddb59ad42ff6765c9bd0c1fa4789f035a902a3907a
 DIST knot-3.1.3.tar.xz 1407576 BLAKE2B 03cde89e32ac2440e721157db1af9b9cbb40ad2d8d813b0d8bc26fe1feb28f59055a3cbe287d50adb13f5190ce3ed532521189997d03b4fe9e4264f309032e23 SHA512 537013e914c3f00615a384c92da06c40bb33871e7dbd28e987280d62d91df42026774cfe0596ac72a218dafa650d8d600b1d831dd0a5c28a9fd796c5cd799838
+DIST knot-3.1.4.tar.xz 1408656 BLAKE2B 637371e5cc9aa0b880fda96d1d61f9e168cc96c244551b17381a1641a8b6ace7cac7ac6b7cf40fb2e86ac8f606be8d1342e548e5cadd64770610b2a5aa35f1f0 SHA512 307667a12b989fee443832d4642fc927231f38f0331439c8c7196c489d196245eca368d96a36fe49639b773f652f7cb80bf0c16bc1ad107e11b47b70e1f04060
diff --git a/net-dns/knot/knot-3.1.2.ebuild b/net-dns/knot/knot-3.1.2.ebuild
deleted file mode 100644
index b4082a371f4a..000000000000
--- a/net-dns/knot/knot-3.1.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="https://www.knot-dns.cz/"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-KNOT_MODULES=(
-	"+cookies"
-	"+dnsproxy"
-	"dnstap"
-	"geoip"
-	"+noudp"
-	"+onlinesign"
-	"+queryacl"
-	"+rrl"
-	"+stats"
-	"+synthrecord"
-	"+whoami"
-)
-IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
-
-RDEPEND="
-	acct-group/knot
-	acct-user/knot
-	dev-db/lmdb
-	dev-libs/libedit
-	dev-libs/userspace-rcu:=
-	dev-python/lmdb
-	net-libs/gnutls:=
-	caps? ( sys-libs/libcap-ng )
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c:=
-	)
-	geoip? ( dev-libs/libmaxminddb:= )
-	idn? (
-		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
-		libidn2? ( net-dns/libidn2:= )
-	)
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	local u
-	local my_conf=(
-		--with-storage="${EPREFIX}/var/lib/${PN}"
-		--with-rundir="${EPREFIX}/var/run/${PN}"
-		$(use_enable fastparser)
-		$(use_enable dnstap)
-		$(use_enable doc documentation)
-		$(use_enable utils utilities)
-		--enable-systemd=$(usex systemd)
-		$(use_with idn libidn)
-	)
-
-	for u in "${KNOT_MODULES[@]#+}"; do
-		my_conf+=("$(use_with ${u} module-${u})")
-	done
-
-	if use riscv; then
-		append-libs -latomic
-	fi
-
-	econf "${my_conf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-
-	default
-
-	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
-
-	newinitd "${FILESDIR}/knot.init" knot
-	if use systemd; then
-		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-dns/knot/knot-3.1.1.ebuild b/net-dns/knot/knot-3.1.4.ebuild
similarity index 99%
rename from net-dns/knot/knot-3.1.1.ebuild
rename to net-dns/knot/knot-3.1.4.ebuild
index b4082a371f4a..4b7058faa52a 100644
--- a/net-dns/knot/knot-3.1.1.ebuild
+++ b/net-dns/knot/knot-3.1.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic systemd
 
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b431bfb3673c..e5b9f1d7302f 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 439a2923d0b0..a0682cc87be5 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,3 +1,4 @@
 DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
 DIST btrfs-progs-v5.14.2.tar.xz 2252600 BLAKE2B 74ac21bc9bbc70a4034b6a439afbd0c0ab023ac7815c1cae1e7ac81c4239684d41be06bebe1d015dc2a0ba80cf0975e8f6da7e111b2825eb1a7814d1832914eb SHA512 dc1a73e49dd94ccd8128c197d99f112977b16350d22bc0ca32247211314a3fec66de73827305bf24ef8e0571fc890f00378d0ec3a82988f0ee54f5db10f6578c
+DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549
 DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 45fa1e20d14bdd92b1a7761771c7b6c2795d885f91fb44c9c5cf9c735c0c6c0f319e701ca2f6bf19191c50552459287042b56d4308fcc2da5bd566e63c755941 SHA512 5fc182c490733cbe7f2cdb8e131e0c79e5cc374ae32427d5f9ee2251e00e6e1d8ba0fdbbe31d50230f2bded08a9b9c652a4288998a427643a2d738f57ce72f90
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
new file mode 100644
index 000000000000..36548f98db8a
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 2008-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit bash-completion-r1 python-single-r1
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV="v${PV/_/-}"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+else
+	WANT_LIBTOOL=none
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert doc python reiserfs static static-libs +zstd"
+
+RESTRICT=test # tries to mount repared filesystems
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-apps/util-linux:0=[static-libs(+)?]
+	sys-libs/zlib:0=
+	convert? (
+		sys-fs/e2fsprogs:=
+		reiserfs? (
+			>=sys-fs/reiserfsprogs-3.6.27
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	zstd? ( app-arch/zstd:0= )
+"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-5.10
+	convert? ( sys-apps/acl )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)
+	static? (
+		dev-libs/lzo:2[static-libs(+)]
+		sys-apps/util-linux:0[static-libs(+)]
+		sys-libs/zlib:0[static-libs(+)]
+		convert? (
+			sys-fs/e2fsprogs[static-libs(+)]
+			reiserfs? (
+				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+			)
+		)
+		zstd? ( app-arch/zstd:0[static-libs(+)] )
+	)
+"
+BDEPEND="
+	doc? (
+		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
+		app-text/docbook-xml-dtd:4.5
+		app-text/xmlto
+	)
+"
+
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" sys-devel/gnuconfig"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		AT_M4DIR=m4 eautoreconf
+		mkdir config || die
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		$(use_enable convert)
+		$(use_enable doc documentation)
+		$(use_enable elibc_glibc backtrace)
+		$(use_enable python)
+		$(use_enable static-libs static)
+		$(use_enable zstd)
+		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_install() {
+	local makeargs=(
+		$(usex python install_python '')
+		$(usex static install-static '')
+	)
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+	newbashcomp btrfs-completion btrfs
+	use python && python_optimize
+
+	# install prebuilt subset of manuals
+	use doc || doman Documentation/*.[58]
+}
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 23be5fc47a35..1be4894863e0 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1 +1,2 @@
 DIST mtools-4.0.35.tar.bz2 455988 BLAKE2B 9c1ac7f3ad3f9f13a572d0e1ea3c3a9d79bd08f0ae963c7357a19a687b74536cd8442eb167a9e50f7d22398c56736753b0d98bccdaa4c7d8427d1c09e1dd786c SHA512 ef563b3319285667993c82d819e08cb819a6bcd71c466fc252568996b4218cfb3731107ffcd6150ba33c0837e012e02057def41e2b011f751eaf550bfa366a10
+DIST mtools-4.0.36.tar.bz2 445920 BLAKE2B 753ee3e412452572b36d15805982255f28bc277764ce66a0fe8483e19a3488fbb282b873a6be85e87e82a71bf7fda517e1234e1911f0b7c3f3992e25f8d18322 SHA512 2425ee0e39c06ea201a5303ab09a0aa9f0c59341522e2c15abc4f079320fd3d67d28afeb2870ee508d472bba6904c542e11c02b92652c8eda1bf338bab372d07
diff --git a/sys-fs/mtools/mtools-4.0.36.ebuild b/sys-fs/mtools/mtools-4.0.36.ebuild
new file mode 100644
index 000000000000..3ebdd3b6df91
--- /dev/null
+++ b/sys-fs/mtools/mtools-4.0.36.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
+HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="X elibc_glibc"
+
+RDEPEND="
+	!elibc_glibc? ( virtual/libiconv )
+	X? (
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	use !elibc_glibc && use !elibc_musl && append-libs "-liconv" #447688
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/mtools
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local -a DOCS=( README* Release.notes )
+	default
+
+	insinto /etc/mtools
+	doins mtools.conf
+
+	# default is fine
+	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
+}