gentoo resync : 25.08.2020

4 files changed, 21 insertions, 75 deletions

diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 5e0d8aa21e91..bef93e8485af 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,6 +1,5 @@
 AUX mbuffer-20180410-sysconfdir.patch 897 BLAKE2B 1fc57be6f5ce11f483d43dc69c9e4120b09a4c59caaee90deefd5500058ea0c8b9cd6b9b3dea1a2f21733acf4eb8a922171d791e57d658275997ca951f73559e SHA512 36964604338a0bfd0e9cb55d17b307f32dfe09d280019e8083e5909b81e091887bb8f360ef9aebf21eb8448a3d9ba305a6f7a7bc35ea4884418bb7d67e9fadb0
-DIST mbuffer-20191016.tgz 145508 BLAKE2B d69600544fc0ed9e619f07f552a5369aed24f8a93588edd2a205613bdf5ebd5c636cda24702149bf7a82605c9a956408b56555c1577eb83c8f8ca0eb49c5c14c SHA512 78142a3f1529609b12151aafe848ad768a6074f4891bedaa52cc46ffa14350a2a8c0362d02621fa227bda54e98eabc4970c00838114574540873b426fbfe97a5
+AUX mbuffer-20200505-find-OBJDUMP.patch 377 BLAKE2B 7b9d8660d85532a5dff19195ab884fa37155ec603b414e576766c593295388c7f3ac2c3f6e333dbb5dbdf794036aedc814435b35bf746b10a5a0575905bcdbfb SHA512 4228741aeece32872c11da8a6840d8a7de6db77d4663edb44a8875384c70ba0807929bbb70c397f870ea1c18c5d0c0a224ad90f3d4e7094246496b461a5e6bff
 DIST mbuffer-20200505.tgz 146020 BLAKE2B b85742f710405e29775c7d25e9c1be733fd94d7157018017b7c8fb5b5cdeab7fa8819b024d297d96af960a73a8982fdeaefe50627c605f797df4d75b0c15435f SHA512 8a1e5721869fd705d02486cf93467bfe0a59b58789826ca337c18a023e9fbb18c1651211bfebdea4cdd45772ad23d0715bb3892bed04ce66f5fbe72406cde9f7
-EBUILD mbuffer-20191016.ebuild 1497 BLAKE2B 073e82a8ee1138b306d37dd63c3047df020d91eb90264276e01c845a9001b3c4d951a31d02771205864576529abb41c5dcf7d53c588fd07eb2b19ee03a08e48c SHA512 e9477f102d2da811a19736832b904ba65645fff2f2a1f28220e04e79f13abd052159a97b3e0014d075941e4bda2d7f6bfdeaaecb4aaebedaa34caab9e03649e5
-EBUILD mbuffer-20200505.ebuild 1501 BLAKE2B c5f87a3fe6fc28352c732fa9f95d0e91601a41030e8085da1fb7bd29a2ec62dd895b7dc92594d358234b0d843e29b89c483982c6328ec682e126f30990a953cd SHA512 b3f83676d9eaf44c2bd7ee24b0930ebbaf98501a4f66bbf370f233cf360e706cc7049d04f96a461acece024ab0c4ab344f4b92245ec1c6fe0a2b6734e5057a34
+EBUILD mbuffer-20200505.ebuild 1580 BLAKE2B 7d4d32ea78865d3fe29f94f77e2c2228814b37587bf97ceea6010ef0c99da441bba41344c2b5c4ba38cba7eb64a3e803a5f48ad4785d4bbac858db75fc891352 SHA512 eac277d0ec3650f05087ba0c3e50b15e088eda8c7de182d40334318c44cf54e895c8885bd3a42473cceb31882dbf5ec57f8792ce23c69ca8fe64f18f504dca6d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/files/mbuffer-20200505-find-OBJDUMP.patch b/sys-block/mbuffer/files/mbuffer-20200505-find-OBJDUMP.patch
new file mode 100644
index 000000000000..93fe6265e2ae
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20200505-find-OBJDUMP.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -109,7 +109,7 @@ AC_PATH_PROG(CP,cp)
+ AC_PATH_PROG(MT,mt,AC_MSG_WARN(could not find the program mt - you might need this if you want autoloader support))
+ AC_PATH_PROGS(TAR,[gtar tar])
+ AC_PATH_PROG(AWK,awk)
+-AC_PATH_PROGS(OBJDUMP,objdump gobjdump)
++AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
+ AC_SYS_LARGEFILE
+ AC_STRUCT_ST_BLKSIZE
+ 
diff --git a/sys-block/mbuffer/mbuffer-20191016.ebuild b/sys-block/mbuffer/mbuffer-20191016.ebuild
deleted file mode 100644
index a1a48e24a58a..000000000000
--- a/sys-block/mbuffer/mbuffer-20191016.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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 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
-}
diff --git a/sys-block/mbuffer/mbuffer-20200505.ebuild b/sys-block/mbuffer/mbuffer-20200505.ebuild
index 5dd75f36ff0b..3f4bfb12c78d 100644
--- a/sys-block/mbuffer/mbuffer-20200505.ebuild
+++ b/sys-block/mbuffer/mbuffer-20200505.ebuild
@@ -11,19 +11,22 @@ SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="debug ssl test"
+KEYWORDS="amd64 arm ~arm64 ppc x86"
+IUSE="debug libressl ssl test"
 
 REQUIRED_USE="test? ( ssl )"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/openssl:0 )"
+RDEPEND="ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
+	"${FILESDIR}/${PN}-20200505-find-OBJDUMP.patch"
 )
 
 src_prepare() {