gentoo auto-resync : 27:09:2022 - 03:09:13

7 files changed, 114 insertions, 20 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 7e390be87d2f..4328cdc2d11b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/patiencediff/Manifest b/dev-python/patiencediff/Manifest
index e59ca9f55665..a9546cc7e78d 100644
--- a/dev-python/patiencediff/Manifest
+++ b/dev-python/patiencediff/Manifest
@@ -1,6 +1,5 @@
-DIST patiencediff-0.2.2.tar.gz 28799 BLAKE2B 28d8ef1bca5091e6b92167e7d48bbf1ebcc5b7a42c24c23ba82b4a29700e852170cdbc8019d197936c0e3ce0b406ea5d8b2189f7f9482b361feddbf8379bc4a6 SHA512 9b1e058604e114cc4ac6e5855d51cb1f9599fd692a48a1d68ff56f4e82cf568fa4d3858fe7bf233b784b07bf2825f7fd1d1ba0ca71371242ae46820ef469ebd6
+AUX patiencediff-0.2.3-wint-conversion.patch 3219 BLAKE2B ba42b299c6ec3f7546d9fa077a904ad51b3c467cd40d4f686a6fa5e9b950e00560a3970cd16b53ae50593b98c7a4947dc0a95672023193319a4a9f7c6d0a2c3c SHA512 f10b4814bf4509bd3e67b751b93d9aa11871a599830f115f263521c1ec95f9d133d5039f5e8298f6a2602832e6f23e8528bce3080c10d67faf0c3d3983e5ac0e
 DIST patiencediff-0.2.3.tar.gz 28903 BLAKE2B 83a5dffc11e02b759e8fda540453055d3f2fa03db098c2b323c965b39b121e5bc7e9b3fb0a7f5f1eff76aba81223350def2823469d2a3ceedb54824ae22a32c0 SHA512 4211aa824a8f0e4e5c9fa788ab532bc163684381fc143a089250b16ae70229efabdd1b2e4e50fdd8d36f3363526b80cf687030c435bd9b87e12624fc1fc6b786
-EBUILD patiencediff-0.2.2-r1.ebuild 593 BLAKE2B 535c5b56248ad9f04450690786345efb97e45f65a9bfd62b64f13b1baf0210a7144f3483a940a27a13c5d61882f69807b0586879e57f26a72e503551ef3c64ee SHA512 2399fdfd05bce1ebd9d6bb2741c88a456f4bfbfdc43fd98d4d54de1d6e76ae60b63df67d385d37270e434870d5f6a51b9a3973329b60029c97d30760ed8ef0f5
-EBUILD patiencediff-0.2.2.ebuild 465 BLAKE2B 478affb069fcb91ca6e41a43c4975a68a1c2b6f5950c77f9e99e7a7e2a088404768cdc53dc15dc38b4c642278448688ddb750307402312f611a66f0bbb60f5b4 SHA512 ebcbb4ada19e4d306cb70d078ca0b5cf9c3edbc8695c8fa0c3c2eca8ebd5b536c79cfdecf89b0e7c743fd3cec64407b94da1c3a59453ef344f057fc5bbc43c50
+EBUILD patiencediff-0.2.3-r1.ebuild 648 BLAKE2B afbafb876a025581eeb95fd0cb2182f8ec48695f04b7e3f97ea39dbe0fd6536b08883abb3a1bb503f04243120ff3971293870a00f78c3e302552fd5afe4af912 SHA512 9e52fdabb2d7aeac21ed516169f4a70b2fe04a2111a877cdaaebbe2ba3bd701a27d04fc1e99d63d5fd8c8684dfb1c6a971dc5451583ca3ff093b3a23422bde05
 EBUILD patiencediff-0.2.3.ebuild 593 BLAKE2B 535c5b56248ad9f04450690786345efb97e45f65a9bfd62b64f13b1baf0210a7144f3483a940a27a13c5d61882f69807b0586879e57f26a72e503551ef3c64ee SHA512 2399fdfd05bce1ebd9d6bb2741c88a456f4bfbfdc43fd98d4d54de1d6e76ae60b63df67d385d37270e434870d5f6a51b9a3973329b60029c97d30760ed8ef0f5
 MISC metadata.xml 380 BLAKE2B ecdc31572c230eb18696e567a55d49f8f49b9ac254b6deaff93d403fc399ace4b9d284b0cd3ef749cbd68eb0e21af284e1d088690df896b2133da7144aaa7cd5 SHA512 4ca7b8cb364b2e6a75a7720836d63933f281e3927c6f2b41eb6a27aeb11f338fed1f70eedd3c46156ee80d8469e271e381e4b43eb0bf704601270d578e99b63e
diff --git a/dev-python/patiencediff/files/patiencediff-0.2.3-wint-conversion.patch b/dev-python/patiencediff/files/patiencediff-0.2.3-wint-conversion.patch
new file mode 100644
index 000000000000..3a8fd9fc1293
--- /dev/null
+++ b/dev-python/patiencediff/files/patiencediff-0.2.3-wint-conversion.patch
@@ -0,0 +1,84 @@
+https://github.com/breezy-team/patiencediff/commit/24e26cd2929e01dc8ef47fb71b3b87536ad43947
+
+From 24e26cd2929e01dc8ef47fb71b3b87536ad43947 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 26 Sep 2022 21:49:47 +0100
+Subject: [PATCH] Use designated initialiser syntax for PyTypeObject
+
+Fixes build with Clang. Switch to the more readable designated
+initialiser syntax to avoid having to lookup member order.
+
+Before, Clang would complain:
+```
+clang -Wno-unused-result -Wsign-compare -Wunreachable-code -DNDEBUG -O2 -pipe -fdiagnostics-color=always -frecord-gcc-switches -fPIC -I/usr/include/python3.10 -c patiencediff/_patiencediff_c.c -o build/temp.linux-x86_64-cpython-310/patiencediff/_patiencediff_c.o
+patiencediff/_patiencediff_c.c:1175:5: error: incompatible pointer to integer conversion initializing 'Py_ssize_t' (aka 'long') with an expression of type 'void *' [-Wint-conversion]
+    NULL, /* tp_print */
+    ^~~~
+/usr/include/wchar.h:46:14: note: expanded from macro 'NULL'
+             ^~~~~~~~~~
+```
+
+This is because some of PyTypeObject's members are actually
+Py_ssize_t so chucking a NULL in looks like a codesmell to Clang.
+
+See https://docs.python.org/3/c-api/typeobj.html#quick-reference
+and https://docs.python.org/3/c-api/typeobj.html#examples.
+
+Bug: https://bugs.gentoo.org/869995
+Closes: https://github.com/breezy-team/patiencediff/issues/12
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/patiencediff/_patiencediff_c.c
++++ b/patiencediff/_patiencediff_c.c
+@@ -1168,44 +1168,13 @@ static char PatienceSequenceMatcher_doc[] =
+ 
+ static PyTypeObject PatienceSequenceMatcherType = {
+     PyVarObject_HEAD_INIT(NULL, 0)
+-    "PatienceSequenceMatcher",  /* tp_name */
+-    sizeof(PatienceSequenceMatcher), /* tp_basicsize */
+-    0, /* tp_itemsize */
+-    (destructor)PatienceSequenceMatcher_dealloc, /* tp_dealloc */
+-    NULL, /* tp_print */
+-    NULL, /* tp_getattr */
+-    NULL, /* tp_setattr */
+-    NULL, /* tp_compare */
+-    NULL, /* tp_repr */
+-    NULL, /* tp_as_number */
+-    NULL, /* tp_as_sequence */
+-    NULL, /* tp_as_mapping */
+-    NULL, /* tp_hash */
+-    NULL, /* tp_call */
+-    NULL, /* tp_str */
+-    NULL, /* tp_getattro */
+-    NULL, /* tp_setattro */
+-    NULL, /* tp_as_buffer */
+-    Py_TPFLAGS_DEFAULT, /* tp_flags */
+-    PatienceSequenceMatcher_doc, /* tp_doc */
+-    NULL, /* tp_traverse */
+-    NULL, /* tp_clear */
+-    NULL, /* tp_richcompare */
+-    0, /* tp_weaklistoffset */
+-    NULL, /* tp_iter */
+-    NULL, /* tp_iternext */
+-    PatienceSequenceMatcher_methods, /* tp_methods */
+-    NULL, /* tp_members */
+-    NULL, /* tp_getset */
+-    NULL, /* tp_base */
+-    NULL, /* tp_dict */
+-    NULL, /* tp_descr_get */
+-    NULL, /* tp_descr_set */
+-    0, /* tp_dictoffset */
+-    NULL, /* tp_init */
+-    NULL, /* tp_alloc */
+-    PatienceSequenceMatcher_new, /* NULL */
+-    NULL, /* tp_free */
++    .tp_name = "PatienceSequenceMatcher",
++    .tp_basicsize = sizeof(PatienceSequenceMatcher),
++    .tp_dealloc = (destructor)PatienceSequenceMatcher_dealloc,
++    .tp_flags = Py_TPFLAGS_DEFAULT,
++    .tp_doc = PatienceSequenceMatcher_doc,
++    .tp_methods = PatienceSequenceMatcher_methods,
++    .tp_new = PatienceSequenceMatcher_new,
+ };
+ 
+ 
+
diff --git a/dev-python/patiencediff/patiencediff-0.2.2.ebuild b/dev-python/patiencediff/patiencediff-0.2.2.ebuild
deleted file mode 100644
index 917b4b785ddb..000000000000
--- a/dev-python/patiencediff/patiencediff-0.2.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the patiencediff algorithm"
-HOMEPAGE="https://pypi.org/project/patiencediff/ https://github.com/breezy-team/patiencediff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/patiencediff/patiencediff-0.2.2-r1.ebuild b/dev-python/patiencediff/patiencediff-0.2.3-r1.ebuild
index 0fed7fa1f361..71db75366bb9 100644
--- a/dev-python/patiencediff/patiencediff-0.2.2-r1.ebuild
+++ b/dev-python/patiencediff/patiencediff-0.2.3-r1.ebuild
@@ -19,6 +19,10 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-wint-conversion.patch
+)
+
 distutils_enable_tests unittest
 
 python_test() {
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index 073be04b8754..93dd23474b58 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1,3 +1,5 @@
 DIST ytmusicapi-0.22.0.tar.gz 50474 BLAKE2B cd0d3a0c45a754560cb70b1766888d76a4b4c1b956f0112d761b1ee8663d7ed792c2befc71c5430464daacb19b7bcff48b7e2d079fd5de08db4583a110b4002a SHA512 3286e67e80c5b73e18b7d30040faca76d790b1b4ac45e635d721f5465379d525af89e6f6635353d3849c43d67c8b59a632423d3bee5a24a2e9c993cc009f2286
+DIST ytmusicapi-0.23.0.tar.gz 56717 BLAKE2B 39483ecfb90fe902a33cf535d8a13f55d2d1ff4aa2e6b00b6e8cee4547b46f915dc75c86dc0dcfb876eca74d17c4810ebc1e210863d5588b9b084a14cd6f6570 SHA512 401cf7908b77f3f8279d510992c242c0d75cd97b6566b79743421d8c3eee456d6ccb6b09bad8b3582a166c7dc4688e68846131fe90b725fa1c257a4202a3d148
 EBUILD ytmusicapi-0.22.0.ebuild 535 BLAKE2B a58ef20fb67c130a7b70d53c2c47fc4e92db5526161cd98f7b518d145f6c15489b33759f2e4db135676f960c50b31daf46f1d0a7b0194c15b4fcfd1ea0ef0390 SHA512 d604121b1ed2182763677998afdca3aab24dde4ab0cf4b5c019e652d4aa6e2dfff9bc2000010ed539eaa9185dcf7efbbc4ed4a4950e5813a7f9406ad4f3d477f
+EBUILD ytmusicapi-0.23.0.ebuild 547 BLAKE2B c326753bbf73e795351640909b6977c52791da959fff7d27c20cef09d856e22181074064cbf70670317c633fd9cde20c6f1e2c90478c67ea61be13588c111034 SHA512 71c8c66dce49642745ee9254ddba7f0e6e3f19045cc5d0e3e3ecb19c168e67900ec752740d8f40cd6b9e5d1c41c90e315f1c147632e43c963760703fdeb9e0b3
 MISC metadata.xml 457 BLAKE2B d0c47a8419447ae65b9d126c3e57283790e48e97099b08ddd6666c51e3d6452412d7df7caf2c6ca538a34f2de81309cf1e1c9468d932feea51fae9047e8592df SHA512 843a8ef31306802557af79c2f7bffa00c339f1c17600d95cbe55ac12de89cfc07127c4efd57002ae27a2899c5b39d9b704c56c03223734545dd0608def9a4711
diff --git a/dev-python/ytmusicapi/ytmusicapi-0.23.0.ebuild b/dev-python/ytmusicapi/ytmusicapi-0.23.0.ebuild
new file mode 100644
index 000000000000..f7bf16281852
--- /dev/null
+++ b/dev-python/ytmusicapi/ytmusicapi-0.23.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Unofficial API for YouTube Music"
+HOMEPAGE="https://ytmusicapi.readthedocs.io/
+	https://github.com/sigma67/ytmusicapi/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme