9 files changed, 84 insertions, 12 deletions
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 5d724621f3ec..caefbb752ec5 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/buffer/Manifest b/sys-block/buffer/Manifest
index 00b263177b98..dd39c404ab84 100644
--- a/sys-block/buffer/Manifest
+++ b/sys-block/buffer/Manifest
@@ -3,5 +3,5 @@ DIST buffer-1.19.tgz 34960 BLAKE2B ce572e860e1315cf4d5b5f6de43906fbddada2d96c7d9
 DIST buffer_1.19-12.debian.tar.xz 9924 BLAKE2B 9f6591e00d596257956e3230cbdf8e58392aa3666d7900c30ea26d103f03d25071ff1033fa72e7be799021ed4c32d43e0e5ad69d1457a5ee22c33e3ae6f8c058 SHA512 3bc9d8c281268d38c1cc3ac40727d747c91b605fc3128e285d24663f97396292a0ec40ede9205702793b5d090c4e172b0df28321921b000aa0fdcb2660319367
 DIST buffer_1.19.orig.tar.gz 17753 BLAKE2B 68e2026f29cb00c48c8f3638d97adeeee0d194d7a6db96cbded251b3f97d36ba2ac32a60660df8aa1d2c7b79dd774b543d3a460a5d76ab6ca408606a013b5648 SHA512 b724d8c3e21f29890659c95a61db8667846e49614455411995160bc8d5af8a37af91465ad5d882e6bd7883dbd7886215a8c1d530f7392c98cdcead4f4377aa7f
 EBUILD buffer-1.19-r3.ebuild 668 BLAKE2B 712eb3b2872cb66894ece916573b443f6d4f70f932fd3b79659354f10635de6eeeafcb36d78aa989288a7f90d7e58d53bdd1f797c89a286a33e35395f6993765 SHA512 18977f06f1a74d675e527fa03f6c09b1d01b0b59d456c566b724fa1f880627188e2fe5d359a12c9c8540f0b70f4fde7402da315aa757cdefb96c846f2514944b
-EBUILD buffer-1.19-r4.ebuild 1213 BLAKE2B d4f88f4803a1566121ab47afb125d2daea7f4acb36b0188959fcaeaf0a0e210f709f228af2a4d0a18078f505bd12ace07d1386209849edee69de7dab9cd0c657 SHA512 dffba76eaa5e075a70d33d807d8b1610a3dcb8a1a172ebf3dd4633ece52434e92ef43afe1b2a3048fa91d92939723026a6a22192eb05a6ebc259255e35260f92
+EBUILD buffer-1.19-r4.ebuild 1214 BLAKE2B 3015165c6da253da53505a5c8bb3cf29fe97d233fe65584481b5bc34a975e029656ec1c3a00d96407c83466fa724d8bdd4651a09de6c89a06b8f71a142c024c2 SHA512 5934bc6abdafe92eb10913da8f668791f7ddafbcaff84d53f0bb9ed425faa9c72b60da259cce1acf0f4a8a160824802e522d33ed0a9bbe662bef527ca0914588
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/buffer/buffer-1.19-r4.ebuild b/sys-block/buffer/buffer-1.19-r4.ebuild
index b933ee375e56..ed04e96ac0a8 100644
--- a/sys-block/buffer/buffer-1.19-r4.ebuild
+++ b/sys-block/buffer/buffer-1.19-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="a tapedrive tool for speeding up reading from and writing to tape"
+DESCRIPTION="A tapedrive tool for speeding up reading from and writing to tape"
 HOMEPAGE="http://www.microwerks.net/~hugo/"
 
 DEBIAN_PR=12
@@ -22,16 +22,17 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE=""
 
 src_prepare() {
+	local f
 	for f in $(<"${WORKDIR}"/debian/patches/series) ; do
 		p="${WORKDIR}"/debian/patches/${f}.patch
 		ln -sf "${f}" "${p}" || die
-		einfo $p
+		einfo ${p}
 		eapply -p1 "${p}" || die
 	done
-	cd "${S}"
+
+	cd "${S}" || die
 	emake clean
 	eapply_user
 }
diff --git a/sys-block/libzbd/Manifest b/sys-block/libzbd/Manifest
index 88013f274f93..925297c4c636 100644
--- a/sys-block/libzbd/Manifest
+++ b/sys-block/libzbd/Manifest
@@ -1,3 +1,3 @@
 DIST libzbd-1.2.0.tar.gz 56107 BLAKE2B 0b20ced5cb0abc6ac5d303a1b583b1a8c0b3c89936cf664dd227832d5a704f6665a82e0d1c7cf80c381400b4edcff6c9e0b192c10deaf00c89009b40edde8676 SHA512 d165640331c7a87c4660f3f707c0510fa7a21edd194e66e96abe6ad3698dc4652a6a673ac8ac1929b0f603df49c1621f398cfb81b7ab8f9dba6353fa9f05d94f
-EBUILD libzbd-1.2.0-r1.ebuild 965 BLAKE2B 809374e2b2c47de46351dc03cbe6acd34e806f90eb4bfa41e76f26869949f29703b6e7c218ce560cea1a3dbc975af85c7384c4952b62b8b52a3972d7fee3c37f SHA512 2162fa6c3ec233571549683b074ff09e0726fe9c210f51010f24c7c3fbea58acf687e95405202e5f0a5ad394a9d85e47abc5e05519617c19885283b394de7d9b
+EBUILD libzbd-1.2.0-r1.ebuild 972 BLAKE2B 958a77116e8ac79eb82047d9c8108b584aa6d72e1bff655fccd291491ea0c722010fd82a9521cd1da778e60c74ed776909efe4c54142a1352b44031d16167173 SHA512 5f7ae1c5634c7842a93a2c309df1810f69b1f22a8f819957f4424bae176037a0eed6ff894bb2129f89f1dfddcb489eb0c7b304b5562e55d0fb93707369ea00a1
 MISC metadata.xml 360 BLAKE2B a4923a3ae6bd9db591be3a443a7acb0e3a7d1142f72c9f0e38fffa3aa01749058f68d540eb68df67e8368e2981e18b02ea1d3bb4e314afb152ef1c83dbe93cf2 SHA512 270e3d73adc2c49d2d96f4be69a90acc71087113958174acc4ca9b7dd5593765b0bfc593a3ead251a85e5dd25784f19822aa0c8d133c3429d3168b723a1ab7b2
diff --git a/sys-block/libzbd/libzbd-1.2.0-r1.ebuild b/sys-block/libzbd/libzbd-1.2.0-r1.ebuild
index a4d306774d1c..df59911800b2 100644
--- a/sys-block/libzbd/libzbd-1.2.0-r1.ebuild
+++ b/sys-block/libzbd/libzbd-1.2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/westerndigitalcorporation/${PN}/archive/v${PV}.tar.g
 # Examples/tools are GPL-3+, library is LGPL-3+
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="gtk"
 
 # PKG_CHECK_MODULES is only for GTK right now
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 1d9f0e7d5034..5a3061252ad5 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -2,6 +2,8 @@ AUX mbuffer-20180410-sysconfdir.patch 897 BLAKE2B 1fc57be6f5ce11f483d43dc69c9e41
 AUX mbuffer-20200929-find-OBJDUMP.patch 279 BLAKE2B f22f74549eb2fba1061141616097fc01b987c846302a0fd59aaf8a0236a291207a02f0a85ec542fb217377eb40eb0983cd450aaf9a56f3df7838c29f31ab663a SHA512 20a9969de11f6eaf398627a306465df6b43ccb640176c4743ce8e8aa59b06f1837b0ef968223a0770c7aa1cf1959713526fa064f3eb54bbfabb067d834e510c0
 DIST mbuffer-20200929.tgz 147855 BLAKE2B abbcb4b29013ed24b4135a8b7576a0e728c3b5f1987558f0582711b1b00333caea8b55a02c4506ac179a4dae04977ee64572df09a210bf34bd71fd336be7e418 SHA512 332106205ea8743c9cf47529106c04ac15801a02b116d8e0c0fd3baadad51331c9f4ba1c8fa125edb42940cf401048a45ba23e2dac0e5189671bcf0ecee36996
 DIST mbuffer-20210328.tgz 148009 BLAKE2B b369fdae908cfa239e70d092f512f1613215f1a38e5f2dba9403edeb5579fe14a099f0b9950572c1e294c7d5938bd5a363a1cc3239b4553ecd24c6b805fbfe27 SHA512 69f7cac7fe49a86944092d642c6138455ba95da8e6d00abd41b37d126a9f03c3252e69795c5fb5bf8e56d0ce1461bde6b51f48c5eb7073ee49ee4e6df83d834d
+DIST mbuffer-20210829.tgz 148786 BLAKE2B af4d47eab143861a10fa5e9f86cc0066594b675baf37dd63ba71dffb4a22a4bd057ea4a03d50ba210af8c1021dad258a33d46525a11c7cc2ad0dd852839f3b9a SHA512 67b7398c27fb4539d36437b5224a7305216c32af140d5dd9d4af734227bb4bb4c9e8c577e05e315534c5e1cf65a87a9a7a32a212cc4faef17e3c387b3895ef47
 EBUILD mbuffer-20200929.ebuild 1520 BLAKE2B 118ca53f14fbcd0f01b3c1bc6cc75eec9a879c65c3721f1366c3fe1bc18ccb65bfe64f5c4916358ddea8d54a4cb966e6630605172bc3ebad23896c97ce9fc8d0 SHA512 15b13c98138583bbf9046a06d30a84812d661e53cd2ec460f36869d5769185a0cc046883aa0af1b316630c40a75a705e4cd7eaf36f07ff834b4ef9a1dfcbafb6
 EBUILD mbuffer-20210328.ebuild 1520 BLAKE2B 118ca53f14fbcd0f01b3c1bc6cc75eec9a879c65c3721f1366c3fe1bc18ccb65bfe64f5c4916358ddea8d54a4cb966e6630605172bc3ebad23896c97ce9fc8d0 SHA512 15b13c98138583bbf9046a06d30a84812d661e53cd2ec460f36869d5769185a0cc046883aa0af1b316630c40a75a705e4cd7eaf36f07ff834b4ef9a1dfcbafb6
+EBUILD mbuffer-20210829.ebuild 1525 BLAKE2B 7e679c246ce656064853ec65561a425f0e0d2c74980008e9d1213d72c0320d1b0bd0d3e8b513b45a2e46cd516d9bdbf9eef6eba313ec927e6039e551dafa4399 SHA512 02c9cb2c90a0cf0561704fa688449296182ae3e3e74452013fcc1e719be525e6bb72e36dcc99efb2689e49b3e5672fe4d0e850dfdcb72c04bd589badbf36649c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/mbuffer-20210829.ebuild b/sys-block/mbuffer/mbuffer-20210829.ebuild
new file mode 100644
index 000000000000..b5df3c74c1a2
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20210829.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
+HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
+SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="debug ssl test"
+
+REQUIRED_USE="test? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="ssl? (
+		dev-libs/openssl:0=
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
+	"${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
+)
+
+src_prepare() {
+	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
+
+	default
+
+	mv configure.in configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable ssl md5)
+		$(use_enable debug)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
+		ewarn "Some tests may fail with FEATURES=usersandbox or"
+		ewarn "FEATURES=network-sandbox; Skipping tests because"
+		ewarn "test suite would hang forever in such environments!"
+		return 0;
+	fi
+
+	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
+	# using same port and src_install may have problems (with /etc folder)
+	local -x MAKEOPTS=-j1
+
+	default
+}
+
+pkg_postinst() {
+	if ! has_version "app-arch/mt-st"; then
+		elog ""
+		elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
+	fi
+}
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index e7213b402756..30d630225e43 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,5 +1,5 @@
 DIST partitionmanager-21.04.3.tar.xz 2097428 BLAKE2B 821ea6c8cd61a250acd433e55dddc3ddc6e115f8908f79b7d243e0ba5bda69f8edc38e6b2aef1d014258d38111b8cdd361632015af031fd85ced9d13f3ba6129 SHA512 cfaf08ee27a4976de38cee282092915aa154a3c4c0561b1ce9a971e991038473dcce4ffd4f20d845eb5d29e48a223f16b3d4a670d0442b8267c4ed0c86dff4a4
-DIST partitionmanager-21.08.0.tar.xz 2097400 BLAKE2B 186db1f7fbc1d0a9ca77013cefffbadbb06120f539aa46a1dcec96615d1d0d930c0f95fe63a390ce22a15651f857b4decf0490481c26911364f60ceb98c6243d SHA512 2a44055f70a640b7eb020471582d771c11ec82c07f68572ec970b6e8709741be3caaf2f659df15226645ff7c964b1b6b400ebd445a2d6db14463e73d8e7afcd8
+DIST partitionmanager-21.08.1.tar.xz 2097384 BLAKE2B a5a9d40407969ebed61ee4b0f9d2dcd7bdb1b1df9139548a129ce5886cbea22415c3c2c88414decdd6bbbc4e9e46bef8b94028a5705a99d57bef8c1581403d68 SHA512 11f23c9444f46489b9bf691d9ac1522f665a165d4503524aaa955e11966e6a4230021ed6f661878b30cfa0143b5efcc8676048625b3b2a79eea36051477bb2ae
 EBUILD partitionmanager-21.04.3.ebuild 930 BLAKE2B ed9f315068b6ea4ec0ec8be0d90b31fea1d22e83f8bd8d6419469f45348b26e6144f5494d107348cfe4e6f3b3ada02d5abdeb9226277450e844c261004187a90 SHA512 c21359e2137ce508f267ff02f3c029d9d1924df02ab2f28cb9f0492c69a7a94452b1a70b70742d3b6c7b803defaf08dce7f20df9105d94427007fdde50332103
-EBUILD partitionmanager-21.08.0.ebuild 933 BLAKE2B 4f01fc1c6dcff2b3abb9233a5fa6a1aebacbd701810cde265ecc9b175bfb5d99de0d1a793b754ac4b29de233ba7108d01d7b630828140f3e3a559b022df05c67 SHA512 85c79af37e24f1a3472605d768baf24cfffa19337f7685f8c0cc06b24bce10a80b323ffe2d00d4b7aac0394abb3160870a694a655a0722740b5b6cec641f4c78
+EBUILD partitionmanager-21.08.1.ebuild 933 BLAKE2B 35f4bb1de84aecbf9068bda3f2a1ef6644573d8f669479c8e3bf1fe25edde17ef36cafae0c2fbb00a4f141cd7e64afa5c8a45bd17eb0411ad81bdeb94083aad9 SHA512 899f273eb259fafb8ce62791eefd4f83109c530f0535cce543bc0946e62c4d8916857fb7e138083f873bef3a44628e6e757255c083bf1a23ca6e25294efb6757
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/sys-block/partitionmanager/partitionmanager-21.08.0.ebuild b/sys-block/partitionmanager/partitionmanager-21.08.1.ebuild
index 638565cb116c..e71105f11b37 100644
--- a/sys-block/partitionmanager/partitionmanager-21.08.0.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-21.08.1.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
 
 ECM_HANDBOOK="optional"
 KDE_GEAR="true"