gentoo resync : 24.12.2018

5 files changed, 39 insertions, 78 deletions

diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index 1a7ebcb6a38b..65ab524a6866 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -1,9 +1,5 @@
-DIST yq-2.1.2.tar.gz 4704 BLAKE2B 980f0025ed397d620cf4883b3603411e7d969d641a50b6ad7f8be2ed9cb326772b0d79b36b0fe1c1f168e9b859bab63be3c0a6e267fef9ae15e8aa66574dbd67 SHA512 88f32e58aacd82deb06deee6910f5a145e54d20829f438cd47248d560119dd8112e0813ea8d55708664ac29ef011bbc3fd6b882e1c538ef44aaa9aa119584e99
-DIST yq-2.3.0.tar.gz 5165 BLAKE2B 5d317d78e4e9e0fbe3064c004b33cb267fe0947d011ea3f12b873a2a31b16695c57bd932b2f2e5145afa22f9cccb43bed0a34847c4975f83bf63651e6b3b5372 SHA512 f256d1766b697f6bcb88bb8129e587bb99929154e13167f179bff1669b08b5444af90d7a17382b4f434092110ddb9e578c1f374b56aba03b4a4406fc25b76d6a
-DIST yq-2.3.3.tar.gz 5486 BLAKE2B fa02b7466d54dbb5ddd4090329e1dd1d3826aa12d647563296236122fa34a85e7ee3e7f06edc227264db8fc18a215f39a5b171c18e498132bf701ef25def7936 SHA512 58461c74f907be241047197967ec316ea6ffe2accd99c8b97a158369d06f32c758c56edaeea30d3e4988e295a58fabeb47d960097b136c6b0bf16c2792b7f75d
 DIST yq-2.3.4.tar.gz 5657 BLAKE2B d7e6a37ed157ff2a23b648a54cf729cda1413a627f1169ba938ae89d4bd175270cdc5fa39ca5ea3c31d55d562439296bcce391cb22cd2faccc5f545f2577a12d SHA512 ea530d3f501a8697474b1b77644fdf439326e49fbae158a862e58fba6f939ee5f3ba50f82cc5e990b1ed05c4e7aa9c205635290e6d2507d46e53b68ee467d5e1
-EBUILD yq-2.1.2.ebuild 637 BLAKE2B 54ab2b629b25fbdf5fa25187e1ef5589571a248e9b7d0aaff7a3b35a079f1780fe2d07756f615080d1f05580d113f7c072f4c3a9803957c041741ca8ccb4065a SHA512 0aeed2e12c6afea7c5b1f08c054e0ca45fa638e621df3df0ef2be8b38164d7367025027c6e248a744b3effe35648231b636793ca03c0a18ed7ea1681b398462c
-EBUILD yq-2.3.0.ebuild 637 BLAKE2B a753a36f7570a61081ba41dc225f0e53f62d334d7b5f1bf0564b756578ad3b9ca2810dd22787e7b3300115a95188a07f501740b1b018cfe788381b21d78cb97a SHA512 2cae03018de7e33f0c9b6df32c9808f03b8e2069d906c73797b81be605ea723954d7b745acf5bab45fa1356c2befdacedf0bdf9f314925a62ea5379306fb8095
-EBUILD yq-2.3.3.ebuild 637 BLAKE2B a753a36f7570a61081ba41dc225f0e53f62d334d7b5f1bf0564b756578ad3b9ca2810dd22787e7b3300115a95188a07f501740b1b018cfe788381b21d78cb97a SHA512 2cae03018de7e33f0c9b6df32c9808f03b8e2069d906c73797b81be605ea723954d7b745acf5bab45fa1356c2befdacedf0bdf9f314925a62ea5379306fb8095
+DIST yq-2.7.1.tar.gz 13794 BLAKE2B 87fe4961974ab41fc14efb7b85c3db5c13577593253eb236c445f59e4034ce5211173cbdd1680e8b83394068ebcc99962f9f3b7c1cd36a4554aa2769b0a5ce66 SHA512 ad76f6102cdb7b0cc82d57c8120dfe10221b7d7456c4c3dd6e5ed0630d9ab178099f4ee8bfc075f15eb4b35aaef4237fcb0ef01a769a612632b4ef774da2b50a
 EBUILD yq-2.3.4.ebuild 637 BLAKE2B 54ab2b629b25fbdf5fa25187e1ef5589571a248e9b7d0aaff7a3b35a079f1780fe2d07756f615080d1f05580d113f7c072f4c3a9803957c041741ca8ccb4065a SHA512 0aeed2e12c6afea7c5b1f08c054e0ca45fa638e621df3df0ef2be8b38164d7367025027c6e248a744b3effe35648231b636793ca03c0a18ed7ea1681b398462c
+EBUILD yq-2.7.1-r1.ebuild 1015 BLAKE2B cef0cd6d83941060e1b728b4c4e750558cce76ffefe731ddc1df99a9f3f7ffab7a80d8bed830abe3bff21964ad0b3425f08edf22a0edcb1a424ed3e2b5ebb376 SHA512 3c19aed68eb40ba60f64a060c25d8d6e783fddc79d6cea3524cd548d8a6140a6980631bc25aec1e529139c2037e63c6ffcbbb2eaf4dcaeaa0f0b1919aec7e673
 MISC metadata.xml 333 BLAKE2B 25cb1f46ef4320b5b01b23bec540f623f53be1ee4b0a1d3d9c20cdd90185b88d8f9d5fecefbd15abeca1a861e2863123d15e89e40aa3cdbbd1c56fefa71105f4 SHA512 2cb6c56e50e0d436f37c090549cdeb0c4b1fba34b8049c90ccf24f44aaefddd87bd8e6260a8e645df2c8e2bb1f28c305ae353f1a86e2992a2c987936c4caa416
diff --git a/app-misc/yq/yq-2.1.2.ebuild b/app-misc/yq/yq-2.1.2.ebuild
deleted file mode 100644
index 1508219d3b3b..000000000000
--- a/app-misc/yq/yq-2.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/jq
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	./test/test.py || die
-}
diff --git a/app-misc/yq/yq-2.3.0.ebuild b/app-misc/yq/yq-2.3.0.ebuild
deleted file mode 100644
index ab7d35d6967b..000000000000
--- a/app-misc/yq/yq-2.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/jq
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	./test/test.py || die
-}
diff --git a/app-misc/yq/yq-2.3.3.ebuild b/app-misc/yq/yq-2.3.3.ebuild
deleted file mode 100644
index ab7d35d6967b..000000000000
--- a/app-misc/yq/yq-2.3.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/jq
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	./test/test.py || die
-}
diff --git a/app-misc/yq/yq-2.7.1-r1.ebuild b/app-misc/yq/yq-2.7.1-r1.ebuild
new file mode 100644
index 000000000000..7b34b51cdb04
--- /dev/null
+++ b/app-misc/yq/yq-2.7.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="app-misc/jq
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -e 's:unittest.main():unittest.main(verbosity=2):' \
+		-i test/test.py || die
+}
+
+python_test() {
+	./test/test.py || die "tests failed under ${EPYTHON}"
+}