gentoo resync : 25.11.2020

46 files changed, 423 insertions, 956 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 7c9890b03dd5..f2c3bab12887 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/cec/Manifest b/sys-block/cec/Manifest
index 048427a4e943..1a3652f094b1 100644
--- a/sys-block/cec/Manifest
+++ b/sys-block/cec/Manifest
@@ -1,3 +1,4 @@
+AUX cec-14-fno-common.patch 915 BLAKE2B 7c27607c44abb9e321c1891d2683ce7a6a8601d01b1d0d4021bb319bf83951193863a071ec46d7d3cac3ff795a17642b4fba455f6eb13c4a91447c736cefc0da SHA512 ea02e6dc3c0d546285a948966ba149e08684df62efea371230bd2e5dd1fbd2eb6969a490fcb6f238bdf934cd9a19da9c343d71d3ae1a392c071f1d140eb02934
 DIST cec-14.tgz 22654 BLAKE2B 01bf2c301983a5183bcffb3975ffb148b7efd2b7ea945c71654f090b1063ec1502bb4b64885924ef1fcd5798378537182a3b54e64400187fb515a6fc864a539c SHA512 b024c26badc7992c1d2804378119e214923bd7cfbac80de374efd22084595f74752db0edf3b83ac0e258db1847a3b49734958effc3961c9e086e61d5b806782c
-EBUILD cec-14.ebuild 475 BLAKE2B 97934cdaae8e05e21a8b52a39042f34f1910127dded28554fdad84cb8e1ac13fbb97276d320581558323973e05c4965b37696fe57a145b00408d5f95989fa559 SHA512 edde09ad57506b3e4b12a31ca4cff6ce3ec515d567fbc634a0bf0cfcc8146e7f8b85467a5315a8bbcc23a3d1758a94cf32286baa568b0903411d810d2ab9c513
+EBUILD cec-14.ebuild 513 BLAKE2B bd45dc6a07308d44228a41a314c8c7b838d713583ebdb024ef280686e5aa24a17f46a0d73d83423cc71594c51d0b55dbde942d1d20c68ea5718a8da717684043 SHA512 93868f0f138f398438a0fee92897e06d7469bd32fb8e8de7d789d62e3f6313f4b376200c7e1b477ae84bfbaf6de7ab85286b2cc0b66f101f198b7a23d69e6429
 MISC metadata.xml 245 BLAKE2B 1b7a6d4a39b54b959230e9f6941be9369471f402c248a481c4cb0e5cd707b3c4b1d4e8b8a80c01ea9a4dafdf5a0406da9e67a40e1e622427dd3a28e106aea76f SHA512 ed2e6dddb717dffd70eb6a115254a3743c1fc04be9166844e94272797800f8d4dfb39f43c693f31385837b948f365f2fa9ab9010c06bd3cc3ac1d06dc4e3078d
diff --git a/sys-block/cec/cec-14.ebuild b/sys-block/cec/cec-14.ebuild
index 1b70ba738da6..367dcfda642f 100644
--- a/sys-block/cec/cec-14.ebuild
+++ b/sys-block/cec/cec-14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,7 +12,8 @@ SRC_URI="mirror://sourceforge/aoetools/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
diff --git a/sys-block/cec/files/cec-14-fno-common.patch b/sys-block/cec/files/cec-14-fno-common.patch
new file mode 100644
index 000000000000..e7e3ce022675
--- /dev/null
+++ b/sys-block/cec/files/cec-14-fno-common.patch
@@ -0,0 +1,57 @@
+--- a/cec.c
++++ b/cec.c
+@@ -20,6 +20,9 @@
+ typedef struct Shelf Shelf;
+ typedef struct Pkt Pkt;
+ 
++int debug;
++char *progname;
++
+ struct Pkt {
+ 	uchar		dst[6];
+ 	uchar		src[6];
+@@ -76,7 +79,7 @@ extern int errno;
+ Shelf	tab[Ntab];
+ int	ntab;
+ uchar	contag;
+-extern 	int fd;		/* set in netopen */
++int fd;		/* set in netopen */
+ int	shelf;
+ Shelf	*connp;
+ char 	esc = '';
+--- a/cec.h
++++ b/cec.h
+@@ -6,8 +6,8 @@ typedef unsigned char uchar;
+ typedef unsigned int uint;
+ #endif
+ 
+-int debug;
+-char *progname;
++extern int debug;
++extern char *progname;
+ extern char hbacecfile[];
+ 
+ int netopen(char *name);
+--- a/hba.c
++++ b/hba.c
+@@ -9,7 +9,7 @@
+ 
+ #include "cec.h"
+ 
+-int fd;
++extern int fd;
+ static char hba_bytes[1<<14];
+ static int hba_len;
+ 
+--- a/linux.c
++++ b/linux.c
+@@ -25,7 +25,8 @@
+ 
+ #include "cec.h"
+ 
+-int fd;
++extern int fd;
++extern int debug;
+ char net_bytes[1<<14];
+ int net_len;
+ char srcaddr[6];
diff --git a/sys-block/f3/Manifest b/sys-block/f3/Manifest
index 8fceb834afc1..ff57e2df2270 100644
--- a/sys-block/f3/Manifest
+++ b/sys-block/f3/Manifest
@@ -1,3 +1,5 @@
 DIST f3-7.2.tar.gz 68471 BLAKE2B fa2e98ee0bdbad117c44bcc866d8ee5ef1572469d0b3cc48734de0fdb47653946774cc85429157f00d2a977662f593885074822bf1e069aa84ceafafa64726bf SHA512 4e41fca8b02dbd6bfaae01237a47573916aefe47f5aafc864618d708568e32ec122390c03af24d89caaf03de692fa374e87747b07a8546eaf8cafd57887a61ac
+DIST f3-8.0.tar.gz 71493 BLAKE2B e5c580971b001be0041b7cda2815d3e075b9590dde20f3afc722dc0126b10dfd13f85e4d2c7994210b4bc4746fed2ef400582293cbdf9d3271ca62ba379b4df0 SHA512 4c929eb3ad56ffefff7ae3266148e2000e14f01553c1960ddbe77a164df18dda6f32980140b7568e32a3165f9362e4f43c990a946a62b15b06720d6f8b87f924
 EBUILD f3-7.2.ebuild 1024 BLAKE2B 9a667aeba7406e8c7052e27786c7227cb891e6b8ca50d58eecf889532d1a51e043effc14e92e52a8ae956687c8c76f878fc4c5b18e78290c394f1edbdef33529 SHA512 ce0cb757390b388699f342015da761a51686bcf135dd17abf4f16560daf04d7bf4349fcb307248afa9cd6d7fc4bf2be17d4478a5d437c331b397df6ade2f58af
+EBUILD f3-8.0.ebuild 1026 BLAKE2B 75d21bae985526a6e49992c46fb5c6653f8ea557c01d476cb0776841e74d8c8b9d8aac4d9882b2b60ef970ec0f383ee4b3ca91bf8478b46d97f490b46a906856 SHA512 c591a0ead73fd60edb53bc0bf4b623ab05f701e3d4cf162d7b5ac14452ac4129478f14a4a1e01f5ef510bd31410b4706de484cc9eff6597dcb5a8235dcdf0ecc
 MISC metadata.xml 959 BLAKE2B 216b03b57f363f727f19317c6ac7a9dcd5c383f23939803e0e04a5061628c0669083084e0bfd2a3bd8234810e37cf851babc8b63355bd9e4082a35126844c4df SHA512 a3c52956ad1241ea8d834cfe4d45f36fb80e4c3d717f18e0f15e126b950a2cf6fdd036e8612b9feee8812d9c77a49ce9e209a2e54fd8d0f3655696814b4c9b40
diff --git a/sys-block/f3/f3-8.0.ebuild b/sys-block/f3/f3-8.0.ebuild
new file mode 100644
index 000000000000..353b4009e3cc
--- /dev/null
+++ b/sys-block/f3/f3-8.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Utilities to detect broken or counterfeit flash storage"
+HOMEPAGE="http://oss.digirati.com.br/f3/ https://github.com/AltraMayor/f3"
+
+PATCHES=(
+)
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/AltraMayor/${PN}.git"
+
+	PATCHES=()
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/AltraMayor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+IUSE="extra"
+
+DEPEND="extra? (
+		sys-block/parted
+		virtual/udev
+	)"
+
+RDEPEND=""
+
+DOCS=( changelog README.rst )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:-ggdb::' \
+		-e 's:^PREFIX =:PREFIX ?=:' \
+		Makefile || die
+
+	tc-export CC
+}
+
+src_compile() {
+	default
+
+	if use extra; then
+		emake V=1 extra
+	fi
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install
+
+	if use extra; then
+		emake PREFIX="${ED}/usr" install-extra
+	fi
+
+	einstalldocs
+}
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 81946f178a16..0d563dd9ca2c 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -12,7 +12,6 @@ EBUILD fio-3.16.ebuild 3536 BLAKE2B 2103340435d0bab73419f187554e6d1d466f6cd9b9cb
 EBUILD fio-3.17-r1.ebuild 3944 BLAKE2B 332569e86cb7542fe3003acd4eecc2fceb34d987db50f7bb1c3343231fdd2cb8b7f5cfef993f328a8ea34d440a32b78bf38a60f2524ad761931ec511189fb67d SHA512 fec9f05a86081b670fa5f995f3fd3a4afe084ad9f09d92a6d5d4cbd3b5a168580f5208da64da6a8a186347bf64c8f4029dee7e0d9047e15454d644a5a889c317
 EBUILD fio-3.17.ebuild 3548 BLAKE2B 4a13146b9ade206190d95a4daa235e4c2c15d040335e5eee8a9fd55a50e643c27b9abc2f42095e96291b3e70b69f38a0048effc9899937926f50e52ebf77f408 SHA512 fb04e3eda7ba0f4f3f5ffc905c502ed1a0a3618d131fce539f17a6cd3d2b1f5aa2c33645504eb18c292d86d22462f84f149712baba862df4e8b5c9aafdb74fe1
 EBUILD fio-3.19.ebuild 3894 BLAKE2B 558a90a4f245837ee0044529d2e09d381c5675410239abd2f21a5376299d51626a09494d50b5e09194ce2bb0759686b4ce47994ed9f394a65e8e7bfcf86f42b9 SHA512 8f2d3c714e4a53691353e51ddf0b50da0d5e614f5af0c126b724d3264e99823124b54c4602e12e499f4e8e752e0df5eade5b2fcc921680dded6e664387cc8d9e
-EBUILD fio-3.20-r1.ebuild 4432 BLAKE2B 307c850c639c5395e3b972feffb16ca1cf329453f17f6845062e7b2390e62774ae92db7171e816c59cdd3976da41fb92af2104ce60b00681dbe960ed41398ae6 SHA512 ed4185e3a998fc03dcf773b1b06200cdcfcbd901fd35fac09adaee9023e762d89750277d10e35f99c9d289555466754c745a89d89d33853d4c98bcd3eff7f623
-EBUILD fio-3.20.ebuild 4391 BLAKE2B b9689e5ee54353db6d0e60afb69da68a06c70fd7f5af41efcc11887c20a6bd53fb2d2e38b23719bec79d155e696e07bcc399013e85b619c6403f7e33a343dd77 SHA512 a574abda812f38276aca681fdaaa38fb043ad5dc111ae62086db844e659794ac7ce14995356d339e4861d7e50f7f2db7bc2bb8c47bba17c1f7f93767d0f6f8d6
+EBUILD fio-3.20-r2.ebuild 4434 BLAKE2B eb2c49c2cdce8d9613defb2ceb4bf6855bdd8ec260bb9b8ae5fed498ff1a25eee3980b198b22a032c019c72293680516959bfce0af74111eb3420ded19387628 SHA512 a491f050fc082329cb760b76f3182916e8c6fd7a33d3e6646f87abdfb072cdc41cdb5b3fb5e3db0155dfcbf019c188f69ac56df8d45906adf70235f46392d212
 EBUILD fio-3.7.ebuild 2996 BLAKE2B 66bbc26691006fe8d796009b2260ee768a251e462280d5c0fb7871a96bd67fd9955a02624ecee60ec34fec2218cb89ae5c782ee87dd237f6f9d5d77698dec482 SHA512 7cc3d4a80c9f608da5d5c8da831f1acd46e0fcb8ac90808f24cc876203e831317b19d4778d951db0e1bfacf73d96acc4c1526095967d198263bbb0f89c73bf46
 MISC metadata.xml 1172 BLAKE2B e35bbaaa15c8cd095791a4a23a7344314a015ea42bb864b11bb165d340585ee667f969426282465b834a7d092ab6885736e55ec8d4fe950001fbb6336fdfdc14 SHA512 defbc7f932a5ab83b67da58a601ef62784b27f2268f8a8dd5057c02fb441b164bd0945217fa52a0e06803c74b5168dda3b4668de52f593d5cade428bd2f79e86
diff --git a/sys-block/fio/fio-3.20-r1.ebuild b/sys-block/fio/fio-3.20-r2.ebuild
index 445de828e1e3..36b088a60fb9 100644
--- a/sys-block/fio/fio-3.20-r1.ebuild
+++ b/sys-block/fio/fio-3.20-r2.ebuild
@@ -35,7 +35,7 @@ LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
 	)
 	glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
 	gtk? ( dev-libs/glib:2[static-libs(+)] )
-	io-uring? ( sys-libs/liburing[static-libs(+)] )
+	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
 	numa? ( sys-process/numactl[static-libs(+)] )
 	rbd? ( sys-cluster/ceph[static-libs(+)] )
 	rdma? (
diff --git a/sys-block/fio/fio-3.20.ebuild b/sys-block/fio/fio-3.20.ebuild
deleted file mode 100644
index 6e66a7abbe20..000000000000
--- a/sys-block/fio/fio-3.20.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="https://brick.kernel.dk/snaps/"
-SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio curl glusterfs gnuplot gtk libressl io-uring numa python rbd rdma static tcmalloc test zbc zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	libressl? ( curl )
-	gnuplot? ( python )
-	io-uring? ( aio )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-# GTK+:2 does not offer static libaries.
-LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
-	curl? (
-		net-misc/curl:=[static-libs(+)]
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
-	gtk? ( dev-libs/glib:2[static-libs(+)] )
-	io-uring? ( sys-libs/liburing[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	rdma? (
-		sys-fabric/libibverbs[static-libs(+)]
-		sys-fabric/librdmacm[static-libs(+)]
-	)
-	tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
-	zbc? ( >=sys-block/libzbc-5 )
-	zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? ( dev-util/cunit )"
-RDEPEND+="
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
-	)
-	gnuplot? ( sci-visualization/gnuplot )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/fio-2.2.13-libmtd.patch
-)
-
-python_check_deps() {
-	has_version "dev-python/pandas[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-
-	# Many checks don't have configure flags.
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e '/if compile_prog "" "-lzbc" "libzbc" *; *then/  '"s::if $(usex zbc true false) ; then:" \
-		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
-		-e '/if compile_prog "" "-laio" "libaio" *; *then/'"s::if $(usex aio true false) ; then:" \
-		-e '/if compile_prog "" "-lcunit" "CUnit" *; *then/'"s::if $(usex test true false) ; then:" \
-		configure || die
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	# TODO: cuda
-	# TODO: libnbd - not packaged in Gentoo
-	# TODO: pmem - not packaged in Gentoo
-	set -- \
-	./configure \
-		--disable-optimizations \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		--disable-pmem \
-		$(usex curl '' '--disable-http') \
-		$(usex glusterfs '' '--disable-gfapi') \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex io-uring '--enable-libaio-uring' '') \
-		$(usex numa '' '--disable-numa') \
-		$(usex rbd '' '--disable-rbd') \
-		$(usex rdma '' '--disable-rdma') \
-		$(usex static '--build-static' '') \
-		$(usex tcmalloc '' '--disable-tcmalloc')
-	echo "$@"
-	"$@" || die 'configure failed'
-}
-
-src_compile() {
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
-	local python2_7_files=(
-		"${ED}"/usr/bin/fiologparser_hist.py
-		"${ED}"/usr/bin/fiologparser.py
-	)
-	local python_files=(
-		"${python2_7_files[@]}"
-		"${ED}"/usr/bin/fio_jsonplus_clat2csv
-	)
-	if use python ; then
-		sed -i 's:python2.7:python:g' "${python2_7_files[@]}" || die
-		python_replicate_script "${python2_7_files[@]}"
-	else
-		rm "${python_files[@]}" || die
-	fi
-
-	local gnuplot_python2_7_files=(
-		"${ED}"/usr/bin/fio2gnuplot
-	)
-	local gnuplot_files=(
-		"${gnuplot_python2_7_files[@]}"
-		"${ED}"/usr/bin/fio_generate_plots
-		"${ED}"/usr/share/man/man1/fio_generate_plots.1
-		"${ED}"/usr/share/man/man1/fio2gnuplot.1
-		"${ED}"/usr/share/fio/*.gpm
-	)
-	if use gnuplot ; then
-		sed -i 's:python2.7:python:g' "${gnuplot_python2_7_files[@]}" || die
-		python_replicate_script "${gnuplot_python2_7_files[@]}"
-	else
-		rm "${gnuplot_files[@]}" || die
-		rmdir "${ED}"/usr/share/fio/ || die
-	fi
-
-	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
-	rm "${ED}"/usr/bin/genfio || die
-
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-}
diff --git a/sys-block/libzbc/Manifest b/sys-block/libzbc/Manifest
index d569f68d9fe6..5eb940ec9f53 100644
--- a/sys-block/libzbc/Manifest
+++ b/sys-block/libzbc/Manifest
@@ -1,5 +1,5 @@
 AUX libzbc-5.5.1-gcc-10.patch 2745 BLAKE2B d652144129c02bad8fa39b1587d54726e36c892b124c69084844737aa7604e16a00574569e95e6a0913f43002c4ff7240cbff017440b76842e013fdf25de6172 SHA512 d51a926e6db51df874f6cfdb73a7e85a4dd9a837fef62e6727f5e32b31fde8b9e1a2df0c06cdec0b5a9b53ab275761331566bf73f57811cbf39ebd91ee571212
 AUX libzbc-no-automagic-gtk-dep.patch 976 BLAKE2B 211a33a5eac0239526f050de30187b3392e953a257457de88c47eab39b9db518b2f9f7ea3110f6fd294ed2f54270f9a2cd25cdc38620ce7a62f2e3e68af088a6 SHA512 b1278b7d91bfabb577488016749a69714958601219a47a31794af4a22361a8f2621bdb1a964beaf78d7c73d00f934647a66e90681853abbcb5f8c7e969d981c7
 DIST libzbc-5.5.1.tar.gz 128638 BLAKE2B 3cb636f29ff29bb87c86bd800231a1b45f517822e5785af599a6385705dffa1e90574e4bd2c1b310d5a0dab094cf6e878fc80b6178ea4eb028d5d1d174e7559a SHA512 cb060d06839ea207ed2e32e940348176dd0eff2279cbdb72f565bef177eb4a195feea67c4d1ed5f455e3839475e0f4557a45774129e3d9e009ea38f9134ae159
-EBUILD libzbc-5.5.1.ebuild 714 BLAKE2B 5687be6efe446449d651b2dce6d334360e0243f08b2850f85c0ab5859ee6bd698347ca13b64b87b96609a309244eba5b26eda455135415cd4ca88accc01e3b2e SHA512 3edda7543759a9199e753cac285d1c1430ac202910add7a874f4fa589c7432c56986e4cc97c7cf16c230b4e2cef12d0bb2382fb372d6d2e0d6e9f4fe71b5e03c
+EBUILD libzbc-5.5.1.ebuild 809 BLAKE2B 732963d7a2e08a9e439c840ffd92be6f2be44c355bfc6d02c1099cf78d5f783019359dfb0452318952ec3e1388231f39e41678f7f07c5447f7b16ae1e030bb29 SHA512 a7520811e5bcac41ff30029e44de3be62d060b9779be253bbc864444348b9703091038a2e67256e327254ef5bb4cef7c3202529bc743eca4bfc4d0f59c7e7b19
 MISC metadata.xml 836 BLAKE2B 360b17822ed9256339bb8a81993814aebd63925acc8b600d75851a2a1834ac6714f84f036882617f789362e06b5b58beec89e2ae5a5b01a88c67b7122311972f SHA512 6a53f78f3fb53d3ac0a97eac47710d5fcdf23db95c98f58ee1c296eef7bbbd218f79cd151eed6424a917ae69775bf2eb42916c7a51c7ac82dffd4e8e5b9ef451
diff --git a/sys-block/libzbc/libzbc-5.5.1.ebuild b/sys-block/libzbc/libzbc-5.5.1.ebuild
index 093cc27ec453..f61ae7b6e199 100644
--- a/sys-block/libzbc/libzbc-5.5.1.ebuild
+++ b/sys-block/libzbc/libzbc-5.5.1.ebuild
@@ -29,5 +29,12 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_with gtk gtk3)
+	econf \
+		$(use_with gtk gtk3) \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sys-block/lsiutil/Manifest b/sys-block/lsiutil/Manifest
index a4d05dccd857..c9df61b2e69a 100644
--- a/sys-block/lsiutil/Manifest
+++ b/sys-block/lsiutil/Manifest
@@ -1,5 +1,3 @@
 DIST LSIUtil_1-62.zip 2344606 BLAKE2B 4b9cfef2a5ec920dfb19b2dcd34754a211b93ab82489d2eb8a6ff92729bb91c9fcb879a0997b8c7efc1b607b3a45843b89b6ad817745b2ea72a932ed5eeed4b2 SHA512 85de9ce20efe881e4f05fb4025031ce8c5f0b506912e813975c2e10600fa87f9c6f0147d274349f47c618ef996b7b5331b0328630ec2d153a3afe69557ba63f2
-DIST LSIUtil_1.62.zip 2544375 BLAKE2B 727619aa73bab1ede7c3e1765062313f1819493b8aef3a37523ae2d6b152704060addcef0b81a72fc4100e3d139f6b30294e6f912962cc99ccec35a692d840fe SHA512 65f68cf584b109e557ccc021412a922f867149c82060289e126186ff168b183ba325dcf3421f8275a4b34585a90ff3ef2848d1e8bfb7b386816d2ae7f5e9dd08
-EBUILD lsiutil-1.62-r1.ebuild 1032 BLAKE2B bcf5d12902193f4709b5ca0b8f3315aff35b226cfce19248652bae15eba21726c02856427e9f2e8c82797f74eecd431124da0b448b55f58ed9bc9c279cdd27f1 SHA512 08c16a06cd35bb8b1bc21618d8385837c208f13ddb7778d60ce8487d55a2e7b1fa7da17a70df6af673df5e8632a45b036e63dfdad7ed2a3e4c59f2f46d3b6ed6
-EBUILD lsiutil-1.62-r2.ebuild 904 BLAKE2B f5cfde9e1aa0f244f82cce9540b32d51f054d8f197f2106bf4e6c956816b301b15358cbb197f247f9d4e6e29f2f4fbcb8a967f12a7128b5908c213c078529fed SHA512 473c294c365c3e6734e123b95de15e9ac828b8aa06f7e850aed0b846ad68e8608d838343d2f78cf57f572f2aab50f90b965de081a5952e790b2e190b478a2c14
+EBUILD lsiutil-1.62-r3.ebuild 815 BLAKE2B 672a98906b67ad880847632629eb354c1f5470f2c09af8ed38f413ad6971f6ccfab5c9780cb67427bac59f9cec3d14b6d7db9ee847710704d23b934d3315bd22 SHA512 1eccdc23398f9eb0dc791ea01d62a2d44ab7c569a4a184bcfa0e75095d50ae5e98040482459a2d7087f6027477bf854915a9ced33b3edd9c29a759f06e4cef27
 MISC metadata.xml 318 BLAKE2B 98c2744d890564a2aee5a9541954654e57d97c3a30ca9d2470afb2d0d63935eadf02d7745b617bb9f0d076bc449ed5f10fbf4610226d3f701077d6e4c3929ab9 SHA512 d2c34bba25ecc086ba1e3e009fbcf56d40efa3522cbc8d1fd4e273a58d21d82c2fd159c25e9295939f713e1ed845d361645915060fef9bc71be9be3d4ef043ee
diff --git a/sys-block/lsiutil/lsiutil-1.62-r1.ebuild b/sys-block/lsiutil/lsiutil-1.62-r1.ebuild
deleted file mode 100644
index cb29c7db8358..000000000000
--- a/sys-block/lsiutil/lsiutil-1.62-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="LSI Logic Fusion MPT Command Line Interface management tool"
-HOMEPAGE="http://www.lsi.com/"
-SRC_URI="http://www.lsi.com/downloads/Public/Obsolete/Obsolete%20Common%20Files/LSIUtil_${PV}.zip"
-
-LICENSE="LSI"
-SLOT="0"
-# This package can never enter stable, it can't be mirrored and upstream
-# can remove the distfiles from their mirror anytime.
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
-
-RESTRICT="fetch mirror bindist"
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-QA_PRESTRIPPED="/opt/bin/lsiutil"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Upstream has implemented a mandatory clickthrough EULA for distfile download"
-	einfo "Please visit $SRC_URI"
-	einfo "And place $A into your DISTDIR directory"
-}
-
-src_install() {
-	exeinto /opt/bin
-
-	if use x86; then
-		doexe Linux/lsiutil
-	elif use amd64; then
-		newexe Linux/lsiutil.x86_64 lsiutil
-	elif use ia64; then
-		newexe Linux/lsiutil.ia64 lsiutil
-	fi
-
-	dodoc changes.txt
-}
diff --git a/sys-block/lsiutil/lsiutil-1.62-r2.ebuild b/sys-block/lsiutil/lsiutil-1.62-r3.ebuild
index c9cb2cb12fa7..1208722bd953 100644
--- a/sys-block/lsiutil/lsiutil-1.62-r2.ebuild
+++ b/sys-block/lsiutil/lsiutil-1.62-r3.ebuild
@@ -1,38 +1,30 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 DESCRIPTION="LSI Logic Fusion MPT Command Line Interface management tool"
-HOMEPAGE="http://www.avagotech.com/"
-SRC_URI="http://docs.avagotech.com/docs-and-downloads/legacy-host-bus-adapters/legacy-host-bus-adapters-common-files/LSIUtil_${PV/./-}.zip"
+HOMEPAGE="https://www.broadcom.com/"
+SRC_URI="https://docs.broadcom.com/docs-and-downloads/legacy-host-bus-adapters/legacy-host-bus-adapters-common-files/LSIUtil_${PV/./-}.zip"
 
-LICENSE="LSI"
-SLOT="0"
 # This package can never enter stable, it can't be mirrored and upstream
 # can remove the distfiles from their mirror anytime.
+LICENSE="LSI"
+SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
-
 RESTRICT="mirror bindist"
 
-RDEPEND=""
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
-QA_PRESTRIPPED="/opt/bin/lsiutil"
+QA_PREBUILT="*"
 
 S="${WORKDIR}"
 
 src_install() {
 	exeinto /opt/bin
-
-	if use x86; then
-		doexe Linux/lsiutil
-	elif use amd64; then
-		newexe Linux/lsiutil.x86_64 lsiutil || die
-	elif use ia64; then
-		newexe Linux/lsiutil.ia64 lsiutil || die
-	fi
+	use amd64 && newexe Linux/lsiutil.x86_64 lsiutil
+	use ia64 && newexe Linux/lsiutil.ia64 lsiutil
+	use x86 && doexe Linux/lsiutil
 
 	dodoc changes.txt
 }
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index bef93e8485af..38329dbece3c 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,5 +1,8 @@
 AUX mbuffer-20180410-sysconfdir.patch 897 BLAKE2B 1fc57be6f5ce11f483d43dc69c9e4120b09a4c59caaee90deefd5500058ea0c8b9cd6b9b3dea1a2f21733acf4eb8a922171d791e57d658275997ca951f73559e SHA512 36964604338a0bfd0e9cb55d17b307f32dfe09d280019e8083e5909b81e091887bb8f360ef9aebf21eb8448a3d9ba305a6f7a7bc35ea4884418bb7d67e9fadb0
 AUX mbuffer-20200505-find-OBJDUMP.patch 377 BLAKE2B 7b9d8660d85532a5dff19195ab884fa37155ec603b414e576766c593295388c7f3ac2c3f6e333dbb5dbdf794036aedc814435b35bf746b10a5a0575905bcdbfb SHA512 4228741aeece32872c11da8a6840d8a7de6db77d4663edb44a8875384c70ba0807929bbb70c397f870ea1c18c5d0c0a224ad90f3d4e7094246496b461a5e6bff
+AUX mbuffer-20200929-find-OBJDUMP.patch 279 BLAKE2B f22f74549eb2fba1061141616097fc01b987c846302a0fd59aaf8a0236a291207a02f0a85ec542fb217377eb40eb0983cd450aaf9a56f3df7838c29f31ab663a SHA512 20a9969de11f6eaf398627a306465df6b43ccb640176c4743ce8e8aa59b06f1837b0ef968223a0770c7aa1cf1959713526fa064f3eb54bbfabb067d834e510c0
 DIST mbuffer-20200505.tgz 146020 BLAKE2B b85742f710405e29775c7d25e9c1be733fd94d7157018017b7c8fb5b5cdeab7fa8819b024d297d96af960a73a8982fdeaefe50627c605f797df4d75b0c15435f SHA512 8a1e5721869fd705d02486cf93467bfe0a59b58789826ca337c18a023e9fbb18c1651211bfebdea4cdd45772ad23d0715bb3892bed04ce66f5fbe72406cde9f7
+DIST mbuffer-20200929.tgz 147855 BLAKE2B abbcb4b29013ed24b4135a8b7576a0e728c3b5f1987558f0582711b1b00333caea8b55a02c4506ac179a4dae04977ee64572df09a210bf34bd71fd336be7e418 SHA512 332106205ea8743c9cf47529106c04ac15801a02b116d8e0c0fd3baadad51331c9f4ba1c8fa125edb42940cf401048a45ba23e2dac0e5189671bcf0ecee36996
 EBUILD mbuffer-20200505.ebuild 1580 BLAKE2B 7d4d32ea78865d3fe29f94f77e2c2228814b37587bf97ceea6010ef0c99da441bba41344c2b5c4ba38cba7eb64a3e803a5f48ad4785d4bbac858db75fc891352 SHA512 eac277d0ec3650f05087ba0c3e50b15e088eda8c7de182d40334318c44cf54e895c8885bd3a42473cceb31882dbf5ec57f8792ce23c69ca8fe64f18f504dca6d
+EBUILD mbuffer-20200929.ebuild 1586 BLAKE2B 890fbffad6fc330fc3d270d64c3604aa07c35fc55d1e8f9edb25460d90cd7422f4f8b641f78ffc87f8cf6054c8602f4e85d6de987e9382859ba7012f8e4c3b28 SHA512 208c74375c003d86f62b519d555e944f174a7372f6fa37a3f83bfc7130be7368f72505be25bf0ea573ed28224f0a0b7f29b0abc8783e98c0ad71d0b1da4981e2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/files/mbuffer-20200929-find-OBJDUMP.patch b/sys-block/mbuffer/files/mbuffer-20200929-find-OBJDUMP.patch
new file mode 100644
index 000000000000..891084b6ca7e
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20200929-find-OBJDUMP.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -113,7 +113,7 @@ AC_PATH_PROG(AWK,awk)
+ AC_SYS_LARGEFILE
+ AC_STRUCT_ST_BLKSIZE
+ 
+-AC_CHECK_TARGET_TOOLS(OBJDUMP,gobjdump objdump)
++AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
+ 
+ AC_HEADER_ASSERT
+ AC_CHECK_LIB(pthread, pthread_mutex_init)
diff --git a/sys-block/mbuffer/mbuffer-20200929.ebuild b/sys-block/mbuffer/mbuffer-20200929.ebuild
new file mode 100644
index 000000000000..a0fc6c22696b
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20200929.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 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 libressl ssl test"
+
+REQUIRED_USE="test? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl: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/parted/Manifest b/sys-block/parted/Manifest
index 60046065dd2c..d286b65dfa4a 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -1,15 +1,5 @@
-AUX parted-3.2-devmapper.patch 1972 BLAKE2B 10ceeec3f6af744dad642a9b1b8e8d30a85793415bac68c87463d459e4b1fb321c1d0e9017aa895334f2a2849c436f617581c5b4f3d1d0dbe5d1a97b9f3a278b SHA512 3baf2090ba86242df1633bb4b50deeb6e0226b0a56ad82466ddd76f028a859e29bd021f1f251047cd2a2a5ea1c77ed0129eca8be2e97ee48c21c1d186c07b8da
-AUX parted-3.2-fix-resizing-FAT16.patch 2383 BLAKE2B d680374c1949a1f4f118e67ad5f2b90cbde13475b0749cf580d25dc78b424ecc003a97c4607733b7bde833022c0ba76bdcae0853c8f205fb1fb4c873639ee928 SHA512 31a79f24de58fdbc77b50790372019083375acace66f9a9d3fc93c6ec22988b7198fda13c3790e00518f7a2878de1efb914658f517d275c6ecfd3e507bc4cd15
 AUX parted-3.2-po4a-mandir.patch 275 BLAKE2B 5342cc776f557c9ef95604eb2c15ad484c4dbf102d4093dcb1d4005f2f6d4f90db2ff0fc3ceae59fd22c3442604b2abbdac48594f860ba810dc4d8dce89d6fc0 SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872
-AUX parted-3.2-sysmacros.patch 804 BLAKE2B 294094fd79a799d577c2db00569f4be218713b71659654603a299f039939a7b3901ab80aab6cf969fd503712da8a7039e8fd7dac007b164a1f3b7ead4c5596ed SHA512 97c141d623bc52387b3726a164c5191c094cef1b2aa000dbd8e505aab418210d27ad07a59e0433faf001bf12ee1e3729838186fc2bae69ed7a66941364e3b468
 AUX parted-3.3-atari.patch 421 BLAKE2B 9048176f882e66cf89cc2d79aa0ea7a550f9c649d8f54f4df102eb361c6e0be473a2e07e1ab8f63dc446422a92ced10cfb4858a27b7988c1b5a960e6e8e1d518 SHA512 59738de6f89dd6d407eef139ffe4d0925d418f4d33a30a1ead1e1f05ab7ad93e13294412d5061dd40302b9592a33b97f137089f477dc6a2febd3fe60eae77ca0
-DIST parted-3.2.tar.xz 1655244 BLAKE2B 56608590b26a9b5266dacf3698d990b730bdb35d9374d1da57103fbef3ef5037e40dd2fe0f523ca8e0e75401a3b25cf543e5ca5c94cf410bbaa62ea15d6f0ba3 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4
 DIST parted-3.3.tar.xz 1757432 BLAKE2B d1e248cd8fdce22d4957055d65f9f93333505229f92174f343897422a31a43f3d35ea06f8f1bdafd254e4629c5890ec38d6b75d3b499c39a9ada4a8d5f9d9d8f SHA512 d1384694a491aa53bab6206fdeccd1d192de2ed379fe25aa865dd6aa06ed945a728e85b2ccc2fb23f5aa9dfee4a8bd8f0f2be1dd386cb8e8861b73382c6a07e4
-DIST parted_3.2-23.debian.tar.xz 88152 BLAKE2B 5e69a5799cc909bf54d1dcd1c7a8f7fe5dd7ce46b03957406f4a6118480d5acca3a165cc16b720fd03a89339fcfb46844d470079c4e10a4683e270c9e804c245 SHA512 7f449a24d1ea75a185b5fd589fea73a2f0944f1276288ece2790c5889de6adf8354f94388046a25b2dbf5735759f6010397f140607320a4de348cf77f8c75b09
-DIST parted_3.2-25.debian.tar.xz 88524 BLAKE2B e994ca8a68f700773e0a67657d59793ea130a5c7e9eca31688fa48e7133a0c350446b8c0a175ac2f59aca8c2fe1ef419a94f3f6f0547b0b25cca329c6f569571 SHA512 2d4e52513b016ef67b203db577641cd56b4d2d013e1bc186b665ab47d0f6c673321b108f81d36caaa0fd14c555d8336a2556a60cccbeccb9d2cf98a85872d949
-EBUILD parted-3.2-r1.ebuild 1479 BLAKE2B 72706d8d8cfbc63af64546de63d6e8b9baeea99e6ac032f8565a09a2ecb21cba9c2cb946a87b322df7274acc0a021609e4ac0260694c1313c3ca0a85a7f37b2d SHA512 39ad4d18564b6bd06978e33087d756654962eec60ca945e99690762f2c44e80ae580ee33c74a3bee3c0ecd4a362ae6b5083422cbe9c8eae431792620b7e38456
-EBUILD parted-3.2_p23.ebuild 1677 BLAKE2B a5d9dc1c9873434259b6e4625dd5399f7cb190d2adaa66fccc8e1088523769b7fac5d6d41e74ec8e1921a3d41202007811335d5df206d287f13df52b8ccb76b4 SHA512 69f4d97ba8583b658261cb47af1db6993a065c17c54d444acdbab67020efd3fff85ca301d0aa49fb36a3f43352068306f2dd5532eb569f247548897c24585160
-EBUILD parted-3.2_p25.ebuild 1678 BLAKE2B 01aec7444da95f070d776ba0fdccb825391abdbcf2ea488cf72836e8b6c057d325c31b45657a5de166bc47b12bc46b008ee2bed623748f6d6663f303b5d6c0e7 SHA512 e9489c3cb304975a4bf2eb83d005b5c6230252278e48a24fcbb1c97d95252c73b92e288613c1b353c94ae02496e65f68030241f2980ce3f1d5426e45334609ec
-EBUILD parted-3.3-r1.ebuild 1392 BLAKE2B 7fd4582f48518e8cc48d82e3d7b21c626d18aacd6fe469cd201d827e90af5e517a81881ec13db20dd5afbff55b1e69c01c5c7e5fb45d3bdb93b1677041bb1e23 SHA512 e8b197e02351925ebe775cecc268303324ce2a28a11507ac42e47104987de8083ee6bf4122d01391629cdff5e4ba3b28c3babe225245bb0d8a1eee338268bdbb
-EBUILD parted-99999.ebuild 1407 BLAKE2B ac953dbc8d771ffab9d7e39990020a2ab01e621ded61b2b42a9bac6778eae29015dd4be1d2e02201adf15435cd7016bfd054bf42a21b756850f686ea41c5e061 SHA512 02c10b91a43ecbe806d7ec7bd546e212c98a8ba5ed93d5ad68dc0013886b3cdab34e13033776f88d71c813b7fa9710e20fa4568056651bd95df1267d56d61935
-MISC metadata.xml 754 BLAKE2B 6bf44d26295c82c00691f9ba11e114f43c2674e98b1a0f332280e2753c08aeeb5b5a402c2288e9f0c654d4d91be1ed20810eb4b19cf277b76d326423ee6b19a8 SHA512 b5ced0310e8a606de46a5a2a690d7a549c5528eb843616621486db93a9fc45266eafbcbacc90d38d8005cd0366fee671705fc98c54c79bf0b3519d182d15c184
+EBUILD parted-3.3-r2.ebuild 1327 BLAKE2B f658999b44e2756e802acd05a8db7ddc53ad34ab4543080ddc9cad31a5d66d18ee3d3fd645e97846e851067426e1f8d3dd3fbb58c2a54acde0ebbeaaa8461eff SHA512 57499a912376b92d63eb3406ac92dc9aab0c13f2d5eae24fd1ee212a4d36a33c847b5c41126eb914d6e7b14261ab2cd7b53e7ce49f7f75dc3bb7c4c6719b4a29
+MISC metadata.xml 886 BLAKE2B 7eab7ab0acb3ca62dbd119ebdccad3a0a5aa69754edbc7465182496bfd136cdd06a7f12c8515ff2c9420dd22b9a4c03ca7f126b357f146af3825bf8e76064149 SHA512 aad773c94d64b99d1f70f2e542e75c4795e1c58bfdc238eb50d0e0a7c10d1255af464b2c7ddea76bbee4b6af5f8d90e1c584f319cb290cbe85aa6c7c8e873e21
diff --git a/sys-block/parted/files/parted-3.2-devmapper.patch b/sys-block/parted/files/parted-3.2-devmapper.patch
deleted file mode 100644
index 0cd3e0e3307f..000000000000
--- a/sys-block/parted/files/parted-3.2-devmapper.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/libparted/arch/linux.c
-+++ b/libparted/arch/linux.c
-@@ -2304,6 +2304,7 @@
-   return r < 0 ? NULL : resultp;
- }
- 
-+#ifdef ENABLE_DEVICE_MAPPER
- static char *
- dm_canonical_path (PedDevice const *dev)
- {
-@@ -2326,12 +2327,22 @@
- err:
-         return NULL;
- }
-+#endif /* ENABLE_DEVICE_MAPPER */
- 
- static char*
- _device_get_part_path (PedDevice const *dev, int num)
- {
--        char *devpath = (dev->type == PED_DEVICE_DM
--                         ? dm_canonical_path (dev) : dev->path);
-+        char *devpath =
-+#ifdef ENABLE_DEVICE_MAPPER
-+                        (
-+                         dev->type == PED_DEVICE_DM
-+                         ? dm_canonical_path (dev) :
-+#endif /* ENABLE_DEVICE_MAPPER */
-+						 dev->path
-+#ifdef ENABLE_DEVICE_MAPPER
-+                        )
-+#endif /* ENABLE_DEVICE_MAPPER */
-+                        ;
-         size_t path_len = strlen (devpath);
-         char *result;
-         /* Check for devfs-style /disc => /partN transformation
-@@ -2945,12 +2956,14 @@
-                                                unsigned long long *length);
- 
- 
-+#ifdef ENABLE_DEVICE_MAPPER
-         if (disk->dev->type == PED_DEVICE_DM) {
-                 add_partition = _dm_add_partition;
-                 remove_partition = _dm_remove_partition;
-                 resize_partition = _dm_resize_partition;
-                 get_partition_start_and_length = _dm_get_partition_start_and_length;
-         } else {
-+#endif /* ENABLE_DEVICE_MAPPER */
-                 add_partition = _blkpg_add_partition;
-                 remove_partition = _blkpg_remove_partition;
- #ifdef BLKPG_RESIZE_PARTITION
-@@ -2959,7 +2972,9 @@
-                 resize_partition = NULL;
- #endif
-                 get_partition_start_and_length = _kernel_get_partition_start_and_length;
-+#ifdef ENABLE_DEVICE_MAPPER
-         }
-+#endif /* ENABLE_DEVICE_MAPPER */
- 
-         /* lpn = largest partition number.
-          * for remove pass, use greater of device or label limit */
diff --git a/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch b/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch
deleted file mode 100644
index 2a5a2311f1dd..000000000000
--- a/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 1e9e770f4bc7f3d80e09ecd1df58575fad064163 Mon Sep 17 00:00:00 2001
-From: Mike Fleetwood <mike.fleetwood@googlemail.com>
-Date: Sun, 28 Sep 2014 15:15:48 +0000
-Subject: lib-fs-resize: Prevent crash resizing FAT16 file systems
-
-Resizing FAT16 file system crashes in libparted/fs/r/fat/resize.c
-create_resize_context() because it was dereferencing NULL pointer
-fs_info->info_sector to copy the info_sector.
-
-Only FAT32 file systems have info_sector populated by fat_open() ->
-fat_info_sector_read().  FAT12 and FAT16 file systems don't have an
-info_sector so pointer fs_info->info_sector remains assigned NULL from
-fat_alloc().  When resizing a FAT file system create_resize_context()
-was always dereferencing fs_info->info_sector to memory copy the
-info_sector, hence it crashed for FAT12 and FAT16.
-
-Make create_resize_context() only copy the info_sector for FAT32 file
-systems.
-
-Reported by Christian Hesse in
-https://bugzilla.gnome.org/show_bug.cgi?id=735669
----
-diff --git a/NEWS b/NEWS
-index 297b0a5..da7db50 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,10 @@ GNU parted NEWS                                    -*- outline -*-
- 
- * Noteworthy changes in release ?.? (????-??-??) [?]
- 
-+** Bug Fixes
-+
-+  libparted-fs-resize: Prevent crash resizing FAT16 file systems.
-+
- 
- * Noteworthy changes in release 3.2 (2014-07-28) [stable]
- 
-diff --git a/libparted/fs/r/fat/resize.c b/libparted/fs/r/fat/resize.c
-index 919acf0..bfe60a0 100644
---- a/libparted/fs/r/fat/resize.c
-+++ b/libparted/fs/r/fat/resize.c
-@@ -668,11 +668,17 @@ create_resize_context (PedFileSystem* fs, const PedGeometry* new_geom)
- 
- /* preserve boot code, etc. */
- 	new_fs_info->boot_sector = ped_malloc (new_geom->dev->sector_size);
--	new_fs_info->info_sector = ped_malloc (new_geom->dev->sector_size);
- 	memcpy (new_fs_info->boot_sector, fs_info->boot_sector,
- 		new_geom->dev->sector_size);
--	memcpy (new_fs_info->info_sector, fs_info->info_sector,
--		new_geom->dev->sector_size);
-+	new_fs_info->info_sector = NULL;
-+	if (fs_info->fat_type == FAT_TYPE_FAT32)
-+	{
-+		PED_ASSERT (fs_info->info_sector != NULL);
-+		new_fs_info->info_sector =
-+			ped_malloc (new_geom->dev->sector_size);
-+		memcpy (new_fs_info->info_sector, fs_info->info_sector,
-+			new_geom->dev->sector_size);
-+	}
- 
- 	new_fs_info->logical_sector_size = fs_info->logical_sector_size;
- 	new_fs_info->sector_count = new_geom->length;
---
-cgit v0.9.0.2
diff --git a/sys-block/parted/files/parted-3.2-sysmacros.patch b/sys-block/parted/files/parted-3.2-sysmacros.patch
deleted file mode 100644
index a29e7619b148..000000000000
--- a/sys-block/parted/files/parted-3.2-sysmacros.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/580022
-
-From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 21 Jun 2016 15:01:08 -0400
-Subject: [PATCH] include sysmacros.h for major/minor/makedev
-
-Linux C libs are moving away from including this header implicitly via
-sys/types.h, so include it explicitly.
----
- libparted/arch/linux.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
-index 326b95619d31..e5c168be3c68 100644
---- a/libparted/arch/linux.c
-+++ b/libparted/arch/linux.c
-@@ -37,6 +37,7 @@
- #include <dirent.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/utsname.h>        /* for uname() */
- #include <scsi/scsi.h>
--- 
-2.8.2
-
diff --git a/sys-block/parted/metadata.xml b/sys-block/parted/metadata.xml
index 2011c0117f13..97203c5d7a4f 100644
--- a/sys-block/parted/metadata.xml
+++ b/sys-block/parted/metadata.xml
@@ -1,20 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>livecd@gentoo.org</email>
-		<name>Gentoo LiveCD Project</name>
+		<email>base-system@gentoo.org</email>
+		<name>Base System Project</name>
 	</maintainer>
 	<use>
 		<flag name="device-mapper">
-	Enable device-mapper support from <pkg>sys-fs/lvm2</pkg> in parted
-	</flag>
+			Enable device-mapper support from <pkg>sys-fs/lvm2</pkg>
+			in parted
+		</flag>
 		<flag name="debug">
-	Enable debugging as encouraged by upstream: [The default configuration]
-	includes --enable-debug (by default), which contains many assertions.
-	Obviously, these "waste" space, but in the past, they have caught
-	potentially dangerous bugs before they would have done damage, so we think
-	it's worth it.  Also, it means we get more bug reports ;)
-	</flag>
+			Enable debugging as encouraged by upstream: [The default
+			configuration] includes --enable-debug (by default), which
+			contains many assertions.  Obviously, these "waste" space,
+			but in the past, they have caught potentially dangerous bugs
+			before they would have done damage, so we think it's worth
+			it.  Also, it means we get more bug reports ;)
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-block/parted/parted-3.2-r1.ebuild b/sys-block/parted/parted-3.2-r1.ebuild
deleted file mode 100644
index 5c7263071d8e..000000000000
--- a/sys-block/parted/parted-3.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic ltprune
-
-DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
-HOMEPAGE="https://www.gnu.org/software/parted"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="+debug device-mapper nls readline selinux static-libs"
-RESTRICT="test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
-	selinux? ( sys-libs/libselinux )
-	elibc_uclibc? ( dev-libs/libiconv )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.2-devmapper.patch \
-		"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch \
-		"${FILESDIR}"/${PN}-3.2-fix-resizing-FAT16.patch \
-		"${FILESDIR}"/${PN}-3.2-sysmacros.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	use elibc_uclibc && append-libs -liconv
-	econf \
-		$(use_enable debug) \
-		$(use_enable device-mapper) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		--disable-rpath
-}
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sys-block/parted/parted-3.2_p23.ebuild b/sys-block/parted/parted-3.2_p23.ebuild
deleted file mode 100644
index c02bd5426f6d..000000000000
--- a/sys-block/parted/parted-3.2_p23.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
-HOMEPAGE="https://www.gnu.org/software/parted"
-SRC_URI="
-	mirror://gnu/${PN}/${P/_p*/}.tar.xz
-	mirror://debian/pool/main/p/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+debug device-mapper nls readline selinux static-libs"
-RESTRICT="test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
-	selinux? ( sys-libs/libselinux )
-	elibc_uclibc? ( dev-libs/libiconv )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-devmapper.patch
-	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
-)
-S=${WORKDIR}/${P/_p*/}
-
-src_prepare() {
-	default
-	sed -i -e '/atari\.patch/d' "${WORKDIR}"/debian/patches/series || die
-	for patch in $(< "${WORKDIR}"/debian/patches/series); do
-		eapply "${WORKDIR}/debian/patches/$patch"
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	use elibc_uclibc && append-libs -liconv
-	econf \
-		$(use_enable debug) \
-		$(use_enable device-mapper) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		--disable-rpath
-}
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-block/parted/parted-3.2_p25.ebuild b/sys-block/parted/parted-3.2_p25.ebuild
deleted file mode 100644
index fceabd18435f..000000000000
--- a/sys-block/parted/parted-3.2_p25.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
-HOMEPAGE="https://www.gnu.org/software/parted"
-SRC_URI="
-	mirror://gnu/${PN}/${P/_p*/}.tar.xz
-	mirror://debian/pool/main/p/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+debug device-mapper nls readline selinux static-libs"
-RESTRICT="test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
-	selinux? ( sys-libs/libselinux )
-	elibc_uclibc? ( dev-libs/libiconv )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-devmapper.patch
-	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
-)
-S=${WORKDIR}/${P/_p*/}
-
-src_prepare() {
-	default
-	sed -i -e '/atari\.patch/d' "${WORKDIR}"/debian/patches/series || die
-	for patch in $(< "${WORKDIR}"/debian/patches/series); do
-		eapply "${WORKDIR}/debian/patches/$patch"
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	use elibc_uclibc && append-libs -liconv
-	econf \
-		$(use_enable debug) \
-		$(use_enable device-mapper) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		--disable-rpath
-}
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-block/parted/parted-3.3-r1.ebuild b/sys-block/parted/parted-3.3-r2.ebuild
index 20e7c295951b..5cc32e79496f 100644
--- a/sys-block/parted/parted-3.3-r1.ebuild
+++ b/sys-block/parted/parted-3.3-r2.ebuild
@@ -3,24 +3,24 @@
 
 EAPI=7
 
+inherit flag-o-matic
+
 DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
 HOMEPAGE="https://www.gnu.org/software/parted"
-SRC_URI="
-	mirror://gnu/${PN}/${P}.tar.xz
-"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+debug device-mapper nls readline selinux static-libs"
-RESTRICT="test"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="+debug device-mapper nls readline selinux"
 
-# specific version for gettext needed
-# to fix bug 85999
 RDEPEND="
 	>=sys-fs/e2fsprogs-1.27
 	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
+	readline? (
+		>=sys-libs/ncurses-5.7-r7:0=
+		>=sys-libs/readline-5.2:0=
+	)
 	selinux? ( sys-libs/libselinux )
 	elibc_uclibc? ( dev-libs/libiconv )
 "
@@ -41,20 +41,23 @@ src_prepare() {
 
 src_configure() {
 	use elibc_uclibc && append-libs -liconv
-	econf \
-		$(use_enable debug) \
-		$(use_enable device-mapper) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
+	local myconf=(
+		$(use_enable debug)
+		$(use_enable device-mapper)
+		$(use_enable nls)
+		$(use_enable selinux)
+		$(use_with readline)
 		--disable-rpath
+		--disable-static
+	)
+	econf "${myconf[@]}"
 }
 
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
+DOCS=(
+	AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp}
+)
 
 src_install() {
 	default
-
 	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sys-block/parted/parted-99999.ebuild b/sys-block/parted/parted-99999.ebuild
deleted file mode 100644
index f107e4023828..000000000000
--- a/sys-block/parted/parted-99999.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools git-r3
-
-DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
-HOMEPAGE="https://www.gnu.org/software/parted"
-EGIT_REPO_URI="https://git.savannah.gnu.org/git/parted.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="+debug device-mapper nls readline selinux static-libs"
-RESTRICT="test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
-	selinux? ( sys-libs/libselinux )
-	elibc_uclibc? ( dev-libs/libiconv )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
-)
-S=${WORKDIR}/${P/_p*/}
-
-src_prepare() {
-	default
-
-	sh ./bootstrap --gnulib-srcdir=gnulib --no-git || die
-
-	eautoreconf
-}
-
-src_configure() {
-	use elibc_uclibc && append-libs -liconv
-	econf \
-		$(use_enable debug) \
-		$(use_enable device-mapper) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		--disable-gcc-warnings \
-		--disable-rpath
-}
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index b1079db1cd9c..40d0e02db289 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,3 +1,3 @@
-DIST partitionmanager-4.1.0.tar.xz 1347088 BLAKE2B 1095f4bd006177483dec455bdf6b18cb16b27b19d79ec10bde3d992a5dc3942c59f3a46d32abcbed3670a09acd6293f3f9c80041803ffaf9139c3a8b10b9a9ca SHA512 63f77c68f0468e6b17da33bf52824e2858b43f33cb46f8ff7069386d56a154c86f5f3ec20113c472d567a790ba0d8593c2ecb44d9c0d4e1614dcdc570b072761
-EBUILD partitionmanager-4.1.0.ebuild 1055 BLAKE2B 3f90494eeef6fab917e326a56923b7c4af0ad37d38bb41aa680df7627ed07f4ac85880fb5170890e791574a394c59ce167422575c937122d4a1d03c8cddf0fd8 SHA512 27c6fc0993462e2f615fb78e144110b36a8398098431bf09119884f72f91dd527f68997a13cf6110a8e693722f66141cdddd5b6ba3fc669dce74e4627bc9289c
+DIST partitionmanager-4.2.0.tar.xz 1936268 BLAKE2B ae4ea19d2534384e6929526ee0258e528e8cb5e128acf454eaee9f7b4ae6b2485847f496190bea1c41e0f34e45fa0915fda0476cd2a4b9a7686e649554f7ed84 SHA512 bbc4706d078cec9abb0fa89453aecc5ab77c3eba143b5518372772c1cdd823e0a0846a807c5a01c19f5e6a5d44dcd7bc7b9cd1c2375f3f56bb7114bc659e66a4
+EBUILD partitionmanager-4.2.0.ebuild 1001 BLAKE2B 5693668b4711fafc722742c297f96a77d536668389e4d6feb40d2b5516634b8d316dad3607e9e83b9a366dc8b560fda943db7fa657bfd139fc8b9731dd569529 SHA512 2392a8737c008abc2b60c18fd895cb1866a31815fb3cdeb02d853ce0f90af67eff9eaea386a2aba91a908f2bfbfb48564afb84b73590302ff1680ac35f87d509
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-block/partitionmanager/partitionmanager-4.1.0.ebuild b/sys-block/partitionmanager/partitionmanager-4.2.0.ebuild
index c270f5aa9d22..3220dc95f3c2 100644
--- a/sys-block/partitionmanager/partitionmanager-4.1.0.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-4.2.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=7
 
 ECM_HANDBOOK="optional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Utility for management of disks, partitions and file systems"
-HOMEPAGE="https://kde.org/applications/system/org.kde.partitionmanager"
+HOMEPAGE="https://apps.kde.org/en/partitionmanager"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
@@ -29,11 +29,10 @@ DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kjobwidgets-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=sys-libs/kpmcore-4.1.0:5=
+	>=sys-libs/kpmcore-4.2.0:5=
 "
 RDEPEND="${DEPEND}"
diff --git a/sys-block/rts5229/Manifest b/sys-block/rts5229/Manifest
deleted file mode 100644
index 3ba94108df13..000000000000
--- a/sys-block/rts5229/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX rts5229-linux-3.10.patch 1261 BLAKE2B 3b6454e5de85a81f7b0697739cc1c881ef4095ce5e57a9c9cf7687e3795dcaa42762fd9ff1ceaac041feb4af34019dda4924272825a784f79f958d0f6914e985 SHA512 e46d0ff4f8eb9e59059bce493cb0e2b818b0c2db6ef9baa390ca32ccf7de60a1d46d1b2a23ed933a1ac687bd4df94714c13e898db5aea94860e202bd52926524
-AUX rts5229-linux-3.8.patch 820 BLAKE2B 3893c1afeaa194941b4ed90157099c9be9e961f40963298aa6b147cf7fc7bc86d0db75e916a68e177e36b37b777761a7005773c6579fda546cc62a589ced2f90 SHA512 76152d71656f6312b0fbe17386c5cdc6973ee230b96b9b76e09de33d85114aa25017f461ab87f1e0b9cbd6fd3143ecd444ebbe153807fffab20fca0724f9d974
-AUX rts5229-vmalloc.patch 1043 BLAKE2B dcde2fedc2aa421582268488e59158267a73d7184c0608a71ff5403fcb4ae627315de2adb7dd816afa3607e8e3ad59b0a3e68217dc8541af928ae21ac5e6b547 SHA512 8784ece688f52fabe430e19c0b6fdde3eb81531e8b9af95fc2325a965cd36766a34a10bfcea61b8ea38169d143ee8a5185c4fc0814b2e8cac46b8f2b434b3879
-DIST rts5229-1.07.tar.bz2 67175 BLAKE2B 43b1488ca788889ebbdcdcc03b3653a4323ce4550507e45f69f03caab5b37b561a17159b39a57eec7347f11fe6fb4e032c4c43c7b882a1a7e9eada2339d71575 SHA512 8df0396d5a08a22507e3a0a56321de6b17d1ca90b5cbdaa9712f56f5f4db026d1b49b9dacf244407889d354cb8eeac4e771388a0fc6eb00295b81456459a4503
-EBUILD rts5229-1.07-r7.ebuild 1102 BLAKE2B 1b36ef30c6940e006ca25983d5472f3303415687de45fb2aa8ef6f71f9e88c3654d3ffc5063c662cb262e688dee16845964b8afd3da21bde89eaa610de9c193a SHA512 5c711cf6f3a1f9d74f33a69034340aa672869a7f78eb7c49725b9aec91d3ad542f5d49da659247dd973468f3195197be7637d849c26f48b2e35b60410e27ad0c
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/sys-block/rts5229/files/rts5229-linux-3.10.patch b/sys-block/rts5229/files/rts5229-linux-3.10.patch
deleted file mode 100644
index 5044234fe07d..000000000000
--- a/sys-block/rts5229/files/rts5229-linux-3.10.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- rts5229.a/rtsx.c	2013-07-03 05:24:40.728296993 +0530
-+++ rts5229.b/rtsx.c	2013-07-03 05:20:56.452568592 +0530
-@@ -126,38 +126,18 @@
- 
- 
- #undef SPRINTF
--#define SPRINTF(args...) \
--	do { if (pos < buffer+length) pos += sprintf(pos, ## args); } while (0)
-+#define SPRINTF(args...) seq_printf(m, ##args)
- 
--static int proc_info (struct Scsi_Host *host, char *buffer,
--		char **start, off_t offset, int length, int inout)
-+static int show_info(struct seq_file *m, struct Scsi_Host *host)
- {
--	char *pos = buffer;
- 
--	
--	if (inout)
--		return length;
--
--	
- 	SPRINTF("   Host scsi%d: %s\n", host->host_no, CR_DRIVER_NAME);
--
- 	
- 	SPRINTF("       Vendor: Realtek Corp.\n");
- 	SPRINTF("      Product: RTS5229\n");
- 	SPRINTF("      Version: %s\n", DRIVER_VERSION);
- 	SPRINTF("        Build: %s, %s\n", __DATE__, __TIME__);
--
--	/*
--	 * Calculate start of next buffer, and return value.
--	 */
--	*start = buffer + offset;
--
--	if ((pos - buffer) < offset)
--		return (0);
--	else if ((pos - buffer - offset) < length)
--		return (pos - buffer - offset);
--	else
--		return (length);
-+    return 0;
- }
- 
- 
-@@ -263,7 +243,7 @@
- 	
- 	.name =				CR_DRIVER_NAME,
- 	.proc_name =			CR_DRIVER_NAME,
--	.proc_info =			proc_info,
-+	.show_info =			show_info,
- 	.info =				host_info,
- 
- 	
diff --git a/sys-block/rts5229/files/rts5229-linux-3.8.patch b/sys-block/rts5229/files/rts5229-linux-3.8.patch
deleted file mode 100644
index 81779aef2767..000000000000
--- a/sys-block/rts5229/files/rts5229-linux-3.8.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- rts5229.a/rtsx.c	2012-03-21 07:10:18.000000000 +0530
-+++ rts5229.b/rtsx.c	2013-05-29 01:06:32.333737569 +0530
-@@ -911,7 +911,7 @@
- 	chip->support_mmc = 1;
- }
- 
--static int __devinit rtsx_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
-+static int rtsx_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
- {
- 	struct Scsi_Host *host;
- 	struct rtsx_dev *dev;
-@@ -1066,7 +1066,7 @@
- }
- 
- 
--static void __devexit rtsx_remove(struct pci_dev *pci)
-+static void rtsx_remove(struct pci_dev *pci)
- {
- 	struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);
- 
-@@ -1092,7 +1092,7 @@
- 	.name = CR_DRIVER_NAME,
- 	.id_table = rts5229_ids,
- 	.probe = rtsx_probe,
--	.remove = __devexit_p(rtsx_remove),
-+	.remove = rtsx_remove,
- #ifdef CONFIG_PM
- 	.suspend = rtsx_suspend,
- 	.resume = rtsx_resume,
diff --git a/sys-block/rts5229/files/rts5229-vmalloc.patch b/sys-block/rts5229/files/rts5229-vmalloc.patch
deleted file mode 100644
index 51058cfb6f0c..000000000000
--- a/sys-block/rts5229/files/rts5229-vmalloc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur rts5229.a/ms.c rts5229.b/ms.c
---- rts5229.a/ms.c	2012-03-20 21:40:18.000000000 -0400
-+++ rts5229.b/ms.c	2015-09-17 01:13:54.830723253 -0400
-@@ -23,6 +23,7 @@
- #include <linux/blkdev.h>
- #include <linux/kthread.h>
- #include <linux/sched.h>
-+#include <linux/vmalloc.h>
- 
- #include "rtsx.h"
- #include "rtsx_transport.h"
-diff -Naur rts5229.a/rtsx_chip.c rts5229.b/rtsx_chip.c
---- rts5229.a/rtsx_chip.c	2012-03-20 21:40:18.000000000 -0400
-+++ rts5229.b/rtsx_chip.c	2015-09-17 01:13:29.574133449 -0400
-@@ -24,6 +24,7 @@
- #include <linux/kthread.h>
- #include <linux/sched.h>
- #include <linux/workqueue.h>
-+#include <linux/vmalloc.h>
- 
- #include "rtsx.h"
- #include "rtsx_transport.h"
-diff -Naur rts5229.a/rtsx_scsi.c rts5229.b/rtsx_scsi.c
---- rts5229.a/rtsx_scsi.c	2012-03-20 21:40:18.000000000 -0400
-+++ rts5229.b/rtsx_scsi.c	2015-09-17 01:13:44.035898653 -0400
-@@ -23,6 +23,7 @@
- #include <linux/blkdev.h>
- #include <linux/kthread.h>
- #include <linux/sched.h>
-+#include <linux/vmalloc.h>
- 
- #include "rtsx.h"
- #include "rtsx_transport.h"
diff --git a/sys-block/rts5229/metadata.xml b/sys-block/rts5229/metadata.xml
deleted file mode 100644
index 58f638b2ac3e..000000000000
--- a/sys-block/rts5229/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-</pkgmetadata>
diff --git a/sys-block/rts5229/rts5229-1.07-r7.ebuild b/sys-block/rts5229/rts5229-1.07-r7.ebuild
deleted file mode 100644
index a8fbcc633137..000000000000
--- a/sys-block/rts5229/rts5229-1.07-r7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit linux-mod
-
-DESCRIPTION="PCIE RTS5229 card reader driver for Linux"
-HOMEPAGE="http://www.realtek.com.tw/Downloads/downloadsView.aspx?PNid=15&PFid=25&Level=4&Conn=3&DownTypeID=3"
-SRC_URI="https://dev.gentoo.org/~vikraman/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-MODULE_NAMES="rts5229(misc/drivers/scsi)"
-BUILD_TARGETS="default"
-
-src_prepare() {
-	sed -e 's/\/lib\/modules\/\$(shell uname -r)\/build\//\$(KERNELDIR)/g' \
-		-i Makefile || die "Sed failed!"
-	([ ${KV_MAJOR} -gt 3 ] || ([ ${KV_MAJOR} -eq 3 ] && [ ${KV_MINOR} -ge 8 ])) \
-		&& epatch "${FILESDIR}/${PN}-linux-3.8.patch"
-	([ ${KV_MAJOR} -gt 3 ] || ([ ${KV_MAJOR} -eq 3 ] && [ ${KV_MINOR} -ge 10 ])) \
-		&& epatch "${FILESDIR}/${PN}-linux-3.10.patch"
-	sed -e '/__DATE__/d' \
-		-i rtsx.c || die "Sed failed!"
-	epatch "${FILESDIR}/${PN}-vmalloc.patch"
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
-}
diff --git a/sys-block/sedutil/Manifest b/sys-block/sedutil/Manifest
index df347e4050c2..f6279a5905b9 100644
--- a/sys-block/sedutil/Manifest
+++ b/sys-block/sedutil/Manifest
@@ -1,5 +1,5 @@
 DIST sedutil-1.15.1.tar.gz 297551 BLAKE2B 233ce75a75e298cf77b5737ab8a072b615ea1ee6f13936d4bd2c35d26036fe663efd2ccbf23e7bb1506230014e8282f590a8905a1349a2d7f0d8c77848a613e5 SHA512 9708ef307b457fad2f45735b044685ac6731c353af428c49ff0e312190f3bdc521bcfa71a9e1239d9ffe637d18293a99b09b7e001df96494cdce53f5442750f1
 DIST sedutil-1.15.tar.gz 295399 BLAKE2B 28d4a748248d1d1e7409afbe68dc608c037716aa694c2682d766654cc369136aab00a4af84d4abd2cf7bf1e32bf37b1d8eb55d2386a5b0db5b05471f1895ace5 SHA512 f4071d510db8227c7a4e37e1055993436cd8469e584cdb9d2bf507e006570c103b9e19353733f4ba6631226856c9d2aa8817c134febf96750318cffc935707da
-EBUILD sedutil-1.15.1.ebuild 597 BLAKE2B 9a14f67e5982810a0edc15ba121861fecc8498f98ec44c53891c541d66e1e48be6d33d6eb0e49317d0052de990be3584fc0c247a7f35ed88c92d6acec1d1f289 SHA512 42df20da9c2e29098c07c0528da1b37c9848253a165a282fe5b76f82d9679e3f1e6670f483e2c867f41efb27775f294e5c19ef500caae1da710b0c7658b5d89f
+EBUILD sedutil-1.15.1.ebuild 592 BLAKE2B e4ed7248ab398d92eec28e58378d676c32c08e28d348eb25b705080808723114b90577563ef99342bc127e19f4cff794ce15bc0d8b03c2f4803138630f44d18a SHA512 e8ba616cd6c3881db1f34c879c6d86be43e729419511202b458bd44724339f499f372dd666d71361cbe15747d368726494e2478b57e1c9c20d648caf702f0581
 EBUILD sedutil-1.15.ebuild 1027 BLAKE2B b2de8bc78b3c617c528488e0a8f6303bd555c9df142bcc39282403b08037f9dbe84219a66fda15da67f480f245b0f350f7299df1b23187be51f3cd23fcc0ba6b SHA512 4811618ec7ec75894dd67767d162ee5898c67112818ee94f1cc64d1e1b37f1784e6a783a7e88809911ade4a6f6b2cbce49eeebe5378b4fa7597ea7040643eb8a
 MISC metadata.xml 310 BLAKE2B aff6f154421fb59a5c0e9c60b63a681d47c9044d93bfa448e50e08a5e66b5a517d9d407d2cd6e3869724d3563311981de297478c9647d9e75c70cc64490509e1 SHA512 d060f20a44ba11ff4bfcf99aba392a09b7959bab38477f5c1a0f1deaef43c8d69e719c6464d0592943fe4d4f6ec1df883736c822b890bc17973468f8d3efa59f
diff --git a/sys-block/sedutil/sedutil-1.15.1.ebuild b/sys-block/sedutil/sedutil-1.15.1.ebuild
index 49da0065b212..46add69f934e 100644
--- a/sys-block/sedutil/sedutil-1.15.1.ebuild
+++ b/sys-block/sedutil/sedutil-1.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Drive-Trust-Alliance/${PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/sys-block/seekwatcher/Manifest b/sys-block/seekwatcher/Manifest
index f672e175b636..269dd03a5ecf 100644
--- a/sys-block/seekwatcher/Manifest
+++ b/sys-block/seekwatcher/Manifest
@@ -1,3 +1,3 @@
 DIST seekwatcher-0.13.tar.gz 25811 BLAKE2B 72c574e239a346620eb5a1c574365f18dc745e926bfb4f191dd9997ff73b26e716ded9679481be34149c3e5e424077a23a264e7dabe9423eafb396f687085dbd SHA512 687c1190a4d62ee4d7237c6930358d69d2045a7fd5af19caf9fdde8dfae8fcc64ba2d382445af2b038bc31f77c356f31b8dbff2d52cdaf4320881d1b1340dd17
-EBUILD seekwatcher-0.13.ebuild 776 BLAKE2B add5689371320e4b92261735eeee1f87f16fe8c3f1a4cacd3ed8976fe4b9675e533a703d5d650bd4d54ff382ff1e7edbdaa0112d1cc532bda0dbd3f4297c9c9d SHA512 713608672f847e064fb6b72fcbbfa458942fd4f3c943735f97908f48161eeb1ba56fd929d7ee8ae3ee2a0f779973c52912717aa2f1c1a42ebe684e0fb2ec5f43
+EBUILD seekwatcher-0.13.ebuild 778 BLAKE2B 19ad805991dd69261550f439e4f4b743a398c2d456c535a0690222765f2b2830d09623b2adc4c79eaf1909ccd6e62bbb979957936b97ee3fd6e0ff1645754ef5 SHA512 cae2f1239e65409218767fe03e5c4910ec7d2db0172075c906f38c9cf0ca74aacc2ef292e7cfd29703cfff83068a91089913ab682d9d1836497797fcf2e266e0
 MISC metadata.xml 326 BLAKE2B 21768c11bcab92a1bb978e7ed1be16b1b76525a957955894a1ca18ae5e5fd0103dc312c8dc09b586ed4b3d46f471ccf039a4180ba000b0f4e410b05d34f7f335 SHA512 0a77e934710066157e808d2848283a9d25d9db5c1ccd03292ddb35b812b996918c8ae731b75eb1d60518cf1d6ece5ee9db51ae4e8a964357cb66e77fcd1c3b06
diff --git a/sys-block/seekwatcher/seekwatcher-0.13.ebuild b/sys-block/seekwatcher/seekwatcher-0.13.ebuild
index 25386d9e874f..65fa0aab85bb 100644
--- a/sys-block/seekwatcher/seekwatcher-0.13.ebuild
+++ b/sys-block/seekwatcher/seekwatcher-0.13.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/sys-block/viaideinfo/Manifest b/sys-block/viaideinfo/Manifest
index f4cd326d9d69..da5e909712aa 100644
--- a/sys-block/viaideinfo/Manifest
+++ b/sys-block/viaideinfo/Manifest
@@ -1,3 +1,3 @@
 DIST viaideinfo-0.5.tar.gz 87428 BLAKE2B 6f2834378f58ad091cec7c60f18d3124b1e67b90be08a5550c56679e95186dcc8da961ec7eed0d3b9e9f83ccd1a1cfddc1f56a483b0f78ab1f984a99a62fc0d8 SHA512 8b697f5192828db9393706bbc4b679c664a1f3f5668820bfad7aaf1b8767586e49fe428fdc61e9223ee4cc2a16601f6060a2ec206690c098a864e9f26915e7c2
 EBUILD viaideinfo-0.5-r1.ebuild 446 BLAKE2B adc40fd8d600c879b6bd10064b3e40456196f380528a3fcdda35fee26a413faeffdcf33993153c6873f3a7ada5812c7613a229fa934de449ccf16dea68996e47 SHA512 439bb99d5d166533463629fa2fe9053714b722d35181eaae0f67d9c0950c17c998c7ce9deba4c3c8655f9d4061f84662704d1e4ef06f220a24d36b7f76a9e6b2
-MISC metadata.xml 240 BLAKE2B 64fe413f69832b5396b621f50bc6f618ddea15ddd4044ac76da4557d7dc0d963ce6ba36c0d1c0a8911af48fd71a6e84c4981f15ac7bad40bbd801e52b568a23b SHA512 25affa2d6d2fe48707ae81553343451aff9797885b4232e73973a29d4cc1d28a937d024cefca49f92383f01eb8cb811546cd2334cbb78f8e66f1db1f63ff4572
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-block/viaideinfo/metadata.xml b/sys-block/viaideinfo/metadata.xml
index f9f8bbfd9405..6f49eba8f496 100644
--- a/sys-block/viaideinfo/metadata.xml
+++ b/sys-block/viaideinfo/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>jer@gentoo.org</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest
index b4e51ef13455..a2cf8b2f40f1 100644
--- a/sys-block/zram-init/Manifest
+++ b/sys-block/zram-init/Manifest
@@ -1,7 +1,7 @@
+DIST zram-init-10.5.tar.gz 20496 BLAKE2B a28ba9e3813be7ca571ac033ca7b4bdf7c95624f9be72288d8478a2fffa950f7bb18fe865b9933fd209dabc705366af8f825fa7ee8a16be364e1d71c7062067c SHA512 97591549aa9b678b0b12efcc27136826c19b42cc0cf027a3f251843ef5678425568c9eb573d24661ce795eede1d136243fcccbf4dcd62e9d61eb7d775f84f1c1
 DIST zram-init-8.1.tar.gz 9177 BLAKE2B 229a469aeeb0b22b80f48d946d4ff746c7bd5d7b58ea9290db0da011df6d618c7c55ad95810b0be74ff81350182057d9067e834ecba688eb4ffa668521468a8b SHA512 8f688accb7a4231f705f694c4b4e7344bbb338b2b1f09a6dacd900020a4e8583105b25fef5b40f39630db88db6fcc8ec79824945ceaee95ea1279d09d081a994
-DIST zram-init-9.1.tar.gz 11414 BLAKE2B d7f7d1fd49594882a043322b905c02ac9e1f6ea78a626fb35ab0939096a062ef384e759d62e2cc4a990946e124317d70a4325b145e38612ebad173752209fa55 SHA512 4e3c76a389d188df98479f3f70af28405144b065df60ba191777cbec88d9bfe94be472d94bbb16314c0eefd41d177105cba74b45d1f13e82a741ff21a4d69c6a
+EBUILD zram-init-10.5.ebuild 1807 BLAKE2B 0aff41827844d8ff19b03a2a6370cc079f8b21640b50f937267b98be411ba9da1bc417352f58256e458ad7adc26bf6fb30fc3436f2daf02ac9fcd545c73eef9a SHA512 4e76467040b537ef691be7dca32a99f18dd10fa78a3fa62aace937e182300523f5c2e238b4731d9b2a937f300055c429c3233b23228e10574aa2d262913c8632
 EBUILD zram-init-8.1-r1.ebuild 1420 BLAKE2B cc89bf351776d5ecf21fbb4cf6f01fde82f66128740691973aba48242247009c7c291a3be9e42aa52b9902d29b667df91eec34cd8c20fa7d225d142269ab8add SHA512 f2458e9cf76bc3649f89fb6badcba7161b22a8a10acb35fc0eae2676e785cf4812c09364383dae3fe7cf621ed303fae26971eb18a1911d2125abf55cbd0de19f
 EBUILD zram-init-8.1.ebuild 1316 BLAKE2B 9f7e1876d23a1456ebd9731d85633376afbc6164f87b95200f6df463acede47a6795a3076fe2453ae47e727650a35281905d4e602596bf9fbad5e731b835b8cf SHA512 600376b939292e5cca35d1a976ce39cd291efcf84b26dc6e784fb4eab3fbaee9e9237226df1f80f8cc46509969a9a84e6a9640e52bcbcc85dbc3d6c5619db6ba
-EBUILD zram-init-9.1.ebuild 1439 BLAKE2B 19085f5a8606b1dae58ca6b5626b72a300bbdd26d99fb394cfd36bf7da31be21557b16392268f3544c9b2d2b04fe96af7ade8b9c1c55b8709b69acded9a1ae98 SHA512 cab9d4f730e33100b9fe0de001dee70460e7d953f3a92091ca9516efd4ba5aa8bfa0dbe81c17a17c6c76ce9c318a84c35d4a1249a8c05b4cd250b6c4704e7f10
-EBUILD zram-init-9999.ebuild 1439 BLAKE2B 19085f5a8606b1dae58ca6b5626b72a300bbdd26d99fb394cfd36bf7da31be21557b16392268f3544c9b2d2b04fe96af7ade8b9c1c55b8709b69acded9a1ae98 SHA512 cab9d4f730e33100b9fe0de001dee70460e7d953f3a92091ca9516efd4ba5aa8bfa0dbe81c17a17c6c76ce9c318a84c35d4a1249a8c05b4cd250b6c4704e7f10
-MISC metadata.xml 328 BLAKE2B 844b8904dd7452f6d78ba5322008aeedcb1cfbc25447320b37cc3a7e810d6725af9399150aaffa1d0b17b6c531e65d2ac5b37a90db7201c99a8d20f7fbfc2d90 SHA512 9f64f5788512ad221a6921fbf60a1cc4c1cab6e0a42e0fddb0f9642b4a1139d366bbe95a6aac5d6bc34f4a223801f3b58fb66290700700cff5b1f3e50c6b5e43
+EBUILD zram-init-9999.ebuild 1807 BLAKE2B 0aff41827844d8ff19b03a2a6370cc079f8b21640b50f937267b98be411ba9da1bc417352f58256e458ad7adc26bf6fb30fc3436f2daf02ac9fcd545c73eef9a SHA512 4e76467040b537ef691be7dca32a99f18dd10fa78a3fa62aace937e182300523f5c2e238b4731d9b2a937f300055c429c3233b23228e10574aa2d262913c8632
+MISC metadata.xml 725 BLAKE2B 1bec9f0a9fdcaddc89365d689cd2b661520180a822e2044935c2ab131b01d500f1f1a68049b0e4f4c5a400669fce87c824a749ae0852e477c10f2ec5af5d998a SHA512 32cc2ffc65cd72a8813a30a592d8ac722ba3c0860d5ad31931628fc5e89bf13ee9b04532681e01d750895a035316b2f10a170ce8543b05f147df3a314f5fe329
diff --git a/sys-block/zram-init/metadata.xml b/sys-block/zram-init/metadata.xml
index fdbc0f6b02d7..013ba527f064 100644
--- a/sys-block/zram-init/metadata.xml
+++ b/sys-block/zram-init/metadata.xml
@@ -2,11 +2,20 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>beatussum@protonmail.com</email>
+		<name>Mattéo Rossillol‑‑Laruelle</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>perfinion@gentoo.org</email>
 		<name>Jason Zaman</name>
 	</maintainer>
-
 	<upstream>
+		<maintainer status="active">
+			<name>Martin Väth</name>
+			<email>martin@mvath.de</email>
+		</maintainer>
+		<changelog>https://raw.githubusercontent.com/vaeth/zram-init/master/ChangeLog</changelog>
+		<bugs-to>https://github.com/vaeth/zram-init/issues/</bugs-to>
 		<remote-id type="github">vaeth/zram-init</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-block/zram-init/zram-init-10.5.ebuild b/sys-block/zram-init/zram-init-10.5.ebuild
new file mode 100644
index 000000000000..c591f149b38a
--- /dev/null
+++ b/sys-block/zram-init/zram-init-10.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix readme.gentoo-r1
+
+DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zRAM"
+HOMEPAGE="https://github.com/vaeth/zram-init/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vaeth/${PN}.git"
+else
+	SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+BDEPEND="sys-devel/gettext"
+
+RDEPEND="
+	>=app-shells/push-2.0
+	virtual/libintl
+	|| ( sys-apps/openrc sys-apps/systemd )
+"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="\
+To use zram-init, activate it in your kernel and add it to the default runlevel:
+	rc-update add zram-init default
+If you use systemd enable zram_swap, zram_tmp, and/or zram_var_tmp with
+systemctl. You might need to modify the following file depending on the
+number of devices that you want to create:
+	/etc/modprobe.d/zram.conf.
+If you use the \$TMPDIR as zram device with OpenRC, you should add zram-init
+to the boot runlevel:
+	rc-update add zram-init boot
+Still for the same case, you should add in the OpenRC configuration file
+for the services using \$TMPDIR the following line:
+	rc_need=\"zram-init\""
+
+src_prepare() {
+	default
+
+	hprefixify "${S}/man/${PN}.8"
+
+	hprefixify -e "s%(}|:)(/(usr/)?sbin)%\1${EPREFIX}\2%g" \
+		"${S}/sbin/${PN}.in"
+
+	hprefixify -e "s%( |=)(/tmp)%\1${EPREFIX}\2%g" \
+		"${S}/systemd/system"/* \
+		"${S}/openrc"/*/*
+}
+
+src_compile() {
+	emake PREFIX="${EPREFIX}/usr" MODIFY_SHEBANG=FALSE
+}
+
+src_install() {
+	einstalldocs
+	readme.gentoo_create_doc
+
+	emake DESTDIR="${ED}" PREFIX="/usr" SYSCONFDIR="/etc" \
+		BINDIR="${ED}/sbin" install
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-block/zram-init/zram-init-9.1.ebuild b/sys-block/zram-init/zram-init-9.1.ebuild
deleted file mode 100644
index 87a6d31eaf21..000000000000
--- a/sys-block/zram-init/zram-init-9.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit readme.gentoo-r1 systemd
-
-DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
-HOMEPAGE="https://github.com/vaeth/zram-init/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/vaeth/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-RDEPEND=">=app-shells/push-2.0
-	!<sys-apps/openrc-0.13"
-
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel:
-	rc-config add zram default
-If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl.
-You might need to modify /etc/modprobe.d/zram.conf"
-
-src_prepare() {
-	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-		-e 's#PushA_=`push.sh 2>/dev/null`#PushA_=`cat '"${EPREFIX}"'/usr/share/push/push.sh`#' \
-		-- sbin/zram-init || die
-	default
-}
-
-src_install() {
-	doinitd openrc/init.d/*
-	doconfd openrc/conf.d/*
-	systemd_dounit systemd/system/*
-	insinto /etc/modprobe.d
-	doins modprobe.d/*
-	insinto /usr/share/zsh/site-functions
-	doins zsh/*
-	dodoc AUTHORS ChangeLog README.md
-	readme.gentoo_create_doc
-	into /
-	dosbin sbin/*
-	doman man/${PN}.8
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-block/zram-init/zram-init-9999.ebuild b/sys-block/zram-init/zram-init-9999.ebuild
index 87a6d31eaf21..c591f149b38a 100644
--- a/sys-block/zram-init/zram-init-9999.ebuild
+++ b/sys-block/zram-init/zram-init-9999.ebuild
@@ -2,53 +2,69 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit readme.gentoo-r1 systemd
 
-DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
-HOMEPAGE="https://github.com/vaeth/zram-init/"
+inherit prefix readme.gentoo-r1
 
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
+DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zRAM"
+HOMEPAGE="https://github.com/vaeth/zram-init/"
 
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/vaeth/${PN}.git"
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vaeth/${PN}.git"
 else
 	SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
-RDEPEND=">=app-shells/push-2.0
-	!<sys-apps/openrc-0.13"
+LICENSE="GPL-2"
+SLOT="0"
+
+BDEPEND="sys-devel/gettext"
+
+RDEPEND="
+	>=app-shells/push-2.0
+	virtual/libintl
+	|| ( sys-apps/openrc sys-apps/systemd )
+"
 
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel:
-	rc-config add zram default
-If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl.
-You might need to modify /etc/modprobe.d/zram.conf"
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="\
+To use zram-init, activate it in your kernel and add it to the default runlevel:
+	rc-update add zram-init default
+If you use systemd enable zram_swap, zram_tmp, and/or zram_var_tmp with
+systemctl. You might need to modify the following file depending on the
+number of devices that you want to create:
+	/etc/modprobe.d/zram.conf.
+If you use the \$TMPDIR as zram device with OpenRC, you should add zram-init
+to the boot runlevel:
+	rc-update add zram-init boot
+Still for the same case, you should add in the OpenRC configuration file
+for the services using \$TMPDIR the following line:
+	rc_need=\"zram-init\""
 
 src_prepare() {
-	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-		-e 's#PushA_=`push.sh 2>/dev/null`#PushA_=`cat '"${EPREFIX}"'/usr/share/push/push.sh`#' \
-		-- sbin/zram-init || die
 	default
+
+	hprefixify "${S}/man/${PN}.8"
+
+	hprefixify -e "s%(}|:)(/(usr/)?sbin)%\1${EPREFIX}\2%g" \
+		"${S}/sbin/${PN}.in"
+
+	hprefixify -e "s%( |=)(/tmp)%\1${EPREFIX}\2%g" \
+		"${S}/systemd/system"/* \
+		"${S}/openrc"/*/*
+}
+
+src_compile() {
+	emake PREFIX="${EPREFIX}/usr" MODIFY_SHEBANG=FALSE
 }
 
 src_install() {
-	doinitd openrc/init.d/*
-	doconfd openrc/conf.d/*
-	systemd_dounit systemd/system/*
-	insinto /etc/modprobe.d
-	doins modprobe.d/*
-	insinto /usr/share/zsh/site-functions
-	doins zsh/*
-	dodoc AUTHORS ChangeLog README.md
+	einstalldocs
 	readme.gentoo_create_doc
-	into /
-	dosbin sbin/*
-	doman man/${PN}.8
+
+	emake DESTDIR="${ED}" PREFIX="/usr" SYSCONFDIR="/etc" \
+		BINDIR="${ED}/sbin" install
 }
 
 pkg_postinst() {