[gentoo-commits] repo/gentoo:master commit in: dev-util/pkgdev/, dev-util/pkgdev/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/pkgdev/, dev-util/pkgdev/files/

[Sam James]

commit:     5b3a94a94085b43c5d67c5914a9006131d068faa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 05:28:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 05:28:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b3a94a9

dev-util/pkgdev: backport man page fix

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/pkgdev-0.2.1-fix-signoff-example.patch   | 25 ++++++++
 dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild             | 68 ++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/dev-util/pkgdev/files/pkgdev-0.2.1-fix-signoff-example.patch b/dev-util/pkgdev/files/pkgdev-0.2.1-fix-signoff-example.patch
new file mode 100644
index 000000000000..9fddf8a768fb
--- /dev/null
+++ b/dev-util/pkgdev/files/pkgdev-0.2.1-fix-signoff-example.patch
@@ -0,0 +1,25 @@
+https://github.com/pkgcore/pkgdev/commit/b780cf967804cb532421ef7cced5f1964224d8dd
+
+From: Arthur Zamarin <arthurzam@gentoo.org>
+Date: Mon, 23 May 2022 22:07:43 +0300
+Subject: [PATCH] docs: fix signoff example
+
+Fixes: https://github.com/pkgcore/pkgdev/issues/72
+Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
+--- a/doc/man/config.rst
++++ b/doc/man/config.rst
+@@ -34,10 +34,10 @@ related values. To find all possible configuration options, run:
+     push.ask = true
+ 
+ - Add `Signed-off-by` consenting to the `Certificate of Origin <https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin>`_
+-  to all commits for the 'gentoo' repository::
++  to all commits::
+ 
+-    [gentoo]
+-    push.signoff = true
++    [DEFAULT]
++    commit.signoff = true
+ 
+ - When committing, stage all files in current working directory (note that this
+   option doesn't expect value, therefore no value is defined post equal sign)::
+

diff --git a/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild b/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..1b214da9f039
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]] ; then
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+	"
+else
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
+	"
+fi
+
+# Uses pytest but we want to use the setup.py runner to get generated modules
+BDEPEND+="test? ( dev-python/pytest )"
+RDEPEND+="dev-vcs/git"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-signoff-example.patch
+)
+
+distutils_enable_sphinx doc
+distutils_enable_tests setup.py
+
+python_install_all() {
+	# We'll generate man pages ourselves
+	# Revisit when a release is made
+	# to pregenerate them, making USE=doc
+	# for generating the real HTML docs only.
+	if use doc ; then
+		cd doc || die
+		emake man
+		doman _build/man/*
+	fi
+
+	cd .. || die
+
+	# HTML pages only
+	sphinx_compile_all
+
+	distutils-r1_python_install_all
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/pkgdev/, dev-util/pkgdev/files/

[Arthur Zamarin]

commit:     5dd0b3434fabac6e209a454a26ba2a0cc386a850
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 15:38:30 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 16:04:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dd0b343

dev-util/pkgdev: fix docs generation

Closes: https://bugs.gentoo.org/877189
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-util/pkgdev/files/pkgdev-0.2.3-docs-path.patch | 47 ++++++++++++++++++++++
 dev-util/pkgdev/pkgdev-0.2.3.ebuild                | 12 ++++--
 dev-util/pkgdev/pkgdev-9999.ebuild                 |  8 ++--
 3 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/dev-util/pkgdev/files/pkgdev-0.2.3-docs-path.patch b/dev-util/pkgdev/files/pkgdev-0.2.3-docs-path.patch
new file mode 100644
index 000000000000..3386c3e96cff
--- /dev/null
+++ b/dev-util/pkgdev/files/pkgdev-0.2.3-docs-path.patch
@@ -0,0 +1,47 @@
+https://github.com/pkgcore/pkgdev/commit/640c78d7
+
+doc: fix generating of code when built in PEP517 mode
+
+When in PEP517 mode, the source code is located in a different location,
+so use better relative fallback place. Also cleanup a little the code
+handling to use pathlib.
+
+Bug: https://bugs.gentoo.org/877189
+Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -16,13 +16,17 @@
+ import os
+ import sys
+ from importlib import import_module
++from pathlib import Path
+
+ # If extensions (or modules to document with autodoc) are in another directory,
+ # add these directories to sys.path here. If the directory is relative to the
+ # documentation root, use os.path.abspath to make it absolute, like shown here.
+-libdir = os.path.abspath(os.path.join('..', 'build', 'lib'))
+-if os.path.exists(libdir):
+-    sys.path.insert(0, libdir)
++
++if (src_path := Path(__file__).parent.parent / 'src').is_dir():
++    sys.path.insert(0, str(src_path.resolve()))
++
++if (libdir := Path(__file__).parent.parent / 'build/lib').is_dir():
++    sys.path.insert(0, str(libdir.resolve()))
+
+ os.environ['PKGDIST_REPODIR'] = os.path.abspath('..')
+ from snakeoil.dist import distutils_extensions as pkgdist
+@@ -241,11 +245,9 @@
+
+ # -- Options for manual page output ---------------------------------------
+
+-bin_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'bin')
+-scripts = os.listdir(bin_path)
+-
+ generated_man_pages = [
+-    (f"{project}.scripts.{s.replace('-', '_')}", s) for s in scripts
++    (f"{project}.scripts.{s.name.replace('-', '_')}", s.name)
++    for s in (Path(__file__).parent.parent / 'bin').iterdir()
+ ]
+
+ # One entry per manual page. List of tuples

diff --git a/dev-util/pkgdev/pkgdev-0.2.3.ebuild b/dev-util/pkgdev/pkgdev-0.2.3.ebuild
index 0599a544b7a9..242f46ae1906 100644
--- a/dev-util/pkgdev/pkgdev-0.2.3.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.2.3.ebuild
@@ -8,8 +8,6 @@ PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
-	PKGDEV_DOCS_PREBUILT=0
-
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgdev.git
 		https://github.com/pkgcore/pkgdev.git"
 	inherit git-r3
@@ -48,8 +46,14 @@ RDEPEND+="dev-vcs/git"
 distutils_enable_sphinx doc
 distutils_enable_tests setup.py
 
+PATCHES=(
+	"${FILESDIR}/pkgdev-0.2.3-docs-path.patch"
+)
+
 python_compile_all() {
-	use doc && emake -C doc man
+	if use doc; then
+		"${EPYTHON}" setup.py build_man -f || die
+	fi
 
 	# HTML pages only
 	sphinx_compile_all
@@ -58,7 +62,7 @@ python_compile_all() {
 python_install_all() {
 	# If USE=doc, there'll be newly generated docs which we install instead.
 	if use doc; then
-		doman doc/_build/man/*
+		doman build/sphinx/man/*
 	elif [[ ${PV} != *9999 ]]; then
 		doman man/*.[0-8]
 	fi

diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 0599a544b7a9..f42159a4c268 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -8,8 +8,6 @@ PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
-	PKGDEV_DOCS_PREBUILT=0
-
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgdev.git
 		https://github.com/pkgcore/pkgdev.git"
 	inherit git-r3
@@ -49,7 +47,9 @@ distutils_enable_sphinx doc
 distutils_enable_tests setup.py
 
 python_compile_all() {
-	use doc && emake -C doc man
+	if use doc; then
+		"${EPYTHON}" setup.py build_man -f || die
+	fi
 
 	# HTML pages only
 	sphinx_compile_all
@@ -58,7 +58,7 @@ python_compile_all() {
 python_install_all() {
 	# If USE=doc, there'll be newly generated docs which we install instead.
 	if use doc; then
-		doman doc/_build/man/*
+		doman build/sphinx/man/*
 	elif [[ ${PV} != *9999 ]]; then
 		doman man/*.[0-8]
 	fi