gentoo resync : 20.03.2022

4 files changed, 22 insertions, 63 deletions

diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index c5dfb7b94025..f5e112f3b4cb 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1,4 +1,3 @@
-DIST pyudev-0.22.0.tar.gz 85077 BLAKE2B 66c78aa4d3bea5ceae3660a93e5bd1733629bb5228d67d8e647abb8c237a2786c1061b07e034be5467f5bcab58d95ba30f91d74bdc54cd8253dff69be3ad4a80 SHA512 a09ed479a54a1772a6af68cb975fef792068c2de3655e20223905bc3f574fd32bd3dbe6b97062eee3ab5f08a8b041ad3ea86dfb68c839ea44e29d65ec1686670
-EBUILD pyudev-0.22.0-r1.ebuild 1327 BLAKE2B 1e1d8ad556f7c8348d037e8055fafc3d7799d11e978133ade6df952856fd05ce4db13c3147a40bcc3b84ef4eb61a19bc258b295ab4a311f80cd342af60303d41 SHA512 8557b7e5865518df3b150e996b74810c9af976740b2beb4b65254783d8fed4a9d8f0ea175dd48c31cc5871a3c33cdd48a416693cc8802db443ae24b83ab3d18d
-EBUILD pyudev-0.22.0.ebuild 1270 BLAKE2B 75c78e4b24b4f85af76edd0684a31d074a32f389569f7b8e66c56171d8661db2216bf4d3d9725cd9c05c2399d1b3697808b8940bea1f230f128ed034d51fd50b SHA512 01ec90457800da048f09f4edca75ca4b88075af8d5e4ea3cd2f1bb6c2425991091f957cb0a0cc1f26072d0dce9980f9ea7e447574fb9e4bdef4e5e35accf15bf
-MISC metadata.xml 594 BLAKE2B 5b620e46403b2c1a572c3a208669c2c64c166812031f139d1f6ffc15fc4aa094b2d3f02848e2893d6870942c89bc94434419921b6188903a2e7d80b2af8b8280 SHA512 575efd0013afd252bc9617995db85987ccd11712932c8b2b542db683864606eb5cd52c9b37fa2430b05182c16ba712dac1434fffc1fc405c4ef6dad41c4eb9f2
+DIST pyudev-0.23.2.tar.gz 87199 BLAKE2B 0ce4300296f4fcc3a56ba4100d3ebe7734330b3096fde59475fe9880758a3279324c4c3df883b22d1ec9f4e0cfa83fc7c25fbe54ed03a5e019567595deb21211 SHA512 40b947d363dca73789f5ab77cbda4b48349e28fe04f2f5cafb93d20799d842ebeb2b7d78d1f16dcbcaac5c20aff1b931b372c75852706e731337e6e1d30b8538
+EBUILD pyudev-0.23.2.ebuild 1432 BLAKE2B bedd1eac12c724a2fab3187362c9d0b2078c7f07056b6a5caba9164703bf115e2e204c7ed4b5f44090a3490a163c41448eeb3e233352eb43dd5711cf99f38c45 SHA512 2ffdd540e9124266320667b081e7ab462073652fd63b2df57b417be492f4a8927587fd7bc49cd115cdcaca6131adeb8ddd44f15feb27996e8aa665bcff2c99c6
+MISC metadata.xml 705 BLAKE2B 5668637e59e1d434d0a72d0856e7ed614a2f5a3371e3fa4e841f4d516228f8b8a5567bc6a91cb07c8ee1f9c14db76ce238adac5bdab987a810adc2aed994b5a7 SHA512 a73f8225942c597d02ed08d3dc03724858f33cc07a2d9fcde64fe20f5c4263d1b7510e26e6365af120b72e7c8ebb075b7606dde493fe6464db2a585a23ca4b6a
diff --git a/dev-python/pyudev/metadata.xml b/dev-python/pyudev/metadata.xml
index a8af019f0a1d..0ed8a0ec4179 100644
--- a/dev-python/pyudev/metadata.xml
+++ b/dev-python/pyudev/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pyudev/pyudev-0.22.0.ebuild b/dev-python/pyudev/pyudev-0.22.0.ebuild
deleted file mode 100644
index 7add9fbf588e..000000000000
--- a/dev-python/pyudev/pyudev-0.22.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python binding to libudev"
-HOMEPAGE="https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="qt5"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	virtual/udev
-	qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( CHANGES.rst README.rst )
-
-#PATCHES=(
-#	"${FILESDIR}/${PN}-0.19.0-skip-non-deterministic-test.patch"
-#)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use test; then
-		ewarn "If your PORTAGE_TMPDIR is longer in length then '/var/tmp/',"
-		ewarn "change it to /var/tmp to ensure tests will pass."
-	fi
-
-	# tests are known to pass then fail on alternate runs
-	# tests: fix run_path
-	sed -i -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \
-		tests/test_core.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyudev/pyudev-0.22.0-r1.ebuild b/dev-python/pyudev/pyudev-0.23.2.ebuild
index b17a7837de83..26cc8c89ddc7 100644
--- a/dev-python/pyudev/pyudev-0.22.0-r1.ebuild
+++ b/dev-python/pyudev/pyudev-0.23.2.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+EAPI=8
 
-inherit distutils-r1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Python binding to libudev"
 HOMEPAGE="https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev"
@@ -12,21 +13,23 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="qt5"
 
+# Known to fail on test system that aren't exactly the same devices as on CI
+RESTRICT="test"
+
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	virtual/udev
-	qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
 "
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 DOCS=( CHANGES.rst README.rst )
 
@@ -48,3 +51,7 @@ python_prepare_all() {
 
 	distutils-r1_python_prepare_all
 }
+
+pkg_postinst() {
+	optfeature "PyQt5 bindings" "dev-python/PyQt5"
+}