gentoo resync : 04.05.2018

3 files changed, 94 insertions, 0 deletions

diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 45754b1fb208..b5ba724d75d9 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,10 +1,13 @@
 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-20180318.tgz 137259 BLAKE2B bec1f6acc68c3c9cf617dd7a752644628d088541c20816737ea1533eb0e9c92b76ef2dd037912501c29056994443e3ad66b1e7f4456e0f40687b32e4c6a12cf1 SHA512 ac71876aa0bea3acce8ea00c3848783b752991a0e60ebc4245277fd435c2c9e08c79cc5f47c996e590e711ca1bd652ded075c24ca820efe845f578b106c43594
+DIST mbuffer-20180410.tgz 140026 BLAKE2B d271b4c744d5c54aebaea9a68a674df184ac460f879ac4788afaca732466c95dd958145ffcb42155ed998cab771a5b0e70a57a6b479d244156afe6232c37b154 SHA512 88fdad5b767bc4dabdbe3300cf3de99a56d137ac991aa5be7ba383fc2447ec01cb43853f31ec88be3bf0cfa736753afe8bd5ef0a5abb386521f2d3316b781d74
 EBUILD mbuffer-20150412.ebuild 795 BLAKE2B 92d4c504fb558dafd340c80c814240c3dc266a8f1a28bddc8621004269da216a16b2630a637963c0478208c0e5761a6ee99570dbf1a96fd84058a377190c04ce SHA512 b4b9c424ccc4da361b00a173c4d18f0bd55994242f962c35c79dcd6edaec7c4f7e3ab29a18314b2dc047ea4916171dafaca57de7bf49ad18ae18a6989a93f32b
 EBUILD mbuffer-20171011.ebuild 1420 BLAKE2B b31a6e5966ed14f909055f3bbf41d9a10fff33afbb7764faa5f533683ac70321e7b4ba093c234ffe56a43eee6039b7250fbf9f6c40515d47387faf4775dd6d64 SHA512 cee05fbb0a9b10dd65fec4e7b16a56f04f5db516ee526ff478109e623d7efe485d82d3ea83e30e181d10faf64d1ab9827d5b1bb4c6da35898a24c6a14a04f50a
 EBUILD mbuffer-20180318.ebuild 1422 BLAKE2B 7743ea686f29752e4168b3932ceadd3393b5334b550121848c4b65196a005f270a90013bbe69596d623959930c77e4e625178382eb878c1d7bf49663fe0a9422 SHA512 c7e2e07b7130a13dea4080303024ba4f127d6b63f62c882d5073b602b942fc07991f27eb73afe7e35fe79b91ddd3115b9a58c94d5dee3535a014e0af0fc2fe6c
+EBUILD mbuffer-20180410.ebuild 1462 BLAKE2B 20f10be9d294edba49618c493b8001292c73a6a5a43e5633ea169b1f920f6463d728a368acad3c6506ad425cb0a2dc042c67488b363f318eae2bde7b9cf7a171 SHA512 ea7ba8e7e0981208c8f8a0f41467f4fd55e4fe99280fdb5d022a54d285ee66a06fe11ccf028e46556ced87760a9e838128af0fa0113a8727c4131eb01e53667d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/files/mbuffer-20180410-sysconfdir.patch b/sys-block/mbuffer/files/mbuffer-20180410-sysconfdir.patch
new file mode 100644
index 000000000000..560f4c516df8
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20180410-sysconfdir.patch
@@ -0,0 +1,26 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -12,6 +12,7 @@ OBJDUMP		= @OBJDUMP@
+ VPATH		= @srcdir@
+ prefix		= @prefix@
+ exec_prefix     = @exec_prefix@
++sysconfdir      = @sysconfdir@
+ datarootdir	= @datarootdir@
+ bindir          = @bindir@
+ mandir		= @mandir@/man1
+@@ -46,11 +47,11 @@ distclean: clean
+ 	-$(RM) $(TARGET) config.h config.log \
+ 	config.status Makefile mbuffer.1 core
+ 
+-$(DESTDIR)$(etcdir)/mbuffer.rc:
+-	-$(INSTALL) -d -m 755 $(DESTDIR)$(etcdir)
+-	$(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(etcdir)
++$(DESTDIR)$(sysconfdir)/mbuffer.rc:
++	-$(INSTALL) -d -m 755 $(DESTDIR)$(sysconfdir)
++	$(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(sysconfdir)/
+ 
+-install: $(TARGET) $(DESTDIR)$(etcdir)/mbuffer.rc
++install: $(TARGET) $(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-20180410.ebuild b/sys-block/mbuffer/mbuffer-20180410.ebuild
new file mode 100644
index 000000000000..3b1fd2aa6a99
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20180410.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+
+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
+}