gentoo resync : 15.12.2017

5 files changed, 11 insertions, 131 deletions

diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 5bf920d6ec09..14b5f3f6a8f1 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,14 +1,10 @@
 AUX libmicrohttpd-0.9.53-fix-build-without-epoll.patch 702 BLAKE2B e56d5a0ede9c760d0c0ef47e93ffc0ffeb1837ca1ca3f1627b6b5936d12cc639517e2223f0a38d2dede6aad3ab018a1f1e313d61a8126db42c8b09f9b560ecfe SHA512 d14269551ebc8c4f2f21da71cfbbeb82c8808e6daedda906f3e699350e52eaa14c55cc263343e25667f18d3ae703b86d413925b03c73a992d6358053165bbb02
-DIST libmicrohttpd-0.9.51.tar.gz 1114110 SHA256 3000bb0ba219061f2ea60251b8ea3d5f694e8c6ce1706bbff57e7e24867a23c7 SHA512 462178033d5fabc53885189a7f73a343a1a0d2f54e8ff6310a3e74ace3316567927c453773e62ff35150ec36658605d6d0a9c1c38c5d3186d543ca313f4a5912 WHIRLPOOL 9c68282e4f423f251e950f0016d3394c7ce97c85e86a57525a31f832fd2b6b32790a0395a0a0701ad0f4104ff575488ffaed547684d7c3f6f809a3e92bde464d
-DIST libmicrohttpd-0.9.52.tar.gz 1244489 SHA256 54797f6e763d417627f89f60e4ae0a431dab0523f92f83def23ea02d0defafea SHA512 2cb7fa6ed59ec5f48748cd2aedea8a68629f02ffcf8e86c6d5b57a6622bb5f0ffd7dabfd6c04cc99047ca81eb76efe2a79b34bd6e3de329261a319369232fcf4 WHIRLPOOL b70f91dba5e6e69fe42066345d51bb72248b1c4271fa88c0599d78adf17b3eb79144e5a83159f1636a79a6c9081ebb6274d90fa307d4f78a3edbfc7e0d6bd10a
-DIST libmicrohttpd-0.9.53.tar.gz 1301214 SHA256 9b15ec2d381f44936323adfd4f989fa35add517cccbbfa581896b02a393c2cc4 SHA512 2e29595c980cdcf12c1cead62f8938cc32e8c93d3a848e7473c5d5f596c6b6858732df0a3293b93d89577e5a325a62fe82adf3921a76d7184a647489364d7e2c WHIRLPOOL 940eb42aaca8581ab7c7f2f3f6c246bf001956965d5529491d780f377eb00cffbf28aec3069b6a8eb691a78d84e77555ec5554b10ce066a11333d6cae19641a4
-DIST libmicrohttpd-0.9.54.tar.gz 1309560 SHA256 bcc721895d4a114b0548a39d2241c35caacb9e2e072d40e11b55c60e3d5ddcbe SHA512 d3276ad3af123aacc5ff885786861ccc94397576b81999974456b9b803fe5d911115f6595281ffce2240087f98a6527a840506eabeec9f2589d555fd235b6c89 WHIRLPOOL 5d5c099ea269c3d767b6d3f706453ec31b584c74fc01cbfc55ba0a54ce902611853cfeca7f7c8cc3f3c47147cb3db7cea3730abc86174f5d857471d75013b2c5
+DIST libmicrohttpd-0.9.52.tar.gz 1244489 BLAKE2B b8736bd50afa9531ea5377f082c8085ff189fad32cca5c07db14e4a1551dd2330630a06cfadb022b212385c2b01e4469c66e727c3e1c2035c131d99760962171 SHA512 2cb7fa6ed59ec5f48748cd2aedea8a68629f02ffcf8e86c6d5b57a6622bb5f0ffd7dabfd6c04cc99047ca81eb76efe2a79b34bd6e3de329261a319369232fcf4
 DIST libmicrohttpd-0.9.55.tar.gz 1308328 BLAKE2B 5189bcaf2f29fdff9fdd3d7dfddd1b5e5abbca016c4f55a7e0a176b505cd6e3aa5868260615c922937856cfb9c6fd77a4edeab829c669b4f7751d5512e8c538b SHA512 b410e7253d7c98c40b5e8b8dcd1f93bcbb05c88717190e8dae73073d36465e8e5cfa53c6c5098de60051a5ec64dc423fd94f4b06537d8146b744aa99f5a0b173
 DIST libmicrohttpd-0.9.57.tar.gz 1332713 BLAKE2B 52e46726b220229ae722b4b94478bcd657e5edf1a836fa412b3365d8a2ca651887e62badd095f42f4fe41ad92f07e4147c812aef1c03dd6fba72a4acc6b1581a SHA512 996a59b1bc950320f21df095d3e24e1e6a6e4204095eb84e7dc5e5ed296b1dbe553459b227ba6cc93f60721f1975f778ece8c7c1c10e9168d030fba46675eed3
-EBUILD libmicrohttpd-0.9.51.ebuild 1187 BLAKE2B 00f635699d0ecabd004a9b9003cee412425207baddd3a4d54510aba6f4bff6741bf6400d527f4628b1977c5358460da5e4aee13dbba6dff14cec86c81e371d16 SHA512 74a4a07e0beb590bb10064c50402f504df59e4fdccb837f844b47d72e9ce1795fbf78f02e3ca7ef5948bffdc171e90240e5e98eb759fb756c5fc06eba7cf12e3
+DIST libmicrohttpd-0.9.58.tar.gz 1333687 BLAKE2B ef3dfb4684f2c387399d9044eb46de70c387b89bc4600529a9cdad7f2f31a25e0b0996b91d03cf42421979279781161b72d35eeb94d4bb101dd4d73bb6181bb7 SHA512 f68268bb0a0776ac0654a682fc598f4778561c2cc775e7315505c0e2f26f0633590d01f157984d348fdcedfb63d31d39add760a4ddb041694330015293d161b6
 EBUILD libmicrohttpd-0.9.52.ebuild 1187 BLAKE2B 00f635699d0ecabd004a9b9003cee412425207baddd3a4d54510aba6f4bff6741bf6400d527f4628b1977c5358460da5e4aee13dbba6dff14cec86c81e371d16 SHA512 74a4a07e0beb590bb10064c50402f504df59e4fdccb837f844b47d72e9ce1795fbf78f02e3ca7ef5948bffdc171e90240e5e98eb759fb756c5fc06eba7cf12e3
-EBUILD libmicrohttpd-0.9.53.ebuild 1285 BLAKE2B 7ca9d0e7870164ba820a9833f6d88ebec80d8601db33dfbe70ae1aa0e258ee79e8647680b546b5ad606597e4fa4a3b222846307346fed245d3b3f227e0a4079f SHA512 607b9dacb538b14616e77e33399d77928edb56b095ff52881d3758972f64dc1f49d489cf71341d36a09bc015d63019842461e10e1563c7711ed6c2cbfdf9dacf
-EBUILD libmicrohttpd-0.9.54.ebuild 1196 BLAKE2B ca0e41c0fd2a64bad44f4c1413087a0a0d7ab59da3b7b3e389fe2b4aa4904580809e0c5c2fc2f8ab194efce0857f7c4c44240d1a0719554bc6462c4e6359f5dd SHA512 12cad915d06bad003b8a879e9c4fb5a64abd55706e77210da5449f7b1eeb3f9cf6bf1d15762698365cf357d95597108548ff09c11ea29cd4ac9d54264d9a7d3b
-EBUILD libmicrohttpd-0.9.55.ebuild 1198 BLAKE2B 17a32e9ef564f601f7292619597b37be35ef816de271db8d73d3556dcd8b80c9c000e949fa15e4cc16a4eee2657f02d2a3ddefb03bd980d75792b7bcd07d6bf9 SHA512 ca92aaac47272a2801e4eb7765f073e13f1bd505f618d1e9c95b76fe41ea4f8f2e8e53b448c8ed8452b9eea543e60fa1cdbe4f3c24c50bf5722836b5c9514f58
+EBUILD libmicrohttpd-0.9.55.ebuild 1197 BLAKE2B 9d175c399742755a2a2c1d00cc6219903df06149d58c773050dc50af027d9bd8bd0389ea6d438d354e0f31dd2af4a17f2e9d11c159b1f854b3d0ae935c515fdb SHA512 319ad4f70177b08318ced6a41acd0f4ec895996266880786a77623e86766b706faeb261d51ba5d36034a8c7400e74f02936dad76f5bd1fffccd2e50d81367cb0
 EBUILD libmicrohttpd-0.9.57.ebuild 1274 BLAKE2B e47b21d68fca4320be4c488a43b09bf147b09b570a180019fbb2cb5f831931f6373bc8c6639fefe6c29204100ff74bfe66124830bb1c190c12a574dd9d34ad9a SHA512 f3e0970fad231edae530b31bb639dbeff43cb7be72d79d1a1f674440c14d055dd11b330ed67b2c26f31b8c1dd07c7b19425b956c99d3974dd8cc6bd55f189b67
+EBUILD libmicrohttpd-0.9.58.ebuild 1274 BLAKE2B e47b21d68fca4320be4c488a43b09bf147b09b570a180019fbb2cb5f831931f6373bc8c6639fefe6c29204100ff74bfe66124830bb1c190c12a574dd9d34ad9a SHA512 f3e0970fad231edae530b31bb639dbeff43cb7be72d79d1a1f674440c14d055dd11b330ed67b2c26f31b8c1dd07c7b19425b956c99d3974dd8cc6bd55f189b67
 MISC metadata.xml 372 BLAKE2B d180fcd5efefd2e3578a0c24eceab503d896a3b194a15d3966bb2ccf4bc2bb4734951824b8f85b22f7a7dde6ca17b2e17026cd182788f2055f7cc37b9429032e SHA512 dfa7081c0ae502a60c5b86d7fb2aab3a23f77b08d0e638686fddba3e7976c917dd2392ba150365ffa411f2fcdd10483856b051bf1ee0ac519b74ce7b2672a8d7
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.53.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.53.ebuild
deleted file mode 100644
index 9afe482cd6bf..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.53.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="epoll messages ssl static-libs test"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-fix-build-without-epoll.patch
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.54.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.54.ebuild
deleted file mode 100644
index d782c539ac31..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.54.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="epoll messages ssl static-libs test"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-src_configure() {
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild
index 0defba419216..4b26a3730057 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.51.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.58.ebuild
index a31f258f10f8..e5946aac12bd 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.51.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.58.ebuild
@@ -3,6 +3,8 @@
 
 EAPI="6"
 
+inherit multilib-minimal
+
 MY_P="${P/_/}"
 
 DESCRIPTION="Small C library to run an HTTP server as part of another application"
@@ -11,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
@@ -30,7 +32,8 @@ S=${WORKDIR}/${MY_P}
 
 DOCS="AUTHORS NEWS README ChangeLog"
 
-src_configure() {
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
 	econf \
 		--enable-bauth \
 		--enable-dauth \
@@ -50,7 +53,7 @@ src_test() {
 	:
 }
 
-src_install() {
+multilib_src_install_all() {
 	default
 
 	use static-libs || find "${ED}" -name '*.la' -delete