gentoo resync : 27.03.2018

7 files changed, 9 insertions, 161 deletions

diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 25480013075f..9818429178ba 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,17 +1,10 @@
 AUX mbuffer-20121111-resolv-multi-order-issue.patch 780 BLAKE2B 83b253cbd3657c0c05778ca18bcc2cc2a00e24e3ed9ad8ff1539ad97b8d8a25f1f9c076c9c1ee3ce4e6ab0b6a65416689c93ea11fe57b41fd1b50c9871b2c031 SHA512 d633b4c5185cbb5eb52cb428002e7227e07819f6d49c9ed353c541c2d9234fe9c1f0c7f40e0a1662e47cd13835927b4eff310aae41181526f68cb7b0174218a4
-AUX mbuffer-20170515-sysconfdir.patch 934 BLAKE2B 5788ffdae11e41e63e56767eee8c43d867ca2bd5f84a4a925d65e21e3f1f6c4eeacc90fe3f46bd3febd67e884fb8b31ac15931bc7d6a6672fdd0c24bbce9ac82 SHA512 ab06b8930b95692c3985af476fb825483972c14ae45f2c212833770933ce99382628b0ddb1113089a2037856122b5a948f4db582bdba7275a568f96402384f66
-AUX mbuffer-20170921-resolv-multi-order-issue.patch 762 BLAKE2B 062d708900b58ca37049da878ce830fa77304abe0a0a2f0622f7c5a394c69a292e92cacd63f289d1ec98aae45e7f83f3afa0575f7f853f82e4e54d2957bb6415 SHA512 3edc736965e9b3559d25e118ac293ae0c2e5f48701767c06f138c5867bc41b8d7a598c6344418c9326d9b709efd9c1a68891e7a7aee1b16c430833ef09e25c81
-AUX mbuffer-20170921-sysconfdir.patch 924 BLAKE2B 88ed6f449b9875f5b102db289031a438290846a0e90952b1999659b07221de5fba6d9e644a114f1c759bb8900d84ddfde7607306d442c9bf0d34a1ee3d90b22f SHA512 803dcacba327386430488aeef4d9137dddb49d067332abc36f4b9502e277124ec9fdbf6f50cb0656572c5af2c9b663127c3d368ed23ad124977adccdb8e4e18f
 AUX mbuffer-20171011-resolv-multi-order-issue.patch 477 BLAKE2B 125454ba9539a3dba60808a5598cf34f44b3a5aa71ea276eca6694c885e2b89fd13e3b3adf6cffb48fd58113698f670a4ce4a740719e7b3edd545f766c602475 SHA512 cea92010f1de5685077f80490726837dfc066abe5ab4c1f6c01372a238035df351624024099972e0e571093d856873b7bcc6899cf1a0c7c1063a1035ec8d5951
 AUX mbuffer-20171011-sysconfdir.patch 916 BLAKE2B bd9443187e68fc6c67afef232904bdbc268564307b0b2150fe46ee3d2a9b9e480f52c200a3ec218bf795f706fb3f7c5c4a37c2ecaeb03fc1eec9b727622ab445 SHA512 88b19fb1dcd0156c04266f057196a5341896046d1e54ca70529452e72d544768b644d44d469255ecabf28e735ff3a8a41db9e4462bf3ebe079f97ae8520aeeb2
 DIST mbuffer-20150412.tgz 122935 BLAKE2B c57708861a9fc049fd4f3aa9c1229798a82e866a503e9ab78b1581fca7d60d0fd5cf2d80e8a8bcbb7fc6b000c9a38fb0bfd0d5184cd6bc2b7dca486bd87fb2b1 SHA512 cef64f1229872e2207e678aa77dc95e0c24f54e4a88a57a0e797d10b07a16d1f5fa96c8cfa3876ff65dd97c114eff87b683917fa1d39cdb4f08c864325e4223c
-DIST mbuffer-20160228.tgz 123108 BLAKE2B a19997f66a9a9247775bda94e0254938f286c0dff7b9f64a9fc08dedbbe10dcae0a0920af66d2f882c80761faaba0daa1e8bf5ae19ae29a2a56267fdf9773259 SHA512 0706b8dd137f5f5b01885bcca4bf799cbd14b25895402f0c73f874d78fc160c7fae8c5a229c40efce9ba96288972a8e5846443ef5cd4d1ff02af92f703e33a2e
-DIST mbuffer-20170515.tgz 125736 BLAKE2B 5524b1e63637180661d432dcf124b5579f17d4da3ff0bedba41d1a94d147df9478e209eaa3fd409092a0f82c37bee10910791b8b6344ab509211cc7fc2f03a8a SHA512 991cb33b09e48f1177b7a05e5ab2c189aa2cb0f03e220d7e46996b3a3e3ba1e3f3ad4a68b8750ed73dc765c5874029715bba1d2f5a80a9601cd0a39e1f9fd447
-DIST mbuffer-20170921.tgz 136192 BLAKE2B 2ec9858aae970340cf5b9d2f305039d351df6efbe51ee3a28d1de407da508a82fceb7c41f1dc89c1a58d7b26430151e8103023a1574cdad84bee1f7b78770402 SHA512 f4b897e7649893cb02f9b3b806e956acf60692cd549f9cfe6cf164c703f369f0af251bfdabfbcdd76dacf5a4c3871ed7b98fbd6b5fcb97d184b7c317082bfaee
 DIST mbuffer-20171011.tgz 136630 BLAKE2B ba69435684b8c844701a51c5a77d0f5ecbf8bef3ca9b9739a63309524b14d0cbbeba422cee1c5d69f1029a42c18d089cea0bcc46dbeba7f51767df3a815f7de7 SHA512 398d7545388a94b4f8961193192cd5e1139b84f31c7699c2b7f66b84a40488a2e70c88a2a70578bd95375e11efc87978a5f6fec805dbbc5f1fea460b3a9c68c4
+DIST mbuffer-20180318.tgz 137259 BLAKE2B bec1f6acc68c3c9cf617dd7a752644628d088541c20816737ea1533eb0e9c92b76ef2dd037912501c29056994443e3ad66b1e7f4456e0f40687b32e4c6a12cf1 SHA512 ac71876aa0bea3acce8ea00c3848783b752991a0e60ebc4245277fd435c2c9e08c79cc5f47c996e590e711ca1bd652ded075c24ca820efe845f578b106c43594
 EBUILD mbuffer-20150412.ebuild 795 BLAKE2B 92d4c504fb558dafd340c80c814240c3dc266a8f1a28bddc8621004269da216a16b2630a637963c0478208c0e5761a6ee99570dbf1a96fd84058a377190c04ce SHA512 b4b9c424ccc4da361b00a173c4d18f0bd55994242f962c35c79dcd6edaec7c4f7e3ab29a18314b2dc047ea4916171dafaca57de7bf49ad18ae18a6989a93f32b
-EBUILD mbuffer-20160228.ebuild 798 BLAKE2B 12610519b36456859977c3314eee246a691b2ba027f00d129bb2824661d9f10b3c4e56885a3a646c755766360153a0c17c5c8c0f0cd23ea8a1758ea4ce1d290b SHA512 4fc706486a433884a3b51bd17caee1c5f1a60ae10bd6309be9c6f79be6dcf1af9bab82ef2daae4eeefb1534785bffd6b055a6dea13b54f40695e251e991956a2
-EBUILD mbuffer-20170515.ebuild 885 BLAKE2B 0a1d148b3d0061efa6ad39cc6b580f1bbdf1926e5182772c59a0beeb87d137b838b95595640fba418c45f4c8e06d37ba6ef823442dd27f12cd4980804a924ab5 SHA512 b95e700f76352df3f46aaf2c60d90d4f618644f842cb31202dc433f03d1d858f112eb8b370568bac1fbb1a6c1502f5d6112a7ebf6735510bd51aa9812ba69503
-EBUILD mbuffer-20170921.ebuild 1386 BLAKE2B 87054c00e0555771f64b355f6ab71b73acc450f463d442191ee643d26c8f214e878a35668c173b73166c85788ddae1b9545d6b0ce95b237d733785a37bff1462 SHA512 4a91da34f0fe0f6b76b152d5c3a1b8961cb99ac5c61250356d6007c21218c4bb57f1959384d2c06a3c74b92ea105ba2a39b6d14f9c4533e0fdf7da45566e4304
 EBUILD mbuffer-20171011.ebuild 1422 BLAKE2B 8d57719fc5b13f8df59bb55f01a8048ce8c6a3488985efcb2e3a5e645f5e0d7785e6cbf445171494f66864f956490ce99d02113972c07feea4e074336b158266 SHA512 82e27724e3d22cd0f93477c81e754f0f57b3f4f91323bf35c3c4c4d47ab92ffba6d09b1ae3709df514ad5714a5b2f7774c803ee884cd2368530e530974eeb77e
+EBUILD mbuffer-20180318.ebuild 1422 BLAKE2B 7743ea686f29752e4168b3932ceadd3393b5334b550121848c4b65196a005f270a90013bbe69596d623959930c77e4e625178382eb878c1d7bf49663fe0a9422 SHA512 c7e2e07b7130a13dea4080303024ba4f127d6b63f62c882d5073b602b942fc07991f27eb73afe7e35fe79b91ddd3115b9a58c94d5dee3535a014e0af0fc2fe6c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/files/mbuffer-20170515-sysconfdir.patch b/sys-block/mbuffer/files/mbuffer-20170515-sysconfdir.patch
deleted file mode 100644
index f6a49a10e023..000000000000
--- a/sys-block/mbuffer/files/mbuffer-20170515-sysconfdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- mbuffer-20170515/Makefile.in
-+++ mbuffer-20170515/Makefile.in
-@@ -10,6 +10,7 @@
- VPATH		= @srcdir@
- prefix		= @prefix@
- exec_prefix     = @exec_prefix@
-+sysconfdir	= @sysconfdir@
- datarootdir	= @datarootdir@
- bindir          = @bindir@
- mandir		= @mandir@/man1
-@@ -39,13 +40,13 @@
- 	-$(RM) $(TARGET) config.h config.log \
- 	config.status Makefile mbuffer.1 core
- 
--$(DESTDIR)$(prefix)/etc:
-+$(DESTDIR)$(sysconfdir):
- 	-$(INSTALL) -d -m 755 $@
- 
--$(DESTDIR)$(prefix)/etc/mbuffer.rc:
--	$(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(prefix)/etc/
-+$(DESTDIR)$(sysconfdir)/mbuffer.rc:
-+	$(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(sysconfdir)/
- 
--install: $(TARGET) $(DESTDIR)$(prefix)/etc $(DESTDIR)$(prefix)/etc/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/files/mbuffer-20170921-resolv-multi-order-issue.patch b/sys-block/mbuffer/files/mbuffer-20170921-resolv-multi-order-issue.patch
deleted file mode 100644
index f8771145aa6b..000000000000
--- a/sys-block/mbuffer/files/mbuffer-20170921-resolv-multi-order-issue.patch
+++ /dev/null
@@ -1,23 +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 -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 -4 -O 127.0.0.1:8000 -H; \
- 		wait
- 	sync
- 	diff $@.md5 test.md5
-@@ -101,7 +101,7 @@ test3: test.md5
- 	./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 & \
- 		sleep 1; \
- 		rm -f $@.tar; \
--		./mbuffer -i test.tar -o /dev/null -6 -O ip6-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-20170921-sysconfdir.patch b/sys-block/mbuffer/files/mbuffer-20170921-sysconfdir.patch
deleted file mode 100644
index 1b9031aa58b4..000000000000
--- a/sys-block/mbuffer/files/mbuffer-20170921-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)$(prefix)/etc:
-+$(DESTDIR)$(sysconfdir):
- 	-$(INSTALL) -d -m 755 $@
- 
--$(DESTDIR)$(prefix)/etc/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-20160228.ebuild b/sys-block/mbuffer/mbuffer-20160228.ebuild
deleted file mode 100644
index 0d9d87bd5651..000000000000
--- a/sys-block/mbuffer/mbuffer-20160228.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-20170515.ebuild b/sys-block/mbuffer/mbuffer-20170515.ebuild
deleted file mode 100644
index 0ea6b6c8904a..000000000000
--- a/sys-block/mbuffer/mbuffer-20170515.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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"
-
-DEPEND="ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20121111-resolv-multi-order-issue.patch"
-	"${FILESDIR}/${PN}-20170515-sysconfdir.patch"
-)
-
-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
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable ssl md5)
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-block/mbuffer/mbuffer-20170921.ebuild b/sys-block/mbuffer/mbuffer-20180318.ebuild
index 2870b2b50535..b98af0bb4ca8 100644
--- a/sys-block/mbuffer/mbuffer-20170921.ebuild
+++ b/sys-block/mbuffer/mbuffer-20180318.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,14 +10,15 @@ SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ssl"
+IUSE="debug ssl test"
 
-DEPEND="ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/openssl:0 )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-20170921-resolv-multi-order-issue.patch"
-	"${FILESDIR}/${PN}-20170921-sysconfdir.patch"
+	"${FILESDIR}/${PN}-20171011-resolv-multi-order-issue.patch"
+	"${FILESDIR}/${PN}-20171011-sysconfdir.patch"
 )
 
 src_prepare() {