gentoo resync : 16.06.2019

20 files changed, 41 insertions, 203 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f123cfe6269e..3398f7f88e2d 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index c070fdf166a4..fa33e71d588b 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,11 +1,7 @@
-DIST libmicrohttpd-0.9.59.tar.gz 1396234 BLAKE2B 9cb2d52dd39bdc6c54267751e21a224ffa926f4200b392a28009c6f717b5059580884f4de1bb272f49f7c48bdae276df2832b413cc60db77222b7b1278ba6004 SHA512 2c9080ebd520631b5ab6eed42770c7911079365c7bc79ea74fc5502ebc370fdaea9a84a4d9db7cbd8ba1c4797c7531e127e3b73ad8d38601d700529f2bab84d5
-DIST libmicrohttpd-0.9.60.tar.gz 1818383 BLAKE2B 693da0a02e289000bb657d843cd577311e97ca4d8cd698d659410e669295314d429eb9679eedac98398420f3386c1fa6800c33b883481120ea199585412f8e83 SHA512 418afc302e93ac93141c2457c2bf03c6a1da4a16ff19aa655312f9953e1d0b132b0dd983fc36ccc703688b0acd68fc0900f5927efcada354a10078ba5e577325
-DIST libmicrohttpd-0.9.61.tar.gz 1823891 BLAKE2B d7704f36790b7f14e03a02b7fbc5eaaca5fc22702f1fadfc94f9fe05329505d5bf9422a1ff38daa1f33c82db3e1196a8db754227574cc2cb9441c08a50d65d72 SHA512 d409ca2164a55b0eab948a8a4a17e0d6547942039354f593b293a286a3cae247bd67d7de4ce0dd4f1a3f3684948250076f582a8086546eb72598a43d7f41a27d
 DIST libmicrohttpd-0.9.62.tar.gz 1837529 BLAKE2B eb06d6ee05af2b37909ad1c60e16de29d94278a7ffea6e7b98391330e3778950537f9c2d6b057186b4ed45af66853570c0a386b6e9b1f0164956bd0856ecbaa5 SHA512 337f29dbc5e8c30132c17aad6142f21ea1c794b0ce80a3fc4c5e1e14b3dabb300aa410bf9413ef9e65d5d486fcfedbc3716725763a1fa28b4687c9f2aa3158e4
 DIST libmicrohttpd-0.9.63.tar.gz 1840005 BLAKE2B 0fdbc97901a3c5fd9567e70c58e3ef93517a2b7defd88313329fd2e9c8f610e41524291e877ba6633339a29df4f17a735416904651163c272eb2334fa5012f11 SHA512 cb99e7af84fb6d7c0fd3894a9dc0fbff14959b35347506bd3211a65bbfad36455007b9e67493e97c9d8394834408df10eeabdc7758573e6aae0ba6f5f87afe17
-EBUILD libmicrohttpd-0.9.59.ebuild 1263 BLAKE2B 2ed2aa3c175c488d14b03e19651678166ba24b0d898ec901100622cc6841600a4ab8a056dafe90aa74dc3d2dcc1357a8d1664930f6cda26634c483eb71f43238 SHA512 91694bcc81e890f44600139f54bb1c1ab0fe05f70810ed826522bb338a0dea714b2ce2e0a2f76a41d7ed2d95846e84695dcb0df9309ca3a87eb5ce15776bb3af
-EBUILD libmicrohttpd-0.9.60.ebuild 1271 BLAKE2B dbc9bbe154271e5cea08016a268442618d1a696e3b5b6eadee3cf5e149305baeeade7af37df524798d96b2fe927f0fd0408964e5708a2e205e78c07aad136ba4 SHA512 4c102a0ecf59e09048e3ab848647d8a4c1300c399396528ae8bdaf704fad193b5a085a4222a203a2bb8ad39e3ca6a28f78e12f2535330aaff61b943c4b6c32db
-EBUILD libmicrohttpd-0.9.61.ebuild 1271 BLAKE2B dbc9bbe154271e5cea08016a268442618d1a696e3b5b6eadee3cf5e149305baeeade7af37df524798d96b2fe927f0fd0408964e5708a2e205e78c07aad136ba4 SHA512 4c102a0ecf59e09048e3ab848647d8a4c1300c399396528ae8bdaf704fad193b5a085a4222a203a2bb8ad39e3ca6a28f78e12f2535330aaff61b943c4b6c32db
+DIST libmicrohttpd-0.9.64.tar.gz 1631384 BLAKE2B 15437188f0246ea0270338e45016c344d345c31954256b70de73a16d6858bf7eff03b796214463cd5e34c5c9f8b47e84fcfb80550659d3579031eb3697e8555c SHA512 2569bcfcbc16da988a236fe337b60c0c69c23e7e66e9c9459b26b0b09a4763a42e94db11c9f10fbaf424bdce2b60e7d2837ecdd65393134ff5bc06f8b23c6bd9
 EBUILD libmicrohttpd-0.9.62.ebuild 1263 BLAKE2B 2ed2aa3c175c488d14b03e19651678166ba24b0d898ec901100622cc6841600a4ab8a056dafe90aa74dc3d2dcc1357a8d1664930f6cda26634c483eb71f43238 SHA512 91694bcc81e890f44600139f54bb1c1ab0fe05f70810ed826522bb338a0dea714b2ce2e0a2f76a41d7ed2d95846e84695dcb0df9309ca3a87eb5ce15776bb3af
-EBUILD libmicrohttpd-0.9.63.ebuild 1271 BLAKE2B e3a9159dffa50ac50f8d8b98cde0ffd9f7b3cfac38b0becf105c68456e4649881007bd39cea9a954bb0db04e10f04c34ef69a054942cae0e8f147160e56a06be SHA512 578600917b0295118471ece4416459fee6fa62352144fd913ecfe2d6d701b067b1ff5f511a1a75c58a0722d83340403840b5272cc50d2dd2dca346d341317501
+EBUILD libmicrohttpd-0.9.63.ebuild 1265 BLAKE2B 4d71af139647e5cb317704245eaf7b21f8e0fda9ae4b4dd0771f74e428f229a5c6290e8de04ba0b3f2f46089ede5c34695c23b2588c34e20560986b0dad40397 SHA512 cb3860f200a5c44fb7c83918f440880475752b59ae96717d41187d2c71b47ffb2ee0af8853be1d729ce80952db726be614d30ed9d0e5069ff3f880cc3e76de41
+EBUILD libmicrohttpd-0.9.64.ebuild 1271 BLAKE2B e3a9159dffa50ac50f8d8b98cde0ffd9f7b3cfac38b0becf105c68456e4649881007bd39cea9a954bb0db04e10f04c34ef69a054942cae0e8f147160e56a06be SHA512 578600917b0295118471ece4416459fee6fa62352144fd913ecfe2d6d701b067b1ff5f511a1a75c58a0722d83340403840b5272cc50d2dd2dca346d341317501
 MISC metadata.xml 372 BLAKE2B d180fcd5efefd2e3578a0c24eceab503d896a3b194a15d3966bb2ccf4bc2bb4734951824b8f85b22f7a7dde6ca17b2e17026cd182788f2055f7cc37b9429032e SHA512 dfa7081c0ae502a60c5b86d7fb2aab3a23f77b08d0e638686fddba3e7976c917dd2392ba150365ffa411f2fcdd10483856b051bf1ee0ac519b74ce7b2672a8d7
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild
deleted file mode 100644
index 19abf491bbfd..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib-minimal
-
-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 arm64 ~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"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	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() {
-	:
-}
-
-multilib_src_install_all() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.61.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.61.ebuild
deleted file mode 100644
index 2c54b305f529..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.61.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib-minimal
-
-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 ~arm64 ~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"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	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() {
-	:
-}
-
-multilib_src_install_all() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
index 7b1be999f8eb..de2fce1d175a 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
@@ -13,7 +13,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.60.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.64.ebuild
index 2c54b305f529..7b1be999f8eb 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.60.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.64.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit multilib-minimal
 
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 0bdbec823a11..d928b0edc3d4 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,5 @@
 DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
 DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
 EBUILD libpsl-0.20.2.ebuild 1473 BLAKE2B c70153f34bd9da55823c004eb61fd10cd9f91bd04b55ad33d528d37dbd4bf32bbf3eb6b117adfcc1933099ea09a3f6ce1b490342386054662f7a9f97fc125699 SHA512 32ff684e4938c070a09ecf5410b35e50131716b4e694c798c6b7a9e6cbfb86d3145ab9b78ff7c2469bac74e43c579a131d64ae5dee4002723c15d46431af307a
-EBUILD libpsl-0.21.0.ebuild 1480 BLAKE2B 4357ebf870c6f50321c5d760dcdb869b533e16d66fccfa9993d5b9a325e4cc46cc02109bcc15dc26ca63e17cb364594f8f3183b647bb1a06108f662430e7e83b SHA512 0933b97f2e731db85ee34e2f6a12b48b089e01025138e4862e038062bf35816f4a5c2cbdad570e3147ebb332a10bc129e69eea909f8a8221e9f22c5805cdb29b
+EBUILD libpsl-0.21.0.ebuild 1487 BLAKE2B 3705c19e6ca7938bb43fd20ffcdf2fdcd99b26a2cb11bb7a30147b5952f179bb90f79500c91b65ee12b9c5c924275ccb945a12a3f156276e0a916564828613db SHA512 3464547f9e29186235b0c2e183ed8251659dc151e591e20297864946bab516e5bc9bf67c059eb12325f6c0bda7877d7068b65cf6a53b3d3335231b62cb690cad
 MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index 6606dd228d7f..253a567d9aa5 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv s390 ~sparc x86"
 IUSE="icu +idn +man"
 
 RDEPEND="
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 456794e25567..8baaec879620 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -4,5 +4,5 @@ DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e
 DIST libsoup-2.64.2.tar.xz 1793440 BLAKE2B 77a41ad62e0e419711cb26f510b6c0ca09c0430300f72144a0d0563a24e24639d1ca430784051b8de279623193a273510d5c95de6edb4a54a3aee0bd7903d9cd SHA512 c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f
 EBUILD libsoup-2.58.2.ebuild 3011 BLAKE2B 6bb09cc7a247550ac1ef0fbc82b3a6e2d0fe421174243f12feabb87dda992b305ef0aaec2fdbc99a13eccd1523ed98f46bfe175598907f30d9365034ad6c3fd7 SHA512 98dfcd612e875658b20e590875f0ffc016fed4f4da998d38954a6fbd5f8817c0d95819343d567432b682dadb152299d826f8d65aa36714de091e4aad8c20e8aa
 EBUILD libsoup-2.62.3.ebuild 2922 BLAKE2B 8b7f012a12a0a6d6ec723a5d8fd74ac57bc5c734c2dd4c65fa51ac6db657f4a286a3324509c4490fe97b9e5c8f0834d8116285392bf643349bb398bffb8c406f SHA512 c70d71b679159df7cf00829cd13e68f8723e054ef3bb3ddcd131008ce699317fb5a7e9a0a69cc4381746441555b2f1dd78c78f1528e39cc38315d396054cbcb0
-EBUILD libsoup-2.64.2.ebuild 2816 BLAKE2B 1b7e3161d37cdc54d3ab56b3c2e5d7ab28c9513a4b4c50b7b03475f7d9e435ef2eb196dcb17609e401f7818ad5c0c2e1d27224241cde2e9a7ebce1a24a837283 SHA512 e6b0d903dc1c8181c40052b76974681fe21f21c629e22d0fa4500037bd4c17841ebec1bb479caffef8cb7f2528f69765c4c8c35e50b12d7ccd99db6b4c1060be
+EBUILD libsoup-2.64.2.ebuild 2752 BLAKE2B 98bec121a10948793c6c4d4ebd70f3b4a430ba7ddc24c003ad983aa418a7a3ba7356697f86b3417941131abb2aa946cd46f5f704e2b60a66b50c99f825f877f9 SHA512 ff9c898a0a96de6cf830e266357702f5ca524cb9178e73a7cc6a96b30e395d19c1fa44f6eba39bf6d8620011855d6c3111a5dddf927a30ae3bc5c9781e3786d6
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.64.2.ebuild b/net-libs/libsoup/libsoup-2.64.2.ebuild
index cbd439f73b92..92eb098a8c55 100644
--- a/net-libs/libsoup/libsoup-2.64.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.64.2.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_5,3_6} )
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 multilib-minimal python-any-r1 vala
+inherit gnome2 multilib-minimal vala
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
@@ -30,7 +29,6 @@ RDEPEND="
 	samba? ( net-fs/samba )
 "
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
 	>=dev-util/intltool-0.35
diff --git a/net-libs/libtelnet/Manifest b/net-libs/libtelnet/Manifest
index c096ac7791d5..c209879db45b 100644
--- a/net-libs/libtelnet/Manifest
+++ b/net-libs/libtelnet/Manifest
@@ -1,4 +1,4 @@
 DIST libtelnet-0.21.tar.gz 240486 BLAKE2B 24765fde2344f11050c17d14721c5dd2513b3f4c7f3a3494acf068d9c6b799464f07eb0c26330c9ceea962347c626cd88746f22289c04b4ec5d555d635322b35 SHA512 69dc0ac4741c81d932136cd736b48a11a05cd2738da6255d6050844f50a2f16c575c747e5c758bbdbc6b1e3309ce02e4979f0002b40fed32a3711aa8f22e04f1
 EBUILD libtelnet-0.21.ebuild 761 BLAKE2B ab0c712770c7eb008ea57c257021a1c0c0220234181d763cd1a6c25c10e02b1d1ad504eee271f61ce0413003b4f22a9827bc66a5884e239c32e15b151e3704d1 SHA512 77719039a8aff7ebda29a2c245ef41faa6ab1b130357e2e1fdfaaeaa59fb92eb3945f4fae104629dcc705575247112859f28898960259670c0fd3bd6eb188b6c
-EBUILD libtelnet-9999.ebuild 761 BLAKE2B ab0c712770c7eb008ea57c257021a1c0c0220234181d763cd1a6c25c10e02b1d1ad504eee271f61ce0413003b4f22a9827bc66a5884e239c32e15b151e3704d1 SHA512 77719039a8aff7ebda29a2c245ef41faa6ab1b130357e2e1fdfaaeaa59fb92eb3945f4fae104629dcc705575247112859f28898960259670c0fd3bd6eb188b6c
+EBUILD libtelnet-9999.ebuild 606 BLAKE2B 93b0f1a38a09909ad42a26b4f0ee5ddb597b6298ff15536ed1d0cf26342ab1f174a71d89c2ef1f7e3eedd79e24262aec1aea90924271fb56c7cc51b64a375575 SHA512 21602185e57c09b832e7abfa6c428803eb929150bc79b73dcc4620229e7ba2b595b67cd0aa9ca6fdd5e3b6707cd2864047475b4a11f77eca1b86041d2b50857a
 MISC metadata.xml 352 BLAKE2B 35d61ac47c3cbe79d89b33487dc05c167799f4352f2a339ba47054c0f27a135745bd6f24d6b77fe13491395775c1f05878958f7aec11c7d70286f74370e714eb SHA512 8e0b4ff5329576c1b209652dee6e5ad1717ae7d2c9938c570d12641e9d1eea9769050539f73b5d6074290e6a95f87de96c054b5a3bff830ef237e5e6b1208f3b
diff --git a/net-libs/libtelnet/libtelnet-9999.ebuild b/net-libs/libtelnet/libtelnet-9999.ebuild
index aae3c462a1cc..620355b68c92 100644
--- a/net-libs/libtelnet/libtelnet-9999.ebuild
+++ b/net-libs/libtelnet/libtelnet-9999.ebuild
@@ -1,33 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools
-DESCRIPTION="Simple RFC-complient TELNET implementation as a C library"
-HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
+EAPI=7
+
+inherit cmake-utils
 
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="https://github.com/seanmiddleditch/${PN}.git"
-	inherit git-2
-	DEPEND="dev-vcs/git"
-	S="${WORKDIR}/${PN}-master"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/seanmiddleditch/libtelnet.git"
 else
+	SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~x86 ~amd64"
-	SRC_URI="https://github.com/seanmiddleditch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
-WANT_AUTOMAKE=1.11
-DEPEND="${DEPEND} sys-devel/automake:${WANT_AUTOMAKE}"
+DESCRIPTION="Simple RFC-complient TELNET implementation as a C library"
+HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
+
 LICENSE="public-domain"
 SLOT="0"
 IUSE=""
-RDEPEND=""
 
-src_prepare() {
-	_elibtoolize
-	eaclocal
-	eautoconf
-	eautoheader
-	eautomake
-}
+# needed unconditionally for man pages
+DEPEND="app-doc/doxygen"
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index bd9a3779618a..2d9274df0049 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,10 +1,10 @@
 AUX nghttp2-1.38.0-boost-1.70.0.patch 1950 BLAKE2B ed9f72c2f01912176d963fdfb955388c7d40a9ec4e7674f0629166de1d3c249c2f31a3e06c2f82c4186e1f48319bf0bc367e4b4aa25c10faa26ac6e0a118af25 SHA512 7da6199d64b2b1b6b5258841d2ef52fb5617f200de4c63021b4e9b85b9faa6894f4a9c8c9b1b0c35b2984845de5bd80c3ff6d1a67c1fb44cfb24eae0f0afa806
 DIST nghttp2-1.33.0.tar.xz 1554776 BLAKE2B 1b995d6385188423acbcd7c8b3a626a622270bc3079972885a1f707a9cc4ebb053f7347930ce217d2cf4277eab0a3309accb8f9ff18bd8ccc55c86aefa6246c3 SHA512 eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74
-DIST nghttp2-1.37.0.tar.xz 1628248 BLAKE2B ed5cdfda44b4e38a03d92352520eb765cc1da99080e0cd3e9d663efd5ef2ff219c6ccdbc16cfde001a8377afc796acef250913e1eb422ae2cac2eb95b8f98089 SHA512 67a4b9df3f7f0edad719011fa289d9aa9ef04f31ef3ccf826b861c8830ed24e0743a33b54ab66d198fec7edbf723852b38a2007b335d7f566f702f4b02297b0f
 DIST nghttp2-1.38.0-unbundle_http_parser.patch.xz 2616 BLAKE2B 3f15154d33f32c91aad87f23f56d761501e19e0b53b99d4df720f9e04d6d9c49a52118acbe3da87f8585c2b71b7b430ef60fc33465605f3bf9933635aabb924d SHA512 1b4377b34cf6428164011be9fc86efdd7ab8d3443edf197c45768beea0f843084a842c4cb2abc5179d6036ec99174557e06344ce67a07d98992de64d99faf3a6
 DIST nghttp2-1.38.0.tar.xz 1628356 BLAKE2B 0568d4ac5c1e5e6d7adf762815836502524d59fb55c623f344a8427638407a19447fe1a7753142aa205898f7bda6ebce8ef6f4d85edc6da98ffa98b83d4e363e SHA512 e432d52bcf77379ed5c10ceafb587ec8d66c56bb728cda56487b237cbab1d0073689624419ed306162dab3a51b91cfe0f59cb173b5d81346e2b6d0abd56635bc
+DIST nghttp2-1.39.1.tar.xz 1634512 BLAKE2B 66444de067200a7dd66f162c22fd258471d336b1ba02f579a675b5d9dfcbf1600fcfb92a37797842a0482bd0f5c850008508d3d41f7afddc47f7c9330fb34b43 SHA512 36558ed03c59086086abbf144ec7c54c60de3fea00a9ea594feea7186a779781cbb66a08c9b34265892dea382b42b875f551e85331cfa0086e357f9b27b919fa
 EBUILD nghttp2-1.33.0.ebuild 1861 BLAKE2B 6bf71fd220cacaa02e17ee2ecc6c7dbd9810a0c45d92f63cc09bbf6631d27a4c9126a1691f42b7a42db4ea934c38c1cb753b364577ca89cc4ec318947cb2bdc0 SHA512 9026b56ba1d3b18b02473da0de7d880c95aae9eb208705938142be394424db9d9c7ed2d2033252cf68861f9b1ccb6811f68ed4f660bd92f38f320df5b8456c10
-EBUILD nghttp2-1.37.0.ebuild 1892 BLAKE2B 5d49eb20ebd6563773800574e2f5c316846658faea3c3febd032da50e432315da6cd6fb83a08561d8410edae24144a443921bc8b7f85304eabf0e9e5219cd2aa SHA512 e3c3e507147a76f30f6668fa334f92d29e63eb9266c718546b256dbbf982002e610817a7cbc6eb4166831e7bbb83855a4a6ad0f7414524f2e5e0fa962265b0b6
 EBUILD nghttp2-1.38.0.ebuild 2339 BLAKE2B 72c0ef2b68b53ac0958777a24aea5ac86ce6af3645997c807b362330b390448086a90824880f62af8e8e83775c0f749c810f11130ddeb25f5ccbce63fc11145f SHA512 ace59fb64bf3e442c0717a72f94cf85f3c3af3b024bc531b7c16689cadb6511d26779c381933912480bb80c03fe0f1cc062ee2d397ad1d3d4c480c790025eecc
-EBUILD nghttp2-9999.ebuild 1966 BLAKE2B 162c885ba4fce06d57655a5d615c3dd7a1b6f01c1baa3b66b61b51ba5a5d83ee11426389f97ce74fc05dea22273418c8b0afe10e59fa52507b18de3ee48fdb98 SHA512 5be35f51f0e4d48e7e5a8bc47f21c73b20e2b7cb0da5c9800499a3387b761ef53e5f7e0b2643253c671481bcad33beaebea2320e154ce7d6f890739e9cd4ace1
+EBUILD nghttp2-1.39.1.ebuild 1966 BLAKE2B 13541411bb8f29654a24fbfd9bfdcc299ce78dff30bfc05de6d66c433cc12f258d9dcad25d222cc9e9f991322d4ff626a220478f5a7c6c61d6009b920f203938 SHA512 d851b5061afdf03f4724c696489915a820437ae62e927e66c3c4089392f8e01fc62e434718391d255d51f42fe61d420cec3de957b81d3c63103b58ffda3ca4e3
+EBUILD nghttp2-9999.ebuild 1966 BLAKE2B 13541411bb8f29654a24fbfd9bfdcc299ce78dff30bfc05de6d66c433cc12f258d9dcad25d222cc9e9f991322d4ff626a220478f5a7c6c61d6009b920f203938 SHA512 d851b5061afdf03f4724c696489915a820437ae62e927e66c3c4089392f8e01fc62e434718391d255d51f42fe61d420cec3de957b81d3c63103b58ffda3ca4e3
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.37.0.ebuild b/net-libs/nghttp2/nghttp2-1.39.1.ebuild
index f27032d7957e..92ac11a357a6 100644
--- a/net-libs/nghttp2/nghttp2-1.37.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.39.1.ebuild
@@ -9,7 +9,7 @@ inherit multilib-minimal
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit git-r3
+	inherit autotools 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"
@@ -44,13 +44,18 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
 
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-examples
 		--disable-failmalloc
+		--disable-python-bindings
 		--disable-werror
 		--without-cython
-		--disable-python-bindings
 		$(use_enable cxx asio-lib)
 		$(use_enable debug)
 		$(multilib_native_use_enable hpack-tools)
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 0950bfb1def2..92ac11a357a6 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -53,9 +53,9 @@ multilib_src_configure() {
 	local myeconfargs=(
 		--disable-examples
 		--disable-failmalloc
+		--disable-python-bindings
 		--disable-werror
 		--without-cython
-		--disable-python-bindings
 		$(use_enable cxx asio-lib)
 		$(use_enable debug)
 		$(multilib_native_use_enable hpack-tools)
diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
index ace04817f1d9..1334aba98c65 100644
--- a/net-libs/ntirpc/Manifest
+++ b/net-libs/ntirpc/Manifest
@@ -1,7 +1,5 @@
-DIST ntirpc-1.6.1.tar.gz 397485 BLAKE2B 2dcc4c3a14eff55b4db52f297b65a48d5dff46ef4b1659912c65ca9104958cca02d542bb3b72f2ce63993414c5d53bb9716b1b1d4ce4b335735ee99da77f3770 SHA512 d176fbe71f1f66e5ee477c1ec2722b77742d36d67856eb4029f1b01474b08349171779a9943c0039d2a30e05debc9ab389d92ea137eabb4d7737fc91e47b0b24
-DIST ntirpc-1.7.0.tar.gz 373195 BLAKE2B 5cfb6c16d1fa3569d37a6b8f51990dd18e713aaaf0f6e6309c36fb8b0bdb6fa0dfcfa81f0e9e185c18dac5b6d422bd9d1b796b245b3dfa519b0f53300ce5c725 SHA512 84fdf62b8a72bcf1b90854536df3c1e3f06c58858d7a2403ee6c085f8585a5d389921a2feb9e0f27ef238dea3a36a9c94b66ea582f290168a8ed21405a452723
 DIST ntirpc-1.7.1.tar.gz 373327 BLAKE2B 55d71932e35b844e382409593b5dead30246d0cbaa27d3d49ad94d09435acb8abb34b945ba90ab7ba9733a955b4184ad839ba202aa82f97eeecbcc502cb88bf0 SHA512 9a98d83db94b4775940584cd08a1105b79263412d44309f91d1e86c609e6d56a482ac239efaaa73ccc1c2f4cabb8b597ccb8931514f33b8b2fd5c2a11b731106
-EBUILD ntirpc-1.6.1.ebuild 745 BLAKE2B 6e27521646f75937f2133353f0cee42c9197ce40691275ecb09f17f4807992318f16549bf0cea56af7bb6b37a793de213ef99921454aa0602cb6265d21c7523d SHA512 63fddc3d67d9ec404c9d3bb6f7187a61973558997e5e5cd81692b2516d32dbdf0705d530647748b671ccbf78004f0e761f93e8874d8a56509fcbb460cc671595
-EBUILD ntirpc-1.7.0.ebuild 742 BLAKE2B 6c65b2bb30cde7ee1d36fffaaa93fa4ab7afed246d90de97e3410847e0680bddc27a61e30af8cbfd3000d1ce320dc4a179a2d235fda183c36e20d61589341e67 SHA512 8d3a8a5131dea9db88ab3d7a34957478f44e8e628cf176419840fda945c4de02ddfad777c4f3095839b83a8021bd73c05722ab255f78b64525b79ab2dda611dd
+DIST ntirpc-1.7.4.tar.gz 373897 BLAKE2B 7354c5d6114947c8d66dcbc4fb933ab38237dd70eeb318278a658946fa4ec354bcaf7e90ac210f39f76b6d8e60f865c0c63ecbf7cbd8ee1e8defa0d7622cfb51 SHA512 076d789edc3fdf0ddb75437196b72b1aef78780d579ae4db0bcc116a1a92ac861fc77e1611070f2d3df003bfec7883ab20653a3c2f2255c685aaed8e7c22ce0f
 EBUILD ntirpc-1.7.1.ebuild 742 BLAKE2B 6c65b2bb30cde7ee1d36fffaaa93fa4ab7afed246d90de97e3410847e0680bddc27a61e30af8cbfd3000d1ce320dc4a179a2d235fda183c36e20d61589341e67 SHA512 8d3a8a5131dea9db88ab3d7a34957478f44e8e628cf176419840fda945c4de02ddfad777c4f3095839b83a8021bd73c05722ab255f78b64525b79ab2dda611dd
+EBUILD ntirpc-1.7.4.ebuild 740 BLAKE2B 8e1539462ffe6a0b6700fb29dc7a3dbfa389e757e8d862c3581a199b317b10460f7fc293a6ad503cb677a13b03d9a7fc520ae4fda0b06657d60b91c5dd6eee3b SHA512 603d21ff32cff6fd08fed345797d7f0b6f7481ceb7249e06a6cc0db66af03b72af91283484175eedf00b6835669f056ff6e2b2ea5fc88e6e1cd54510b40bc635
 MISC metadata.xml 427 BLAKE2B ffd3f6c32d343557e17c17eb78cff8a0a14f93a2298cf607169ebbc1d618cbe30df849c6f3b8dc4b34d7e1a17920e9d0b1483523d4b2b2ff481068c0de5a8317 SHA512 99f5af46839fbf52e5217cf831a7a95fa3f5d501d61ff63488aa7989e0ec98151b2f94607a39f879e0e5b0ba79bc732ee7224a9e4196ff9a40fa13253ece0b0c
diff --git a/net-libs/ntirpc/ntirpc-1.6.1.ebuild b/net-libs/ntirpc/ntirpc-1.6.1.ebuild
deleted file mode 100644
index c78565d83635..000000000000
--- a/net-libs/ntirpc/ntirpc-1.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-multilib
-
-DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
-HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gssapi rdma"
-
-# Since the GSS option only controls some extra files to be enabled,
-# there's nothing to list in the depend string for it.
-RDEPEND="app-crypt/mit-krb5
-	net-libs/libnsl
-	rdma? ( sys-fabric/librdmacm )"
-DEPEND="${RDEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DUSE_GSS="$(usex gssapi)"
-		-DUSE_RPC_RDMA="$(usex rdma)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-libs/ntirpc/ntirpc-1.7.0.ebuild b/net-libs/ntirpc/ntirpc-1.7.4.ebuild
index 07720adb2490..a6136e935816 100644
--- a/net-libs/ntirpc/ntirpc-1.7.0.ebuild
+++ b/net-libs/ntirpc/ntirpc-1.7.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit cmake-multilib
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 52b5be70699b..b9b531336379 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST webkitgtk-2.24.1.tar.xz 17897488 BLAKE2B 62cd6d896d4b4847430f0d41de92595e955db283626dad2aa560071da12ccd0c24093163e15cc50c30ceb96f9767797f9051657ec68f822e7e371c8566872ad5 SHA512 65424f03b6baca53d64f0d633f53e2f7788c7fb65aa8b50b696418c140707c40351ec3cc0a8652806d75b9da98a04a8bb4203dd6ee4c51a3f93878964354c1ca
 DIST webkitgtk-2.24.2.tar.xz 17908808 BLAKE2B bf53f27a5fa15067fb91cbfcff3c2287418c797a4ad03d3a71fbdb194c27e069ab5985b9c8e8df008ed80c80fe2a397d71297b4c187fd7c3acbfe2961d332c50 SHA512 8376167cfc4530886a2ac644ab84ff1021a63f6236d7be9eeb9e0ecade8bad5384b652dfe3720fdd31cddb39df6c935f859f1c0a59f42d7c71998992c4a9ffaa
 EBUILD webkit-gtk-2.24.1.ebuild 8332 BLAKE2B 6f05f3a6f7f7ec01c540eaa08a709c84f4ce745a1d769bac6be2933b5f142031092aa0527c6dad2afbf73d73ee473a6a4ed6e122f5de3bf729b0bcb133f90a01 SHA512 85599d3537f015f2f546b7dd7c38e8f3b2d83d79904724e836a7ecdf22c6999792a863fc05214c4d6e1b5fb237aaf8bb89c54d7be5310d1b58f8122a668faf15
-EBUILD webkit-gtk-2.24.2.ebuild 8333 BLAKE2B ba3466a372079f14ca5cc6e7add3f61c3e4aac077accfac1c5807da62bb7226bc366640873d654ef49301880ddcf0bff21126b5c0064301bb0ef0a9e086f212d SHA512 65022625db7ae7cf19d45525c18675ee3c53122f2c9a3939b80b3e2cafdcc129ae0dd32a319861e6998bc1a9f29e1a0d3806817ca60efc80bbee0fa3e334d9b2
+EBUILD webkit-gtk-2.24.2.ebuild 8334 BLAKE2B 75b620fd2b5906f2c2f167bae4249fe0b3dac7a26d89ee20c42be5b9619293383ddb43b313804b888347d5664a423486f3d35f80882e31a44094363ef2375358 SHA512 06e9bf8737d871d9fc09c48c1ab91f49a63aa23132fb88523e3c817eec1e60b6347ee543ce0743148fb70b048c93e16820660761a2a7c272c00bb8209ab6f197
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
index 5e332dec8436..fd02876d1608 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
@@ -17,7 +17,7 @@ LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 
 # webgl needs gstreamer, bug #560612
 # gstreamer with opengl/gles2 needs egl