gentoo resync : 15.12.2019

6 files changed, 79 insertions, 6 deletions

diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 2662e73fbebe..7d59d39a2d6e 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -7,9 +7,11 @@ DIST mbuffer-20171011.tgz 136630 BLAKE2B ba69435684b8c844701a51c5a77d0f5ecbf8bef
 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 1419 BLAKE2B b623eea89a7b8d913c885b818d94b83ca4883df2d44d2c36463d2e62d9240affed87290989359c51a380e56a763d31f98440de4a011a05692aa2ec686b890d07 SHA512 94da802069d9c9336d85fc837ab8debbd5441aa69530714b3f90690ff13b7e9ef42a86448ba1e443b60b3cacf7ac9646397b5c3f5f71256b5dd631490439539c
-EBUILD mbuffer-20181119.ebuild 1456 BLAKE2B cf6f4a9db384e77059cb01cf4e2e0c94331e59a17a66e1a4734d85edc591b616f59884fe68ec055238b66e464a655314a1121fe2ee11124ea7417a964b9f1fd9 SHA512 12c54c5a023a249722715250565fc04a398cf113e1719c47e5c0efd29f7f9638a9527fa25cf98d887d50f1a11acff00f652caf001887a3125994c2b14fdd421a
-EBUILD mbuffer-20190127.ebuild 1464 BLAKE2B eb49a2d2959912cdad38097667959bbfbf69b48fe7cc9a7e331288c89dfa497cd9753f8643f3ee555923ccf7e52e955f7e58678e534845e155c5441fbd0de4d0 SHA512 2dcba70d1f2bad1de1bdcd9d32985208a5df63e1991b69ff66fb75d464a4b5a4e152ae3b896f87e21bb3679cca288c05b3ccf6f5b669b83ad9f25f440ecfe06f
-EBUILD mbuffer-20190725.ebuild 1466 BLAKE2B 693667b7a90f4d0de456bcf841be298e019edc44adbebf712f4a90858da448b7dcc64fa293b002358c8faa5a97d1c98e422e916d92e938d0becc7a5c343fb0ef SHA512 9ae3ca85f847930c5994d04fa18bda6aa6a5e80d7b561d21dba39cab39e1f74254229a3acab3659039c980773f962d11ca9994f5d224e6489df92fe8aeeef405
+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 1491 BLAKE2B 5e18cdd5b9e7926f115c4570a585a30aa36a3654c498b76739fff00762c0b91189f1069d6cc119cafeead254ed7833794d4381135104c134aabf2e2655a86fa7 SHA512 2a9dcecb51baf8e2b6438653f3e830751adcc3f90311f19e68ac3a38e6af5b1007d60b3781ebe93b2d39d01edf42f967b8284d3032fb775775a988cc0eb0f6d1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/mbuffer-20171011.ebuild b/sys-block/mbuffer/mbuffer-20171011.ebuild
index 76fdd8feac16..beeb45455b5d 100644
--- a/sys-block/mbuffer/mbuffer-20171011.ebuild
+++ b/sys-block/mbuffer/mbuffer-20171011.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug ssl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
diff --git a/sys-block/mbuffer/mbuffer-20181119.ebuild b/sys-block/mbuffer/mbuffer-20181119.ebuild
index 22c1ed552fe6..53a06e811741 100644
--- a/sys-block/mbuffer/mbuffer-20181119.ebuild
+++ b/sys-block/mbuffer/mbuffer-20181119.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug ssl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
diff --git a/sys-block/mbuffer/mbuffer-20190127.ebuild b/sys-block/mbuffer/mbuffer-20190127.ebuild
index 5ace4d03fc75..3fd778622f2b 100644
--- a/sys-block/mbuffer/mbuffer-20190127.ebuild
+++ b/sys-block/mbuffer/mbuffer-20190127.ebuild
@@ -13,6 +13,7 @@ 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}
diff --git a/sys-block/mbuffer/mbuffer-20190725.ebuild b/sys-block/mbuffer/mbuffer-20190725.ebuild
index f0ec344687e4..86e453e1950c 100644
--- a/sys-block/mbuffer/mbuffer-20190725.ebuild
+++ b/sys-block/mbuffer/mbuffer-20190725.ebuild
@@ -13,6 +13,7 @@ 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}
diff --git a/sys-block/mbuffer/mbuffer-20191016.ebuild b/sys-block/mbuffer/mbuffer-20191016.ebuild
new file mode 100644
index 000000000000..100537bee29c
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20191016.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 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-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm 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 )"
+
+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
+}