gentoo resync : 30.06.2018

3 files changed, 4 insertions, 32 deletions

diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index ddc4d24ff8f0..549ec20799a7 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,8 +1,6 @@
 AUX paho-mqtt-1.3.1-strip-test-dependency.patch 681 BLAKE2B 0ed9a448e5e72813aa05ad1d37ae957150ad09b6d48a54f668a969e5e98ad25f8d55b223064e01f6773d0e42da3ba26f2e0a7f43a628ff68fee4b619b8de96c9 SHA512 dbadb8c1bd7691a973d8c1cd146ac9bd72407625ddfc5042b25bc81ff74af6d554c06fa3b2972637acc4a466e75a65c9371990e43bbf649fe5a5a22da2bb36fb
 DIST paho-mqtt-1.1.zip 159529 BLAKE2B ca3a39628c9cab8c4f3606587a5c853e79535b37a92991ecc32903967952cc00f6a9b967af0d343c4619f3e46ace1330baebc7c2e9dc231673f51775e4e1de25 SHA512 ef6d1a29480671413dbb655bd8f668b99f8587c14589d2180a37142b368e0ce058f8ed967dbfaa82f239c86e295338bc35c9f28a3ea39d21a6034cd8787a63ce
-DIST paho-mqtt-1.2.3.tar.gz 91467 BLAKE2B d2f02d6a71498107d8f7c3ef95a9b15d011e16848aa6227c3d7301e4bc474857ea3824a5d1be80bfe0a0c919746e509eaf39ff755925a833ff27f7be24067f99 SHA512 3fb15dc856cbae8885a8a379cea8ceb583ef44954cb8743602fae3e9274d4d0222a87409f048f153180be930bb6e570329768297287a2f8e8c812af03a2c012e
 DIST paho-mqtt-1.3.1.tar.gz 102133 BLAKE2B 905a51824d487cb125e06114bcba6b1ba862de4ab816db16aadb6ff761145fd4724dc6523a0c6837b8a16ced6730c5558612deb138bd95721f15054f5d6851a4 SHA512 95adeeaffbbd4b39d19fbd46feb39ec4a2ac923addd3c754a474b7a91d620bfca1678645c1a09c925e38a33995575944b873e3b2300d7bc2f3c5be3005c74d4c
 EBUILD paho-mqtt-1.1.ebuild 499 BLAKE2B 43da38aa5822daa6968d4a7b9514ddb86d0297617c59caede2453fe0d96ab29daa11c3ef6a38d9bda79c4f1133901b1eb4f2b6752b54162b684c63dca76f60f8 SHA512 b9c0957e161058d9594f7516fb31b2f45168a55fca7780b84e2ca695eb37b5acda3bee064fe2d4f3f603586565c2f806521123844f84924f325b75f9743eb928
-EBUILD paho-mqtt-1.2.3.ebuild 660 BLAKE2B e03bd58907c1e4834beb6b4fbef59108cd205bec141e2da8076d94d915afc8cfad2fff8335f68dff80981dad75afaf064a8a01dc3178d80e15633b29b9d6d90f SHA512 a62003c2687bd5aa828c4c0a61abdf80077f39bb528d6d399ffe2169f2514c7165ae836c1054d42a86437a4d44a0679d195bb15c552626fae09c4d6d86d4e486
-EBUILD paho-mqtt-1.3.1.ebuild 810 BLAKE2B 48d5020dbc1d464b667af3814868cbff1b2ef799bbe8217b8a72c613beaf0f869d0ea93095c9262c9414b819e12d646aa781009a7300d172bcd5e500f7720a0e SHA512 0bb3d711b8739878f51bc61d957ad6f4e9e63ed9585e1fce2bdde6a84862107d916e86cd94a8bf05d91314a5a3382741afb0a8c2b7405ff40c2d7945cd3d4d16
+EBUILD paho-mqtt-1.3.1.ebuild 834 BLAKE2B 73e18f26e30f891661c166d633acfc92a30138bdcb0e38bb1e2696d7201e0662a5f395fb03ce70a10cafd48fe4d22a7beae233a2bc0a69fd12cc51ccc59ce430 SHA512 65304d91912386f2fa8a1a9240566e11e408f486a6e54c3aa8321982e623a18c3e4ea0a19796f5913f5682f39561986777d31799d1aa14c294ba9032059ce820
 MISC metadata.xml 462 BLAKE2B bb478b5d843359050dbdb5ba67e9bca36dec28f6c65b6e89ac49cc00cf63c80abebc4525de91bd0c43f6979bc2c1a3b850243de39f3d5620a1f19d6b3c9fb8dd SHA512 bb6dabe3f0a5dcda951a9aa58ae0c883ceb7324f8538dd2962fbe216eeedf9af09829b79e35f5bbd8baa00cdfd16602411430276329554bb1908d6ca9609a9ae
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.2.3.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.2.3.ebuild
deleted file mode 100644
index dde4d1c6b56c..000000000000
--- a/dev-python/paho-mqtt/paho-mqtt-1.2.3.ebuild
+++ /dev/null
@@ -1,28 +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,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1"
-HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
-SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/paho.mqtt.python-${PV}"
-
-python_prepare() {
-	sed -i -e "s/python/${EPYTHON}/" test/lib/Makefile || die
-}
-
-python_test() {
-	emake test
-}
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.3.1.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.3.1.ebuild
index 63403cdcae4c..af2a6150bf52 100644
--- a/dev-python/paho-mqtt/paho-mqtt-1.3.1.ebuild
+++ b/dev-python/paho-mqtt/paho-mqtt-1.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND=""
@@ -25,6 +25,8 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 S="${WORKDIR}/paho.mqtt.python-${PV}"
 
+RESTRICT="test" #659106
+
 src_prepare() {
 	eapply "${FILESDIR}/${P}-strip-test-dependency.patch"
 	default