gentoo resync : 31.12.2018

5 files changed, 4 insertions, 62 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 743bc70f8665..3eee4795ec62 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index a3e69465e6f3..38a3a61977ef 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,7 +1,3 @@
-DIST speedtest-cli-1.0.7.tar.gz 21077 BLAKE2B 8bbb9b73f21f9252763461230053bac5d890d19d3f80a81f616bb4535c5e386b70b43c6ee0688ca813fab21f8387fd93df65b1b0254613efbdec93b1807d3caa SHA512 c06c0e80ec00adebc04fb2bdab5b45ec84a32d9dbf2e4fbe7b0461f4b3b1fdcf29048b8c7a906c03dcea0771417317394243bdc6f1bc8fb763e13eafae31a42b
-DIST speedtest-cli-2.0.0.tar.gz 23642 BLAKE2B 042b5c24d084400663548d3110dd28a4c4bad780d46f9f4182ab8d1a323a087970e0ebdff04dee2ecd1bed9b488dd72f4799992c762f631d3cad59aedc6452e5 SHA512 60bde263a06589c609a10e1a881a1b02f7c7426b95778d7729b1388e545713094501914c24ee08f0857c4f445354539b5508825ab1a51df284215ba681dd7888
 DIST speedtest-cli-2.0.2.tar.gz 23915 BLAKE2B 95b88e1666d7bc50c525ae7eb587e1b53babe02549e3b6b81f59451166fdbfb5561daa29e1de308d3ca7340989bcb6e7b43edd84bf371716284c034cdeb21fd8 SHA512 12fa9a5dd8bcb7a7ee68ecc9075dc5c18f089cecf003e7e643dbb6b1c3663f17c2aba48d1e84aa27bff6b66e207d39ecaf874aebad1d71cac772c58b62191723
-EBUILD speedtest-cli-1.0.7.ebuild 662 BLAKE2B c4b2a3cc3fae1300e89ca981959b1468da02ad0e34887413a9d3dc4a344ff61d4f13c8f5e01684d324bfebaf53d2a2a3a09c46c02eb9f6156dd031cdbef18101 SHA512 35d739bc858c8c843c50c03e7889a3b9999c34d171fb8f4d0c5698ae464b83a7a9d977ab0b8dc9a99517a9a6ba610d6fa87f2f572c3487f07a72e45ac3ecf5e2
-EBUILD speedtest-cli-2.0.0.ebuild 664 BLAKE2B e7a99e1d91e1de89eabfe8b481835c822973e9161da4bde276044088bb430b07f5d880fa86c4c4f20b1b940e504534660c54217325d830d322a851243914080a SHA512 70f27e8f337e173384c973b0c574d45942b9b5c39602c687a0df6a32693729cb36ef2c3bcb016e173b2e97c4ecbc2f24c9d3706d4cb5b3bf9e81a85f861c70b0
-EBUILD speedtest-cli-2.0.2.ebuild 664 BLAKE2B e7a99e1d91e1de89eabfe8b481835c822973e9161da4bde276044088bb430b07f5d880fa86c4c4f20b1b940e504534660c54217325d830d322a851243914080a SHA512 70f27e8f337e173384c973b0c574d45942b9b5c39602c687a0df6a32693729cb36ef2c3bcb016e173b2e97c4ecbc2f24c9d3706d4cb5b3bf9e81a85f861c70b0
+EBUILD speedtest-cli-2.0.2.ebuild 663 BLAKE2B 41d2a7e1359e7131fbfd1a0d15eb4f7b9b8591e4353537f2369c410fa53810e79d20ee82faab0bd5fe4e4c2f415e9e3879083c8ca6ffa5301aabbadc3f1de943 SHA512 ab8d9a9093f4fd53da16566af22b853af77e032e42735eada29d63ce09c5b3c23974628e038114e330a54a85f63c921718a6c7e62fc3ee74ee14b3123f65803b
 MISC metadata.xml 460 BLAKE2B 488a43d888cbc4baa7d74bcf4b8852054037be8227f380d43f187baba239e253c2a0aa3ce1d8c2c672a4947be9e4268a2d1fa8adbb3db38fee9e2334851bc7eb SHA512 6e911380a7bc75a4f5726f4bb8f864a2660e93cb07be2cdf55b428fe8615e9e31c7a78f978064ed73fdc1133d6611b3bc3a39966439bb249e4f8a69dbae88f1c
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild
deleted file mode 100644
index 5d55575fd650..000000000000
--- a/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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,3_6} )
-
-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-2.0.0.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.0.0.ebuild
deleted file mode 100644
index 0bf6c921ff5b..000000000000
--- a/net-analyzer/speedtest-cli/speedtest-cli-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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,3_6} )
-
-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-2.0.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild
index 0bf6c921ff5b..5ac123e2be42 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -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}]"