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

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

[Arthur Zamarin]

commit:     153667becfcadb8179d9cdd22c551b9d9705ab7e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Nov  8 06:20:50 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  8 16:52:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=153667be

dev-util/pkgdev: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28182
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../files/pkgdev-0.2.1-fix-signoff-example.patch   | 25 ----------------------
 1 file changed, 25 deletions(-)

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
deleted file mode 100644
index 9fddf8a768fb..000000000000
--- a/dev-util/pkgdev/files/pkgdev-0.2.1-fix-signoff-example.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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)::
-

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

[Conrad Kostecki]

commit:     779de8f07582a624a17fb5e47346e84ef6317bd3
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Jan  8 15:14:56 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 22:09:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=779de8f0

dev-util/pkgdev: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29012
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-util/pkgdev/files/pkgdev-0.2.3-docs-path.patch | 47 ----------------------
 1 file changed, 47 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
deleted file mode 100644
index 3386c3e96cff..000000000000
--- a/dev-util/pkgdev/files/pkgdev-0.2.3-docs-path.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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