gentoo resync : 10.09.2021

5 files changed, 2 insertions, 104 deletions

diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index 04761ccde7d7..6288be0a329f 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1,8 +1,3 @@
-AUX ruamel-yaml-clib-0.2.2-python3_10.patch 1223 BLAKE2B 6d221d4ef7aab6d8f9a367fd877abe459243159d5e199fa287fa3a526d8888512ac16611cb377f50ba53fd8811a1d7193a0216ac37bb5bbcc16145e979f7b9a5 SHA512 0817dd4c459067b4545276e8cfd9e8e1ecd73bac5d9b3fd822501c80a41ecc766f0440a7b518b7554ee6cab82586920b19dc1c340f8136a0e8cf5724d5e53846
-DIST ruamel.yaml.clib-0.2.2.tar.gz 179914 BLAKE2B 90fe272c3c4f8943e944d43dcf1f61367600bd3b1fb296d7434b27183433267a510b6e41cfd50fac8e17bebcfaa51d7d1ca89d4d23da0b1107c468cafa65ac3f SHA512 5bbab2a23c65b1416480758cf0d0a75dcf8ddece0f8df603ce90f2b1c54356bb6876ac113d53e01c4869e3c9fb22b13ea29e66dc31a09144d4426c3e0f3b9399
-DIST ruamel.yaml.clib-0.2.4.tar.gz 180667 BLAKE2B 01341ac42ecea437faebbc9b30ebe2bdb9a6e5b15144b808c3065f3a003f12ce99c4b97d4b5056235a78295ed7a3237a325c8dd2cac036da3ac54c8aef2d7949 SHA512 f9d986175c241db4417a1d71e47a6eeff6f059ff204ea25a5b4ed365f732ae6872000c53f0ad1336d3ce80383e056df42f2ad9a6a05b92932332289c5129abf6
 DIST ruamel.yaml.clib-0.2.6.tar.gz 180695 BLAKE2B 54d0e00544c1716971022257bece3a6c8f83c9188b52e15a136381f5fdf00a519fc5b74792c614a2908ffe68f20fb165732cb814458dadb8498660f28ea67939 SHA512 12307a3c3bae09cf65d9672894c9a869a7ed5483ca3afb9ee39d8bcbf1948b012a0dbf570e315cc8b9a8b55184de9e10324953ec4819d214379e01522ee13b20
-EBUILD ruamel-yaml-clib-0.2.2-r1.ebuild 712 BLAKE2B 21715932317dbc77cf8ff974a08d5deb490df557dc696596cf712f5d7d0cf174b37984aaf704a2adf8a166243b6eb4f7497d73ab098107a80590f200fca2bf44 SHA512 1d10a165392ef789b683dd3f726eb39f5b79d57429f20056c1cb4e2f1c8b3830ed7eaadbd25ed36ef64f2fb83cf50cff21f2205d21ced9ca4edf7db476d00793
-EBUILD ruamel-yaml-clib-0.2.4.ebuild 657 BLAKE2B 5225bbfd6231d6fe97068f0db8cdee17f81c64f20f4299fe516c7188105ecfea1ab822859aa27f8c170cbe445cde3428d127d57bd6ea154210f3620d9f9e9eb5 SHA512 b6e66aaf6dc00caf379ccd1dee8a9ffbf3f13623d18066e5592bd26f04d5197354e4d5aac239eca00bc567b881bcfecd45ca361d115c6223ab80945eeac2a5e6
-EBUILD ruamel-yaml-clib-0.2.6.ebuild 651 BLAKE2B 93e5eb72fc94a82d350967df87f8dd23ad34ca1e62c01d43223602e47f4318f3cac1160ef86436e2b18370d79aaddea0db70372284dd8fba0974488961c58b6c SHA512 3c19c89852ae8df750aec74cfb9bc417b93eba4a1b42ed444ca6a48db6c0a8215680452924d86b723a013f1ea3beba2a251deb864b4eb1b69028488bd864d022
+EBUILD ruamel-yaml-clib-0.2.6.ebuild 650 BLAKE2B 797f4f073f380bfaa3283729df49618102aad3f7c8dffccf6575faae12312946e48eb9dbabb621f1ad07cb5f94b2cecc6e3d45d6192a5ceb2aa8b08248d4ed45 SHA512 ec212262fd254e8301b0c6affc1d9846439d1f8a15bd1c0746c210a145f3d33d5b0da50a7f47c173612c7253144ac0a2cba8d829abfc28a079be5d974cd271ad
 MISC metadata.xml 1183 BLAKE2B 5e9198838214711c9fbb5beb4179300c5465079646c3f4268145a3c893f1913ac9a14811b39afe637aadd183e4351a54c2ed160951e995bc4ce3f869b28bd6e9 SHA512 d6e5a8de5f9fe3e71a91a26be44cd87162863b1fede14301694e0a38135fc2ffb5c3ee25a4aef40d7cdb73812d0b6af72aa6b67ad782004648f54ac5e86cc662
diff --git a/dev-python/ruamel-yaml-clib/files/ruamel-yaml-clib-0.2.2-python3_10.patch b/dev-python/ruamel-yaml-clib/files/ruamel-yaml-clib-0.2.2-python3_10.patch
deleted file mode 100644
index 6a34420de79f..000000000000
--- a/dev-python/ruamel-yaml-clib/files/ruamel-yaml-clib-0.2.2-python3_10.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Since Python 3.10, Py_REFCNT() can no longer be used as an l-value. See
-
-https://docs.python.org/3.10/whatsnew/3.10.html#id2
-
-for details.
-
---- a/_ruamel_yaml.c
-+++ b/_ruamel_yaml.c
-@@ -23877,9 +23877,9 @@
-   {
-     PyObject *etype, *eval, *etb;
-     PyErr_Fetch(&etype, &eval, &etb);
--    ++Py_REFCNT(o);
-+    Py_SET_REFCNT(o, Py_REFCNT(o) + 1);
-     __pyx_pw_12_ruamel_yaml_7CParser_3__dealloc__(o);
--    --Py_REFCNT(o);
-+    Py_SET_REFCNT(o, Py_REFCNT(o) - 1);
-     PyErr_Restore(etype, eval, etb);
-   }
-   Py_CLEAR(p->stream);
-@@ -24050,9 +24050,9 @@
-   {
-     PyObject *etype, *eval, *etb;
-     PyErr_Fetch(&etype, &eval, &etb);
--    ++Py_REFCNT(o);
-+    Py_SET_REFCNT(o, Py_REFCNT(o) + 1);
-     __pyx_pw_12_ruamel_yaml_8CEmitter_3__dealloc__(o);
--    --Py_REFCNT(o);
-+    Py_SET_REFCNT(o, Py_REFCNT(o) - 1);
-     PyErr_Restore(etype, eval, etb);
-   }
-   Py_CLEAR(p->stream);
---- a/_ruamel_yaml.h
-+++ b/_ruamel_yaml.h
-@@ -12,6 +12,10 @@
- #define PyString_GET_SIZE   PyBytes_GET_SIZE
- #define PyString_FromStringAndSize  PyBytes_FromStringAndSize
- 
-+#if PY_VERSION_HEX < 0x030900A4
-+# define Py_SET_REFCNT(obj, refcnt) ((Py_REFCNT(obj) = (refcnt)), (void)0)
-+#endif
-+
- #endif
- 
- #ifdef _MSC_VER	/* MS Visual C++ 6.0 */
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
deleted file mode 100644
index db898fe1072c..000000000000
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="C-based reader/scanner and emitter for dev-python/ruamel-yaml"
-HOMEPAGE="https://pypi.org/project/ruamel.yaml.clib/ https://sourceforge.net/p/ruamel-yaml-clib/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-PATCHES=(
-	 "${FILESDIR}"/${PN}-0.2.2-python3_10.patch
-)
-
-S="${WORKDIR}"/${MY_P}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-}
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.4.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.4.ebuild
deleted file mode 100644
index dd1483ec93f2..000000000000
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="C-based reader/scanner and emitter for dev-python/ruamel-yaml"
-HOMEPAGE="https://pypi.org/project/ruamel.yaml.clib/ https://sourceforge.net/p/ruamel-yaml-clib/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-}
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
index 9d7d37dbd335..9e70b0762310 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 python_install() {
 	distutils-r1_python_install --single-version-externally-managed