gentoo Easter resync : 12.04.2020

6 files changed, 20 insertions, 111 deletions

diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index 4512a48481a7..41f06ded62f1 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,12 +1,8 @@
 AUX pyyaml-5.1-cve-2017-18342.patch 1420 BLAKE2B bf053ed121355aea1e44f9bd29b22c9afbca7b99b68e59a6e213d2723531044049964dcb20dbc036ee27ae8bcc2c26e317cf080637e611fa0105a9d451496125 SHA512 8e7737761555d851b21ca61128d2ced4163d446acb87510b6962a20dc217923bcf835d70224c9e721486351e0aeb57f9f3c570b57086a0a00c3e8ac656a458c5
-DIST PyYAML-3.12.tar.gz 253011 BLAKE2B 530f2910acb757af9e2a738d93ace45daee3fc5764f19fbc758508e873f05ebfa2486c4f82800540e5e405e7f114f06f963e5011908fd15014ca8b8afb3a76aa SHA512 e16d8b7f4f026b6a95b11fb59c54ec5f114f6f516294eaa95e718abdf5d37c17a9c4b5e0a0a61fca04e801792d9b7fb801087cf849ff22b9581f6af204b1883a
 DIST PyYAML-3.13.tar.gz 270607 BLAKE2B f365f63587b911234497426c9796f98b85f5de052abd88ea434137a4eb8a4c1e08f9ee1982a30df1934dadb615145f4af8fcff577d3d4e52058e7a8843aa8604 SHA512 93642286d0317e2fe970632c36d38ce6030f7cabcf971f28e3a1054f07390fcee5baaf7f167e7c9690dbd7b2adc61f5b7d75a218ace0abca34ff8815486cfdd7
-DIST PyYAML-5.1.2.tar.gz 265034 BLAKE2B a3f6fe4a0c0a24f8934b94545e7727fad26b397755416a8127bd52fd9ea5e8fea3c6452ddfbd91edfa2e8ca88522b1ae9061c9221f394c8fa4cbd1c2dc256f72 SHA512 b5ee201c612486a95c87b7e41d474313160284359b8b30ababc80b51325aef9dd7dc27eb3b8a03a4749cb8c7e3789c5684d5c285fe35d4b20be1f189641531e0
-DIST PyYAML-5.1.tar.gz 274244 BLAKE2B ea8cc4b56b9fc70bc7b01f8c654ceb8b73c82dcc936c939cba3c3654df04fe32fc46c7df322a38869d28ad5a58f6134b35cbe43924df3b4d5f3e54e33700dc73 SHA512 8f27f92bdfa310a99dd6d83947332cc033fa18f0011998bb585ad5c4340a2da20d8c20bfdb53beaae15651198d1240c986818379b0a05b230f74d1f30f53e7fd
 DIST PyYAML-5.3.tar.gz 268214 BLAKE2B 2017ec6d64744323c7e6f3bdcea77b249943ba93844de363ba5d2b14cf70cc5c06e8427d12515e1e60f8432a87a115df1033d959fc42851f61818d0bdc8cd7a2 SHA512 9124bf4d58ebe925f430fd6ed749e5a3311a54d536a035d39794c485843ddb80692fd7f7bac05797507128b933297ff730d967f49e7237c7c567086a83ee9e1f
-EBUILD pyyaml-3.12.ebuild 1038 BLAKE2B 24c55fde60111c5e55b37ff88443c03910d15dc18a0c79ac124e2be38d1560a184cbde65cdaff4881e554d9f637825e93d5c636d6e9ce749704f7a7ab459fa24 SHA512 20fce1f572cb9c16a6d456a9cae33d7489e99c39c73636355b5e0cff99132b19fd083625b07552559672718cc85ca2dc3ffda8900be88b1e923ba7e8a89b2961
-EBUILD pyyaml-3.13.ebuild 1042 BLAKE2B 8b199cbe733740a43ea2f14896aba490b35a9b3598bbe0261d3f7c6a599b041618b0c69834dc07282decbab583f00299814d13616e4efd4db5db0e6979df3989 SHA512 63d1df5910ea8c9cc9b8b43a3f8bc1ba1492fd4be069b0ee8f2cb0967cb00480e424dd0685d2f3bd8bd70f41bd481aa8c81dc03b8ff83bd431a4b299f8cd04d3
-EBUILD pyyaml-5.1.2.ebuild 1186 BLAKE2B f17711b03f88e4e2523dcd69df0da08bb9e956a76574ef7e3b62984d3b6b44a76b8e72b35d323c6d4bc2b9331d54951e1d411342aa6edeed070f239f8c2095ca SHA512 fa0350c39f5a4b4bc3474df58f7698a956b04eac5c814a57ebc1b94fca30164ad3eb31f01356913781ca7a868cd4e2d732d9a03aa8fefd1b002e1c45309a8067
-EBUILD pyyaml-5.1.ebuild 1123 BLAKE2B c691fb9e289ba23fec8836ac225974bd3efe8d5e554467c88f7d8d0ea96cd42c4c9f5dad1cd6569582d0e756ba86e58621fb7036241f31a4befe84129e41ab1a SHA512 57b9f6dca4a6566b0ef7b2eabcd4ce6d64944b94bb095da8027250db135bebcf3be1e0c661efcb1c4666738b2cf6b13d487527c2eb554362f3d812856b7e5945
-EBUILD pyyaml-5.3.ebuild 1177 BLAKE2B b1f4bdfc454561b84428b820997f67acf69445a97a86445f76b30f679eb2764753a4f56f4a98a92d2908f35792615f46468c6f2d975f2c0b5486fbb6c8497fa6 SHA512 d67976b9958104c63440d6f3ace5bda2fd9d67e157ede507e6c3b320d732f0fac5ddb4f98e3bec208550e9a1b22742d287cb4f9ba6c4c2fb9f5cfc1c28a13490
+DIST pyyaml-5.3.1.gh.tar.gz 168044 BLAKE2B 2acc62ecc7448925eb340c2555001c8a74bd883d720b992d6deaea890b4eac435e4ae02eb129db3a6778c0be21a231fa9d96ee8ae59a4a39bc49961e5fb0d6ab SHA512 27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556
+EBUILD pyyaml-3.13.ebuild 1040 BLAKE2B 08e2b7529ef7503c0b7d3bc6ee2a9212a299f94ea52a7e38be8fc2e937325a01f01e38d91cce26b9f2dd83353f34a5498590658bd3ed9d17c48a18d62fd7e118 SHA512 961e1a82794f105f81233a2fba2d059021194cc1eba429c91d5eef1c2aa0ede30fea1a116f95226a244e013f28b7d5abb5ef86b49171a7abd90b2662ba9894f3
+EBUILD pyyaml-5.3.1.ebuild 1162 BLAKE2B 345d316a093d522e37d095326bde4ea76a4569a8b2de8dcb01ad728fb9072fefafd5bdcb0f288e374c7d3e80bc3a7aa72ba916e2caeab2229972825d20565c08 SHA512 8b80500c404b0d1f910d207612a4c7ee7bc7fd01bc81a69ba2d70c02269c43f5eedcf2986cd6ce19588caa40ec93b37c36728286b9ddcee6b1b972bfaa5ae010
+EBUILD pyyaml-5.3.ebuild 1173 BLAKE2B 718a64909dc7e926610afe52bbf57aeced8453806c16b05aff32fa9cf2567a04175655c9ecb6c9009eebd52e9f429c1af2fba3356bb70453ae5eff8e0a113c68 SHA512 d665671cdd5289b94cda61191b1f859fd3fcd23ef8849f31fb18757b64b64437b418969de5376c8305220d5dfc1441974a0bd2a4f2af3ed544234e2909dcbf8b
 MISC metadata.xml 345 BLAKE2B 8c26b8b05b08ed9abab5ed2cb36552dc9af33ee2b30cf3ebe551576d7ad44908b3dff195cd7f1a3f5af9323d17eadee407e42bfeb99150be2a0ac4b48653c1eb SHA512 1fdee5219c989b3edf11bdb63264c6ca6bd54fb1f44907bf20ce7ee6b1968c9c6f2c94363698be87d92eb6cd07a034acca7dbcffaeac40d2add8d57a240772da
diff --git a/dev-python/pyyaml/pyyaml-3.12.ebuild b/dev-python/pyyaml/pyyaml-3.12.ebuild
deleted file mode 100644
index 2bb60c8bc1ef..000000000000
--- a/dev-python/pyyaml/pyyaml-3.12.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_P="PyYAML-${PV}"
-
-DESCRIPTION="YAML parser and emitter for Python"
-HOMEPAGE="https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/"
-SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="examples libyaml"
-
-RDEPEND="libyaml? ( dev-libs/libyaml )"
-DEPEND="${RDEPEND}
-	libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_configure_all() {
-	mydistutilsargs=( $(use_with libyaml) )
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-python/pyyaml/pyyaml-3.13.ebuild b/dev-python/pyyaml/pyyaml-3.13.ebuild
index 6c60108bee1a..d3f60fffc2e7 100644
--- a/dev-python/pyyaml/pyyaml-3.13.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/pyyaml/pyyaml-5.1.ebuild b/dev-python/pyyaml/pyyaml-5.1.ebuild
deleted file mode 100644
index 62d85eb5388d..000000000000
--- a/dev-python/pyyaml/pyyaml-5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-MY_P="PyYAML-${PV}"
-
-DESCRIPTION="YAML parser and emitter for Python"
-HOMEPAGE="https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/"
-SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="examples libyaml"
-
-RDEPEND="libyaml? ( dev-libs/libyaml )"
-DEPEND="${RDEPEND}
-	libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# bug #659348
-	"${FILESDIR}/${PN}-5.1-cve-2017-18342.patch"
-)
-
-python_configure_all() {
-	mydistutilsargs=( $(use_with libyaml) )
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-python/pyyaml/pyyaml-5.1.2.ebuild b/dev-python/pyyaml/pyyaml-5.3.1.ebuild
index b63569118b84..88b24f47bd92 100644
--- a/dev-python/pyyaml/pyyaml-5.1.2.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.3.1.ebuild
@@ -8,36 +8,36 @@ PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
-MY_P="PyYAML-${PV}"
-
 DESCRIPTION="YAML parser and emitter for Python"
-HOMEPAGE="https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/"
-SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://pyyaml.org/wiki/PyYAML
+	https://pypi.org/project/PyYAML/
+	https://github.com/yaml/pyyaml"
+SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="examples libyaml"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="examples +libyaml"
 
-RDEPEND="libyaml? ( dev-libs/libyaml )"
+RDEPEND="libyaml? ( dev-libs/libyaml:= )"
 DEPEND="${RDEPEND}
-	libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )"
-
-S="${WORKDIR}/${MY_P}"
+	libyaml? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		' 'python*')
+	)"
 
 PATCHES=(
 	# bug #659348
 	"${FILESDIR}/pyyaml-5.1-cve-2017-18342.patch"
 )
 
+distutils_enable_tests setup.py
+
 python_configure_all() {
 	mydistutilsargs=( $(use_with libyaml) )
 }
 
-python_test() {
-	YAML_TEST_VERBOSE=1 esetup.py test
-}
-
 python_install_all() {
 	distutils-r1_python_install_all
 	if use examples; then
diff --git a/dev-python/pyyaml/pyyaml-5.3.ebuild b/dev-python/pyyaml/pyyaml-5.3.ebuild
index cad8d097574b..3e79df1978ea 100644
--- a/dev-python/pyyaml/pyyaml-5.3.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"