gentoo auto-resync : 09:01:2023 - 00:17:07

2 files changed, 0 insertions, 48 deletions

diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index bd327a378d6f..0391ae4e304c 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,4 +1,3 @@
-AUX pkgdev-0.2.3-docs-path.patch 1716 BLAKE2B 28ec6efaa09b93894087483105809687ea121b0fb03e8d8e5b22b5409df9cf67eb225145c45c31f505f3cb0b9a82e1771485b9b04ce4c08009eccab619997951 SHA512 9b243768eed0ebfc15e552706f3c5a0022703b4aceae75c0eeff66727d7dc927eacd2bb8337a46e0a210700151a4d8cab7c51a0d4800db48ced3ab168b84c962
 DIST pkgdev-0.2.4.tar.gz 64156 BLAKE2B 321e14b246a97236142a862968bfc127f3215314ef173dc0d610ca867d00a0db067def7810083b11bf6aea1e36202e6c91d7c63d74aa2b85fb17ec476cba1f7c SHA512 0390e130abda2f8eea1d3dd029d31d9381f2543ca98f547b91716ce383791c3760bd89bb276b5b15eaaa165be339c8147d26e93ba81d5be4c8a4cbede6a31caf
 EBUILD pkgdev-0.2.4.ebuild 1612 BLAKE2B 524f65404ea5d3336c11fc7243437e998ae7ae47e2f94357bf596fc899adeee59f06032ceb28b0d9ba7087caf833bad43fb27578f8e009236b8dd5f04d7b2a0a SHA512 8db1fc333dc90e1040a278b881493d46ba279a58d56d9bd1e3c410846bc0061419ef28839d807e67d339c5d32eba0843943397836710988a17d2ff75f7eb998b
 EBUILD pkgdev-9999.ebuild 1631 BLAKE2B 2b1c129ea90a849d775c4ca60014b3c4128a98ba9c2eacb117d137ae16d2826de6e8224d0f62beeec2beede165620ccfb13de176c8bdaaf6300a5a30aa399dfc SHA512 68ad3250424d74ca21cfe928fbc5b1efcecb3c6cb4daef692af8f785a3169b1bbaf9a7ef9f7f201b5beadae8b711fe74b1b1d5024883e5e69ec7253b04539f62
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