gentoo resync : 14.04.2018

19 files changed, 122 insertions, 154 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f788fbe58487..29271222b27e 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ccnet/Manifest b/net-libs/ccnet/Manifest
index d19a5d0a8a61..d981edeeb290 100644
--- a/net-libs/ccnet/Manifest
+++ b/net-libs/ccnet/Manifest
@@ -1,9 +1,3 @@
-DIST ccnet-6.0.7.tar.gz 179356 BLAKE2B cc7a3fb70013e575845c8fd638847f1fd9670b0ea1997d208fd89f917f1c4c60ed86064c31db118bf5969dda27bc055d5e3abf0bb1ad63bc00ad49ba5819dda6 SHA512 66df998bb544ad614479d853820e3ee3119c2b08087d82a2a0633202c860447a7ac79f3639e587d531c2443def3cd58bf9ccdb2fed350c8bd7005737fb3d85fd
-DIST ccnet-6.1.0.tar.gz 179362 BLAKE2B a7c10433a3af69456f15df75c02d92e203628f7f4d64a9f57849cc80e8d0913fccc7767b58e161551a2105cbffd79074144237fbacba5663972eadea661131d1 SHA512 0053d342cf9256a37ca2ebf774794c791cb08caa7d608035c1b307a271e11719da1d4c272870ab51ad1cd8d8c0a84d22959b513865ddf98b4691cba35bc93018
-DIST ccnet-6.1.3.tar.gz 179321 BLAKE2B 23f6877ee9e3d80d4413e7b059688d83f99e21f3b665abaf41389366cf99fcb841e730535808e6874f4c1ba09818f637bbf222858ebb1ec3473cd40b6b03d0b0 SHA512 1700237749dd250798b6bd3ea2d74bd09f72e3f5502520d413671c247eeeae05f92947a4a4429035f8ab6414c9c67353939025de046b00941956b6854f4cfcc3
-DIST ccnet-6.1.4.tar.gz 179357 BLAKE2B 5f0a83ef15f43394655c68d2b2a13ca91e0df93fb661f598814d8f0c4a31eddb26d0b8a0f0679d9c3babf7200f8ce1bb75818e0a6d445f41527358b4c6102d2c SHA512 99ec3f41ad1e6c06455ca1622b6e5219d76ce85014523db6bfd15cbbd9b54fd4027f87906fc47bd7bafcbabc9febdbccb6839c5b8fa10133ddb461dca4f46ce0
-EBUILD ccnet-6.0.7.ebuild 873 BLAKE2B 679326c2ced8f7b7b246f56b6c27b09352e4a49108d722236c951637f31856e2fe38b85da6869a236fea6857618bcf07a2b797a7fd73c6e028b931679a77d090 SHA512 6ebabe35a41860198c5f32a01c59ef0505b78238747dcbe705570d42b42dcd61cf89a4faee2036b7e04b7294eaad88aa471135abba20739745352fd4d2b8f593
-EBUILD ccnet-6.1.0.ebuild 873 BLAKE2B 679326c2ced8f7b7b246f56b6c27b09352e4a49108d722236c951637f31856e2fe38b85da6869a236fea6857618bcf07a2b797a7fd73c6e028b931679a77d090 SHA512 6ebabe35a41860198c5f32a01c59ef0505b78238747dcbe705570d42b42dcd61cf89a4faee2036b7e04b7294eaad88aa471135abba20739745352fd4d2b8f593
-EBUILD ccnet-6.1.3.ebuild 1009 BLAKE2B 60ac3868b2b59dbf88a6baf296323e63f9c0146a5f34b337332c295662eab76678e556c436f2289ee8f37f830d67cb9af72beb2a3c3f55e3e956dfa03b0ab3aa SHA512 93985895949b2eacde0c1e73713627b9d46f43584293c2a0c51712302c444d7324331fa07c638dfb4be7df0614b776a99bd15df6d0465e1f7ecd2b60b643e58c
-EBUILD ccnet-6.1.4.ebuild 1009 BLAKE2B 60ac3868b2b59dbf88a6baf296323e63f9c0146a5f34b337332c295662eab76678e556c436f2289ee8f37f830d67cb9af72beb2a3c3f55e3e956dfa03b0ab3aa SHA512 93985895949b2eacde0c1e73713627b9d46f43584293c2a0c51712302c444d7324331fa07c638dfb4be7df0614b776a99bd15df6d0465e1f7ecd2b60b643e58c
+DIST ccnet-6.1.7.tar.gz 179364 BLAKE2B 214284a5b04ee2c8a51f8479bee5bcc3d5b044ed0cd622b56ae5caf4fb2757bf28191ffedca9f76fce80b5c6da5a489207e1bdef3436e44dbe1841a69a82c448 SHA512 bac93c9987f434915f9d5b5f0cfc44d88471ae27896e89059f3c924182255d938fb6c87dec31354f256807d5e4274b6af2e3325e753d06cd8a5ea91caba9490d
+EBUILD ccnet-6.1.7.ebuild 995 BLAKE2B 259e0ff75a805902d29bfe659510ebeb801c77894b3d863cecb3650312818c3fb4bf17c067f9ea1ddffb1bacb212022698420dda075ae42632402311621e59e1 SHA512 ed7642aa5269055f57612d853412a7ca99b808fc72bdb424a2b75e1c63caba7c5c744f09ea4bb0d47f22b82bfbb73641947a0be6b43d2c473fb71d0de93f0029
 MISC metadata.xml 414 BLAKE2B 4a36924c507e6d008c32aa08bd7216b525c9b987229cb9158393d3b0abbca75ecafbf9ff9f7b687afa53b73d41a32588960f7abd9bd365b795f87cb064d79a93 SHA512 d3687845c8d2b3f8bed69df446341ebcea3fa151bf956d2c87c4aeca43c4a5af29cec35e9dc894b7f95d97e2f144324e78cb0d68d62c08c7db3c86f3587b045f
diff --git a/net-libs/ccnet/ccnet-6.0.7.ebuild b/net-libs/ccnet/ccnet-6.0.7.ebuild
deleted file mode 100644
index e78f3357f6ea..000000000000
--- a/net-libs/ccnet/ccnet-6.0.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="Ccnet is a framework for writing networked applications in C"
-HOMEPAGE="https://github.com/haiwen/ccnet http://seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
-	>=dev-libs/glib-2.16.0:2
-	>=dev-libs/libevent-2.0
-	dev-libs/openssl:0=
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e "s/(DESTDIR)//" libccnet.pc.in || die
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
diff --git a/net-libs/ccnet/ccnet-6.1.0.ebuild b/net-libs/ccnet/ccnet-6.1.0.ebuild
deleted file mode 100644
index e78f3357f6ea..000000000000
--- a/net-libs/ccnet/ccnet-6.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="Ccnet is a framework for writing networked applications in C"
-HOMEPAGE="https://github.com/haiwen/ccnet http://seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
-	>=dev-libs/glib-2.16.0:2
-	>=dev-libs/libevent-2.0
-	dev-libs/openssl:0=
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e "s/(DESTDIR)//" libccnet.pc.in || die
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
diff --git a/net-libs/ccnet/ccnet-6.1.4.ebuild b/net-libs/ccnet/ccnet-6.1.4.ebuild
deleted file mode 100644
index 111ba4108381..000000000000
--- a/net-libs/ccnet/ccnet-6.1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="Ccnet is a framework for writing networked applications in C"
-HOMEPAGE="https://github.com/haiwen/ccnet http://seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
-	>=dev-libs/glib-2.16.0:2
-	>=dev-libs/libevent-2.0
-	dev-libs/openssl:0=
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e "s/(DESTDIR)//" libccnet.pc.in || die
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/ccnet/ccnet-6.1.3.ebuild b/net-libs/ccnet/ccnet-6.1.7.ebuild
index 111ba4108381..76149b4a86fe 100644
--- a/net-libs/ccnet/ccnet-6.1.3.ebuild
+++ b/net-libs/ccnet/ccnet-6.1.7.ebuild
@@ -17,9 +17,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	net-libs/libsearpc[${PYTHON_USEDEP}]
-	>=dev-libs/glib-2.16.0:2
-	>=dev-libs/libevent-2.0
-	dev-libs/openssl:0=
+	dev-libs/glib:2
+	dev-libs/libevent:0
+	dev-libs/openssl:0
 	dev-db/sqlite:3"
 DEPEND="${RDEPEND}
 	$(vala_depend)"
diff --git a/net-libs/ftplib/Manifest b/net-libs/ftplib/Manifest
index 3b1f3bc62d73..5bc3704e18b9 100644
--- a/net-libs/ftplib/Manifest
+++ b/net-libs/ftplib/Manifest
@@ -2,7 +2,7 @@ AUX ftplib-4.0-crash.patch 3277 BLAKE2B b99ac37f15d7253824b27c0b4ef422f08c71680b
 DIST ftplib-4.0.tar.gz 66680 BLAKE2B a4a2ca6df725daaeec226c7dfe4b165e7a8e1c5317d681a0137056b89bbfc448c83e15278696062d9bda83b62c58dfa5f0a52b83817f2a642805b03a403bd08f SHA512 ff39c243a6acbb67a8d2779f34b59f69f45d578ea3976c14aee1abcc56bf16cbbc6518ba96a4ccf34f6dd469eef388043caf066858b8df24bebfab7ab30a1c62
 DIST ftplib_3.1-1-9.debian.tar.gz 8560 BLAKE2B c9a1a487bbf260cbdac5c3c5fef04a3e059414805e3528339d8bb37d37ed3a84c8858552ad6b8b48d1034c412d912933c04631ec5379d32148ba3508b10999f3 SHA512 c87fb17bca4616d85f064f718161071b35a0e3f1c84ce8f13b4cd9f9b75f5115a4c518680d77af240196f0b2ee5eff520e0d4a0b87c797554c1ee8caa4962e07
 DIST ftplib_3.1-1.orig.tar.gz 90724 BLAKE2B 4aabc71dae317801c3754979b48fa04871c6f6b5b332037d5606dbe669d64c82b057560656a5e2f8a792d4a3ae4597fc873f471d4e10f52e8a25ef6c41687249 SHA512 5a0116ce1526f77532ced94c00bc1199378da1e1707c86637c83c6e9a27fef3a290bfefb7fc537946219587625b39560399cf136b83878a7829a2f3bee5f926f
-EBUILD ftplib-3.1.1.ebuild 1094 BLAKE2B 7c67f3640b39a0b850386e5b1f5274731d88ce0dc8512f412a1a916ae6f3515b3efd60d5d89176fe6c506718b5de6fd494d28a4c7606e2cf65701aedf8394f7f SHA512 5ff3a8fe0fcd02ad744c4171c3bed2ecf8be22e777d7f174e31f9bea309a7f149e7482e7c29bb59d6999a604cda2c307c7137c0ec379db4d35656e7cfe471f28
+EBUILD ftplib-3.1.1.ebuild 1093 BLAKE2B cd1fe296df8d4e9d611ec0f1d0dc1204cccbc79a8897b130eb5127d7248f879fd739a9be1c9e9d99fcc10c2ebb6dff564aedb8a9ba2ff5151ed559e5936b8cb9 SHA512 cd492415e438616ed852b912897af824c20ffcf484a27e18f28319ff16c5b39a1ff019071be5c1f04cf4e0f589b737e323d953bba7db890788cfca5f8882d700
 EBUILD ftplib-4.0-r1.ebuild 1016 BLAKE2B b559ed7e660d2072edad64bf6fde5bce864d78f987469cac6d770c683c2253b56aac81b6f590e5f8b00931fe9bf270df513ed7d952f6389d44b0b7b0da2a4685 SHA512 f5d86f2761d039891b94eb163c4700a3ec55d14155cc848cec69df02d20b4063576b786f53aafb582eb604f4d33b67154a7f934be575885e328efbd61e6d3aa8
 EBUILD ftplib-4.0.ebuild 863 BLAKE2B b70d71673b6d3bd6949533f425d6488fa90422596806baccde705e9bf03fb305f6c67dde8db2c00f58ad92a530ef2f59921be5cbf27c826ec79ff275e1e07413 SHA512 5d3a79f831504f72d66045bcfc7f159590525ace2d3d745cbe32394318dfc88f9b3905ffe5a98a778b185796782b29aee4e660654a17b99e2bdbfe334fcf0c4f
 MISC metadata.xml 227 BLAKE2B 129a977f3a470f0774cb25c7d9d67968f807b5bbba6b1d1b1d0155e288555355796826ce187abf95a06ee0a448e08e9c5ec34ee79d9895bf2718b47ff0d9bfe8 SHA512 d39fc0676c06bf09884fa817e0d5dc386a536d5626a9c2cf34ddb8b7e29d612ecb2c617214788ffe729c5118c632c119e03ce6d38f17114c48c090c82a2ec2e5
diff --git a/net-libs/ftplib/ftplib-3.1.1.ebuild b/net-libs/ftplib/ftplib-3.1.1.ebuild
index 4fba790d9438..51a887e92428 100644
--- a/net-libs/ftplib/ftplib-3.1.1.ebuild
+++ b/net-libs/ftplib/ftplib-3.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${DEB_URI}/${PN}_${MY_PV}.orig.tar.gz
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index e069b0a69afa..68a6e4956596 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -7,7 +7,9 @@ AUX http-parser-2.6.2-darwin.patch 452 BLAKE2B 3c300ae1a9d484c8c3d188df421b4ea28
 DIST http-parser-2.6.2.tar.gz 48292 BLAKE2B 054ffa66960bad29a31e1a697a035447eb551fb85ed2af3786664f161d8d5a62aad8142ce859b7f1af85489b703b188d09980bf82b56cb190c21ecbe9c3a2f5c SHA512 e19e5377b3eb7f149c428196826fb878564fdfa3716ff6df5a3845c51586aee0582e252e09d1f8ebad1163b3e66632ff0c6e78f6acb2f0da20d7a06e734406c1
 DIST http-parser-2.7.1.tar.gz 48578 BLAKE2B dcf67172b4b975543ca3b51bfce2b03f2b9b2dcc8c774322dfe41dd53a942f70f8f69cf69221ba76da249b22d6bee0aab6e6d887ea0a5e0f7350fa21c4091efb SHA512 c0fe86455db1a563a5c668f118dfa9a27b9a637ee1c0e2f2f18a5b816352436ed90435ea978e3f3d85b037d3c630234e47d609dc3b7086b898286c4e54d9f031
 DIST http-parser-2.8.0.tar.gz 50575 BLAKE2B 0ea1973b452b62915ad2a92be95e09281c1aa2f152ff4a67580e99ab113b44544f98b2e33fa1fadb259144975f15dc69c8b0ecc9de59e603dbd0e0a0785b7976 SHA512 57252a29b75f91452fd9bf2d3805bf1ddd95c32aee864cbe47dc676861512b9db95a7b3a4e1b999d5c046ab0d50809e7f184994c24ad48fe97cc2bcc27d9eb7b
+DIST http-parser-2.8.1.tar.gz 50731 BLAKE2B 1c4f3f61550f7f8e86d7b47e3986754a108dc979c6232d87ac418f9f8295b88ee43c4a5af150460f707e6ade01f5d435801f980ccbff93369ee0a9dc2eb60656 SHA512 6f52f543d979f39688ccefae236527a8183929b3d30f5370570107b01cf89d0338b448249a81102b78d31615d2e8f6e7c708f8961f55ece08e7d3a40e5ad0883
 EBUILD http-parser-2.6.2.ebuild 1395 BLAKE2B 3ecf77d59826d0b5a82c3bb6dffb25b98837027e0ab915bfde595b38d2633203278422db4a60c6be2fcb142055b64ba9862e71b9bdf409fc3c074cb765a51bb3 SHA512 ff59a0b6f3b7aef3ca79483384df88eafaf7ad80f05ea809288c6798ce0234f83a9dd41b5b2c80a865c70cb449574b0f2100c87bec2a5c2fecf432874b5a07f3
 EBUILD http-parser-2.7.1.ebuild 1353 BLAKE2B 6e0444e9dcc52cbbfaf8142f4178a1824566ff66184897bd71e2a8d0ddf1e192634c224ba62465ba99f5db2ed498c042b69cabc2388d909a442b7a39a9b27f4c SHA512 0a7730443f49ec26ea9b0c146adbc1a86902446a04a4ee927017ca6c89af193d760758277656204d5f26562dba41dd70c26fae6d2f562d3a07b4fd074b1e8464
 EBUILD http-parser-2.8.0.ebuild 980 BLAKE2B d3451576cd8dedfdea29cd77f9498d662873fa5837537e0512de59dc052bbf71cbe98f80d9133c0de8ba64bdc3cbede132a0ec44413a488c4ee5df60889eda3b SHA512 9250e3941ab53591e2a7bb5faf7945c12fa3b3dd332fcac267d8aab9800a159c0c2edc3b8c3c5b49fdca7e4c7d455deb570bd35bf5dac38bd0fec0d69627e632
+EBUILD http-parser-2.8.1.ebuild 980 BLAKE2B 13071399ce29b354b53346dad0f27e772904a04d29fbec15b5197db8a57d9f6af35b63591eb91a6931e80e295fe5daad618e1c4fbbaab1e6851910d386b21869 SHA512 2843c603d821982e9b21183024a6fcca4243f27a14ee6928cfa9a3aae2adfdd972e1c053f21bd45688018e409d58928fb8f47fc5ea70918bd35e08b6ef22d094
 MISC metadata.xml 289 BLAKE2B 805f4cc8d1b3649e03fe78b6b9b54e24bb9fd20ce85ebfd26e0b3876a9694de33790fc36fcadb0776a3fffec46b9b9083b419e8db54f19d4f624b9892130e5e8 SHA512 099cab401d2a3b0f7ca10fdbb5d31a9cc1f14dc016d75cfdcce122b6c3250cf17ef0215ca92574b1e64d4dc9bb460b3286be1b6a6d123acd0511a3c25c34a022
diff --git a/net-libs/http-parser/http-parser-2.8.1.ebuild b/net-libs/http-parser/http-parser-2.8.1.ebuild
new file mode 100644
index 000000000000..4e95e31a47d1
--- /dev/null
+++ b/net-libs/http-parser/http-parser-2.8.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="Http request/response parser for C"
+HOMEPAGE="https://github.com/nodejs/http-parser"
+SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2.8.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+	tc-export CC AR
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
+	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
+}
+
+multilib_src_test() {
+	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+	use static-libs && dolib.a libhttp_parser.a
+}
diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest
index 6eecad74628f..ee6c66482761 100644
--- a/net-libs/libsearpc/Manifest
+++ b/net-libs/libsearpc/Manifest
@@ -1,4 +1,3 @@
 DIST libsearpc-3.0.8.tar.gz 48740 BLAKE2B c2743d7f03001dd971821ef72f403ad2c26aa8e2e8350e2c751e7aa3ffc2be2bcdec0adc75ef5dd23b12b31a866ff9b590f8a279616a5f5c76db0eacf225b2f2 SHA512 1f2cf9a15a004b6ddf8fc0b6a436a5db09a514cea4cec94ce9fa6ce973cd71dfc4a112e948a36ab0be61d736f1021622e46429d07de70b23c25b886d1e51c02a
-EBUILD libsearpc-3.0.8-r1.ebuild 710 BLAKE2B 7aca4bdb57b31d1fb9c5c93c4285f00ebaea16ad412039d0a379190c5d4de293acd5ef3562fc3fa10fcc06044d117c49e7c3a62ae9a9fbafb5e4a8dfb0ab59c3 SHA512 ff80ce18a972016b2e475ec6eb0ea5f369f0fcbb5586b2efb281ba3d5b798a71812b76dfc802979148d82f6375e18be2f15c4f246a236caa1d8f59dc08d7bf72
-EBUILD libsearpc-3.0.8-r2.ebuild 881 BLAKE2B 08906e8a087bda30912bc061e701108f5e103edb9dc6a0900152375b3b5aa470050dc31ce85a02680f3abf1fb0d7e1f7df87e9f3d5cadf092ab27cac23c137a4 SHA512 19279bee90a6d591fdb21e7d61054a434f221088f6e92e466f9dd51b63071efae055c77694213a01878faec9d0dbaf8e4156d690c1bb043924c40967a69fe02f
+EBUILD libsearpc-3.0.8-r3.ebuild 939 BLAKE2B d9b32b8e8fc34eeecb2a516cbdceb031a353f83d833372f4f305201b71168301df8ecefe9158a234a0abf3f2510af005b77e36b2349d0c36bce56620ac60e090 SHA512 b4b0519fff93be89506a45fdc7a76dfe31bcd5213b49a8f248506897178f24a89cc558fc7a2512bd771c981e83007623d907e98ceaec521649a7c26ce9093b36
 MISC metadata.xml 418 BLAKE2B 6e983f419e7429f15c0f4186b5746ef35dbfe0ef3e7d8df7b6ffd23555f4488606370261f90103ac2f73232f6c5ce6aa5cd84e1e0a59c540c2c9bf3ae3e7d79e SHA512 37d9578d4a4fe4e6c19b111b2fe96e630e96585d06b6768de56f993d2d3880d6b6219df1d07480668c8cb42dc315c2211e56e520d07835772a20b952fc40f6f1
diff --git a/net-libs/libsearpc/libsearpc-3.0.8-r1.ebuild b/net-libs/libsearpc/libsearpc-3.0.8-r1.ebuild
deleted file mode 100644
index 70f1c5fd0f9a..000000000000
--- a/net-libs/libsearpc/libsearpc-3.0.8-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vcs-snapshot
-
-DESCRIPTION="A simple C language RPC framework"
-HOMEPAGE="https://github.com/haiwen/libsearpc/ http://seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.26.0
-	>=dev-libs/jansson-2.2.1"
-RDEPEND="${DEPEND}
-	dev-python/simplejson[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-	sed -i -e "s/(DESTDIR)//" ${PN}.pc.in || die
-	eautoreconf
-}
diff --git a/net-libs/libsearpc/libsearpc-3.0.8-r2.ebuild b/net-libs/libsearpc/libsearpc-3.0.8-r3.ebuild
index 2b27645bfc81..23605ce88036 100644
--- a/net-libs/libsearpc/libsearpc-3.0.8-r2.ebuild
+++ b/net-libs/libsearpc/libsearpc-3.0.8-r3.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
@@ -7,7 +7,8 @@ inherit autotools python-single-r1 vcs-snapshot
 
 DESCRIPTION="A simple C language RPC framework"
 HOMEPAGE="https://github.com/haiwen/libsearpc/ http://seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+#TODO: Use commit hash tarball on next version bump.
+SRC_URI="https://github.com/haiwen/${PN}/archive/v3.1-latest.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index a8ce5b5ae766..143ab1664bdc 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -8,6 +8,6 @@ EBUILD mbedtls-2.6.0.ebuild 2416 BLAKE2B e9f164316f072fe0648fc77391f78b14bd25fca
 EBUILD mbedtls-2.6.1.ebuild 2426 BLAKE2B fa77e8b8060ef1cba7e0dea4ba0da72b1f731fffb4194eb1d3c1b88dcd9f475e5d77a9113b825549ce1cd39bf3b2f8fa6907b862cf5ed2cb53e5f4a65214918d SHA512 38486a58add1060c65a0f190cb7b9e7327da8dfa9a3c05f93ee149b5e68ea9bf02d0acff502264d0314986e00a18ca3247f39adf4c6272fc1f6c0dd0cc0248de
 EBUILD mbedtls-2.7.0.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
 EBUILD mbedtls-2.7.1.ebuild 2418 BLAKE2B aa3b1703e9054f1dbb4ad55eaf2ed3b286a1c3bd0f8a369f6123b1abfbcb42156bb2c71885c0ffa7710b6f842071532dd07776943cefd35728040c54ab307b87 SHA512 0ccf855ca1eb9cbf54a51ddd969bcf5feec66b3619d345be6cd480c782ddb36203f2e733475a5e2cf011c24ee1960f5f6ce03cc061cc55470328724844d8a942
-EBUILD mbedtls-2.7.2.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
+EBUILD mbedtls-2.7.2.ebuild 2424 BLAKE2B d337cb49d4f4312523e10c2b096795efc4c9a232e11ea62d595a5516f52ee1c5f4a6f17c660410b4a3fef79d99d2ec98f393a32e728caa4cdb2f3c78c24bb03c SHA512 cbbaf8e758f41e0c909c6eacdb6dd0aaa422680a8945350f19772bed0c6fb4d8399c5ae2c89d656cedd793159c0f1d637dc8055a111f94f3d430e0b4d68dbb7d
 EBUILD mbedtls-2.8.0.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.7.2.ebuild b/net-libs/mbedtls/mbedtls-2.7.2.ebuild
index a992986693d0..0c2a43b22f0a 100644
--- a/net-libs/mbedtls/mbedtls-2.7.2.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.7.2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/10" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
 
 RDEPEND="
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 7d33e9f0ee57..2b47c3697bb0 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -5,5 +5,5 @@ DIST miniupnpc-2.0.20180222.tar.gz 87018 BLAKE2B 656ae02ac6e462084252d95e579972d
 EBUILD miniupnpc-2.0.20170509.ebuild 1266 BLAKE2B 275a77b2813007c8055df57d2e8d74c05c02e7f81af1b1ad766a4c9f274f955c7d56779184983a1e45962bbc38e9ff58f15f4bfc076ed86cc1400eabac4f2dcb SHA512 aeeaba172f38162342256afc17223e1efce42f149561ca0e19bcd8336d32dd74d51a55951f4df79663d1999702930eb4dcd6ceebeea9afe82d9f376432dd7271
 EBUILD miniupnpc-2.0.20171212.ebuild 1268 BLAKE2B ca406d5a3e31759c38d3582ec5904a6181edf7d834d54a27673e02a267b1250179c58f0a8d85b6493da80c63119a95ac3f6521124089ffd3fb3db667ae976449 SHA512 9a27f379a7a094a5207df078d6b32750459a108d3b0685161d4caee47f0a6a15e6f808394d4c52189c88a2d951e93e74ebd0ac4167bee6b75f580582b298cd50
 EBUILD miniupnpc-2.0.20180203.ebuild 1339 BLAKE2B be0965e64f83087fffb495b3c3de74d691b2575fd8d14b36c56284404e912b623baea93027c61d58d354ef00c8fb31f4581b01959606683e1d23563e75b72891 SHA512 af3b05b0af780f4b8707209b7d1bbd26c8952c0f9314f613569f6da6e03a5bac9961d19e16e6c0876abee7006401c909b02e5c058daba7e2dbd6922aba98110e
-EBUILD miniupnpc-2.0.20180222.ebuild 1337 BLAKE2B 26e93624eee8eec08b0725ea71badc0f95f7f2d68642d2d83e9301cfef2a2ba2e3b57288144e6ab36a555aeab116ef34dc19a6b65fc7c580f8e96b66a5df9d62 SHA512 17925318a563a5298077ee54fa887c94b69625b45f3de8b800deb902623f3b141dd11972efa53cbb2fef05043ba2184cb1380014888c26a6f22b50fa43af771e
+EBUILD miniupnpc-2.0.20180222.ebuild 1336 BLAKE2B 2dee6e7bb70468879fec928df639817e8d7f854e618d7176788a06f9950a8bc47f6cea2bea8e95a3fe24dd4496cfc76889e7a45fd68e3a85d1181a9c303212e9 SHA512 2a5a7cd0f77f35b83ee3e962edd35eb9baf341a7aa6df07b8e9fd0e60173abcb333294441b7d25ecdbc84fc33b723b6ec9f0377ce8f530676c5a1a1bdef0dff8
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild
index 67c5672a80e9..f1d214698038 100644
--- a/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/16"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index b52012e739be..b044e39e543a 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -2,9 +2,11 @@ DIST nghttp2-1.19.0.tar.gz 2159530 BLAKE2B 09e71408e527f5cd42ed224377042d4b68ff8
 DIST nghttp2-1.29.0.tar.xz 1544736 BLAKE2B 1708d2c787e27d722aec27890a21e752a9fe66cdcff481615ac0bd9dcc92099946d9e5563a70137029dec54f8cc4244ef22813e0c2010572cd070ff272120bdb SHA512 a518ff1dcc9ae93f8228f4fa9110b9cbc460260a794d455530218c66317c6b96a5b14971aff25428e37326b5ce9f4d8480eefe6fcba17af23efa4ebceb56f23e
 DIST nghttp2-1.30.0.tar.xz 1545352 BLAKE2B 0d52f973a63632dc1ad235f1b535c24053a8dde52dfbda957c3e40548b4de5db5975639140f207cd9ffe564b6151ed6d97de45ff070eb2cfa3d6b41f52254430 SHA512 4b79f46947777627f0a9e1384ec51ac70e273aef6d46d322aa448731726b8ca606e73dcb171170bbe91fce93c28170ff04e11da56ee90fa28d642e7bc37b50be
 DIST nghttp2-1.31.0.tar.xz 1545800 BLAKE2B c0b8130abe7eb16e977cb8d480505d74c41986f15733da2005b1772b4030082c1c0c2e9a0576aae3e88922fc7b17ad9658e916641c3ddb816b45cc0e202b5bf4 SHA512 00342b0517eb9e1044eced4649488d7ad35694e0a1303c4cba2d2be897fb86c5c70f1a5a157799d5c0cf448a6b983f2a2a57ee2bdb5ec762876647f9303446ca
+DIST nghttp2-1.31.1.tar.xz 1545400 BLAKE2B 1d1a0982dc36928fe031c26d7adeca3364e0efbef43a7a2e01701614e128c3ab307321fc3e3166f09e71f002bd14d1ad5caaf3242502cbe4e71285591d8f2977 SHA512 e0f5b345b6d794b21fa04bc0c7125f24a877074538ad746451d4a293eb22f1afb9e0e619c69b84f0fc2142a925044a19976af4cffb8426358e95e7d9715d5a4f
 EBUILD nghttp2-1.19.0.ebuild 1811 BLAKE2B 7931aa1b1477275b7efb6f174bbcd5a7c18ef6df4d69d4097d4b199d9debe43a9de9a4ef3ffee66d7bd7b7895289fddb69707a69e6eb3da49210109b5d87ea39 SHA512 5ed6ebd9d727a4803878bade7f3abd7fdf61b53ce7e04259e3c07290fd48f8a26a4b61d64aa533afa9eaaf37d4c7a7376e9f37b6bbc04637e61d6d07f603857b
 EBUILD nghttp2-1.29.0.ebuild 1852 BLAKE2B d1b38bd11741cd70e153c933b961b049eec102edc439d3c5c40425458878cbad8cc2e3e64f55019fe5694ac1229cec52de99e3e2f599b27dbef08e7e61f1db78 SHA512 b15473ec7490b351612a14d2593e92a3d17322e7e8c8dbda7064c4da055326a2c5b68de17ae0da85d91d937a3d8942ea0c46cb7d95224c19bd9a322b802405fc
 EBUILD nghttp2-1.30.0.ebuild 1860 BLAKE2B 1921255023f5cf1ed11003ff073094c50427849fe965440ad361a86515f75d11825b04097d4c4728a7f3158f60b94a3cdf086297c2c54f68ba25699be7dca7d7 SHA512 b3a7e529a1c7d303e47d8440a673f5ec9a72f111c5473f3a7c5cb22610ca007d260d626a6f480ae1d9cbffece42cb7ecdb21535714ef74dd1f8d087e829026c1
 EBUILD nghttp2-1.31.0.ebuild 1872 BLAKE2B 775c3fabc17662def41332741827e2a67c1729c04fe6d8eb2752c1ac744066279103ac9b8dc7bfc95654004e72dfa159b2e005f99bbdbf8bcb75f87c1b0a7fc6 SHA512 995c72a6396a1620736db53995c56875f6b4a6370246a04a3b04caa0ed670343274909e8bd091f30ff3ba0a556f96f9db8054084308b2d150994b755bc6a5f74
+EBUILD nghttp2-1.31.1.ebuild 1871 BLAKE2B bc1f23d5cbfd185986c376159716214f551af6d805100e6313d6a4ba38e71be455a8800b98ba63a1a9c451229e36fe6220617d22f1c95f41889225be34296bcd SHA512 54d043d8397bbd46393b2509a2e43b911740598d86b24501295191ca98a558396bb687e407789dfa8a3c599e92ae44bf6a6e21fe03483df5b4e640448e9586c5
 EBUILD nghttp2-9999.ebuild 1934 BLAKE2B 091fa366b740f254c371d075bf24dc126f8d86f66315816b16b3c4c0177c9d2fff66d4ba916adbc203bb2d92ca6a070e80d58d6a4f30cea6bc8fa71eb3718616 SHA512 7e157bcc44e80ca78a85fe1b0e97b293646a30aedbfe7d918f5e16b96d061e9303636053675021af5ca97f84f38fabe0e54c63348f40fe9a52b00e20b0717c4d
 MISC metadata.xml 578 BLAKE2B a210790f12a0149240e59fee7702570c81a026851cfe8fdc2ce015bfb56c73150937a06e26dfabf896118a4d566b33d94ace7a622d751c0455629bf02061fcdb SHA512 a8948265c469d936a699b42978f7e8b2fdd6a7d016094242763730f75f285e6b8ed2a26d66ae8597f1c0ca9d45d47f3e2893005c0cd101e13fd4f62c6e937e28
diff --git a/net-libs/nghttp2/nghttp2-1.31.1.ebuild b/net-libs/nghttp2/nghttp2-1.31.1.ebuild
new file mode 100644
index 000000000000..e5a132d27e30
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.31.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=6
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
+
+SSL_DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5 )
+	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-werror
+		--without-cython
+		--disable-python-bindings
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
+}