Adding metadata

9 files changed, 242 insertions, 45 deletions

diff --git a/dev-python/caldav/Manifest b/dev-python/caldav/Manifest
index 2df4a23ff04f..57b442cb12f9 100644
--- a/dev-python/caldav/Manifest
+++ b/dev-python/caldav/Manifest
@@ -1,2 +1 @@
-DIST caldav-0.10.gh.tar.gz 121800 BLAKE2B 6398e2e94f40e6c0d8fa757a02ae2aedcdc2bef59be9b6499a9ff86304ee2280222ff4490b9cf6fe2b37bd1e5031e17f472afbd0e42da2a82a27aec87cfecd08 SHA512 1cd98a3f59381c238ba424a30a6596e969c04bcab74cd1f9cbf9bae1da32d23b12a718135252a12fc069091994ef451bf504a05097d9539a79b397370c55609f
 DIST caldav-0.11.0.gh.tar.gz 126186 BLAKE2B 0d818ea5e76b88b3ea18f1fd878a297fa88ad9921d994a61d05c02aa80b73ac40bd8cb36810a050d8f6a87009911655b64a8a4ef09133cb751a225adacdd5575 SHA512 761753fa86e2ba9788030df1af482177bd01ee266a7fe8da744ac85eee95a74d1450e1afa0f64109b9c12aaedba0354d76da2ee9b27dec2771141fc453727d4f
diff --git a/dev-python/caldav/caldav-0.10.ebuild b/dev-python/caldav/caldav-0.10.ebuild
deleted file mode 100644
index e8318775c889..000000000000
--- a/dev-python/caldav/caldav-0.10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CalDAV (RFC4791) client library for Python"
-HOMEPAGE="
-	https://github.com/python-caldav/caldav
-	https://pypi.org/project/caldav/
-"
-SRC_URI="
-	https://github.com/python-caldav/caldav/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="|| ( GPL-3 Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/vobject[${PYTHON_USEDEP}]
-"
-# For now, really does use nose imports: bug #857738
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/icalendar[${PYTHON_USEDEP}]
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		www-apps/radicale[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cchardet/cchardet-2.1.7-r1.ebuild b/dev-python/cchardet/cchardet-2.1.7-r1.ebuild
new file mode 100644
index 000000000000..022854fbf006
--- /dev/null
+++ b/dev-python/cchardet/cchardet-2.1.7-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+inherit distutils-r1
+
+DESCRIPTION="High speed universal character encoding detector"
+HOMEPAGE="
+	https://github.com/PyYoshi/cChardet
+	https://pypi.org/project/cchardet/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# https://github.com/PyYoshi/cChardet/pull/78
+	"${FILESDIR}/${P}-pytest.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/cchardet/files/cchardet-2.1.7-pytest.patch b/dev-python/cchardet/files/cchardet-2.1.7-pytest.patch
new file mode 100644
index 000000000000..11f38579c184
--- /dev/null
+++ b/dev-python/cchardet/files/cchardet-2.1.7-pytest.patch
@@ -0,0 +1,120 @@
+https://github.com/PyYoshi/cChardet/pull/78
+
+From: q0w <43147888+q0w@users.noreply.github.com>
+Date: Wed, 17 Nov 2021 14:50:41 +0300
+Subject: [PATCH 02/13] Use pytest
+
+--- /dev/null
++++ b/src/tests/cchardet_test.py
+@@ -0,0 +1,111 @@
++import glob
++import os
++
++import cchardet
++
++SKIP_LIST = [
++    'src/tests/testdata/ja/utf-16le.txt',
++    'src/tests/testdata/ja/utf-16be.txt',
++    'src/tests/testdata/es/iso-8859-15.txt',
++    'src/tests/testdata/da/iso-8859-1.txt',
++    'src/tests/testdata/he/iso-8859-8.txt'
++]
++
++# Python can't decode encoding
++SKIP_LIST_02 = [
++    'src/tests/testdata/vi/viscii.txt',
++    'src/tests/testdata/zh/euc-tw.txt'
++]
++SKIP_LIST_02.extend(SKIP_LIST)
++
++
++def test_ascii():
++    detected_encoding = cchardet.detect(b'abcdefghijklmnopqrstuvwxyz')
++    assert 'ascii' == detected_encoding['encoding'].lower()
++
++
++def test_detect():
++    testfiles = glob.glob('src/tests/testdata/*/*.txt')
++    for testfile in testfiles:
++        if testfile.replace("\\", "/") in SKIP_LIST:
++            continue
++
++        base = os.path.basename(testfile)
++        expected_charset = os.path.splitext(base)[0]
++        with open(testfile, 'rb') as f:
++            msg = f.read()
++            detected_encoding = cchardet.detect(msg)
++            assert expected_charset.lower() == detected_encoding['encoding'].lower()
++
++
++def test_detector():
++    detector = cchardet.UniversalDetector()
++    with open("src/tests/samples/wikipediaJa_One_Thousand_and_One_Nights_SJIS.txt", 'rb') as f:
++        line = f.readline()
++        while line:
++            detector.feed(line)
++            if detector.done:
++                break
++            line = f.readline()
++    detector.close()
++    detected_encoding = detector.result
++    assert "shift_jis" == detected_encoding['encoding'].lower()
++
++
++def test_github_issue_20():
++    """
++    https://github.com/PyYoshi/cChardet/issues/20
++    """
++    msg = b'\x8f'
++
++    cchardet.detect(msg)
++
++    detector = cchardet.UniversalDetector()
++    detector.feed(msg)
++    detector.close()
++
++
++def test_decode():
++    testfiles = glob.glob('src/tests/testdata/*/*.txt')
++    for testfile in testfiles:
++        if testfile.replace("\\", "/") in SKIP_LIST_02:
++            continue
++
++        base = os.path.basename(testfile)
++        expected_charset = os.path.splitext(base)[0]
++        with open(testfile, 'rb') as f:
++            msg = f.read()
++            detected_encoding = cchardet.detect(msg)
++            try:
++                msg.decode(detected_encoding["encoding"])
++            except LookupError as e:
++                print("LookupError: { file=%s, encoding=%s }" % (
++                    testfile, detected_encoding["encoding"]))
++                raise e
++
++
++def test_utf8_with_bom():
++    sample = b'\xEF\xBB\xBF'
++    detected_encoding = cchardet.detect(sample)
++    assert "utf-8-sig" == detected_encoding['encoding'].lower()
++
++
++def test_null_bytes():
++    sample = b'ABC\x00\x80\x81'
++    detected_encoding = cchardet.detect(sample)
++
++    assert detected_encoding['encoding'] is None
++
++# def test_iso8859_2_csv(self):
++#     testfile = 'tests/samples/iso8859-2.csv'
++#     with open(testfile, 'rb') as f:
++#         msg = f.read()
++#         detected_encoding = cchardet.detect(msg)
++#         eq_(
++#             "iso8859-2",
++#             detected_encoding['encoding'].lower(),
++#             'Expected %s, but got %s' % (
++#                 "iso8859-2",
++#                 detected_encoding['encoding'].lower()
++#             )
++#         )
diff --git a/dev-python/iniconfig/files/iniconfig-1.1.1-py.patch b/dev-python/iniconfig/files/iniconfig-1.1.1-py.patch
new file mode 100644
index 000000000000..c1722bd3a466
--- /dev/null
+++ b/dev-python/iniconfig/files/iniconfig-1.1.1-py.patch
@@ -0,0 +1,41 @@
+From 6b714f558b6cfb9f25c58b70eeb134f3bfa1bebd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lum=C3=ADr=20=27Frenzy=27=20Balhar?=
+ <frenzy.madness@gmail.com>
+Date: Wed, 30 Nov 2022 22:47:56 +0100
+Subject: [PATCH] Drop dependency on py
+
+pytest 7.2 and tox 4 no longer depend on py and it's not needed here as well.
+---
+ testing/test_iniconfig.py | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/testing/test_iniconfig.py b/testing/test_iniconfig.py
+index fe12421..027949d 100644
+--- a/testing/test_iniconfig.py
++++ b/testing/test_iniconfig.py
+@@ -1,4 +1,3 @@
+-import py
+ import pytest
+ from iniconfig import IniConfig, ParseError, __all__ as ALL
+ from iniconfig import iscommentline
+@@ -100,7 +99,7 @@ def parse(input):
+ 
+ 
+ def parse_a_error(input):
+-    return py.test.raises(ParseError, parse, input)
++    return pytest.raises(ParseError, parse, input)
+ 
+ 
+ def test_tokenize(input, expected):
+@@ -135,7 +134,7 @@ def test_section_cant_be_empty():
+     assert excinfo.value.lineno == 0
+ 
+ 
+-@py.test.mark.parametrize('line', [
++@pytest.mark.parametrize('line', [
+     '!!',
+     ])
+ def test_error_on_weird_lines(line):
+-- 
+2.39.0
+
diff --git a/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild b/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
index c98b6e0a361e..15314fab9a99 100644
--- a/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
@@ -24,3 +24,7 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py.patch
+)
diff --git a/dev-python/smbus2/smbus2-0.4.2.ebuild b/dev-python/smbus2/smbus2-0.4.2.ebuild
index a8110a8bea12..33fac41c89fc 100644
--- a/dev-python/smbus2/smbus2-0.4.2.ebuild
+++ b/dev-python/smbus2/smbus2-0.4.2.ebuild
@@ -5,12 +5,13 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
 inherit distutils-r1
 
 DESCRIPTION="A drop-in replacement for smbus-cffi/smbus-python in pure Python"
 HOMEPAGE="
 	https://pypi.org/project/smbus2/
-	https://github.com/kplindegaard/smbus2
+	https://github.com/kplindegaard/smbus2/
 "
 SRC_URI="
 	https://github.com/kplindegaard/smbus2/archive/refs/tags/${PV}.tar.gz
@@ -21,4 +22,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -s
+}
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index a7a7d4189d5b..fff2d1922d19 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1 +1,2 @@
 DIST xcffib-0.12.1.tar.gz 85272 BLAKE2B 6db2f19caf13d406297198c3829456cb45b5195e2d068b1f5ad01c25d4ed75e3187854da24156c3c5396a559b11c2d6949711b793c5bf5c83e18e9aa54307983 SHA512 6530fb53fa18a3905d7c9e8dd5d05ea084de4a5f392e32953a9786998dd194b2db55b54fa44dbc3e6b68e68ae00431de7432d6884f777734409d660dae325d6e
+DIST xcffib-1.1.2.tar.gz 87303 BLAKE2B 0727c1c4c49692d8daff79d77487cfd2780a4279fa2bd49b45d87f48186e9ba0ee3ea46841dc259e7a3b5e301caacdee764762efe96217e138e6f8cedb2a986f SHA512 21606034bd0be2e1cf87b20904b006f7eb6eecbd835eff778f064ecb2bc16d17f48a6acce0eb1a30ca9bd98d810b4b1674bdadc9f6e42c5effee777f7bd138aa
diff --git a/dev-python/xcffib/xcffib-1.1.2.ebuild b/dev-python/xcffib/xcffib-1.1.2.ebuild
new file mode 100644
index 000000000000..625898dbc8aa
--- /dev/null
+++ b/dev-python/xcffib/xcffib-1.1.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
+HOMEPAGE="
+	https://github.com/tych0/xcffib/
+	https://pypi.org/project/xcffib/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+	x11-libs/libxcb
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
+	' 'python*')
+	dev-python/six[${PYTHON_USEDEP}]
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		x11-base/xorg-server[xvfb]
+		x11-apps/xeyes
+	)
+"
+
+distutils_enable_tests pytest