gentoo resync : 15.02.2018

18 files changed, 161 insertions, 227 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c1122040181a..4bb9ef843457 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index 04f9b5b17626..9dce37184a1d 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -1,12 +1,8 @@
 AUX linkchecker-9.2-unbundle.patch 840 BLAKE2B ad18d9722b8fe84c3728d5c62e741eeec5c82856384950610519aa641c15b80483bd04c8c32ff1bd275d28dcd2e73a657a7d4d324cb7889f550849cfa9e3932e SHA512 899db2f7567d7f101ca995d2b8b26dfaedb854a856902cb3fd2bda50f872e9bd345d10acf7b4687635541a8c5cc69050146c317c7f2875d8841f98d5d8b9d7d4
 AUX linkchecker-9.3-bash-completion.patch 621 BLAKE2B bce120caf1cddcd11e49c06b5cbd08e5651ad48e89e07c72382f0ea7da62a4070f2e4607880f4ccb44b015c953ca8b9734d10db77081d2ff027fcc30c7163e39 SHA512 736b4da75bf905845964e2a097d192fe075095656818d9e9fd118327510d8fe176c713d5e77752be99b2b13fc10dc4c07bd246cb8b77bd2a99056e6ef0fe4904
-AUX linkchecker-9.3-desktop.patch 1783 BLAKE2B 8735cdb6e486ad292cbbf397c59e57a33bd7fee4058250766deaf0c7039b76020e10aa7972a7e780726671c0346015a20ed502ac8a6a4172043d17d2e35fa313 SHA512 4100c7844548a7894157cf884ed3093e3cb4d11cad33bda605ce1328e7214fb40a229935716a1775978bfe96c87413b52fca4783d7a167027736a1284b8d39b0
-AUX linkchecker-9.3-requests-check.patch 1538 BLAKE2B a24a8471d5b42c07afaf17611860b10c001cfb2a2282219f70389bbdb18111901feefc2c73683f4661aa80311565d0bb4c0b2239140c944b617beb86df164988 SHA512 3ba20f160aa27a611d92ad5b6a31f134b64f52644ad1ac73d41dd7ea77fa3b5d743f3fd51cf5f6d4f3229ec27cfb0758d1d4c87dd14c95ab83c0af54236d5d96
 AUX linkchecker-9.3.1-build-fix.patch 450 BLAKE2B 176f2617c0e2285473d500b351a918d9a48ef631662f6ecbfe7abe8ac37a6a8fd0406838193f068c42a9baeb09d9630e70aa518f51e480dfc3dc0c8ae17d6e9a SHA512 47c30bb1e2724ec96ca0c5223dce4ab0c79e30752be799498e84ff5953f78d9495265f59635a337690d28e6d44740296d9771c342cee6a88b30fe46bf2c58952
 AUX linkchecker-9.3.1-requests.patch 1870 BLAKE2B 6ac551b151b805f373b2bccf6d47e08158e85c894721c640d8d1701e177e52a4bd780b0b195503bf0e8e3709175f1ec73c8f7e24dd578aa63846cfd17b851e47 SHA512 fbfd999cdb48628bb3ce14bca2f114e104a69c0355a00c9b81a543c5ac10a8bec0ab71dcbbefc81bc8f468a7e17a9a89dcd5d795ce565b9452131ac2ee6e5fe3
-DIST LinkChecker-9.3.tar.gz 719896 BLAKE2B f0fb43d320c0d82d5cb8fdc277e74c820501d602fd5ea0004155db8fa9b27976c0fcd5af23eb2ceda21315b94c13ac1d5aed5507555889f16b6b47a92a8c18d8 SHA512 26686e5373aaa942b631b5184f8bda8fbe1410c8875bf8499a2b61dc18b7bdfa29a3c18edf98c28dc189a493a3f5794a0020a0211b7d5d3814b33994603dcc59
 DIST linkchecker-9.3.1.tar.gz 779286 BLAKE2B eec374a3455b5348533b29b03ab14558dd19a20e1058947eed9d8027a8b1705b63525e6b8fcf2c4feb59a782ca0e0ad8567e321ca4679320e9d6f256e14df990 SHA512 355c9d262502e123732807b5aaabc17060d267de44a6dc1fee9dd6655c56320ded0c1ff638d985c2dbec366d15803cfb78fae4c1a9943de11c5b4292f5a99305
-EBUILD linkchecker-9.3-r2.ebuild 2016 BLAKE2B 735b62d47111032c2a2e1530f542516588d17752381741124f52a22b83c55179119f3b7775effee058ff4ae01279f32ad74a49c298fc729d843b0b8799703631 SHA512 daba5c569f2be5f22df9a7c8330a47cdb8aade0329e90ac682aef133fa0b69e2315bb0aaa6470327595c4d9c61f586c65263279890c3f79d710fa9b3e962d3b5
-EBUILD linkchecker-9.3.1-r1.ebuild 1636 BLAKE2B ce818ae4c9e6b1fa3fdb03217e6bcc713065716b4972dcadbf1d0944907a1151c5340503be5f1ba345b4f8a5c315dcca488ebc83b78b7ffbf56d3a64aa733b9c SHA512 6f479a201387599ac7a638bbba14e4ea0b9de37fff1a00048182ed8ef137f45667cff6145018eeda22ecce545279049e9cc440c93bda536e6ad4f11966d5b82f
+EBUILD linkchecker-9.3.1-r1.ebuild 1635 BLAKE2B ffe1b02ded5cacb0a1906696634220f69a61d3a426a1cd1d592f88c11a0ac1bcfd2cbd44a6ad61bbd0f4b896bcde56be6ec277181cdde85da84bc18bbd306e36 SHA512 b91819cb02a957f9a3ae3e891e66a27305834983b92384430c24cdf82e2e1b744b17df16b60ffd80d70923de5f6fa1f83a02e27f747044a2b7753c0bcc9478b0
 EBUILD linkchecker-9999.ebuild 1195 BLAKE2B 91e070bf852276911bfa7550a40d287183854a5e503a7adacb1977b3cbdb7c668e17b9cc89fabe7b38c7f1fbfb2500b2e90dc3fc33bfaa5406b030ef5ffdf616 SHA512 8c07f7ad36675aa44905579f2ba56cc80b2b81693272bab03e87dde56f1893f66199307cc9d7498838f17ed55078a06315b2fb16788b613b411be9bda02b9cb1
 MISC metadata.xml 319 BLAKE2B dbf67b67a9a9a65ff108e9ee4c5881023a53533d9bbeee71e9ba1a55658f2a746b408859515f593ce2ef0fd93f938fbb17c5c7a70fa48eda4be977634d11e7c5 SHA512 2fbc3b85bcfd178e2614ef73d55c633e6e3b5ee59d39ca0a6099ffd7e8067e890f69252666d8d6d9a173371d95c4b1fbb8157cb94fd307ee20672fb9ff4182fb
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3-desktop.patch b/net-analyzer/linkchecker/files/linkchecker-9.3-desktop.patch
deleted file mode 100644
index 40fa18a45983..000000000000
--- a/net-analyzer/linkchecker/files/linkchecker-9.3-desktop.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c25bdb3f55a791bfa087fb5a3d8e3d5d62991745 Mon Sep 17 00:00:00 2001
-From: Christopher Meng <cickumqt@gmail.com>
-Date: Fri, 10 Jan 2014 19:57:47 +0800
-Subject: [PATCH] Fix non-standard deskop file
-
-desktop-file-validate /home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker-gui.desktop /home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop
-/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker-gui.desktop: error: value "Network;WebDevelopment" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
-/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop: error: value "True" for boolean key "Terminal" in group "Desktop Entry" contains invalid characters, boolean values must be "false" or "true"
-/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop: error: value "Network;WebDevelopment" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
----
- doc/linkchecker-gui.desktop | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/doc/linkchecker-gui.desktop b/doc/linkchecker-gui.desktop
-index 7e06b6e..09bd997 100644
---- a/doc/linkchecker-gui.desktop
-+++ b/doc/linkchecker-gui.desktop
-@@ -1,10 +1,10 @@
- [Desktop Entry]
--Name=LinkChecker GUI
-+Name=LinkChecker GUI
- GenericName=URL validator
- GenericName[de]=URL Validator
- Version=1.0
- Type=Application
- Exec=linkchecker-gui
- Terminal=false
--Categories=Network;WebDevelopment;
--Icon=logo48x48
-+Categories=Network;WebDevelopment;
-+Icon=linkchecker
--- 
-1.8.5.1
-
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3-requests-check.patch b/net-analyzer/linkchecker/files/linkchecker-9.3-requests-check.patch
deleted file mode 100644
index 905b7f718414..000000000000
--- a/net-analyzer/linkchecker/files/linkchecker-9.3-requests-check.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c2ce810c3fb00b895a841a7be6b2e78c64e7b042 Mon Sep 17 00:00:00 2001
-From: Bastian Kleineidam <bastian.kleineidam@web.de>
-Date: Tue, 28 Jun 2016 21:55:10 +0200
-Subject: [PATCH] Fix python requests version check
-
----
- linkcheck/__init__.py | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/linkcheck/__init__.py b/linkcheck/__init__.py
-index 22a0cf5..1cec214 100644
---- a/linkcheck/__init__.py
-+++ b/linkcheck/__init__.py
-@@ -24,10 +24,17 @@
- # Needs Python >= 2.7.2 which fixed http://bugs.python.org/issue11467
- if not (hasattr(sys, 'version_info') or
-         sys.version_info < (2, 7, 2, 'final', 0)):
--    raise SystemExit("This program requires Python 2.7.2 or later.")
-+    import platform
-+    version = platform.python_version()
-+    raise SystemExit("This program requires Python 2.7.2 or later instead of %s." % version)
-+# require a reasonably recent requests module: 2.4.0 from 2014-08-29
- import requests
--if requests.__version__ <= '2.2.0':
--    raise SystemExit("This program requires Python requests 2.2.0 or later.")
-+# PEP 396 has only version strings, bummer! PEP 386 is also not helpful.
-+requests_version = requests.__version__.split('.')
-+# Depends on the version scheme of Python requests
-+if int(requests_version[0]) < 2 or \
-+   (int(requests_version[0]) == 2 and int(requests_version[1]) < 4):
-+    raise SystemExit("This program requires Python requests 2.4.0 or later instead of %s." % requests.__version__)
- 
- import os
- # add the custom linkcheck_dns directory to sys.path
diff --git a/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild b/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
deleted file mode 100644
index dd9526e518aa..000000000000
--- a/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit bash-completion-r1 distutils-r1 eutils multilib
-
-MY_PN="${PN/linkchecker/LinkChecker}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Check websites for broken links"
-HOMEPAGE="https://wummel.github.com/linkchecker/ https://pypi.python.org/pypi/linkchecker/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
-IUSE="gnome sqlite X"
-
-RDEPEND="
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	<dev-python/requests-2.15[${PYTHON_USEDEP}]
-	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	X? (
-		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
-		)"
-DEPEND="
-	X? (
-		dev-qt/qthelp:4
-		dev-python/markdown2[${PYTHON_USEDEP}]
-		)"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-9.2-unbundle.patch
-		"${FILESDIR}"/${P}-bash-completion.patch
-		"${FILESDIR}"/${P}-desktop.patch
-		"${FILESDIR}"/${P}-requests-check.patch
-		)
-
-	emake -C doc/html
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	DOCS=(
-		doc/upgrading.txt
-		doc/python3.txt
-		doc/changelog.txt
-		doc/development.txt
-	)
-	distutils-r1_python_install_all
-	if ! use X; then
-		delete_gui() {
-				rm -rf \
-					"${ED}"/usr/bin/linkchecker-gui* \
-					"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
-		}
-		python_foreach_impl delete_gui
-		rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
-	fi
-
-	rm -f "${ED}"/usr/share/applications/linkchecker.desktop || die
-
-	newicon doc/html/logo64x64.png ${PN}.png
-
-	docinto html
-	dodoc doc/html/*
-	newbashcomp config/linkchecker-completion ${PN}
-	optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}]
-	optfeature "Virus scanning" app-antivirus/clamav
-	optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]
-}
diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
index d3c49f316f78..dd72dc62cfd6 100644
--- a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
 IUSE="gnome sqlite"
 
 RDEPEND="
diff --git a/net-analyzer/prometheus-alertmanager/Manifest b/net-analyzer/prometheus-alertmanager/Manifest
index 9d79cc1437bf..024a8869b405 100644
--- a/net-analyzer/prometheus-alertmanager/Manifest
+++ b/net-analyzer/prometheus-alertmanager/Manifest
@@ -1,5 +1,7 @@
 AUX prometheus-alertmanager.confd 135 BLAKE2B 7a3dd341e63a73e9782d44dc59c8a65ea1c855ae0589ce80e616be6d8faf24224f804c564296955487760c155649c184b3132a2741cf30d171c88dcfdd469583 SHA512 391eb26d67310fba9371d274b1e9552cf0c9c02de1e3616c3e5514ae99bf7d36b52c6caa7e94a96f640b0f8542b15b4dded9d59154173c01d4e9a99ec2219fbc
 AUX prometheus-alertmanager.initd 817 BLAKE2B 74a7e6c292ac52f4d6d00644038e74624be41ed632a6db389a7c226b3a37d43f22f1c8c098d34f652d9b6b9cb407523b375c884e75fe3740578f26e822df21c7 SHA512 34ae9348f5e054543bdbffd29e30d1fb6147d47e74cecb1755c29bf4327bd56ac4fae4cecddf2c515b6ddffbce4ad7151ae3a3e7f283db2d6b74619f5faa44ac
 DIST prometheus-alertmanager-0.13.0.tar.gz 2782163 BLAKE2B 4918f84a8a8312a3fa53f03b78bb8acc6118e69048ff3fadb2676721340fa120360a636fc11485999e948965569241658eb8ee01204453120adcce6bd1da40d4 SHA512 3f402f577e42bfc9dd9ef2dc1cb634d3654776f3b13d698170e3ae3c1612a45115e0d188d0768880ca968ec9157e05a2082647ca1de132f8be3c7eb7ad0dad42
+DIST prometheus-alertmanager-0.14.0.tar.gz 2786623 BLAKE2B e9c773af81153b3062d27464c6b8d1edcafe66575b8d5a6309b162c6546d3dedf7ae5b1afcf4dafb3dfdb6bcf826aeb9119b27cfe596da365a6272ee71b30441 SHA512 e352d51d86b853ff679892df3c494da2c7b4afb918d807e6d63b76e959b586f43a4c773de18bdd9e6a5067d4034748bb304ebdee2f08983b00890c1ae393d0b8
 EBUILD prometheus-alertmanager-0.13.0.ebuild 1340 BLAKE2B ef6bbcdf5c4fdcfe1f20771da1a2530d25c2fe5354472c02105fbe3b66cf162ff193b6d60c6859804e390878e05b84d210b58f3149996dcc4afdc5f184a490fe SHA512 fdd0595f982192c2c59c18fe0307ef8db1f28bd38a637c9b8826cf7d2955972615ca845467ec330ff2ecfee725a87a385d488d7b2301ab5363f48ddcfbb0c745
+EBUILD prometheus-alertmanager-0.14.0.ebuild 1340 BLAKE2B ef6bbcdf5c4fdcfe1f20771da1a2530d25c2fe5354472c02105fbe3b66cf162ff193b6d60c6859804e390878e05b84d210b58f3149996dcc4afdc5f184a490fe SHA512 fdd0595f982192c2c59c18fe0307ef8db1f28bd38a637c9b8826cf7d2955972615ca845467ec330ff2ecfee725a87a385d488d7b2301ab5363f48ddcfbb0c745
 MISC metadata.xml 333 BLAKE2B eb945c2d22a9d93154b7a021559038b9565f00d54dda86445c00156ddffd6754cd433026ff465a38864d00bf1c44a3c050835fd854dadce82ea92649613151ef SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f
diff --git a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.14.0.ebuild b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.14.0.ebuild
new file mode 100644
index 000000000000..bb54481780e1
--- /dev/null
+++ b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.14.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/alertmanager"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+ALERTMANAGER_COMMIT="fb713f6"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
+HOMEPAGE="https://github.com/prometheus/alertmanager"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix alertmanager || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin alertmanager/alertmanager
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	insinto /etc/alertmanager/
+	newins doc/examples/simple.yml config.yml.example
+	popd || die
+	keepdir /var/lib/alertmanager /var/log/alertmanager
+	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index 3bd6485f8668..502eb3081b0e 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,10 +1,6 @@
 AUX speedtest-cli-0.3.4-fix-unicode-py3.patch 1253 BLAKE2B ac3b81ddc8dacb457e57b86ec9d40238d578b584ed79160725e0c8b7f3464aadf1de15ce76275bf1546d9d6077f805634abcb54d4f7aee6e2c4490c4b9015c88 SHA512 d071aa76158334c5184766b8c6f0cee0dd789df433a633461cff834f91cc87cf717bf57449c8417ff793708e521ad2ad7f5db43808252393066b2181a378790d
-DIST speedtest-cli-0.3.4.tar.gz 14452 BLAKE2B be95f51bca648c2e9a545f8e5f6b473777b5e43150c7ce12e23a73578f9662e15b68b89af2628015776aac5aea36bf808fc958490476c57770e8db6be86dcf78 SHA512 fb22ba9e17a30c172b8f751020d7117caf8b573dee112506917f24c5173e2901e0f0198b4946798daf3a27839519025f4a7f8f8942034bc19356b32d6a0f6851
-DIST speedtest-cli-1.0.1.tar.gz 20114 BLAKE2B 539df6569b33a77232f30c4d59f16dab887f462c3a8ab3d1e2175202473beb743315b2f8ae3bf42fddbc2ca9f70dcfcba76d771fd2c1854a1d8dda0aa003fa72 SHA512 f6e78945f47779dfdadc0328468f3fb20999a011da3c832cca58a4703c083f9d73ea3bd06bc85aba5cce5b63db70a6d3b496ef1037ca377e7699a6cd1e42ed24
-DIST speedtest-cli-1.0.2.tar.gz 20251 BLAKE2B 0fe3efcedee5de207bb102a999d6bdf227a3a2e9512b5a4c48fcca26836cce825bb8cdb6c617be166eb58dd9fffd80f8e1fb7ecec54259f7228936e826055927 SHA512 aa2dad2d9c1246af332c63437be171c0c0d138f16604d246f9f5b8b36b456fbb02376b166c75491211369d6b61220be7669f0b0487235f74dc2db95014e8d349
 DIST speedtest-cli-1.0.7.tar.gz 21077 BLAKE2B 8bbb9b73f21f9252763461230053bac5d890d19d3f80a81f616bb4535c5e386b70b43c6ee0688ca813fab21f8387fd93df65b1b0254613efbdec93b1807d3caa SHA512 c06c0e80ec00adebc04fb2bdab5b45ec84a32d9dbf2e4fbe7b0461f4b3b1fdcf29048b8c7a906c03dcea0771417317394243bdc6f1bc8fb763e13eafae31a42b
-EBUILD speedtest-cli-0.3.4-r1.ebuild 699 BLAKE2B 6cb165c21660fbe6380ad7e7a173d60cf14a247e75e91d5fe9726eeb12cd24b78497d8a574780d874b040770f75aca301caee66954266dfdec9ac266a6dfab61 SHA512 7e551453dd1db6ca4ff3497c2f123c2798329f692a983d05b7c16bcf44e27ddae7743f01e791bba743149c389570e11f534cc5a582db5ac495aa8e05647c20d6
-EBUILD speedtest-cli-1.0.1.ebuild 660 BLAKE2B e7edbdddc005fc76c6f3a8dda9fb4b0255d45a1af8733383b500269b292af1e8a1e856f5ac1d48cf94aeef2a684ef1e46eaaf62ecb12433c50ac49588fe594ea SHA512 fde1118057c3d36b660ade21cb0821b62c4a39d7d797a206f76ae096f7c7ab093e62c1779a97a93d7725682baf11dff3ec698844297597227c511721faf75237
-EBUILD speedtest-cli-1.0.2.ebuild 660 BLAKE2B e7edbdddc005fc76c6f3a8dda9fb4b0255d45a1af8733383b500269b292af1e8a1e856f5ac1d48cf94aeef2a684ef1e46eaaf62ecb12433c50ac49588fe594ea SHA512 fde1118057c3d36b660ade21cb0821b62c4a39d7d797a206f76ae096f7c7ab093e62c1779a97a93d7725682baf11dff3ec698844297597227c511721faf75237
-EBUILD speedtest-cli-1.0.7.ebuild 664 BLAKE2B e7a99e1d91e1de89eabfe8b481835c822973e9161da4bde276044088bb430b07f5d880fa86c4c4f20b1b940e504534660c54217325d830d322a851243914080a SHA512 70f27e8f337e173384c973b0c574d45942b9b5c39602c687a0df6a32693729cb36ef2c3bcb016e173b2e97c4ecbc2f24c9d3706d4cb5b3bf9e81a85f861c70b0
+DIST speedtest-cli-2.0.0.tar.gz 23642 BLAKE2B 042b5c24d084400663548d3110dd28a4c4bad780d46f9f4182ab8d1a323a087970e0ebdff04dee2ecd1bed9b488dd72f4799992c762f631d3cad59aedc6452e5 SHA512 60bde263a06589c609a10e1a881a1b02f7c7426b95778d7729b1388e545713094501914c24ee08f0857c4f445354539b5508825ab1a51df284215ba681dd7888
+EBUILD speedtest-cli-1.0.7.ebuild 662 BLAKE2B c4b2a3cc3fae1300e89ca981959b1468da02ad0e34887413a9d3dc4a344ff61d4f13c8f5e01684d324bfebaf53d2a2a3a09c46c02eb9f6156dd031cdbef18101 SHA512 35d739bc858c8c843c50c03e7889a3b9999c34d171fb8f4d0c5698ae464b83a7a9d977ab0b8dc9a99517a9a6ba610d6fa87f2f572c3487f07a72e45ac3ecf5e2
+EBUILD speedtest-cli-2.0.0.ebuild 664 BLAKE2B e7a99e1d91e1de89eabfe8b481835c822973e9161da4bde276044088bb430b07f5d880fa86c4c4f20b1b940e504534660c54217325d830d322a851243914080a SHA512 70f27e8f337e173384c973b0c574d45942b9b5c39602c687a0df6a32693729cb36ef2c3bcb016e173b2e97c4ecbc2f24c9d3706d4cb5b3bf9e81a85f861c70b0
 MISC metadata.xml 460 BLAKE2B 488a43d888cbc4baa7d74bcf4b8852054037be8227f380d43f187baba239e253c2a0aa3ce1d8c2c672a4947be9e4268a2d1fa8adbb3db38fee9e2334851bc7eb SHA512 6e911380a7bc75a4f5726f4bb8f864a2660e93cb07be2cdf55b428fe8615e9e31c7a78f978064ed73fdc1133d6611b3bc3a39966439bb249e4f8a69dbae88f1c
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild
deleted file mode 100644
index 9d15ffc0b7d4..000000000000
--- a/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
-HOMEPAGE="https://github.com/sivel/speedtest-cli"
-SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~arm ~arm64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( CONTRIBUTING.md README.rst )
-
-PATCHES=( "${FILESDIR}/${PN}-0.3.4-fix-unicode-py3.patch" )
-
-python_install_all() {
-	doman ${PN}.1
-	distutils-r1_python_install_all
-}
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-1.0.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-1.0.2.ebuild
deleted file mode 100644
index 0ddf1db51517..000000000000
--- a/net-analyzer/speedtest-cli/speedtest-cli-1.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
-HOMEPAGE="https://github.com/sivel/speedtest-cli"
-SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-DOCS=( CONTRIBUTING.md README.rst )
-
-python_install_all() {
-	doman ${PN}.1
-	distutils-r1_python_install_all
-}
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild
index 0bf6c921ff5b..5d55575fd650 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-1.0.1.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.0.0.ebuild
index 0ddf1db51517..0bf6c921ff5b 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-1.0.1.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/tcpreen/Manifest b/net-analyzer/tcpreen/Manifest
index 017587768d0f..f29322512b45 100644
--- a/net-analyzer/tcpreen/Manifest
+++ b/net-analyzer/tcpreen/Manifest
@@ -1,3 +1,4 @@
+AUX tcpreen-1.4.4-literal-suffix.patch 498 BLAKE2B 3380254c7dcb97958ec8ddeb9aa2e93fac39643088dd6b5daf686b657764bd8e9cbac442c3b6e2084ae75ca1286ab78e4fe5df3689d08e3eecdbcdf8c6660e0e SHA512 542de59ab2129093b2e4dd56d370e595a82f54eea70c70f764c7f1aced308864f4f594dde37575ec64076d9da76fd7ecf7fd8bf7fb7572c1b978160f220b14c6
 DIST tcpreen-1.4.4.tar.bz2 187979 BLAKE2B ef76c7757c5e630a8b0019ede74314bdf7b0e1e48af00091c8b1a28075499b1e0411b5a7ff8bd01bd54ebb347dfc2169b5efe54d36ef12e6ce31f54c4d278d70 SHA512 94496bbb21218b5acc9e76dd4377f92e35b17e03a2d10a7c42177ba5ccbb6aea1b0b54f49d52c5a97456f8cf77685e1c90c27773f4237c33e95f648d4258b786
-EBUILD tcpreen-1.4.4.ebuild 523 BLAKE2B a38a2ec393aab6a888c709f3590d448e07296af1c430b16c5661d2f2e91da66d543fa37d1386cec34a0c835779de6fdd448bc1807a226f0e45b3d12024aeec00 SHA512 16b80817ab65fd0e627de74d7b062675adb155719784477fbde4872b2af1af7f05d32666f5abcb4e43b0cc62067de8c72dce16922552639fa996152f29f180fc
+EBUILD tcpreen-1.4.4.ebuild 577 BLAKE2B 5bf67b5375465141fd8d6d393655ab483555d393d834337efd0b8c180fd5d6ec320d7b4943ad83b9baad1991120972b4d23091aa9a08ff9b4562f2eaf27b2fcf SHA512 5445c292d9145776236b227e5d98a7c8f03034a2501c8f6a851475745d7fa55920cea723e3813d47a47caa208fb6ccc275b9db675c2b3f32cc8756321e0ce1f3
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/tcpreen/files/tcpreen-1.4.4-literal-suffix.patch b/net-analyzer/tcpreen/files/tcpreen-1.4.4-literal-suffix.patch
new file mode 100644
index 000000000000..1808a54f8875
--- /dev/null
+++ b/net-analyzer/tcpreen/files/tcpreen-1.4.4-literal-suffix.patch
@@ -0,0 +1,13 @@
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -108,8 +108,8 @@
+ # define VERSION "unknown version"
+ #endif
+ 	puts (
+-"TCP re-engineering tool "VERSION" ("PACKAGE_HOST")\n"
+-" built "__DATE__" on "PACKAGE_BUILD_HOSTNAME" ("PACKAGE_BUILD")\n"
++"TCP re-engineering tool " VERSION " (" PACKAGE_HOST ")\n"
++" built " __DATE__ " on " PACKAGE_BUILD_HOSTNAME " (" PACKAGE_BUILD ")\n"
+ "Copyright (C) 2002-2004 Remi Denis-Courmont");
+ 	puts (_(
+ "This is free software; see the source for copying conditions.\n"
diff --git a/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild b/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild
index a2cc20e37a9d..4a5d1fc11656 100644
--- a/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild
+++ b/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="TCP network re-engineering tool"
@@ -12,10 +12,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-
+DEPEND="
+	nls? ( sys-devel/gettext )
+"
 DOCS=( AUTHORS NEWS README THANKS TODO )
+PATCHES=(
+	"${FILESDIR}"/${P}-literal-suffix.patch
+)
 
 src_configure() {
 	econf $(use_enable nls)
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 7da5768e3233..3d7a3b1c689f 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -2,6 +2,8 @@ AUX tcpreplay-4.1.0-enable-pcap_findalldevs.patch 601 BLAKE2B 33c38be287593dfeb2
 AUX tcpreplay-4.1.2-CVE-2017-6429.patch 858 BLAKE2B 988facdce3f6264edbd4712548248ee52db5347361d8dbece0a691d941f77d5e7751cd43def5dddf85c8028935b65e945e1adbab2966197ba6e38233bd73bfcf SHA512 934a42f9b70c882780a4a2fe3c9621b8a8380199ea63056291d27cbce006afcddc7331f9b73c8c244e89229c8526c55d2f534bedba50fb3d28ec3b873f700e3f
 DIST tcpreplay-4.1.2.tar.gz 2162175 BLAKE2B a99542277084a419c1f1208392e3d5b47aaf0be61a8e8de33bee9ba8e4f636fa78ae8eabcc07031c9bb659a8ba58a0aad6e4cc102e56d3dbddb0c3cf11c9df51 SHA512 3a7d125f38fe15070d666eacb4a5ef026a73ff850adec7ef3592966f38d1d155002792c5d5ac2476aa034d71be5f31b9dacd5be34af01a336149af3a42cad360
 DIST tcpreplay-4.2.6.tar.gz 3494827 BLAKE2B 57222d7347efd780d2e1297145a7d81c8cce58a8d43bdb9b1485ef2514751e61af317dc4f5ff2068c214b2a33115d8099204d4b3165671d87bd8549c2df08bbd SHA512 a46846b29e3cd7fbc635faee9c4be90db0d346c0d0f291ac8e007e1fbf614289094e14480c1c5b40feb5a175d3cbad018e2dd4d1a5762b7d31a4325af6102e7e
+DIST tcpreplay-4.3.0_beta1.tar.xz 719884 BLAKE2B 872ea10a3986f122cbf48bf9217d8df96f8c8c08e37aee095fc92ab5d5cf2607b42327aab9de5453c8bd198e1a32a3ae8964b085ba3065a6b3adfd853dd0b43b SHA512 55a9c419d4604cb4912571a631035ad4bc70d06b44d0248629a47b76411c23cba63b824322c23e0f2eeac4131a5d6e4c1fb2b9a60c0f57a7397d46760ff818f9
 EBUILD tcpreplay-4.1.2-r1.ebuild 2020 BLAKE2B a8ab8eb44bdb1f221541ce2088afd501f160095ff3232892715f0bffa68c343fa7705e09586903a2b15cd3ffec038f8965eb88ce9abf57838df361de6df57a18 SHA512 f39b594d93adf778e7432fc0770ac4e3328fea9cb082169fe426e09034e997ddbff43b5b2678ed8324e7d0a95fb05513384c6bcdc94816711b05e2bff561c67b
 EBUILD tcpreplay-4.2.6.ebuild 1923 BLAKE2B c376b7b1e702e0a38cf05c8db6c574ca8b5c41a4ee22fe760969519be75698b081c215ff4314084fb7f58fd7f8ee3cd6b7efe180b3c69f2e52f1189b5a3f8ad0 SHA512 a9d31e3a2db7b7ec12c68a3229c7f0137daaaf6acf35808f7f797f11c025263c3f533c528d5bc763fe8f490ae24aa72f2351a5c2ef9154f96e347bf9c1486752
+EBUILD tcpreplay-4.3.0_beta1.ebuild 1922 BLAKE2B 1c0157c7a5b5ce349e09df3a1ed23e0459c8b24c171061b9925032cfc08ec3e1ad83f7d2189223ec0887fae40515c802a8ce190339667eb1e1a81d77aa54fbfb SHA512 e29584f2e7a1865ba60c53d19dc14a74ce8b491fcedd98ba2afbbe2adace9192eb16e2d36be4f2f63e3f4f7326058ac31f3531aa3393eb492afab759a752949b
 MISC metadata.xml 1116 BLAKE2B 23c8b7009a77b68831affc57432a87a31fde213d7e7ee88f68ced4a4e21a56c55f97497e610fc486a42c699759ef1edf1904fa9b0fe976df4fc9930535f97037 SHA512 58cb13a648ba7b9f9fd8c7a7cdfd37d56f0d7b957824a55d63001a8708f93d529b29e52df051bdce0c87eb672d24c7b2c35ee8a1e94ba062e2a1e12dd0d0ee1b
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild
new file mode 100644
index 000000000000..24946408748e
--- /dev/null
+++ b/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic
+
+DESCRIPTION="utilities for editing and replaying previously captured network traffic"
+HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
+LICENSE="BSD GPL-3"
+SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="debug pcapnav +tcpdump"
+
+DEPEND="
+	>=sys-devel/autogen-5.18.4[libopts]
+	dev-libs/libdnet
+	>=net-libs/libpcap-0.9
+	tcpdump? ( net-analyzer/tcpdump )
+	pcapnav? ( net-libs/libpcapnav )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	docs/{CHANGELOG,CREDIT,HACKING,TODO}
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.0-enable-pcap_findalldevs.patch
+)
+
+S=${WORKDIR}/${P/_/-}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \
+		src/common/sendpacket.c || die
+	sed -i \
+		-e 's|@\([A-Z_]*\)@|$(\1)|g' \
+		-e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
+		-e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
+		src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# By default it uses static linking. Avoid that, bug 252940
+	econf \
+		$(use_enable debug) \
+		$(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \
+		$(use_with tcpdump tcpdump /usr/sbin/tcpdump) \
+		--disable-local-libopts \
+		--enable-dynamic-link \
+		--enable-shared \
+		--with-libdnet \
+		--with-testnic2=lo \
+		--with-testnic=lo
+}
+
+src_test() {
+	if [[ ! ${EUID} -eq 0 ]]; then
+		ewarn "Some tests were disabled due to FEATURES=userpriv"
+		ewarn "To run all tests issue the following command as root:"
+		ewarn " # make -C ${S}/test"
+		emake -j1 -C test tcpprep || die "self test failed - see ${S}/test/test.log"
+	else
+		emake -j1 test || {
+			ewarn "Note that some tests require eth0 iface to be up." ;
+			die "self test failed - see ${S}/test/test.log" ; }
+	fi
+}