diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
| commit | c719fdcee603a5a706a45d10cb598762d56a727d (patch) | |
| tree | 620cbf137661399a3fb1eff92914204f9a970713 /sys-cluster/charliecloud | |
| parent | cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff) | |
gentoo resync : 25.09.2021
Diffstat (limited to 'sys-cluster/charliecloud')
| -rw-r--r-- | sys-cluster/charliecloud/Manifest | 7 | ||||
| -rw-r--r-- | sys-cluster/charliecloud/charliecloud-0.25.ebuild (renamed from sys-cluster/charliecloud/charliecloud-0.23.ebuild) | 9 | ||||
| -rw-r--r-- | sys-cluster/charliecloud/charliecloud-9999.ebuild | 4 | ||||
| -rw-r--r-- | sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch | 25 |
4 files changed, 9 insertions, 36 deletions
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest index 2f5378c4ee44..62aac7b26905 100644 --- a/sys-cluster/charliecloud/Manifest +++ b/sys-cluster/charliecloud/Manifest @@ -1,8 +1,7 @@ -AUX charliecloud-0.22-sphinx-4.patch 838 BLAKE2B 09fbf97c9145ca050ffb56215c5e114354c6fad39eda5e9876427b8272c700a495137dbeac1972eb3aaf525322634f5250595293f9f5af04421b6cc85ba89732 SHA512 1743e8fd6619185059892e70c1906d99d60c9fd27392eab331dd8f624c842aa1426f77da4f7b826cf0025d92777d30aba137f9d3685037607af66560031e3bd1 AUX charliecloud-0.24-dash.patch 779 BLAKE2B 5062e284c59b63a20e2e291c0674d832fb7a9b0546c4fff515f48bb8944548c6f673db286551f0d16740c38885a3f9ca3a08c60c98bfdc984d958abffd2ddff7 SHA512 111f4db9a39f03710317af68a321ab496930ce4f8dd32ec8b8c47a5e9489d2313f0175d7580d25cb095e86b3d9148262fb4d4a1862c235739e39fc6732eb45bc -DIST charliecloud-0.23.tar.gz 403281 BLAKE2B f7a6824782e7bf3bdb51ae791fdca2f5929f5c713590ff49cc8a7e1e1c1758e83bdd429a99497dd15e565d01f0f66f2873f64edddacf24ea78f68c2326669db7 SHA512 35543ed3d838b80fbb64fe3e658993fe9f7ded2d1dfd92e0e9a7725fab6d872503a790964c0f3fabb6438c8bd872b5b00cdf31a028f26588b318b9d0dc568119 DIST charliecloud-0.24.tar.gz 420852 BLAKE2B ca55231c74012a678c24133b28e341392865a562653086766e6b5e570744f31ce69d1afa2bbb2cc85d5e52b6ed6e9f42f67187d9998afd3852a10fd4a8ff29d3 SHA512 41f44ef5f12dc35d7972923a84044b7255801705d4fcabf76e675dcb70a9f25422e7d584a7b49135ef2ae5dc1751a39efd84f8eb719653a769b41f46bd558fd2 -EBUILD charliecloud-0.23.ebuild 2135 BLAKE2B 10dc6c2b9868f78187aefe278d84cbb5d5a2c6cd3171d654a6492d43900819f3da6fc68ebdd5db5dc17659cae45b4043e81ab5c4c1a2d86754d656b0d20a4cf4 SHA512 2fa0001a06fb162d74f174ae3999facd2c596f86c61a71fc993500c82fb9b3e4cd5ae0bfbaed1783ebb1d43e50efb8af1c34bc5fdfb59769ea8bac8feaf11121 +DIST charliecloud-0.25.tar.gz 454041 BLAKE2B 3a071f3b9fb06ca1db6d3b85a577943fe76440d395fdf1415d5085110db665fb75ee09dc14768d326e7e280e6c20096479e5f62290f7dee46821c356f5f18535 SHA512 a7a35b584dbdd6c6e27188d3555173c44f90c0e44fa685a15a47f47c94f9d76aa46ab80054a7c53e10a7f56bef87696f1db2a0eb8c49a388dbb0da0fe9112a60 EBUILD charliecloud-0.24.ebuild 2094 BLAKE2B b8cb9d6b8ae0572a4627df81862f306f5fdbe8ad78113138294d7d90ddf1caa76cedd8f08f0712b1eaf4bcf1e0afb2cf41dd0201b53f8684914e347c690f8f9c SHA512 c3fe87c6eb12e77f1ebddff61a3d0dec32cb79f0adb0148008b2b602ad8fd306bb1f200f771d4100672cabc58bf62bc08f9fff3ed541b31949d0b7db2bc92275 -EBUILD charliecloud-9999.ebuild 2044 BLAKE2B 2d16f1e2434e94fc78ae6bbd5e5b7775a0c74b901df37eefe4e2484d62242c779b0ac9f88fa059941e13541dd7b08af805424b3a3be0946b4b4a111aea096ca8 SHA512 b7a09c5842074a2cef33ae22d96410f8947011a8a4875cba6ca635f642b45804d9acdc68262ddc2ee7dcd4495fead73c30ebc03530fe03c8692876af7350c75f +EBUILD charliecloud-0.25.ebuild 2130 BLAKE2B 42cba472329d3ab59052fd0fc3d519dd628c5fbd305ee95c4d6dc190551b3883542ff2702a3a7d6ddaefaa4be303a862e9b2b226f8f6629f22db79e48ce7b4bf SHA512 cea4d863682c065d0477c88daba6760d19f04828327eef6613c3d4ba3b4fb5b05c982641fd9f6b6317a71d96ed2a2b6e65ece2bd5ac8fda248a2a579e087915a +EBUILD charliecloud-9999.ebuild 2130 BLAKE2B 42cba472329d3ab59052fd0fc3d519dd628c5fbd305ee95c4d6dc190551b3883542ff2702a3a7d6ddaefaa4be303a862e9b2b226f8f6629f22db79e48ce7b4bf SHA512 cea4d863682c065d0477c88daba6760d19f04828327eef6613c3d4ba3b4fb5b05c982641fd9f6b6317a71d96ed2a2b6e65ece2bd5ac8fda248a2a579e087915a MISC metadata.xml 618 BLAKE2B 5f7dbfdb8a940a534ed97b4bd47b05a271d6454b0584ac29db1c2fb533044a2c6d48b8425399866abd8d2ebea1f41199ea4cf23af1c6f2646d4c35b5b4c104a4 SHA512 df1b817bbabc6b227c9a779677d345b9df259444b943b1ab58d55c860cd79ad8f9d4b382dc6c4de0c5daa955fd694990217a559e897a3b11f7e954c7b54d4678 diff --git a/sys-cluster/charliecloud/charliecloud-0.23.ebuild b/sys-cluster/charliecloud/charliecloud-0.25.ebuild index b514ad3c817a..747ab7795f94 100644 --- a/sys-cluster/charliecloud/charliecloud-0.23.ebuild +++ b/sys-cluster/charliecloud/charliecloud-0.25.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) inherit autotools optfeature python-single-r1 @@ -46,11 +46,6 @@ DEPEND=" net-misc/rsync )" -PATCHES=( - "${FILESDIR}"/${PN}-0.22-sphinx-4.patch - "${FILESDIR}"/${PN}-0.24-dash.patch -) - src_prepare() { default eautoreconf @@ -67,6 +62,8 @@ src_configure() { --with-sphinx-python=${PYTHON} # This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808 --enable-buggy-build + # Do not use bundled version of dev-python/lark-parser. + --disable-bundled-lark ) econf "${econf_args[@]}" } diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild index 20ef1b5db540..747ab7795f94 100644 --- a/sys-cluster/charliecloud/charliecloud-9999.ebuild +++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) inherit autotools optfeature python-single-r1 @@ -62,6 +62,8 @@ src_configure() { --with-sphinx-python=${PYTHON} # This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808 --enable-buggy-build + # Do not use bundled version of dev-python/lark-parser. + --disable-bundled-lark ) econf "${econf_args[@]}" } diff --git a/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch b/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch deleted file mode 100644 index 474fa1efbbea..000000000000 --- a/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f424c4078eab817b4af712b85184c4f07e2289c6 Mon Sep 17 00:00:00 2001 -From: Reid Priedhorsky <1682574+reidpr@users.noreply.github.com> -Date: Wed, 12 May 2021 15:18:15 -0600 -Subject: [PATCH] PR #1062: configure Sphinx 4.x behavior to match 3.x (closes - #1060) - ---- - doc/conf.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/doc/conf.py b/doc/conf.py -index 53a187bbb..417c91629 100644 ---- a/doc/conf.py -+++ b/doc/conf.py -@@ -238,6 +238,10 @@ - - # -- Options for manual page output -------------------------------------------- - -+# Put all man pages in one directory regardless of section. Default changes to -+# True in Sphinx 4.0, which broke our builds (#1060). -+man_make_section_directory = False -+ - # One entry per manual page. List of tuples - # (source start file, name, description, authors, manual section). - man_pages = [ |