gentoo resync : 30.06.2018

5 files changed, 10 insertions, 61 deletions

diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index ed3845979d4f..b4ba81bfa3b4 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,13 +1,9 @@
-DIST yarl-0.10.2.tar.gz 127679 BLAKE2B 427d79ba52d81fdf45f9fdb5c6d9732101b5f7868c630ccfc290eca4522d14b08be22d2c6dae588a207ea046cd50b7ba2838c02d6222425b2c0527a5d7d1ad7b SHA512 b385a4165b7d095e4d6e2ec5c808c6536e044fb7750000d917370ca4ca66162ed60b142e33eedb02f608bd8b005f6d1f18304992fe00702ea30dd746a0ad9a88
-DIST yarl-0.10.3.tar.gz 127867 BLAKE2B 6e20500e51a083f20f12bb4ea95611953ea01c56b80ffd5f8127fc905f6cf5a5b94b6dd2a756cd196573e619b159bf74e640f6f783f74df35adc73750f96a4ee SHA512 61df025fb906ecd95b8360bda224801baac5268215f6957837415cfe56a64c90e29bcd0b6a2dd7f253d1142643058301d362952cd3c8f8dd5f5a78a2da413177
-DIST yarl-0.14.1.tar.gz 134863 BLAKE2B 7295b746948c78f174975f2862e481fea0c11b7a292ce59552c17eccc02de7e7b8f3063dd3cea1e5d79b5bd270afa5859c9ae645c2de0fa2a66b52262748febb SHA512 d48292616058731bebb9370f23a892072afbbe8c3c720d920c7b9bb1554d91b02d2c9669662bcff0c1efdc7d519145e214a1440622c03e05c7a9b910d69d69da
 DIST yarl-0.9.8.tar.gz 125806 BLAKE2B 983ccd2516ad00e89b75cb94a2237ea85325947d8fdfd7978b08addba08566b205b5c2a2863fb9943343857b976981b0b5735fe35b2c88f77d6178faa0d814d5 SHA512 67446ca618a2539f8c1fc8a7a96d1ce50a924ece0479e01103347f73a7bd75b0fbdd0ff5c007529195c3f12aa62d185563e761557fcb95b3226eaece65c0be9f
 DIST yarl-1.1.1.tar.gz 156284 BLAKE2B d070b0ea5cb06ef78f850a130d3292e66f592fd46ccf671cfe51f93c0e419a599f42f6a7255e3eb0f15ba96b1ac0cdcd0bce4deff81da6e5dcc25f7a8136bd78 SHA512 fe53e24401e91994d04fd7274200f92168bb08d78c460b49e800646a3e4611f6baefca4ede5b2b6727f2e6e4cd51296ca834305c0e2fb377ac3a928463f995cd
 DIST yarl-1.2.4.tar.gz 159570 BLAKE2B 2214917d01ba8f7ba4ea66e28711bcf2549fb1016be9da49147788d61a51168bc81b209ee1466482c93a8fddb4bec87c9ee072b703a1b0094553ecfcc525c0a9 SHA512 370fafa7ca507589660cb9f025bfa154c7b351fa6f7f7cfbedf8b20b64a175bba78e7673b122443132b10e6214e503668efd98c79dd79ee45364b1f779ecd8f1
-EBUILD yarl-0.10.2.ebuild 598 BLAKE2B c4030009f1487ab1080e9685ec4755a10ff44762a689b5c3b05f55187eb9175719808db76798c06407033e4e9426094ecf00d63ed681d1e9a77cd00285570fc4 SHA512 a1fa1a4053d0d7e478fc0cce51da9e83ad41dbb1b114f2f69f0ecb2aa8b4379d765f2533f221c33216df3667f5e37331c5481b900f3c4bbba57d344f41767957
-EBUILD yarl-0.10.3.ebuild 598 BLAKE2B c4030009f1487ab1080e9685ec4755a10ff44762a689b5c3b05f55187eb9175719808db76798c06407033e4e9426094ecf00d63ed681d1e9a77cd00285570fc4 SHA512 a1fa1a4053d0d7e478fc0cce51da9e83ad41dbb1b114f2f69f0ecb2aa8b4379d765f2533f221c33216df3667f5e37331c5481b900f3c4bbba57d344f41767957
-EBUILD yarl-0.14.1.ebuild 620 BLAKE2B ff237445d53fa8a7d6951d53c8c2043f03217c4799b4532c7e895ce9366942008e6246358748872454c1ccee3df2a9617adfa1669e4d5e3036025ad22dca7902 SHA512 ef6fbb052c0497bdab78c87aea57ee81b4724c4dafb8c197f413ccf92349947c9e382a8ce362ea7d5502b0a4d5b1e4c43813526cd831ef8b9d3954b2bd04c875
+DIST yarl-1.2.6.tar.gz 159816 BLAKE2B f8f8525aaf3471baffc1c9640a2b95f7d1a0b8607ccbae41ccfea5296a1a40968020282ca40d06e38ff04e448b43af1d7ead8703d618c6fdd520ed6581fd7077 SHA512 44384a11944808583139bf87846cd0080545efddb04be750d923e1b7dc8a4f88c3801b9e6fe742136298c79e60ac94e2584e3b39e42f002af4d6bd970896d3f2
 EBUILD yarl-0.9.8-r1.ebuild 580 BLAKE2B 3ede8e4c60be7440d92c1c755393198bbd07cc7b0859482a578f461af6fc798027cf940b0a1da4bee0d4ae011b46562385f4127c23aea09d9a85d78bdfada946 SHA512 a223d7ffc84d391979807702196f17435a7577bbceb6584f1455a88ca99dcddda2f70b4e8c77a83dbf6dc51cfa1c04655e6f0dc2b6ef7593d2e5889f8fce82e4
-EBUILD yarl-1.1.1.ebuild 664 BLAKE2B 1242a6dc9459f12dd061a992400b657359d7eeef0724edf6200681919922f1fcf3bf41915ad9c00f5f4086c19d78e36ba387dad91b8138bf68372b1e5d08070b SHA512 fccef3a98d33aa7f1e80c40bde1d07b58e64539f798b491c55bbf98e8f61a25795a15c25070ab4cda8e32af7350fde84923c634f151054b51079c8e6394f5d5f
+EBUILD yarl-1.1.1.ebuild 662 BLAKE2B 797f00d18d3e41bdaa57b47de4920293e614eaac2a2c1c7c3fffb334fd9a076b251ece4f9f9ead63e1126bfa29e5d1dd40e17acedc74b3787cfac7cbfb475e6f SHA512 5934001b41b33fbb2f3155ac4987f5230b4a59132ddcdfead3fa477e2e5963b1a3a79dd33296d656cf285b90209ce7c71855cfa0e0792471505705f6b51b8678
 EBUILD yarl-1.2.4.ebuild 664 BLAKE2B ba8d0e46dd8517187c328abf10a25c8e95f51f6f660c026826c139c31f9e4d9d39ab67ed1d60031cd4cc0bb97be4ff89b89173d2f829c436fa3aa992bfd9f855 SHA512 4b7b03aad9f19357b671bf3a1ffbcb8e03deb962882b31c6b0578ed54689ee5538f8d38cd849a3f6e98e598bd34a205a58e9716c4e89a4df692512fa1343f845
+EBUILD yarl-1.2.6.ebuild 664 BLAKE2B ba8d0e46dd8517187c328abf10a25c8e95f51f6f660c026826c139c31f9e4d9d39ab67ed1d60031cd4cc0bb97be4ff89b89173d2f829c436fa3aa992bfd9f855 SHA512 4b7b03aad9f19357b671bf3a1ffbcb8e03deb962882b31c6b0578ed54689ee5538f8d38cd849a3f6e98e598bd34a205a58e9716c4e89a4df692512fa1343f845
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-0.10.2.ebuild b/dev-python/yarl/yarl-0.10.2.ebuild
deleted file mode 100644
index 7cfc0223f0bf..000000000000
--- a/dev-python/yarl/yarl-0.10.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/multidict[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/yarl/yarl-0.10.3.ebuild b/dev-python/yarl/yarl-0.10.3.ebuild
deleted file mode 100644
index 7cfc0223f0bf..000000000000
--- a/dev-python/yarl/yarl-0.10.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/multidict[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/yarl/yarl-1.1.1.ebuild b/dev-python/yarl/yarl-1.1.1.ebuild
index 0b326f2e0d50..1cb36b05023b 100644
--- a/dev-python/yarl/yarl-1.1.1.ebuild
+++ b/dev-python/yarl/yarl-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/yarl/yarl-0.14.1.ebuild b/dev-python/yarl/yarl-1.2.6.ebuild
index e1b4bc79d0d7..e1c3de99fca3 100644
--- a/dev-python/yarl/yarl-0.14.1.ebuild
+++ b/dev-python/yarl/yarl-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-RDEPEND=">=dev-python/multidict-2.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (