gentoo resync : 16.04.2022

5 files changed, 95 insertions, 21 deletions

diff --git a/net-im/poezio/Manifest b/net-im/poezio/Manifest
index 2ee58be60d66..332940fcaec9 100644
--- a/net-im/poezio/Manifest
+++ b/net-im/poezio/Manifest
@@ -1,5 +1,7 @@
-AUX Do-not-install-man-pages-and-files-in-usr-share-poez.patch 1171 BLAKE2B e9b4e52563be878b51556df03d63f12abc5cab1029a4ef37ee342247aa8fdbcfc6d4b92a8c87c5ec1186892e987ed899bce721a767f27e57ce1259eae67e2fa1 SHA512 25dd661bd43016381c0360b3039fdc1e0b93515869310579a7e22ea265e966ff0433ce59cc42e43192741a38e4bad52d9d0d1b7522287f74f3d6fb98d1eac6de
+AUX Do-not-install-man-pages-and-files-in-usr-share-poez.patch 1030 BLAKE2B 5ce807a6a3346a980f6fc5aa2da1d5df6f5c3cc1ea5a2743f39a64f81830387e8388cbf0791b1f21de60136f6b53cb072917b86c365c3c01460c06a4814abc0b SHA512 9b878fae63f108b54726805aa123ce6a361a67a44a02a8bdf3af3ef22e37a6770b4827ec9d83f507d3973b1c8df741cc956fba1d06e6c14a125f54c0b2028b6a
 DIST poezio-0.13.1.tar.gz 632572 BLAKE2B e8d3d34c5ca8d236a5a434b4b339cab5ea7286c60db3ef5a6012d406848537b587e834b86f7b6049ee8e637a82e883b2d874134bc1f7d64106e0b0f81aab218f SHA512 6c211ef0fa2fc4bd4cce6ab896166eec6bcdc16ad9e774f4d6bf261b404c9ef68b18d934097da0e165b0cce9bd7779da520ac9c3eac30ccf8280f98ef6aa19c6
+DIST poezio-0.14.tar.gz 662379 BLAKE2B 467741d82945c084c79811d41ff85358ad236d0dcefca7e6f1f8ed5d78aa127f800d2370d624ebaf9e2eb20e1038f280c2e874694ea2b86965fe329b82c4b7d8 SHA512 6e68954a918c645592e2d2f8a265e2f2445a39e256c0525a5517e758a90cc404e066cc08d67ad0f8a3c7d6f3efd61f13a776737d110dd23df7a5f7fab54fc6b5
 EBUILD poezio-0.13.1-r2.ebuild 1412 BLAKE2B cc4c82be986be3adcbdd51617585c3a4b36212332ae12f70225494b7ef564b5acf548a24c3ec0aa8cc458f0c3220ed4b71f32e6c4e238e71988c7647948c6da3 SHA512 56158c6f8958ccc150b3d2c2b46d1aa781e389647c735b1296521c8b5bcbeb6a015b44025c4eeaffa5e64870edc75b5e80336a7cc8239c54e4a6522c32d19847
-EBUILD poezio-9999.ebuild 1414 BLAKE2B 6259c3f7ce2e922c0f2f080e3800d97a0514458c8fc3dc4566fc7a55e5f1666a604006daf4db116f31734dcf04759ce4979a60cdab81d6297f31ab9313b21ec2 SHA512 e39dd8db7ca0760b18fab75003ba91a8ed0831ba4dd04d37fd58419b31ced344b1a8d6923a2faf2d0c4063f734e0310f5105193cf57fc94b8a474ef3074874d7
-MISC metadata.xml 428 BLAKE2B 5d7a1de0e7b2f64145d14f351cf7969e0176e8644a094b40dc0b041de2c0d1e90726958a59d96159a2fc38f708a2dc6b99e7445f233e9855de9d4058cc3e313a SHA512 b647074d78bb2a802a166101e53b2ac0bcba50f8504fbb563820641b26ac5f7725357d33a7f19105735a51bf3bf6adbeacefbdfd830442c4c22886c92b22c89b
+EBUILD poezio-0.14.ebuild 1673 BLAKE2B 453f9cb83349950e01b0a2219b834d97dde47aeb69be2360934cb1982196a9606f6e132e49b32e5773a4df53271093c791c7d950488edd544eeda448bca0a9f6 SHA512 703ca18cb28caefc3c0010d0737fa34cb6e87a59f5aad3dae3fc5feec8696e9f66a2205df82e3b1bb0ecb32fb1a5cf8b51676e42a0ac5dcab0cb518f2994420d
+EBUILD poezio-9999.ebuild 1673 BLAKE2B eeba0a2331ae0a77c90643282a79c1a1b4ef31d24756ec7f16676a51389bd32d51f882f37b0721d591806e45f7f800ba6541d90468f6bdb98c2d2bb2874a4f8d SHA512 148c09904886410923724af0f5a6647b36fdaa0abd7aecbdfc070133f8f4041030e999ab7a78fda3dabb13dc6ea23f0d9bea1ba2873479c83513f65480bce487
+MISC metadata.xml 316 BLAKE2B f37c478624b1cf9ad87b583797f031272cb5cce0d1d3059207515785d58675b8f494fef623f03562f9db4fcd276962f590ecfdf3f2153eabee49f2272bc6e357 SHA512 809370619be912f600c10610cc7c3923a73e8f5fd2cb05d755786764e62c446b187203ff324803ea8efce0172519bf2543d923c536b8561df0901454c83b62a6
diff --git a/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch b/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch
index 9506cdb14908..7b85ba892c43 100644
--- a/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch
+++ b/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch
@@ -4,12 +4,6 @@ Date: Mon, 12 Jul 2021 15:08:30 +0200
 Subject: [PATCH] Do not install man pages and files in /usr/share/poezio
 
 Signed-off-by: Florian Schmaus <flo@geekplace.eu>
----
- setup.py | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index d1dde4d2f02f..bee8e4834b81 100755
 --- a/setup.py
 +++ b/setup.py
 @@ -156,13 +156,9 @@ setup(
@@ -26,6 +20,3 @@ index d1dde4d2f02f..bee8e4834b81 100755
          + sphinx_files_found
      ),
      install_requires=['slixmpp>=1.6.0', 'aiodns', 'pyasn1_modules', 'pyasn1', 'typing_extensions', 'setuptools'],
--- 
-2.31.1
-
diff --git a/net-im/poezio/metadata.xml b/net-im/poezio/metadata.xml
index eb783ed6ad95..47243d5ddc22 100644
--- a/net-im/poezio/metadata.xml
+++ b/net-im/poezio/metadata.xml
@@ -5,10 +5,6 @@
 		<email>flow@gentoo.org</email>
 		<name>Florian Schmaus</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>andrey_utkin@gentoo.org</email>
-		<name>Andrey Utkin</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">poezio</remote-id>
 	</upstream>
diff --git a/net-im/poezio/poezio-0.14.ebuild b/net-im/poezio/poezio-0.14.ebuild
new file mode 100644
index 000000000000..81e2f3ab9a0b
--- /dev/null
+++ b/net-im/poezio/poezio-0.14.ebuild
@@ -0,0 +1,77 @@
+# 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 optfeature xdg
+
+DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
+HOMEPAGE="https://poez.io/"
+LICENSE="GPL-3+"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git"
+	inherit git-r3
+
+	# We build the html documentation using sphinx.
+	BDEPEND="dev-python/sphinx"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="
+	dev-python/aiodns[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	>=dev-python/slixmpp-1.8.2[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/Do-not-install-man-pages-and-files-in-usr-share-poez.patch"
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	# Delete unmaintained plugin which requires an excessive external dep
+	rm plugins/mpd_client.py || die
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if [[ -n "${EGIT_REPO_URI}" ]]; then
+		emake -C doc html
+	fi
+}
+
+# Poezio provides its own Python C extension 'poopt', which needs to be
+# correctly discovered to run the tests. See
+# https://projects.gentoo.org/python/guide/test.html#importerrors-for-c-extensions
+python_test() {
+	cd "${T}" || die
+	epytest "${S}"/test
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman data/poezio.1 data/poezio_logs.1
+
+	if [[ -n "${EGIT_REPO_URI}" ]]; then
+		docinto html
+		dodoc -r doc/build/html/*
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "screen autoaway support" dev-python/pyinotify
+}
diff --git a/net-im/poezio/poezio-9999.ebuild b/net-im/poezio/poezio-9999.ebuild
index 608644fde1b2..162044b8bbf3 100644
--- a/net-im/poezio/poezio-9999.ebuild
+++ b/net-im/poezio/poezio-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1 optfeature xdg
 
 DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
 HOMEPAGE="https://poez.io/"
-LICENSE="ZLIB"
+LICENSE="GPL-3+"
 SLOT="0"
 
 if [[ "${PV}" == "9999" ]]; then
@@ -28,7 +28,7 @@ RDEPEND="
 	dev-python/aiodns[${PYTHON_USEDEP}]
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
 	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/slixmpp-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/slixmpp-1.8.2[${PYTHON_USEDEP}]
 "
 
 PATCHES=(
@@ -51,6 +51,14 @@ src_compile() {
 	fi
 }
 
+# Poezio provides its own Python C extension 'poopt', which needs to be
+# correctly discovered to run the tests. See
+# https://projects.gentoo.org/python/guide/test.html#importerrors-for-c-extensions
+python_test() {
+	cd "${T}" || die
+	epytest "${S}"/test
+}
+
 src_install() {
 	distutils-r1_src_install