Adding metadata

11 files changed, 77 insertions, 37 deletions

diff --git a/dev-python/colour/colour-0.1.5.ebuild b/dev-python/colour/colour-0.1.5.ebuild
index d7934124f35e..5d360c2f8f47 100644
--- a/dev-python/colour/colour-0.1.5.ebuild
+++ b/dev-python/colour/colour-0.1.5.ebuild
@@ -1,20 +1,24 @@
-# Copyright 2021 Liguros Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=7
 
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
-DESCRIPTION="Python color representations manipulation library (RGB, HSL, web, ...)"
-HOMEPAGE="https://github.com/vaab/colour"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+DESCRIPTION="Python color representations manipulation library"
+HOMEPAGE="https://github.com/vaab/colour/"
+KEYWORDS="amd64 ~x86"
 
-LICENSE="MIT"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
 
-distutils_enable_tests nose
+PATCHES=( "${FILESDIR}"/${PN}-setup.patch )
+
+src_prepare() {
+	rm setup.cfg || die
 
-DEPEND="dev-python/d2to1[${PYTHON_USEDEP}]"
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/colour/files/colour-setup.patch b/dev-python/colour/files/colour-setup.patch
new file mode 100644
index 000000000000..833a045fbf82
--- /dev/null
+++ b/dev-python/colour/files/colour-setup.patch
@@ -0,0 +1,8 @@
+--- a/setup.py
++++ b/setup.py
+@@ -60,5 +60,4 @@ if "0.1.5".startswith("%%"):
+ 
+ setup(
+     extras_require={'test': ['nose', ]},
+-    d2to1=True
+ )
diff --git a/dev-python/colour/metadata.xml b/dev-python/colour/metadata.xml
index ca26a67b962d..6f1a00ce94bc 100644
--- a/dev-python/colour/metadata.xml
+++ b/dev-python/colour/metadata.xml
@@ -1,16 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>dev@liguros.net</email>
-  <name>Development</name>
- </maintainer>
  <maintainer type="person">
-  <email>fedeliallalinea@gmail.com</email>
-  <name>Marco Genasci</name>
+  <email>xgqt@gentoo.org</email>
+  <name>Maciej Barć</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
  </maintainer>
- <upstream>
-  <bugs-to>https://github.com/vaab/colour/issues</bugs-to>
- </upstream>
- <origin>ports</origin>
+ <longdescription>
+    Converts and manipulates common color representation (RGB, HSL, web, ...).
+    Full conversion between RGB, HSL, 6-digit hex, 3-digit hex, human color.
+    One object (Color) or bunch of single purpose function (rgb2hex, hsl2rgb
+    ...). Web format that use the smallest representation between 6-digit (e.g.
+    #fa3b2c), 3-digit (e.g. #fbb), fully spelled color (e.g. white), following
+    W3C color naming for compatible CSS or HTML color specifications. Smooth
+    intuitive color scale generation choosing N color gradients. Can pick
+    colors for you to identify objects of your application.
+  </longdescription>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/gphoto2/Manifest b/dev-python/gphoto2/Manifest
index 271d7104b806..99023c2bee5d 100644
--- a/dev-python/gphoto2/Manifest
+++ b/dev-python/gphoto2/Manifest
@@ -1,2 +1,2 @@
 DIST gphoto2-2.3.5.tar.gz 551864 BLAKE2B c7044eeec40846fed8548be0f7cacdd9e7cc8520d0aaee0af1f56fb70cb96655fe2de7d16381cbc952549ded19d28dfae7c43f6ada700620451052e497731f53 SHA512 a488856e13573ae43fd8e222d48caf429308ef2662b2cc4bb6978c8e97654d9228be32ab0e631e1cac8530fe19feeaafb99121a999f5134f75288519bb10c3e7
-DIST python-gphoto2-2.3.4.tar.gz 556634 BLAKE2B 711e5bf84646fbee9b357e98704c892191d6c92285db534b0810ee9e75e8300efde2ffdda6b766a06a4d9e5ed2cc10e54725df35fe7e68bfe33b20d38951df02 SHA512 233a40348716ead3d664589b9294796614a8702412e282680c1fac4500848e9dff194c25365f75380886cd057104d192539998f91d3bc42415df7e65bc3711e2
+DIST gphoto2-2.3.6.tar.gz 551901 BLAKE2B 74a4ff52464c8cc0d8591186309119d686b441e6c5f75f68b95b47e38f7e2fb4c5afe0505a2e12e9dfd191ba2717ba30073bba4d828b36c17a7e71ffe997df76 SHA512 eebc21fa19bde90e6c2f4f26a8aad6f302662ab3567712a3e47f0e48615dd3f1f96a956c21a74581bbf34513907f29e08bb0560ae3a1c5e24d4a1373770873a6
diff --git a/dev-python/gphoto2/gphoto2-2.3.4.ebuild b/dev-python/gphoto2/gphoto2-2.3.6.ebuild
index f2bc73013625..d37218045fe0 100644
--- a/dev-python/gphoto2/gphoto2-2.3.4.ebuild
+++ b/dev-python/gphoto2/gphoto2-2.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Liguros Authors
+# Copyright 2021-2023 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="python-gphoto2 is a comprehensive Python binding to libgphoto2"
 HOMEPAGE="https://pypi.org/project/gphoto2 https://github.com/jim-easterbrook/python-gphoto2"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> python-${P}.tar.gz"
+SRC_URI="https://github.com/jim-easterbrook/python-gphoto2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -19,3 +19,5 @@ RDEPEND="
 	media-libs/libgphoto2
 "
 DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/python-${P}
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index a11d7c268c91..e9da2ac43cac 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1 +1,3 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
+EBUILD langdetect-1.0.9.ebuild 493 BLAKE2B 0df8bce19bc80f79f8e76bcef5a4c2caf333365fe0cb9a3c076b7858bceded5a3e58921474f866a2709dd657b7ed330c1ec4a7f9d7bab0fcf1bc92d77cabc32d SHA512 ea2a1adcb133ac5fc951ba1aa90ef1ce3dfcc424e59727591763d4875aa044a74188be2d15fd89c6b2e83ed6ea04ec3d9851ed584ae79d2c2c127bde7d994b48
+MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index ddb5b0f1787e..020e07f2a3dd 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -2,9 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>cyber+gentoo@sysrq.in</email>
-  <name>Anna</name>
+  <email>marcin.deranek@slonko.net</email>
+  <name>Marcin Deranek</name>
  </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
+ <upstream>
+  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
+ </upstream>
+ <origin>slonko-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/survey/Manifest b/dev-python/survey/Manifest
index 3bdc9a3546c9..39b9b444390b 100644
--- a/dev-python/survey/Manifest
+++ b/dev-python/survey/Manifest
@@ -1,2 +1,2 @@
 DIST survey-3.4.3.tar.gz 21219 BLAKE2B e866addd9233409c603f2b34bbf811209f3f6c2ade1bee00258c4f25d741dc526948d16b2e9e0dc3632e6e20fa7863f573c4c27ed1f48ddaa954c7d53a8c51e3 SHA512 47ff72dd1223a32ec038ccf57709e8fe64806ecc9bb8e54daaced27afaa1c2a45e76fc1b149232a107729c462db7657ad0fd08d8b14bb314e3905aabd23fff4a
-DIST survey-4.5.2.tar.gz 830754 BLAKE2B 32fdcdede0113d4ef05492cddc047925d93f385db309eed6c7a1cb1279c6c92a2ecc69c5ecf7361545eb3ccf4e4685f4e8d0344d2c2cf4392a8c7c635f714f27 SHA512 f011df6a75d074f2543311eee332a0d43436bbd6b29ed491028510a5df9d70502e8f96f18afebe513446bc26623bed292bfcecf1b52e93f3d4838b1f70ff705d
+DIST survey-4.5.3.tar.gz 831058 BLAKE2B 0aa03304749cf92aa6a86f903eecedf955a27dbaeb0e36258fe23fbfe1def435f702b4b55aadef14a3b195dff523c0ea1ae4fbc31faffcbe0f6ec0034b9b4901 SHA512 380174a7f2ece919c4e716f3d4a8b2e4fc011b0d29149d7c08b9696e748c243f4be5773997f11964af3c3685f10c239eceb270b5efaeb6dfe51226b4169cb885
diff --git a/dev-python/survey/survey-4.5.2.ebuild b/dev-python/survey/survey-4.5.3.ebuild
index 5a4213f60dd7..5a4213f60dd7 100644
--- a/dev-python/survey/survey-4.5.2.ebuild
+++ b/dev-python/survey/survey-4.5.3.ebuild
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 346f43acd53f..060446d7c6cd 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,3 +1,3 @@
 DIST urllib3-1.26.15.tar.gz 301444 BLAKE2B 2681f0290a4f8b335dcdf384a0c0692cf51e88ea829f80c8c857be328b00c618978a84957da4e23826e4597fe90764eb36ab9acbbc33f9a6ec8df3e3ff3f4d48 SHA512 b6ddb29c15b2d729605a6acb7c602f18c75a937cdfe9649d35d790a59fbb1d96a8d68975ba0a4c073c9f1750e383c67b7566dbcd81b3e8611501e9f4153e9a2b
-DIST urllib3-2.0.2.tar.gz 277703 BLAKE2B 1c7935a6aca8e60ad212eb35ef76009b75a8d080b1a572fe229e94a200e75c352ab41d831dde3d4a4643ecbbe54c2128f9d9ca1850d978fd1730d6d730ce3ab0 SHA512 874674342259f2f9b77b4aac90bd525ea50d4b6134008c22eb0fe7a04e688797564c3ec8e556600f75416df2983c972867e8a569d5d85a8dda748948217af38e
 DIST urllib3-2.0.3.tar.gz 280489 BLAKE2B 5cb68029b8ea2fc51c5abefe212ab4a58269e72f180d16e4c0bbef93284c3298195fa84e2f2d845663436c5397a73653a95d9970594dab6662077f77a11591a8 SHA512 fd586a12b25a30ea801cfd6e207854a0f762cefee54512d742b3fffcc772db9dd75f436f0b998edd32a60857a7bd818bd10f6984e26f2ea47f56b5c545ead45b
+DIST urllib3-2.0.4.tar.gz 281517 BLAKE2B 58635787069b6d8e83394ddacca2c70824c03190efb4e0838b9b80d8e8c1499fa0143e1d38ece4e2a7f9b34d6b50f9805050bf85707d98eb171307ff35f8b215 SHA512 64d55714d871716730af5a691fc222722cffc13b0603ecae597e5f4cfd82297beede2b08cedc030b2419bd446f51c4c6e54f466ad96c71dd0848abbf806b4db4
diff --git a/dev-python/urllib3/urllib3-2.0.2-r1.ebuild b/dev-python/urllib3/urllib3-2.0.4.ebuild
index 94f160c670ac..2e676df6b0be 100644
--- a/dev-python/urllib3/urllib3-2.0.2-r1.ebuild
+++ b/dev-python/urllib3/urllib3-2.0.4.ebuild
@@ -3,7 +3,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_TESTED=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_TESTED=( python3_{7,8,9,10,11} )
 PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
 PYTHON_REQ_USE="ssl(+)"
 
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="brotli libressl test zstd"
 RESTRICT="!test? ( test )"
 
@@ -45,11 +45,10 @@ BDEPEND="
 "
 
 src_prepare() {
-	default
-
-	if use libressl; then
-		eapply -p1 $FILESDIR/urllib.patch
-	fi
+	# upstream considers 0.5 s to be "long" for a timeout
+	# we get tons of test failures on *fast* systems because of that
+	sed -i -e '/LONG_TIMEOUT/s:0.5:5:' test/__init__.py || die
+	distutils-r1_src_prepare
 }
 
 python_test() {
@@ -63,7 +62,21 @@ python_test() {
 		# take forever
 		test/contrib/test_pyopenssl.py::TestSocketSSL::test_requesting_large_resources_via_ssl
 		test/with_dummyserver/test_socketlevel.py::TestSSL::test_requesting_large_resources_via_ssl
+		# stupid test, next bump please verify if they fixed it
+		test/test_poolmanager.py::TestPoolManager::test_deprecated_no_scheme
+		# fails with newer secure SSL configuration, which removes TLS 1.1
+		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1::test_verify_none_and_good_fingerprint
+		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1_1::test_verify_none_and_good_fingerprint
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1::test_verify_none_and_good_fingerprint
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_1::test_verify_none_and_good_fingerprint
+		# TODO: timeouts
+		test/contrib/test_pyopenssl.py::TestSocketClosing::test_timeout_errors_cause_retries
+		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
+		# warnings, sigh
+		test/with_dummyserver/test_connectionpool.py::TestConnectionPool::test_request_chunked_is_deprecated
 	)
 
+	# plugins make tests slower, and more fragile
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest
 }