commit: df39492b535fa7af6b84eddbd71a65c6fefa60bc Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Mon Jul 12 13:47:16 2021 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Mon Jul 12 13:54:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df39492b
net-im/poezio: install in correct paths, use xdg and optfeature eclass Also fixes test dependencies and HTML documentation (for the live ebuild for now). Closes: https://bugs.gentoo.org/801877 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> ...all-man-pages-and-files-in-usr-share-poez.patch | 31 ++++++++++++++++ ...{poezio-9999.ebuild => poezio-0.13.1-r2.ebuild} | 42 +++++++++++++++------- net-im/poezio/poezio-9999.ebuild | 40 +++++++++++++++------ 3 files changed, 90 insertions(+), 23 deletions(-) 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 00000000000..9506cdb1490 --- /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 <[email protected]> +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 <[email protected]> +--- + 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-9999.ebuild b/net-im/poezio/poezio-0.13.1-r2.ebuild similarity index 55% copy from net-im/poezio/poezio-9999.ebuild copy to net-im/poezio/poezio-0.13.1-r2.ebuild index 0ca4b6cbda4..0a1213f58b0 100644 --- a/net-im/poezio/poezio-9999.ebuild +++ b/net-im/poezio/poezio-0.13.1-r2.ebuild @@ -4,9 +4,9 @@ EAPI=7 DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..9} ) +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,25 +16,27 @@ 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" + 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.2[${PYTHON_USEDEP}] + >=dev-python/slixmpp-1.5.0[${PYTHON_USEDEP}] " +DEPEND="test? ( ${RDEPEND} )" -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 +44,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 } diff --git a/net-im/poezio/poezio-9999.ebuild b/net-im/poezio/poezio-9999.ebuild index 0ca4b6cbda4..cea4492ef2c 100644 --- a/net-im/poezio/poezio-9999.ebuild +++ b/net-im/poezio/poezio-9999.ebuild @@ -4,9 +4,9 @@ EAPI=7 DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..9} ) +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,15 @@ 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}] " +DEPEND="test? ( ${RDEPEND} )" -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 +44,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 }
