gentoo resync : 03.12.2017

3 files changed, 5 insertions, 42 deletions

diff --git a/dev-python/python-iptables/Manifest b/dev-python/python-iptables/Manifest
index 4cb30bea6418..8307a6d7a55e 100644
--- a/dev-python/python-iptables/Manifest
+++ b/dev-python/python-iptables/Manifest
@@ -1,5 +1,3 @@
-DIST python-iptables-0.11.0.tar.gz 73582 SHA256 55bdd0d8e3d0b4c27e4d61bf6f21ada1e19146c0adf65e5093e254a126abcce9 SHA512 5bbaeb09dc256738e3a168fa5941f39e50074eb1ac3ce18545a48c55eb06ef70fd974ad3153dc07ca67b1ef88a2a2c537a9f8d3ac85add990f6d15e9d37aa0a4 WHIRLPOOL 5ecc28a1f65389e63c962408f058ac0795a5ebd846320f4d9de4ad35e6bb7a8ee7dff4555af0c4c9c42d303b7b0f6de372c042d4219141446680ba45b8216ac4
-DIST python-iptables-0.12.0.tar.gz 40831 SHA256 9815fd5ba780fd14b5f8cf8a93e007c0e603019738813a806e37553cd72e4c33 SHA512 bf79288fac53542e523c8ed0e4e0711792cf524100e39f57f10d3581d1b958712875a765f690b3d5ec6e28af9de48d2f3dd0a787c7037ebfc6f8bf87b5e321b2 WHIRLPOOL 360c3dec7c1122ba53cf7f158ff463937a119fbc818ac879403ac943c0f0d04043c89559468274332e3050e4fd84a8d95f8a30b7a783aaa0c023420278c3422c
-EBUILD python-iptables-0.11.0.ebuild 888 BLAKE2B 8da5cfd9abf9623847b66d6e0cc2928d7511f20a234649bab25dcf9a9fefabd7deb4e9364b64e90ceadf5c5af2bc1304f913fa8e9c8df943df371df1af32ba69 SHA512 5a9b8dfc069f8024ea1ecffa631453a44a6ac0c932ce5c3fab7d9974aeb9bfd17f4f8cab2948efd87083e91dd0c35b3ec2e7ce7284b78364abe0de6d80ffdc20
-EBUILD python-iptables-0.12.0.ebuild 888 BLAKE2B 8da5cfd9abf9623847b66d6e0cc2928d7511f20a234649bab25dcf9a9fefabd7deb4e9364b64e90ceadf5c5af2bc1304f913fa8e9c8df943df371df1af32ba69 SHA512 5a9b8dfc069f8024ea1ecffa631453a44a6ac0c932ce5c3fab7d9974aeb9bfd17f4f8cab2948efd87083e91dd0c35b3ec2e7ce7284b78364abe0de6d80ffdc20
+DIST python-iptables-0.12.0.tar.gz 40831 BLAKE2B ea53605a5dd581cad7e05059c1534376a53b3b3da89b8c172cbb38ae7482ca3972fdf786badf3328960847c12c96ce32278657c32c857a1682650621a3add47a SHA512 bf79288fac53542e523c8ed0e4e0711792cf524100e39f57f10d3581d1b958712875a765f690b3d5ec6e28af9de48d2f3dd0a787c7037ebfc6f8bf87b5e321b2
+EBUILD python-iptables-0.12.0.ebuild 930 BLAKE2B fd4701dfbab5e7348088e3a686c02bcfac8fb809d9270568a839fc0dc6147665345433799352e2ec8b48bb686c6293241c520433f3c4977116c9adbc9276ff16 SHA512 0658bda1fa29b4f61af9ea99c4624d8afd2a9cd6c20767b90bc897628a74110a3d366e92c2582d8f4fa7909a59294ff4ffbc25bf92baee11ba0a37992914926c
 MISC metadata.xml 1340 BLAKE2B d7f6bd56d29a11e19dc402343c03007866bfa0e33415317d866bdc9e7b76bd2cc35238270db24299cb31986166044f5bbc84d90efa37e9fad36fe8b16ffc3e03 SHA512 90c875cee0c4ea9e2f34d509152cdd4d83a41010b8a858515fa3bc766bb0ba11e047957f4c005fdaf2e49b088df78cb3b4414a5ecfdb1b6ded550eb6c9dd01d9
diff --git a/dev-python/python-iptables/python-iptables-0.11.0.ebuild b/dev-python/python-iptables/python-iptables-0.11.0.ebuild
deleted file mode 100644
index e294f95ec8fc..000000000000
--- a/dev-python/python-iptables/python-iptables-0.11.0.ebuild
+++ /dev/null
@@ -1,36 +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,5,6}} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for iptables"
-HOMEPAGE="https://github.com/ldx/python-iptables"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="net-firewall/iptables
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-# tests manipulate live iptables rules, so disable them by default
-
-python_prepare_all() {
-	# Prevent un-needed d'loading during doc build
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-iptables/python-iptables-0.12.0.ebuild b/dev-python/python-iptables/python-iptables-0.12.0.ebuild
index e294f95ec8fc..360518b2f5ca 100644
--- a/dev-python/python-iptables/python-iptables-0.12.0.ebuild
+++ b/dev-python/python-iptables/python-iptables-0.12.0.ebuild
@@ -14,9 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-DEPEND="net-firewall/iptables
+RDEPEND="net-firewall/iptables"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
 
 # tests manipulate live iptables rules, so disable them by default