From ca144cbf71b2faf598564847378fa40a0090d67c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Oct 2022 19:51:12 +0100 Subject: gentoo auto-resync : 15:10:2022 - 19:51:12 --- dev-util/pkgdev/Manifest | 5 ++- 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 ++-- 4 files changed, 62 insertions(+), 10 deletions(-) create mode 100644 dev-util/pkgdev/files/pkgdev-0.2.3-docs-path.patch (limited to 'dev-util/pkgdev') diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest index 2004052ab432..bf30dad544f7 100644 --- a/dev-util/pkgdev/Manifest +++ b/dev-util/pkgdev/Manifest @@ -1,4 +1,5 @@ AUX pkgdev-0.2.1-fix-signoff-example.patch 920 BLAKE2B dbf577e4dbc374b26519d459b2bb17ae5dc659e8373a7cf3aac52699c6ec101159fbdb2fce78b8b22b525637e35b6aea0e2b94ed9d81fc3e320b7290934cde09 SHA512 aa9f067dcbec520392327333317eef17f3153369e0d072d2b0f85f971de2151a649d5ce23183fcbb4b6210b872ce905f99e223ad91950e47dc7bdaa761f522a4 +AUX pkgdev-0.2.3-docs-path.patch 1716 BLAKE2B 28ec6efaa09b93894087483105809687ea121b0fb03e8d8e5b22b5409df9cf67eb225145c45c31f505f3cb0b9a82e1771485b9b04ce4c08009eccab619997951 SHA512 9b243768eed0ebfc15e552706f3c5a0022703b4aceae75c0eeff66727d7dc927eacd2bb8337a46e0a210700151a4d8cab7c51a0d4800db48ced3ab168b84c962 DIST pkgdev-0.2.1-docs.tar.xz 4156 BLAKE2B d0cae24586dd24d03ae0378205ebf164957a15a85fec06d4a44d24c448aa22732aec7ae4a98b630b4943949f8108b146e1997379f2c23a660fec325f10e5eddb SHA512 0e4d2906ff3ded58884b419a2c3bc771f70051d1c06fd500f0908e50512b49505c19057c4e63a04d81e418193d50c210672ff4dad3c06693e2e6e966c68dac45 DIST pkgdev-0.2.1.tar.gz 66455 BLAKE2B 6f89b1601813adcb1263a044a096d187d7fa926f116a09dc2b1cec083f8d82da54ae00577c36d64ece5733d8952f8dc5f4dff94aeb695e851f340a30f04b203e SHA512 8277f74f3d9902da295c5436a46302627bdc1cb2a63f29b0603bf9bfa2c8bb812b26f12a54630cbbcba1e2bbac7352146f6ab59fc04cd8b89b46df1fe7c9f8dd DIST pkgdev-0.2.2-docs.tar.xz 5496 BLAKE2B 46df2c14370dbe1312e43e08388aa9a3f13e98c5c74b5762f9562cea1d5f6913fc352bc7a4dcce3aae1c3511e3735bc83946bcd0928e56faad32351e811dfbf0 SHA512 e950fa826036ab3cb6fc3ed4b1b5da533d32739ebdc912e77270f4621d378a31b51758801287fd9552c791fbe0f96019b62499ee06950b20f403260e61276237 @@ -6,6 +7,6 @@ DIST pkgdev-0.2.2.tar.gz 66977 BLAKE2B 50b7c06339438ada28ffc9e8e8ba0c472342cbe44 DIST pkgdev-0.2.3.tar.gz 67292 BLAKE2B 8e4195c1094200836e23f97ed8ddf44659dcbe123180b253bf961fc08f2534d3573c7194302b3dbe866b45a548e63951ef63d4fce77c4d0903c34a0f4ece9c0b SHA512 ea09483fff8d64ed2a53ab3435bf01be172f1ef6fcbcfa5eac2f19104fdd20cd57f045f578db896c92689f4e6e36acfa4ae4feb28424b5566041fc0e1d5ccb05 EBUILD pkgdev-0.2.1-r3.ebuild 2441 BLAKE2B 99cdd71ce398fc02d96ae8cdae0cced060e3854aaa802dd3fa118166f60726d26181ee8a76c191c8b8c8daa4e2028600e92e5f257ff7d93b5626aa59e8897261 SHA512 632fbc60b508672044e7981f9fcb9e9b9df64a187bb371fc2f7e579f5a7e1f21ccb03794288e1808b395b5e6b949fa4824240f85add9210453cb39ae529d5bb8 EBUILD pkgdev-0.2.2.ebuild 2398 BLAKE2B d226f59a1674e3726c7b4cfb162470243e5435c5d23711381e359ac7687f55faaa7fd0d5913a23a07e8372ac2e7034ec8d29ab1c001fd7a0f36b2e9689597010 SHA512 dc3026258c5f3f9bf84cfa05a9322bc797bc49c90b22c0adeef4c0604a6af3e39c2034e772c6637024c287525842fe98835bc18f280f67fadac336a9fc312bac -EBUILD pkgdev-0.2.3.ebuild 1696 BLAKE2B 67a3cc19a92763cd445cf2fbca50b600f137992dff3b64e0ab0bb795f3ca654a45db61d99058e944bd4e2c2c6723e1285210335eafa947d59aeea72628db112c SHA512 bbcd2b20f752f86f421d7561ebbc95f227a363388237c693d7282d86075d5781f44f87cc3b86f26774965068990cc24810af6b520556254caae3326a4106a098 -EBUILD pkgdev-9999.ebuild 1696 BLAKE2B 67a3cc19a92763cd445cf2fbca50b600f137992dff3b64e0ab0bb795f3ca654a45db61d99058e944bd4e2c2c6723e1285210335eafa947d59aeea72628db112c SHA512 bbcd2b20f752f86f421d7561ebbc95f227a363388237c693d7282d86075d5781f44f87cc3b86f26774965068990cc24810af6b520556254caae3326a4106a098 +EBUILD pkgdev-0.2.3.ebuild 1767 BLAKE2B 7feffbe4479f00b4c0cc584c26a953299335f0e4c7d542711a330f4141d641538ed45071031971a4554f58c38be8333ccc044de128c6a950f39932f103d73c46 SHA512 8be6ad6dbff04f00a07bccf22ebdf7600a08d9b61ecd0eae767d86a4e472a09a113fc348a16007d016e80228ab4989b6339116ec6a6000e29a52af7a10590718 +EBUILD pkgdev-9999.ebuild 1710 BLAKE2B 7abf58b76c6bbea0e531b64243603af7fc7a1abf50f13e38e6456bd452db60886b1a0379de8eea5faca59eeb2db8bd2bc3fa8bc5673de82b06f453517b1b06e7 SHA512 3c9223d71122c6634e7cd01dd57e0d182d8034fe88bb94a6d2b2bcf4fbdf60eff8fbd42992624223ae9d017f233e6d4e2a2173b8925bce9165cb888ab3b78046 MISC metadata.xml 449 BLAKE2B f440d395e5453394e7bcc857ccd07b6735bce1b68b3e4ce9d33068c28c5794f6ba65d7394ed6f585dcd3e58ccd3f49ecee4d001ff4e40893db721b5ac869f7ae SHA512 a07c315d071af0ad53ee79f9db3cfd1a8acbdbabfad960cf64025eea1a3759f1ef7d5dcf71bf07b17cbfb6f912513edf118c28d3c24de06223a7a3420cc4438d 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 +--- 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 -- cgit v1.2.3