gentoo resync : 17.07.2021

5 files changed, 134 insertions, 15 deletions

diff --git a/net-im/poezio/Manifest b/net-im/poezio/Manifest
index cbd8c503047f..59eee9975898 100644
--- a/net-im/poezio/Manifest
+++ b/net-im/poezio/Manifest
@@ -1,4 +1,6 @@
+AUX Do-not-install-man-pages-and-files-in-usr-share-poez.patch 1171 BLAKE2B e9b4e52563be878b51556df03d63f12abc5cab1029a4ef37ee342247aa8fdbcfc6d4b92a8c87c5ec1186892e987ed899bce721a767f27e57ce1259eae67e2fa1 SHA512 25dd661bd43016381c0360b3039fdc1e0b93515869310579a7e22ea265e966ff0433ce59cc42e43192741a38e4bad52d9d0d1b7522287f74f3d6fb98d1eac6de
 DIST poezio-0.13.1.tar.gz 632572 BLAKE2B e8d3d34c5ca8d236a5a434b4b339cab5ea7286c60db3ef5a6012d406848537b587e834b86f7b6049ee8e637a82e883b2d874134bc1f7d64106e0b0f81aab218f SHA512 6c211ef0fa2fc4bd4cce6ab896166eec6bcdc16ad9e774f4d6bf261b404c9ef68b18d934097da0e165b0cce9bd7779da520ac9c3eac30ccf8280f98ef6aa19c6
-EBUILD poezio-0.13.1-r1.ebuild 1160 BLAKE2B 34b4dd398b936f9c3adbbe6c3a89a954a1749d92089541612288e6063c34035c3017218fc518c5aff71df67b368fb233ee818acb55aa499e79475c2d4a9ebc56 SHA512 2248557d7659952914bd24c0f03f8847177b2f7e0a46c88f6654dd7a584ec1b0317a8269abf94e2731c91382026063ee54cb062ecfeb18ba399f7441e8cb28e1
-EBUILD poezio-9999.ebuild 1161 BLAKE2B f0d80d98f10e133038c23578d3ba37d0b5a7b2f489413767554181fc52f709796e9c9d3df1e91c2a176a8a0e15ec0899a23586a193528890547cccd78973e354 SHA512 a61e2738d03662435d88bcb643b5537d3e96f4ca2d50a95fb27004f5e4e110304fe771ed5127f0fc35da029a0a4dcf15a4fd7730bc7638b11603c6bdba4a07b5
+EBUILD poezio-0.13.1-r1.ebuild 1161 BLAKE2B a7976c7b606455b2c9254f068ced7b172b3c61ef0849ae89053f6cb04db9b6433acb807c08e918b303037d5277529fe2c31284b06780eb332ac174b623040519 SHA512 0c71b88d20078f1be6fe0e5b45d7868ebd070ee019236363400db24c3330b7f4cea034e82dbf3e365dea1cb60c47bbcb04406dbe8e5d35993c65f48cd6338999
+EBUILD poezio-0.13.1-r2.ebuild 1413 BLAKE2B df4598dbc7901d42f3c05aac396bb8f9648157788ce831625a3d1b005e008c162bc7cf5614636c870d2f07aeaa5f88f164a4621d733f125470bcb0e9023f1086 SHA512 8101f429724b49eb448bf195f70e90d82d6bc5d2fb1298b319f045ab30c2b0a1e951caa7ac2a32d25907168d6fe4be1c2fab867cece022c5a5a624a6e6c8e99d
+EBUILD poezio-9999.ebuild 1414 BLAKE2B 6259c3f7ce2e922c0f2f080e3800d97a0514458c8fc3dc4566fc7a55e5f1666a604006daf4db116f31734dcf04759ce4979a60cdab81d6297f31ab9313b21ec2 SHA512 e39dd8db7ca0760b18fab75003ba91a8ed0831ba4dd04d37fd58419b31ced344b1a8d6923a2faf2d0c4063f734e0310f5105193cf57fc94b8a474ef3074874d7
 MISC metadata.xml 427 BLAKE2B c73646308afc13732dd104f4123e42f0906fdd14fd635dc64b8ec30519f4295e2577452a2c6a595f31b6ce91e0ffbee53a6b16e7a1938d5d072b7a24412ecec4 SHA512 ef402902e54cacbe357137c8f64bfbe081c151e39c7c1bbf715ad6e7d7acc0a7cabaf5e184184b0034973368b2fb70ad5787074d3570bc8cfd0caf0635119c71
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
new file mode 100644
index 000000000000..9506cdb14908
--- /dev/null
+++ b/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch
@@ -0,0 +1,31 @@
+From 343c1e9be4cbf76c0ae437143b4000e36a1488ca Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+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(
+     scripts=['scripts/poezio_logs'],
+     entry_points={'console_scripts': ['poezio = poezio.__main__:run']},
+     data_files=([
+-            ('share/man/man1/', ['data/poezio.1', 'data/poezio_logs.1']),
+-            ('share/poezio/', ['README.rst', 'COPYING', 'CHANGELOG']),
+             ('share/applications/', ['data/io.poez.Poezio.desktop']),
+             ('share/metainfo/', ['data/io.poez.Poezio.appdata.xml'])
+         ]
+-        + find_doc('share/doc/poezio/source', 'source')
+-        + find_doc('share/doc/poezio/html', 'build/html')
+         + 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/poezio-0.13.1-r1.ebuild b/net-im/poezio/poezio-0.13.1-r1.ebuild
index ae4c009726e2..a080438c959f 100644
--- a/net-im/poezio/poezio-0.13.1-r1.ebuild
+++ b/net-im/poezio/poezio-0.13.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1 readme.gentoo-r1
 
diff --git a/net-im/poezio/poezio-0.13.1-r2.ebuild b/net-im/poezio/poezio-0.13.1-r2.ebuild
new file mode 100644
index 000000000000..df3051da179c
--- /dev/null
+++ b/net-im/poezio/poezio-0.13.1-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1 optfeature xdg
+
+DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
+HOMEPAGE="https://poez.io/"
+LICENSE="ZLIB"
+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.5.0[${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
+}
+
+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 f39bc56b1eb6..608644fde1b2 100644
--- a/net-im/poezio/poezio-9999.ebuild
+++ b/net-im/poezio/poezio-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
-inherit distutils-r1 readme.gentoo-r1
+inherit distutils-r1 optfeature xdg
 
 DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
 HOMEPAGE="https://poez.io/"
@@ -16,6 +16,9 @@ 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"
@@ -25,16 +28,14 @@ RDEPEND="
 	dev-python/aiodns[${PYTHON_USEDEP}]
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
 	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/slixmpp-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/slixmpp-1.7.1[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests pytest
+PATCHES=(
+	"${FILESDIR}/Do-not-install-man-pages-and-files-in-usr-share-poez.patch"
+)
 
-DOC_CONTENTS="
-Install these optional runtime dependencies for additional features.
-* dev-python/pyinotify for screen autoaway plugin support.
-"
-DISABLE_AUTOFORMATTING=true
+distutils_enable_tests pytest
 
 src_prepare() {
 	default
@@ -42,11 +43,27 @@ src_prepare() {
 	rm plugins/mpd_client.py || die
 }
 
+src_compile() {
+	distutils-r1_src_compile
+
+	if [[ -n "${EGIT_REPO_URI}" ]]; then
+		emake -C doc html
+	fi
+}
+
 src_install() {
 	distutils-r1_src_install
-	readme.gentoo_create_doc
+
+	doman data/poezio.1 data/poezio_logs.1
+
+	if [[ -n "${EGIT_REPO_URI}" ]]; then
+		docinto html
+		dodoc -r doc/build/html/*
+	fi
 }
 
 pkg_postinst() {
-	readme.gentoo_print_elog
+	xdg_pkg_postinst
+
+	optfeature "screen autoaway support" dev-python/pyinotify
 }