gentoo resync : 16.09.2021

5 files changed, 4 insertions, 71 deletions

diff --git a/dev-python/pretty-yaml/Manifest b/dev-python/pretty-yaml/Manifest
index 74625e9915cf..41bf85466ce1 100644
--- a/dev-python/pretty-yaml/Manifest
+++ b/dev-python/pretty-yaml/Manifest
@@ -1,6 +1,3 @@
-AUX pretty-yaml-20.4.0-fix-py3.10.patch 1074 BLAKE2B fdef49b60127997bda3824b2e663ce01e516cf2e5fe433c9842f0fedec7058a2e84e0edc731e563f8b629d1d006d65e593edfc001e8b436d707d9c9e5619b723 SHA512 77e88f8ab11b1223c3e39f2e41c3847912364f7ab4b23c1509d5889d1a035a82724cb8da76651a8fd9f596fcb515b540f6be05225fcb19892ead486e516467c9
-DIST pyaml-20.4.0.tar.gz 21176 BLAKE2B 0aac0250d610d7b2ef042e251142de4520e7db96073d46bde0dcb37ad43d9c278cbdfc7ab247b4d41c7c30e893306aa47b25a584a2aa4c157d66203b8e140895 SHA512 432fd215e034beafc07270a6aa8b726d5a16ef8946a95c1db9a34b4f492bbe2089dffbb1ce856d3e8153ec18ac943973a23e3aa9283d53ee0b2e7ba5dcd3d317
 DIST pyaml-21.8.3.tar.gz 20269 BLAKE2B 8b829ce374efe13007bb924393a8cde26914cc443999906b7bb4db610b614964170a80b8dd381eeaa9137026c60d98140b3b0d601a6af816c32d1ce9708e33be SHA512 69b1181511f7d3ac1263b710fa49b18a162e096e28414d83300bc2e9038222363cef995a0d3248387560e7066973736f9cee06b67042ee957427b4790c269653
-EBUILD pretty-yaml-20.4.0.ebuild 821 BLAKE2B 9efeae3d9c0642e95b282bb4a9fc81c54958b6d2cf9785207f7269130d5fbf81743d91af82cd4f0cf93ba6251eb3bb3ff45141c867cbddad469b780915b7bfb0 SHA512 e940f1e08f7f21c8ae8559d516e8a7392a3217566cf0918c05d7ad11deade9057d2fa715caeb4dce4d17fb21c2640452cf68d6ac2a4a4c1fd696501eaf971468
-EBUILD pretty-yaml-21.8.3.ebuild 724 BLAKE2B 808b12315cd44b569b5acb985a07129e6093285d8fc3da54b042dd247bd999f30dfe97af43865b576fcaabc3a78a3845781c472d440faff0ee4e16f0787e735d SHA512 b4347b04edcc39a74550cb910be5e1217dcf6d95752e64cf90210601d9d764be0efe6e1a198fcf3f5cdc75775b7f94b16d8545ca6f274721bc61e76fc7bfb107
-MISC metadata.xml 469 BLAKE2B 9a5eb78ddd20825b189c9d6e95c35dd9ef7772a42f5a68d48fd2ee5ff54c906dd0268e03e33ffbd0c77eccc188538597d61445c648de9408813093405f2f063a SHA512 45ce0035cfd63132fd0eb7f7684b4099216d6f6d9ab9101c66c5a031e51d4a80013ed3bcb7e95654e3cd6046a97e3db41bf09ad209e45f2034b5d9ff02d6ed43
+EBUILD pretty-yaml-21.8.3.ebuild 721 BLAKE2B 7aa79dfe521a5090a16ad11de2c1792c68657269bafd17bce8b62c2977369f5a79034a20f8d1b9f9702e297e82b2bd7160757117951aa9162b0a5b6a5d232df7 SHA512 b57d643f4f6ca0072f95728a6d4e63ebb1f474871136f695eef16d4ec9c6a1701138fe405d8e2ad5d383b036913eac0c4b659d6b7a922265c71c019349267cef
+MISC metadata.xml 470 BLAKE2B 725657a34cdcbddf146ea3163af81fd22f78b895281e7dc2192b8c1f49fa9ec868e41a38bc371ce61160535ad0c5c1d8741109858cb8e3eafb40a77d623c3ecf SHA512 c64f440d674396b0a750780cbc5ab1a5003be1d3357b39a792cb9490870c768ab740266575cf6780f173252a893f6fa93fe9d4f414647274e520c4bd4b579c67
diff --git a/dev-python/pretty-yaml/files/pretty-yaml-20.4.0-fix-py3.10.patch b/dev-python/pretty-yaml/files/pretty-yaml-20.4.0-fix-py3.10.patch
deleted file mode 100644
index c2cd44152d1b..000000000000
--- a/dev-python/pretty-yaml/files/pretty-yaml-20.4.0-fix-py3.10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 707e14bd714e91dc53295393e2c8eea257aced5a Mon Sep 17 00:00:00 2001
-From: Louis Sautier <sautier.louis@gmail.com>
-Date: Sun, 8 Aug 2021 13:44:52 +0200
-Subject: [PATCH] Fix tests for Python 3.10: abstract base classes have moved
-
-As mentioned in the documentation:
-"Deprecated since version 3.3, will be removed in version 3.10: Moved
-Collections Abstract Base Classes to the collections.abc module. For
-backwards compatibility, they continue to be visible in this module through
-Python 3.9."
----
- pyaml/tests/dump.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/pyaml/tests/dump.py b/pyaml/tests/dump.py
-index 882a8e8..e1a93ba 100644
---- a/pyaml/tests/dump.py
-+++ b/pyaml/tests/dump.py
-@@ -2,7 +2,8 @@
- from __future__ import unicode_literals, print_function
- 
- import itertools as it, operator as op, functools as ft
--from collections import Mapping, OrderedDict, namedtuple
-+from collections import OrderedDict, namedtuple
-+from collections.abc import Mapping
- import os, sys, io, yaml, unittest
- 
- if sys.version_info.major > 2: unicode = str
diff --git a/dev-python/pretty-yaml/metadata.xml b/dev-python/pretty-yaml/metadata.xml
index b4865611177b..eff59d191b01 100644
--- a/dev-python/pretty-yaml/metadata.xml
+++ b/dev-python/pretty-yaml/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>python@gentoo.org</email>
diff --git a/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild b/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild
deleted file mode 100644
index f592bf0fbdac..000000000000
--- a/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=pyaml-${PV}
-DESCRIPTION="PyYAML-based module to produce pretty and readable YAML-serialized data"
-HOMEPAGE="https://github.com/mk-fg/pretty-yaml"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_P%-*}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/unidecode[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	# https://github.com/mk-fg/pretty-yaml/pull/38
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-python_test() {
-	"${EPYTHON}" pyaml/tests/dump.py -v ||
-		die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pretty-yaml/pretty-yaml-21.8.3.ebuild b/dev-python/pretty-yaml/pretty-yaml-21.8.3.ebuild
index 1a6b58996d2e..0153c8dc8d1d 100644
--- a/dev-python/pretty-yaml/pretty-yaml-21.8.3.ebuild
+++ b/dev-python/pretty-yaml/pretty-yaml-21.8.3.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"