gentoo resync 08.09.2018

5 files changed, 2 insertions, 183 deletions

diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index 01311fd4e565..e76f5f84f47d 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,10 +1,4 @@
 AUX py-amqp-1.3.3-disable_socket_tests.patch 405 BLAKE2B 9d1c75d6499ba8fdd172d022a6f876f5b8eb66de1e0b7c2f685ea6856afd5db316b70e950ee3af1c6fc686b6bbef97dc6f220abddab746adebf6f01f7fff7120 SHA512 7d801f7392edce5bb0f2b04a974f6005b58cd0e288bdf52fd76a7d63de985e7e8a2696972fdbdbf3e39fba339a3213437d490dffb573b5b52f2f67ed6dfb9e32
-DIST amqp-1.4.9.tar.gz 79392 BLAKE2B 03c37db7341705c05d8a1087d8e2911f5d89676b0dd00381677f09d1541b76bf6881688a8897202534e57f7dec0d4341e76138f4eb81b9cef3653f98a7c334b5 SHA512 9c2fecb3c9e1d24333895031a9ae255a858146d498b169a89c3ca8061428c622d85dcee8d2ca45d63a3ecdda34a1efc917aabf42c7c35b579143caf81494a079
-DIST amqp-2.2.1.tar.gz 103599 BLAKE2B 2f0f5573bea19a8dcd609cbadf664ad8835b83f470d0ac24214f3cebcf174e9838fd2f1e4dde029ee9511a1e55ff4b7e2a6368902fdc22035272cc01b8c2f96b SHA512 dcb6297917d4528cfe3ebc446e97be6fed3c100ea77c68923c923cac466fa2d85ed8afaf19582b281ee6e05d699e8ed3fd6cdcbb0cb4de0451becaf16711af29
-DIST amqp-2.2.2.tar.gz 103128 BLAKE2B ee1513e12e1695ce2d16f72fc09dce713a5c9e7e630f8e8d2d39b580b15e254287ff49039db6a43f808f1d2c26239195c003648f360169abfbdcdab9aa700604 SHA512 8ebb8f2b0942e9b88b12cf35b8861da392190dd200d843bf3bba7b98e325afa53f52fe3f8250af1d2c1c14ffe8a071df5494d1eedc1bff974cd62fe88bc3e1e7
 DIST amqp-2.3.2.tar.gz 105854 BLAKE2B 8bacae52f03118e2d0fb93a6494628f18f7139d655f1c4b3e7cda9fd81eba5d92f56038bc01dd4a28a89168be0fd51013db0060e945e7f7c63e1423892feaee6 SHA512 c9c99a238cf64ab5590eaea5756e9f68d58769b4d74af3405321d5c129171f34e6a5d20f2125ef2828e843b637fbd115d1ee9391726fe6ff09d233f0e6bdd511
-EBUILD py-amqp-1.4.9.ebuild 1615 BLAKE2B 2513d1745ca8bbfaabb2310560fb1f53975fa5657c6821c9b627d6fb187b9a620762a4eeb567052460dba6f0c0968e1aa10c6fefff5d8837a3e371dbf11caf6a SHA512 9653194a6d3f666a629e0cac0c5d373cee3071c8e341d16dc44d86f999109e1a5070e43c6dd97fc38e1384c7d6bddb6ff0654ad64ad81d9b4df27912018d7129
-EBUILD py-amqp-2.2.1.ebuild 1184 BLAKE2B 66b918cd16f7629fb3d694ed89a936340538fd6a102ca6fb745f6a658c82c2a9ffec16db7cb13145913dacfb7a0b1e1744ea7e12efcbaca370884afe46fed632 SHA512 a31708b7b9c501d571c3df8670e17e233c081511e935d89737afff85bdd2da636e3fdf78324cd9c0d44832ca3124be14e897c7a73f48ccc0a3f92b351e4684b9
-EBUILD py-amqp-2.2.2.ebuild 1184 BLAKE2B b00ea1a3a4337918834af1238fc9f64f2ea2bc5abaabd6973b87d9ae42afde4582e5b99794a42ead1a609f7b3fc7f1ccc445e716e2862cb101f1fae942998b73 SHA512 b67ad99b6bd8fe75884ccf9ec17a86ad3265e07adb31289538b65b1127ef1d8d0dac702cf7414b617f69006fd0344c12c8ab8ad155262dac979e465a6951adcc
-EBUILD py-amqp-2.3.2.ebuild 1186 BLAKE2B 429dcdb253e5b0e9d9ad29d8b94e4d59d3ba5c0da7cfffbdf4b320695f9f0ce48eb93f3e37ffa33de9ee2b2b27277f31ba4aff51cae002df5dd2787953f9cbf1 SHA512 950549ffd9dcb5215f39897ea64c08c7889e4097cd147915d2235ab6b476d12abd8c89eae9e3e2206240e8e62285ec0c18035277357b75c7488ae8099ebc8451
+EBUILD py-amqp-2.3.2.ebuild 1184 BLAKE2B b00ea1a3a4337918834af1238fc9f64f2ea2bc5abaabd6973b87d9ae42afde4582e5b99794a42ead1a609f7b3fc7f1ccc445e716e2862cb101f1fae942998b73 SHA512 b67ad99b6bd8fe75884ccf9ec17a86ad3265e07adb31289538b65b1127ef1d8d0dac702cf7414b617f69006fd0344c12c8ab8ad155262dac979e465a6951adcc
 MISC metadata.xml 480 BLAKE2B 43fb5084b74b3c2162cfe63a41aa8e115ca9da87aa9cd32ba135371ed1236a443b96804d5593c69b8e8189affeddafb8bebe7733369548150ce525f4d0f71d84 SHA512 d386da72715c929924505be0c50dbbb0b24fe8087f4b4e47ddf5f6d868dd6c42ac63676364837490eedd7ab32053d360e95cac9416954d9225bd110f3d1df9fd
diff --git a/dev-python/py-amqp/py-amqp-1.4.9.ebuild b/dev-python/py-amqp/py-amqp-1.4.9.ebuild
deleted file mode 100644
index 4b82672bc71d..000000000000
--- a/dev-python/py-amqp/py-amqp-1.4.9.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-MY_PN="amqp"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc examples extras test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose-cover3[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-# Same tests from before require a socket connection
-PATCHES=( "${FILESDIR}"/${PN}-1.3.3-disable_socket_tests.patch )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cp -r -l funtests "${BUILD_DIR}"/lib/ || die
-	cd "${BUILD_DIR}"/lib || die
-	if [[ ${EPYTHON:6:1} == 3 ]]; then
-		#   -n causes Python to write into hardlinked files
-		2to3 --no-diffs -w funtests || die
-	fi
-	"${PYTHON}" funtests/run_all.py || die "Tests failed under ${EPYTHON}"
-	rm -rf funtests/ || die
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( demo/. )
-	use doc && local HTML_DOCS=( docs/.build/html/. )
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-amqp/py-amqp-2.2.1.ebuild b/dev-python/py-amqp/py-amqp-2.2.1.ebuild
deleted file mode 100644
index b5e2a2aca353..000000000000
--- a/dev-python/py-amqp/py-amqp-2.2.1.ebuild
+++ /dev/null
@@ -1,55 +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
-
-MY_PN="amqp"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc extras test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/vine-1.1.3[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_celery[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-amqp/py-amqp-2.2.2.ebuild b/dev-python/py-amqp/py-amqp-2.2.2.ebuild
deleted file mode 100644
index efc12460921f..000000000000
--- a/dev-python/py-amqp/py-amqp-2.2.2.ebuild
+++ /dev/null
@@ -1,55 +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
-
-MY_PN="amqp"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc extras test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/vine-1.1.3[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_celery[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-amqp/py-amqp-2.3.2.ebuild b/dev-python/py-amqp/py-amqp-2.3.2.ebuild
index b70ca5751c12..efc12460921f 100644
--- a/dev-python/py-amqp/py-amqp-2.3.2.ebuild
+++ b/dev-python/py-amqp/py-amqp-2.3.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc extras test"
 
 RDEPEND=""