From 4962103953030be5b8f12c33f6ff110952fb6e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Carton?= Date: Fri, 1 Oct 2021 15:07:43 +0200 Subject: [PATCH 1/7] sci-mathematics/why3: update SRC_URI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François-Xavier Carton --- sci-mathematics/why3/why3-1.3.3.ebuild | 2 +- sci-mathematics/why3/why3-1.4.0.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-mathematics/why3/why3-1.3.3.ebuild b/sci-mathematics/why3/why3-1.3.3.ebuild index 75f796891b..89ff253ff0 100644 --- a/sci-mathematics/why3/why3-1.3.3.ebuild +++ b/sci-mathematics/why3/why3-1.3.3.ebuild @@ -7,7 +7,7 @@ inherit autotools findlib DESCRIPTION="Platform for deductive program verification" HOMEPAGE="http://why3.lri.fr/" -SRC_URI="https://gforge.inria.fr/frs/download.php/file/38367/${P}.tar.gz" +SRC_URI="https://why3.gitlabpages.inria.fr/releases/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" diff --git a/sci-mathematics/why3/why3-1.4.0.ebuild b/sci-mathematics/why3/why3-1.4.0.ebuild index 9174013f33..cce31164bf 100644 --- a/sci-mathematics/why3/why3-1.4.0.ebuild +++ b/sci-mathematics/why3/why3-1.4.0.ebuild @@ -7,7 +7,7 @@ inherit autotools findlib DESCRIPTION="Platform for deductive program verification" HOMEPAGE="http://why3.lri.fr/" -SRC_URI="https://gforge.inria.fr/frs/download.php/file/38425/${P}.tar.gz" +SRC_URI="https://why3.gitlabpages.inria.fr/releases/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" From 27c841dc12e4b418f5fa4bea13511e6ac3b9331a Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Fri, 1 Oct 2021 20:19:57 +0300 Subject: [PATCH 2/7] games-board/fairy-stockfish: drop syzygy tests The instrumented.sh syzygy test data tarball gets differ size every time. Drop it. Closes: https://bugs.gentoo.org/815625 Signed-off-by: Sergey Torokhov --- games-board/fairy-stockfish/Manifest | 1 - games-board/fairy-stockfish/fairy-stockfish-14.ebuild | 11 ++++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/games-board/fairy-stockfish/Manifest b/games-board/fairy-stockfish/Manifest index e4fff19a38..031cae2a03 100644 --- a/games-board/fairy-stockfish/Manifest +++ b/games-board/fairy-stockfish/Manifest @@ -1,2 +1 @@ DIST fairy-stockfish-14.tar.gz 326041 BLAKE2B 16c8f07e60a2df19d0c87c5acb2a5d0e9fe3ffcba5791ac36a33337a35eebaaa01296f86a9cfbecc2916744c73c3d3f6f4ae03f2ea74759bfa96cb92c32f30b4 SHA512 7b684009447ddc0083cf356b1859215c11817a81892d887c1e47d34b26da5338a2f12846fac804995a2d21903ccc74132870a71bec46644ac0a8bba453ba7666 -DIST fairy-stockfish-test-syzygy-14.tar.gz 4201241 BLAKE2B 0c4dd000b382dda233a6be0da2e5ce02651b83507143f6e79ab831f07e2d8b0a30dc700b1375ad3781cc86083538fed48bb59e0dd31f262dd19d25549205d09c SHA512 16b000a93c0cdeaa188be37489f104781f34558ac806b5124716faf9ff6224e7f99e9ca92aa2bd16227a7664624aa8934ebeece80c94fd18c2785f523bc4c583 diff --git a/games-board/fairy-stockfish/fairy-stockfish-14.ebuild b/games-board/fairy-stockfish/fairy-stockfish-14.ebuild index 32436ce4e9..49ad646e9e 100644 --- a/games-board/fairy-stockfish/fairy-stockfish-14.ebuild +++ b/games-board/fairy-stockfish/fairy-stockfish-14.ebuild @@ -10,10 +10,8 @@ HOMEPAGE="https://github.com/ianfab/Fairy-Stockfish" MY_PV=$(ver_rs 1 _) -SRC_URI=" - https://github.com/ianfab/Fairy-Stockfish/archive/fairy_sf_${MY_PV}.tar.gz -> ${P}.tar.gz - test? ( https://api.github.com/repos/niklasf/python-chess/tarball/9b9aa13f9f36d08aadfabff872882f4ab1494e95 -> ${PN}-test-syzygy-${PV}.tar.gz ) -" +SRC_URI="https://github.com/ianfab/Fairy-Stockfish/archive/fairy_sf_${MY_PV}.tar.gz -> ${P}.tar.gz" + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -34,7 +32,6 @@ src_prepare() { default local item - use test && { mv -T ../../niklasf-python-chess-9b9aa13 ../tests/syzygy || die; } # Rename Stockfish to Fairy-Stockfish sed -i -e 's:EXE = stockfish:EXE = fairy-stockfish:' Makefile || die for item in ../tests/*.sh ; do @@ -42,8 +39,8 @@ src_prepare() { done # protocol.sh test 'ucci.exp' fails for timeout 5 but pass with 15 sed -i -e 's:timeout 5:timeout 15:' ../tests/protocol.sh || die - # instrumented.sh syzygy test runs infinitly with USE="largeboards", drop it - use largeboards && { sed -i -e '112,141d' ../tests/instrumented.sh || die; } + # instrumented.sh syzygy test data tarball get differ size every time, drop it + sed -i -e '112,141d' ../tests/instrumented.sh || die # prevent pre-stripping sed -e 's:-strip $(BINDIR)/$(EXE)::' -i Makefile \ From b94aeb0dfea9498df363fa648128aa784ba6a2c7 Mon Sep 17 00:00:00 2001 From: "Wolfgang E. Sanyer" Date: Fri, 1 Oct 2021 14:39:09 -0400 Subject: [PATCH 3/7] app-backup/b2: remove spurious DISTUTILS_USE_SETUPTOOLS Closes: https://bugs.gentoo.org/815535 Signed-off-by: Wolfgang E. Sanyer --- app-backup/b2/b2-2.5.0.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/app-backup/b2/b2-2.5.0.ebuild b/app-backup/b2/b2-2.5.0.ebuild index adadbda20e..5cab862146 100644 --- a/app-backup/b2/b2-2.5.0.ebuild +++ b/app-backup/b2/b2-2.5.0.ebuild @@ -6,7 +6,6 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 From a5d5cef451f560c06f31e447d9a87b8aa3e0aba8 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Fri, 1 Oct 2021 20:48:44 +0100 Subject: [PATCH 4/7] app-misc/liquidctl: drop DISTUTILS_USE_SETUPTOOLS Closes: https://bugs.gentoo.org/815691 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alexey Sokolov --- .../{liquidctl-1.7.1.ebuild => liquidctl-1.7.1-r1.ebuild} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename app-misc/liquidctl/{liquidctl-1.7.1.ebuild => liquidctl-1.7.1-r1.ebuild} (95%) diff --git a/app-misc/liquidctl/liquidctl-1.7.1.ebuild b/app-misc/liquidctl/liquidctl-1.7.1-r1.ebuild similarity index 95% rename from app-misc/liquidctl/liquidctl-1.7.1.ebuild rename to app-misc/liquidctl/liquidctl-1.7.1-r1.ebuild index 547ab6c450..f43f2382df 100644 --- a/app-misc/liquidctl/liquidctl-1.7.1.ebuild +++ b/app-misc/liquidctl/liquidctl-1.7.1-r1.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 udev DESCRIPTION="Cross-platform tool and drivers for liquid coolers and other devices" From 34f9d34b57c47f538802422753f155531ef8308d Mon Sep 17 00:00:00 2001 From: "Wolfgang E. Sanyer" Date: Fri, 1 Oct 2021 15:18:30 -0400 Subject: [PATCH 5/7] dev-python/b2sdk: bump to 1.12.0 Signed-off-by: Wolfgang E. Sanyer --- dev-python/b2sdk/Manifest | 1 + dev-python/b2sdk/b2sdk-1.12.0.ebuild | 48 ++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 dev-python/b2sdk/b2sdk-1.12.0.ebuild diff --git a/dev-python/b2sdk/Manifest b/dev-python/b2sdk/Manifest index 245834d917..38390b803f 100644 --- a/dev-python/b2sdk/Manifest +++ b/dev-python/b2sdk/Manifest @@ -1 +1,2 @@ +DIST b2sdk-1.12.0.tar.gz 273412 BLAKE2B e67cf20a6d7277c3d2990e6f6c46cf9df253b3a46a8c8672cbdc810ca851e8c0cd6b6033b9034ce00283a577e2838cdb0c15410b12546f87c480581b5920074b SHA512 4d5eff1f9efed551c474a472a4c531b67b3356e959dde1d1058aad797abd5fd160781700753019d62ac2f05bd711bf1e6a0b15c0f5f86fd93bab17347a83cb13 DIST b2sdk-1.8.0.tar.gz 250511 BLAKE2B dad792589148fc3cad91fed1aeb43e02afca6f67f35e2f8239510606d601067abbdd36a3f0b2b2b8264697004d548d8077c999437f027c058072d7383d13c48c SHA512 ee1e1987f127835b2016bba9485c7a9d9503b4a675662a7364310fec7c963214805ed6bc15b3a1f07477f202bbe06325f480997eb202bcdfa1cb24f006d0a900 diff --git a/dev-python/b2sdk/b2sdk-1.12.0.ebuild b/dev-python/b2sdk/b2sdk-1.12.0.ebuild new file mode 100644 index 0000000000..dafe65efb5 --- /dev/null +++ b/dev-python/b2sdk/b2sdk-1.12.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +inherit distutils-r1 + +DESCRIPTION="The client library for BackBlaze's B2 product" +HOMEPAGE="https://github.com/Backblaze/b2-sdk-python" +SRC_URI="https://github.com/Backblaze/b2-sdk-python/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( + "${FILESDIR}/${PN}-1.8.0-disable-requirement-installation.patch" +) + +RDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/arrow-0.8.0[${PYTHON_USEDEP}] + >=dev-python/logfury-0.1.2[${PYTHON_USEDEP}] + >=dev-python/requests-2.9.1[${PYTHON_USEDEP}] + >=dev-python/tqdm-4.5.0[${PYTHON_USEDEP}] + ') + $(python_gen_cond_dep ' + dev-python/importlib_metadata[${PYTHON_USEDEP}] + ' pypy3 python3_7) +" + +distutils_enable_tests pytest + +BDEPEND+=" test? ( + $(python_gen_cond_dep ' + >=dev-python/pytest-mock-3.3.1[${PYTHON_USEDEP}] + dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}] + ') +)" + +# These tests seem to require some b2 authentication (they're integration tests +# so this is not unreasonable) +python_test() { + epytest \ + --deselect test/integration/test_large_files.py::TestLargeFile::test_large_file \ + --deselect test/integration/test_raw_api.py::test_raw_api +} From 73f41c54d2738acce01374366035931272ebb6b5 Mon Sep 17 00:00:00 2001 From: "Wolfgang E. Sanyer" Date: Fri, 1 Oct 2021 15:55:03 -0400 Subject: [PATCH 6/7] app-backup/b2: add revbump due to RDEPEND change Signed-off-by: Wolfgang E. Sanyer --- app-backup/b2/{b2-2.5.0.ebuild => b2-2.5.0-r1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app-backup/b2/{b2-2.5.0.ebuild => b2-2.5.0-r1.ebuild} (100%) diff --git a/app-backup/b2/b2-2.5.0.ebuild b/app-backup/b2/b2-2.5.0-r1.ebuild similarity index 100% rename from app-backup/b2/b2-2.5.0.ebuild rename to app-backup/b2/b2-2.5.0-r1.ebuild From d65c26e51fdae04e7195077cb71f9eeaa1ce510d Mon Sep 17 00:00:00 2001 From: "Wolfgang E. Sanyer" Date: Fri, 1 Oct 2021 16:23:14 -0400 Subject: [PATCH 7/7] app-backup/b2: bump to 3.0.3 Signed-off-by: Wolfgang E. Sanyer --- app-backup/b2/Manifest | 1 + app-backup/b2/b2-3.0.3.ebuild | 58 +++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 app-backup/b2/b2-3.0.3.ebuild diff --git a/app-backup/b2/Manifest b/app-backup/b2/Manifest index 79c31e99d8..9e03387055 100644 --- a/app-backup/b2/Manifest +++ b/app-backup/b2/Manifest @@ -1 +1,2 @@ DIST b2-2.5.0.tar.gz 72245 BLAKE2B 321114925d594af631a2d489b46a45d35113f561c19223ba62a2777c3c4d578a5ec494c86f35ea4574f81c569de18eba1622a0a8af83379a61ac1341f9050597 SHA512 f9377bd1bbc61d4297afc4080173695df7d3f8461ba0b3c47c408e5cdfd195542a81a4110316d132dab69a90ab6e0a9bf2b08b7b2e4317d29ce8e49d327819ca +DIST b2-3.0.3.tar.gz 78692 BLAKE2B b216b40e7d3bb0a7b5564418ea463bf9e143a0f1a1408ebe2312869943e5bfbae175afa75aadbe203c05b71026f0fc8fa8f6031b7c3a636ba9b9b6017e2e17be SHA512 61ef1dd1d406f04b50b0d8bb3df921127d996465d53f00dc4cf77d5b6e63ce15fdb9a2d1fc5d7d1c01e734c93fe3e4fe316ca43f420aa6c31f7e3d88e134b659 diff --git a/app-backup/b2/b2-3.0.3.ebuild b/app-backup/b2/b2-3.0.3.ebuild new file mode 100644 index 0000000000..65ae71bbdb --- /dev/null +++ b/app-backup/b2/b2-3.0.3.ebuild @@ -0,0 +1,58 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 + +DESCRIPTION="Command-line tool for BackBlaze's B2 product" +HOMEPAGE="https://github.com/Backblaze/B2_Command_Line_Tool" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( + "${FILESDIR}/${PN}-2.5.0-nameclash.patch" + "${FILESDIR}/${PN}-2.5.0-disable-pip-requirement-installs.patch" +) + +RDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/arrow-0.8.0[${PYTHON_USEDEP}] + >=dev-python/b2sdk-1.12.0[${PYTHON_USEDEP}] + >=dev-python/docutils-0.16[${PYTHON_USEDEP}] + >=dev-python/phx-class-registry-3.0.5[${PYTHON_USEDEP}] + >=dev-python/rst2ansi-0.1.5[${PYTHON_USEDEP}] + ') + $(python_gen_cond_dep ' + =dev-python/importlib_metadata-3.3.0[${PYTHON_USEDEP}] + ' pypy3 python3_8) +" + +distutils_enable_tests pytest + +# - integration tests require an application key and id (which is # reasonable) +# - sync tests require network access +# - Per https://github.com/Backblaze/B2_Command_Line_Tool/issues/687 , the +# parse_millis test is broken due to an upstream issue +python_test() { + epytest \ + --deselect test/integration/test_b2_command_line.py::test_integration \ + --deselect test/unit/test_console_tool.py::TestConsoleTool::test_sync_exclude_if_modified_after_exact \ + --deselect test/unit/test_console_tool.py::TestConsoleTool::test_sync_exclude_if_modified_after_in_range \ + --deselect test/unit/test_arg_parser.py::TestCustomArgTypes::test_parse_millis_from_float_timestamp +} + +pkg_postinst() { + elog "The b2 executable has been renamed to backblaze2 in order to" + elog "avoid a name clash with b2 from boost-build" +}