gentoo resync : 30.05.2020

13 files changed, 13 insertions, 308 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index a43ba6e21aa2..b5529e3e16b9 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest
index c3cb9fc1ded9..ede79d011e32 100644
--- a/sys-block/blktrace/Manifest
+++ b/sys-block/blktrace/Manifest
@@ -6,5 +6,5 @@ DIST blktrace-1.1.0.tar.bz2 395445 BLAKE2B 8a19142991527813942e6377baa5de8255721
 DIST blktrace-1.2.0.tar.bz2 395193 BLAKE2B 8f8505f27985f0451f75ced0e438a88758482227e83ba8de235986ab3f116cf38d5aec340d1e7ce3dc3aa5a97c0bd4c46265687976e7326a54ea2e7cce4afc82 SHA512 ce82c8010ca5c2868746d8eb7c6a107fc7382c05df949eeff79e612f5b1a98301a5aa5ab39de0766ea1c074f95e378ba985401cbeba9a296e3182da7d7a23b86
 EBUILD blktrace-1.1.0-r1.ebuild 1233 BLAKE2B 983a6e3fff9ae246733c85866fc8362104433ae809cf1b681ef4e2ec1aae1fbdc4bd07ddb40be1c74ad9678e44438e8ef17717ddd176f2604539168be2e0263c SHA512 bb7797dfc05a1feab0478887f561d8312d17f390f155b7871456b6aaca9fbc92fe71b2d17da55cef48b42cab95de94093c864ad2c6af75d3c5b658eb7a95a66c
 EBUILD blktrace-1.1.0.ebuild 1241 BLAKE2B f5eddec256e923e7985a9e6a6d53ea48adf1de10118fa6a055487a83ef7903fca0a062d0499c6918bff53147768df041ccf676ed5961cf88c5824ddc0d84363c SHA512 8c0c29ae82c9273d7098f6d0b01a7342d4fab4920abcbc4d734d4bdd257e2d919094f61c382fd814b11929100ebd292c3da6e7880ed3d6acfd3dfd866e9cd1c1
-EBUILD blktrace-1.2.0.ebuild 1323 BLAKE2B 9484e15adb14915ef1f31b90a8c8553cfaca2a819c6421fa1c8e06039388f040cd8d212671fd5b7b5870854e0ae86a382dee549e3e573c7aa6c404e7bd6b1cae SHA512 5333a5c0c351e061a7633bde41fb1f03fa6ee6ba0db3f529fd2f6ecd6f35da1ff89ddb49f2dcc2b1f5066e0ec2febf443d12b087c98afccb9a9769338eb78a59
+EBUILD blktrace-1.2.0.ebuild 1368 BLAKE2B 72973adae402b659515fcd84246e32d072165ae0af3a8925d17e7c49a1e05485814d71feeb52150580c0a7a17aa23a724330895ddaf0aafe056d3c6677a4991d SHA512 ca0c2e1450172e66f071484970bc259f7590a1fcd60e3292f38b7659eaff3720be7f30e4d82dd3faf0e4d6a21f4af844d9987e2ded8049a001acec2dcdc28a8a
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/sys-block/blktrace/blktrace-1.2.0.ebuild b/sys-block/blktrace/blktrace-1.2.0.ebuild
index 68ca8627f8c1..099c1255badb 100644
--- a/sys-block/blktrace/blktrace-1.2.0.ebuild
+++ b/sys-block/blktrace/blktrace-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -47,7 +47,7 @@ src_compile() {
 }
 
 src_install() {
-	emake install DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man"
+	emake install CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}" DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man"
 	einstalldocs
 	use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf
 }
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 26f57902b520..0f0a865f4743 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,17 +1,6 @@
-AUX mbuffer-20121111-resolv-multi-order-issue.patch 780 BLAKE2B 83b253cbd3657c0c05778ca18bcc2cc2a00e24e3ed9ad8ff1539ad97b8d8a25f1f9c076c9c1ee3ce4e6ab0b6a65416689c93ea11fe57b41fd1b50c9871b2c031 SHA512 d633b4c5185cbb5eb52cb428002e7227e07819f6d49c9ed353c541c2d9234fe9c1f0c7f40e0a1662e47cd13835927b4eff310aae41181526f68cb7b0174218a4
-AUX mbuffer-20171011-resolv-multi-order-issue.patch 477 BLAKE2B 125454ba9539a3dba60808a5598cf34f44b3a5aa71ea276eca6694c885e2b89fd13e3b3adf6cffb48fd58113698f670a4ce4a740719e7b3edd545f766c602475 SHA512 cea92010f1de5685077f80490726837dfc066abe5ab4c1f6c01372a238035df351624024099972e0e571093d856873b7bcc6899cf1a0c7c1063a1035ec8d5951
-AUX mbuffer-20171011-sysconfdir.patch 916 BLAKE2B bd9443187e68fc6c67afef232904bdbc268564307b0b2150fe46ee3d2a9b9e480f52c200a3ec218bf795f706fb3f7c5c4a37c2ecaeb03fc1eec9b727622ab445 SHA512 88b19fb1dcd0156c04266f057196a5341896046d1e54ca70529452e72d544768b644d44d469255ecabf28e735ff3a8a41db9e4462bf3ebe079f97ae8520aeeb2
 AUX mbuffer-20180410-sysconfdir.patch 897 BLAKE2B 1fc57be6f5ce11f483d43dc69c9e4120b09a4c59caaee90deefd5500058ea0c8b9cd6b9b3dea1a2f21733acf4eb8a922171d791e57d658275997ca951f73559e SHA512 36964604338a0bfd0e9cb55d17b307f32dfe09d280019e8083e5909b81e091887bb8f360ef9aebf21eb8448a3d9ba305a6f7a7bc35ea4884418bb7d67e9fadb0
-DIST mbuffer-20150412.tgz 122935 BLAKE2B c57708861a9fc049fd4f3aa9c1229798a82e866a503e9ab78b1581fca7d60d0fd5cf2d80e8a8bcbb7fc6b000c9a38fb0bfd0d5184cd6bc2b7dca486bd87fb2b1 SHA512 cef64f1229872e2207e678aa77dc95e0c24f54e4a88a57a0e797d10b07a16d1f5fa96c8cfa3876ff65dd97c114eff87b683917fa1d39cdb4f08c864325e4223c
-DIST mbuffer-20171011.tgz 136630 BLAKE2B ba69435684b8c844701a51c5a77d0f5ecbf8bef3ca9b9739a63309524b14d0cbbeba422cee1c5d69f1029a42c18d089cea0bcc46dbeba7f51767df3a815f7de7 SHA512 398d7545388a94b4f8961193192cd5e1139b84f31c7699c2b7f66b84a40488a2e70c88a2a70578bd95375e11efc87978a5f6fec805dbbc5f1fea460b3a9c68c4
-DIST mbuffer-20181119.tgz 141445 BLAKE2B 8900b71af77b42ac6901285391bb571744bdcfd9fea307758b17be48f8ba3fa921c0e4752817d4feb8b139753440af25a8a8162f867e793d00e1baf8f1977e9e SHA512 0a30fa1c16f519a2ce82ae1f0f467dc9672e16affaff17f16cbec7bd3a28aea565e80ab4274ec24e60dd78560c692b8f852c7cba794a3715242f0d2385259347
-DIST mbuffer-20190127.tgz 142141 BLAKE2B 43ab5d92e0f930037da512f8310bb97edc534b8dbc9b76e36407ec87939e87667e723af026c6e48703a47c83c47ee72e82c36d4c99ab720a6c190fbb0bdfc30c SHA512 e42ba41ebe206cb34d16a4b8a2cf8470e8173ba3147ade8fb1fbb3e9fcf534e0a129f2327055a034a9e65c7b59b56441717641841d632709b02f3dd5e9962922
-DIST mbuffer-20190725.tgz 145246 BLAKE2B f0ec2826fcf59543c255c484bf3c901f8c515633a8f81042dcdfa5a712f2eff619fc031fffd6510f98c7348f49916c08ec1c465764546a606b9d451240e2768a SHA512 3f3670a0b618dadf47aa47310c88be96915af372c4dcdbdf3ba6b4d9c67fd994a027bdf6ed397c34c062499dbbc2b563ff9e79d8351c0faedfdeebe660ca4a25
 DIST mbuffer-20191016.tgz 145508 BLAKE2B d69600544fc0ed9e619f07f552a5369aed24f8a93588edd2a205613bdf5ebd5c636cda24702149bf7a82605c9a956408b56555c1577eb83c8f8ca0eb49c5c14c SHA512 78142a3f1529609b12151aafe848ad768a6074f4891bedaa52cc46ffa14350a2a8c0362d02621fa227bda54e98eabc4970c00838114574540873b426fbfe97a5
-EBUILD mbuffer-20150412.ebuild 795 BLAKE2B 92d4c504fb558dafd340c80c814240c3dc266a8f1a28bddc8621004269da216a16b2630a637963c0478208c0e5761a6ee99570dbf1a96fd84058a377190c04ce SHA512 b4b9c424ccc4da361b00a173c4d18f0bd55994242f962c35c79dcd6edaec7c4f7e3ab29a18314b2dc047ea4916171dafaca57de7bf49ad18ae18a6989a93f32b
-EBUILD mbuffer-20171011.ebuild 1443 BLAKE2B 2752db5ce538759ce96ac9f60a06f4e1ffb9151a9d6fe3b0f5aa3aa1df37df75f30c22ba87ee7114cd65d4da2a9d12254b1c7a74233b304a088baa0cf00b2f12 SHA512 dca484389458992fe1242956b421a4335a73008c19a486566f278c8f4b2ef67b93b8e90435474aa35a7351ed9b8828a4809f7fc9d72e448cc38483b67849bd09
-EBUILD mbuffer-20181119.ebuild 1483 BLAKE2B 724bc74a84456a8f29f73abc3806e03419543499073a41a753b54a00d003be52e5cc257136a45fac25f52953f6ed059faf0ae4b298a22e45bf6b5ed72ae09a14 SHA512 574cd79b156bf8639605f6a3b9c9087184dc72337922f60b9eab376636ad179274a1c6496d34c46981d1f223cfd78078c183d5fbc172c9b423c3657543b64c23
-EBUILD mbuffer-20190127.ebuild 1491 BLAKE2B d2635098accf7f2c509094777439b277009cdb2b83a073e66f8a8e5db05e6ce6407fbbe67a25c046663619e495bbd58e0991a621849085d038116ffb201786f4 SHA512 d7a00cc2e064a462467f72a2a54ebc1e119b904a72a2240ad773b2e699db1ac15fcad277e26a48bfc12070126aaf4497361649b3a44d7719e2c3b5c661f8c91c
-EBUILD mbuffer-20190725.ebuild 1493 BLAKE2B d5743f34893f47ce5d20480232023a4f709c4584f381c913b7f7d3d738600cac3361139b36fc9457391ac0f15a529be0fc36329fc670804f0551acca5c388f71 SHA512 9304e734315e4f723545f44ef1f044b18aee2c284bdf8131dbf7c41b84b37a2e8e3ad178d5a1ecdffce98c03d4342320b3ba1d73fcec4121376421d85589068d
-EBUILD mbuffer-20191016.ebuild 1498 BLAKE2B 4f33e291d420b1a7f7a752c717ac09820475fd1009cc0971005d9d4a61370e0957b511504bcb61b331e7d01e8da788386ab59de74acc62360a962e9f754324f5 SHA512 f1d5d1fc6b019d1a07213bc3db6969df17796189451333aa41cef2601ca239197af757bfcd6c0001656dd337e086fd84bf0f09a72deb1b5db93cff848d224a37
+DIST mbuffer-20200505.tgz 146020 BLAKE2B b85742f710405e29775c7d25e9c1be733fd94d7157018017b7c8fb5b5cdeab7fa8819b024d297d96af960a73a8982fdeaefe50627c605f797df4d75b0c15435f SHA512 8a1e5721869fd705d02486cf93467bfe0a59b58789826ca337c18a023e9fbb18c1651211bfebdea4cdd45772ad23d0715bb3892bed04ce66f5fbe72406cde9f7
+EBUILD mbuffer-20191016.ebuild 1498 BLAKE2B 03103c45840be50c95180bc54697edb50b43c3d5cadd686710c1429ea4f7acc18b4037634784438f2c6a57103e2eb7deb226f4327edb3afb9802c15dd506b23b SHA512 c282f00bb02de541130e7beddcd46d369fcd55b146c6be26630ccd10361815ee1771732cdbaf0ae908bb296cfd5e3dc34d2894d464e750dd940f456e490c9fd1
+EBUILD mbuffer-20200505.ebuild 1501 BLAKE2B c5f87a3fe6fc28352c732fa9f95d0e91601a41030e8085da1fb7bd29a2ec62dd895b7dc92594d358234b0d843e29b89c483982c6328ec682e126f30990a953cd SHA512 b3f83676d9eaf44c2bd7ee24b0930ebbaf98501a4f66bbf370f233cf360e706cc7049d04f96a461acece024ab0c4ab344f4b92245ec1c6fe0a2b6734e5057a34
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/files/mbuffer-20121111-resolv-multi-order-issue.patch b/sys-block/mbuffer/files/mbuffer-20121111-resolv-multi-order-issue.patch
deleted file mode 100644
index 08e0b83441b5..000000000000
--- a/sys-block/mbuffer/files/mbuffer-20121111-resolv-multi-order-issue.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u mbuffer-20121111.orig/Makefile.in mbuffer-20121111/Makefile.in
---- mbuffer-20121111.orig/Makefile.in	2012-11-16 11:17:11.000000000 +0100
-+++ mbuffer-20121111/Makefile.in	2012-12-04 22:43:00.186863737 +0100
-@@ -77,7 +77,7 @@
- 	./mbuffer -q -I :8000 -o $@.tar -o - | openssl md5 > $@.md5 & \
- 		sleep 1; \
- 		rm -f $@.tar; \
--		./mbuffer -i test.tar -o /dev/null -O localhost:8000 -H; \
-+		./mbuffer -i test.tar -o /dev/null -O 127.0.0.1:8000 -H; \
- 		wait
- 	sync
- 	diff $@.md5 test.md5
-@@ -92,7 +92,7 @@
- 	./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 & \
- 		sleep 1; \
- 		rm -f $@.tar; \
--		./mbuffer -i test.tar -o /dev/null -6 -O localhost:8000 -o $@.tar -H; \
-+		./mbuffer -i test.tar -o /dev/null -6 -O ::1:8000 -o $@.tar -H; \
- 		wait
- 	sync
- 	diff $@.md5 test.md5
diff --git a/sys-block/mbuffer/files/mbuffer-20171011-resolv-multi-order-issue.patch b/sys-block/mbuffer/files/mbuffer-20171011-resolv-multi-order-issue.patch
deleted file mode 100644
index 4702ca0c1a12..000000000000
--- a/sys-block/mbuffer/files/mbuffer-20171011-resolv-multi-order-issue.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-work around "multi off" in /etc/host.conf and "::1 localhost"
-*not* being the *first* "localhost" entry in /etc/hosts
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -86,7 +86,7 @@ test2: test.md5
- 	./mbuffer --pid -q -4 -I :7001 -o $@.tar -o - | openssl md5 > $@.md5 & \
- 		sleep 1; \
- 		rm -f $@.tar; \
--		./mbuffer --pid -i test.tar -o /dev/null -4 -O localhost:7001 -H; \
-+		./mbuffer --pid -i test.tar -o /dev/null -4 -O 127.0.0.1:7001 -H; \
- 		wait
- 	sync
- 	diff $@.md5 test.md5
diff --git a/sys-block/mbuffer/files/mbuffer-20171011-sysconfdir.patch b/sys-block/mbuffer/files/mbuffer-20171011-sysconfdir.patch
deleted file mode 100644
index ced095366939..000000000000
--- a/sys-block/mbuffer/files/mbuffer-20171011-sysconfdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -10,6 +10,7 @@ CP		= @CP@
- VPATH		= @srcdir@
- prefix		= @prefix@
- exec_prefix     = @exec_prefix@
-+sysconfdir      = @sysconfdir@
- datarootdir	= @datarootdir@
- bindir          = @bindir@
- mandir		= @mandir@/man1
-@@ -40,13 +41,13 @@ distclean: clean
- 	-$(RM) $(TARGET) config.h config.log \
- 	config.status Makefile mbuffer.1 core
- 
--$(DESTDIR)$(etcdir):
-+$(DESTDIR)$(sysconfdir):
- 	-$(INSTALL) -d -m 755 $@
- 
--$(DESTDIR)$(etcdir)/mbuffer.rc:
--	$(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(etcdir)
-+$(DESTDIR)$(sysconfdir)/mbuffer.rc:
-+	$(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(sysconfdir)/
- 
--install: $(TARGET) $(DESTDIR)$(etcdir) $(DESTDIR)$(etcdir)/mbuffer.rc
-+install: $(TARGET) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/mbuffer.rc
- 	-$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
- 	$(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(bindir)/
- 	-$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
diff --git a/sys-block/mbuffer/mbuffer-20150412.ebuild b/sys-block/mbuffer/mbuffer-20150412.ebuild
deleted file mode 100644
index 9c0f022c540b..000000000000
--- a/sys-block/mbuffer/mbuffer-20150412.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
-SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
-	# work around "multi off" in /etc/host.conf and "::1 localhost"
-	# *not* being the *first* "localhost" entry in /etc/hosts
-	epatch "${FILESDIR}/${PN}-20121111-resolv-multi-order-issue.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable ssl md5) \
-		$(use_enable debug)
-}
diff --git a/sys-block/mbuffer/mbuffer-20171011.ebuild b/sys-block/mbuffer/mbuffer-20171011.ebuild
deleted file mode 100644
index beeb45455b5d..000000000000
--- a/sys-block/mbuffer/mbuffer-20171011.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
-SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/openssl:0 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20171011-resolv-multi-order-issue.patch"
-	"${FILESDIR}/${PN}-20171011-sysconfdir.patch"
-)
-
-src_prepare() {
-	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
-
-	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
-	# using same port and src_install may have problems (with /etc folder)
-	export MAKEOPTS=-j1
-
-	default
-}
-
-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
-
-	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/mbuffer/mbuffer-20181119.ebuild b/sys-block/mbuffer/mbuffer-20181119.ebuild
deleted file mode 100644
index 53a06e811741..000000000000
--- a/sys-block/mbuffer/mbuffer-20181119.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
-SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/openssl:0 )"
-
-REQUIRED_USE="test? ( ssl )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
-)
-
-src_prepare() {
-	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
-
-	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
-	# using same port and src_install may have problems (with /etc folder)
-	export MAKEOPTS=-j1
-
-	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
-
-	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/mbuffer/mbuffer-20190127.ebuild b/sys-block/mbuffer/mbuffer-20190127.ebuild
deleted file mode 100644
index 3fd778622f2b..000000000000
--- a/sys-block/mbuffer/mbuffer-20190127.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
-SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="debug ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/openssl:0 )"
-
-REQUIRED_USE="test? ( ssl )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
-)
-
-src_prepare() {
-	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
-
-	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
-	# using same port and src_install may have problems (with /etc folder)
-	export MAKEOPTS=-j1
-
-	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
-
-	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/mbuffer/mbuffer-20191016.ebuild b/sys-block/mbuffer/mbuffer-20191016.ebuild
index 07d830948310..6b311595af38 100644
--- a/sys-block/mbuffer/mbuffer-20191016.ebuild
+++ b/sys-block/mbuffer/mbuffer-20191016.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional funct
 HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
 SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE="debug ssl test"
diff --git a/sys-block/mbuffer/mbuffer-20190725.ebuild b/sys-block/mbuffer/mbuffer-20200505.ebuild
index 86e453e1950c..5dd75f36ff0b 100644
--- a/sys-block/mbuffer/mbuffer-20190725.ebuild
+++ b/sys-block/mbuffer/mbuffer-20200505.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,18 +9,19 @@ DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional funct
 HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
 SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+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}
 	test? ( dev-libs/openssl:0 )"
 
-REQUIRED_USE="test? ( ssl )"
-
 PATCHES=(
 	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
 )