[gentoo-commits] repo/proj/guru:master commit in: app-backup/b2/files/, app-backup/b2/
commit: 330c9f354c16622d6b8de9c4b54a0924fea35b67 Author: Wolfgang E. Sanyer gmail com> AuthorDate: Wed Apr 3 02:29:15 2024 + Commit: Julien Roy jroy ca> CommitDate: Wed Apr 3 02:40:06 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=330c9f35 app-backup/b2: drop 3.4.0 Signed-off-by: Wolfgang E. Sanyer gmail.com> app-backup/b2/Manifest | 1 - app-backup/b2/b2-3.4.0.ebuild | 54 -- ...b2-2.5.0-disable-pip-requirement-installs.patch | 23 - ...b2-3.4.0-disable-pip-requirement-installs.patch | 24 -- 4 files changed, 102 deletions(-) diff --git a/app-backup/b2/Manifest b/app-backup/b2/Manifest index ae607ca74f..92370c8f8d 100644 --- a/app-backup/b2/Manifest +++ b/app-backup/b2/Manifest @@ -1,3 +1,2 @@ DIST b2-3.18.0.gh.tar.gz 189572 BLAKE2B 9516d98c7c493791f120c345480f16c8d615cbf425f692fa3fe6688c21ef7d26f14cdd7b44cfb22f2c13a5554166c046eb5fa1712a1e1994fa4e4181399eda84 SHA512 45c784e961b8b650d27e7fe642cacd194462b3c0864fdc1af52e41a70b435c36fbb803e80cfb2c88b8165ea95459a7e62b1995f26caf612110f8c77418cb6669 -DIST b2-3.4.0.tar.gz 86706 BLAKE2B 2aa1f4934db0bcf8c1334a5def94fd74824a9ca19d293b201b29f8c4511e8d423fd77d71734c386aeb41e60747ea71d36d8c049676cf6fcd3e101354440da8cc SHA512 5b0f411301f9b022c066ab3a1170d2ef3b21a76fe9c4e668d1da0cbd07334d11614f93d283e5c0482cb4f6985466d28b0fe59b4c058a87643218dd7a96857418 DIST b2-3.9.0.tar.gz 131326 BLAKE2B c357831b7c0b4ae6abc4fafb6e09690f8ffe833d2c58c05610ffdbf94ba276f5fa143dd1528f7e7424b6fa96857c8328be993e6ffc60b61c44037bd9ef0b0e96 SHA512 db2fab07e973d6d39db3931dd7f645ee3c9737f4de0ab29327490607d52aad4df2e9049782ef347ee44f80b76dbe91f495ce273285001d49195abe91d5b2cb5d diff --git a/app-backup/b2/b2-3.4.0.ebuild b/app-backup/b2/b2-3.4.0.ebuild deleted file mode 100644 index 1af6890ea7..00 --- a/app-backup/b2/b2-3.4.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_10 python3_11 ) -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 pypi - -DESCRIPTION="Command-line tool for BackBlaze's B2 product" -HOMEPAGE="https://github.com/Backblaze/B2_Command_Line_Tool; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -PATCHES=( - "${FILESDIR}/${PN}-2.5.0-nameclash.patch" - "${FILESDIR}/${PN}-3.4.0-disable-pip-requirement-installs.patch" -) - -RDEPEND=" - $(python_gen_cond_dep ' - >=dev-python/arrow-1.0.2[${PYTHON_USEDEP}] - >=dev-python/b2sdk-1.16.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" -} diff --git a/app-backup/b2/files/b2-2.5.0-disable-pip-requirement-installs.patch b/app-backup/b2/files/b2-2.5.0-disable-pip-requirement-installs.patch deleted file mode 100644 index 18cfaaf35f..00 --- a/app-backup/b2/files/b2-2.5.0-disable-pip-requirement-installs.patch +++ /dev/null @@ -1,23 +0,0 @@ -# These configurations attempt to install missing dependencies using pip, which -# violates the network sandbox. Instead, we'll manage the dependencies in -# portage. a/setup.py -+++ b/setup.py -@@ -103,7 +103,7 @@ setup( - # requirements files see: - # https://packaging.python.org/en/latest/requirements.html - dependency_links=[], --install_requires=requirements, -+# install_requires=requirements, - - # List additional groups of dependencies here (e.g. development - # dependencies). You can install these using the following syntax, -@@ -116,7 +116,7 @@ setup( - 'sphinxcontrib-plantuml', 'sadisplay' - ], - }, --
[gentoo-commits] repo/proj/guru:master commit in: app-backup/b2/files/, app-backup/b2/
commit: 15e6258dd3bbf39663c6f1768e97181d499c0cc6 Author: Wolfgang E. Sanyer gmail com> AuthorDate: Wed Apr 3 00:42:07 2024 + Commit: Julien Roy jroy ca> CommitDate: Wed Apr 3 02:35:41 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=15e6258d app-backup/b2: bump to 3.18.0 Signed-off-by: Wolfgang E. Sanyer gmail.com> app-backup/b2/Manifest| 1 + app-backup/b2/b2-3.18.0.ebuild| 61 +++ app-backup/b2/files/b2-3.18.0-nameclash.patch | 29 + 3 files changed, 91 insertions(+) diff --git a/app-backup/b2/Manifest b/app-backup/b2/Manifest index 1bd1b86f8b..ae607ca74f 100644 --- a/app-backup/b2/Manifest +++ b/app-backup/b2/Manifest @@ -1,2 +1,3 @@ +DIST b2-3.18.0.gh.tar.gz 189572 BLAKE2B 9516d98c7c493791f120c345480f16c8d615cbf425f692fa3fe6688c21ef7d26f14cdd7b44cfb22f2c13a5554166c046eb5fa1712a1e1994fa4e4181399eda84 SHA512 45c784e961b8b650d27e7fe642cacd194462b3c0864fdc1af52e41a70b435c36fbb803e80cfb2c88b8165ea95459a7e62b1995f26caf612110f8c77418cb6669 DIST b2-3.4.0.tar.gz 86706 BLAKE2B 2aa1f4934db0bcf8c1334a5def94fd74824a9ca19d293b201b29f8c4511e8d423fd77d71734c386aeb41e60747ea71d36d8c049676cf6fcd3e101354440da8cc SHA512 5b0f411301f9b022c066ab3a1170d2ef3b21a76fe9c4e668d1da0cbd07334d11614f93d283e5c0482cb4f6985466d28b0fe59b4c058a87643218dd7a96857418 DIST b2-3.9.0.tar.gz 131326 BLAKE2B c357831b7c0b4ae6abc4fafb6e09690f8ffe833d2c58c05610ffdbf94ba276f5fa143dd1528f7e7424b6fa96857c8328be993e6ffc60b61c44037bd9ef0b0e96 SHA512 db2fab07e973d6d39db3931dd7f645ee3c9737f4de0ab29327490607d52aad4df2e9049782ef347ee44f80b76dbe91f495ce273285001d49195abe91d5b2cb5d diff --git a/app-backup/b2/b2-3.18.0.ebuild b/app-backup/b2/b2-3.18.0.ebuild new file mode 100644 index 00..de51fe0a3d --- /dev/null +++ b/app-backup/b2/b2-3.18.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_10 python3_11 python3_12 ) +DISTUTILS_USE_PEP517="pdm-backend" +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 pypi + +DESCRIPTION="Command-line tool for BackBlaze's B2 product" +HOMEPAGE="https://github.com/Backblaze/B2_Command_Line_Tool; +SRC_URI="https://github.com/Backblaze/B2_Command_Line_Tool/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +S="${WORKDIR}/B2_Command_Line_Tool-${PV}" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( + "${FILESDIR}/${P}-nameclash.patch" +) + +export PDM_BUILD_SCM_VERSION=${PV} + +RDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/argcomplete-2.1.2[${PYTHON_USEDEP}] + >=dev-python/arrow-1.3.0[${PYTHON_USEDEP}] + >=dev-python/b2sdk-1.21.0[${PYTHON_USEDEP}] + >=dev-python/docutils-0.19[${PYTHON_USEDEP}] + >=dev-python/phx-class-registry-4.0.6[${PYTHON_USEDEP}] + >=dev-python/rst2ansi-0.1.5[${PYTHON_USEDEP}] + >=dev-python/tabulate-0.9.0[${PYTHON_USEDEP}] + >=dev-python/tqdm-4.65.0[${PYTHON_USEDEP}] + ') +" + +DEPEND=" + test? ( + $(python_gen_cond_dep ' + >=dev-python/backoff-2.2.1[${PYTHON_USEDEP}] + >=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}] + ') + ) +" + +distutils_enable_tests pytest + +# - integration tests require an application key and id (which is reasonable) +# - sync tests require network access +python_test() { + epytest --deselect test/unit/console_tool test/unit + epytest test/unit/console_tool +} + +pkg_postinst() { + elog "The b2 executable has been renamed to backblaze2 in order to" + elog "avoid a name clash with b2 from boost-build" +} diff --git a/app-backup/b2/files/b2-3.18.0-nameclash.patch b/app-backup/b2/files/b2-3.18.0-nameclash.patch new file mode 100644 index 00..cea9a8a720 --- /dev/null +++ b/app-backup/b2/files/b2-3.18.0-nameclash.patch @@ -0,0 +1,29 @@ +From e454e6e2f3edb9358bfd14c59cfaf88567389492 Mon Sep 17 00:00:00 2001 +From: "Wolfgang E. Sanyer" +Date: Tue, 2 Apr 2024 22:12:48 -0400 +Subject: [PATCH] patch + +--- + pyproject.toml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 72cf0e1..464a4a7 100644 +--- a/pyproject.toml b/pyproject.toml +@@ -65,9 +65,9 @@ full = [ + Homepage = "https://github.com/Backblaze/B2_Command_Line_Tool; + + [project.scripts] +-b2 = "b2._internal.b2v3.__main__:main" +-b2v3 = "b2._internal.b2v3.__main__:main" +-_b2v4 = "b2._internal._b2v4.__main__:main" ++backblaze2 = "b2._internal.b2v3.__main__:main" ++backblaze2v3 = "b2._internal.b2v3.__main__:main" ++_backblaze2v4 = "b2._internal._b2v4.__main__:main" + + [build-system] + requires = ["pdm-backend"] +-- +2.43.2 +
[gentoo-commits] repo/proj/guru:master commit in: app-backup/b2/
commit: 683347b16b1a3b51098bf5c811f93122e8231446 Author: Wolfgang E. Sanyer gmail com> AuthorDate: Wed Apr 3 02:30:17 2024 + Commit: Julien Roy jroy ca> CommitDate: Wed Apr 3 02:40:20 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=683347b1 app-backup/b2-3.9.0: update PYTHON_COMPAT Signed-off-by: Wolfgang E. Sanyer gmail.com> app-backup/b2/b2-3.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-backup/b2/b2-3.9.0.ebuild b/app-backup/b2/b2-3.9.0.ebuild index e7159e74cd..92990f4610 100644 --- a/app-backup/b2/b2-3.9.0.ebuild +++ b/app-backup/b2/b2-3.9.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_10 python3_11 ) +PYTHON_COMPAT=( python3_10 python3_11 python3_12 ) DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1
[gentoo-commits] repo/proj/guru:master commit in: app-backup/b2/
commit: f47258a370f943c04011da50c5cc7edcb7e21c29 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Thu Mar 9 07:52:26 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Thu Mar 9 07:52:26 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f47258a3 app-backup/b2: drop 3.0.3 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> app-backup/b2/Manifest| 1 - app-backup/b2/b2-3.0.3.ebuild | 58 --- 2 files changed, 59 deletions(-) diff --git a/app-backup/b2/Manifest b/app-backup/b2/Manifest index 1c9c1877a..939d66585 100644 --- a/app-backup/b2/Manifest +++ b/app-backup/b2/Manifest @@ -1,2 +1 @@ -DIST b2-3.0.3.tar.gz 78692 BLAKE2B b216b40e7d3bb0a7b5564418ea463bf9e143a0f1a1408ebe2312869943e5bfbae175afa75aadbe203c05b71026f0fc8fa8f6031b7c3a636ba9b9b6017e2e17be SHA512 61ef1dd1d406f04b50b0d8bb3df921127d996465d53f00dc4cf77d5b6e63ce15fdb9a2d1fc5d7d1c01e734c93fe3e4fe316ca43f420aa6c31f7e3d88e134b659 DIST b2-3.4.0.tar.gz 86706 BLAKE2B 2aa1f4934db0bcf8c1334a5def94fd74824a9ca19d293b201b29f8c4511e8d423fd77d71734c386aeb41e60747ea71d36d8c049676cf6fcd3e101354440da8cc SHA512 5b0f411301f9b022c066ab3a1170d2ef3b21a76fe9c4e668d1da0cbd07334d11614f93d283e5c0482cb4f6985466d28b0fe59b4c058a87643218dd7a96857418 diff --git a/app-backup/b2/b2-3.0.3.ebuild b/app-backup/b2/b2-3.0.3.ebuild deleted file mode 100644 index 7d0fd5735..0 --- a/app-backup/b2/b2-3.0.3.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..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" -}
[gentoo-commits] repo/proj/guru:master commit in: app-backup/b2/
commit: d65c26e51fdae04e7195077cb71f9eeaa1ce510d Author: Wolfgang E. Sanyer gmail com> AuthorDate: Fri Oct 1 20:23:14 2021 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Fri Oct 1 20:23:14 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d65c26e5 app-backup/b2: bump to 3.0.3 Signed-off-by: Wolfgang E. Sanyer gmail.com> app-backup/b2/Manifest| 1 + app-backup/b2/b2-3.0.3.ebuild | 58 +++ 2 files changed, 59 insertions(+) diff --git a/app-backup/b2/Manifest b/app-backup/b2/Manifest index 79c31e99d..9e0338705 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 0..65ae71bbd --- /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" +}
[gentoo-commits] repo/proj/guru:master commit in: app-backup/b2/
commit: 73f41c54d2738acce01374366035931272ebb6b5 Author: Wolfgang E. Sanyer gmail com> AuthorDate: Fri Oct 1 19:55:03 2021 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Fri Oct 1 20:01:30 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=73f41c54 app-backup/b2: add revbump due to RDEPEND change Signed-off-by: Wolfgang E. Sanyer gmail.com> app-backup/b2/{b2-2.5.0.ebuild => b2-2.5.0-r1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) 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
[gentoo-commits] repo/proj/guru:master commit in: app-backup/b2/
commit: b94aeb0dfea9498df363fa648128aa784ba6a2c7 Author: Wolfgang E. Sanyer gmail com> AuthorDate: Fri Oct 1 18:39:09 2021 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Fri Oct 1 18:39:09 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b94aeb0d app-backup/b2: remove spurious DISTUTILS_USE_SETUPTOOLS Closes: https://bugs.gentoo.org/815535 Signed-off-by: Wolfgang E. Sanyer gmail.com> 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 adadbda20..5cab86214 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
[gentoo-commits] repo/proj/guru:master commit in: app-backup/b2/files/, app-backup/b2/
commit: 89f08bb73b7d5a71a8bde54458bc3bf6fad0ab34 Author: Wolfgang E. Sanyer gmail com> AuthorDate: Wed Jun 2 18:12:41 2021 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Wed Jun 2 18:20:23 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=89f08bb7 app-backup/b2: bump to 2.5.0 Signed-off-by: Wolfgang E. Sanyer gmail.com> app-backup/b2/Manifest | 2 +- app-backup/b2/{b2-2.1.0.ebuild => b2-2.5.0.ebuild} | 15 ++ app-backup/b2/files/b2-2.1.0-nameclash.patch | 12 --- ...b2-2.5.0-disable-pip-requirement-installs.patch | 23 ++ app-backup/b2/files/b2-2.5.0-nameclash.patch | 14 + 5 files changed, 49 insertions(+), 17 deletions(-) diff --git a/app-backup/b2/Manifest b/app-backup/b2/Manifest index 6cbf20eb0..79c31e99d 100644 --- a/app-backup/b2/Manifest +++ b/app-backup/b2/Manifest @@ -1 +1 @@ -DIST b2-2.1.0.tar.gz 41812 BLAKE2B 0450b0e0e501a061a0934ac303414322331de3d55da54506b08515136b3084464b0bcf35ca90b6f5298456af3978055f4edf67004aa5351c9bac4e4ecc99a078 SHA512 13bc95226ac98122de401159e3e6149fc783162b33c8c6033538f9e7bcaa782d3f67334b83bd876ca15b73924b5b7af9d9cc62556c10adaf9a0de8c06f9014b6 +DIST b2-2.5.0.tar.gz 72245 BLAKE2B 321114925d594af631a2d489b46a45d35113f561c19223ba62a2777c3c4d578a5ec494c86f35ea4574f81c569de18eba1622a0a8af83379a61ac1341f9050597 SHA512 f9377bd1bbc61d4297afc4080173695df7d3f8461ba0b3c47c408e5cdfd195542a81a4110316d132dab69a90ab6e0a9bf2b08b7b2e4317d29ce8e49d327819ca diff --git a/app-backup/b2/b2-2.1.0.ebuild b/app-backup/b2/b2-2.5.0.ebuild similarity index 72% rename from app-backup/b2/b2-2.1.0.ebuild rename to app-backup/b2/b2-2.5.0.ebuild index 86c355f36..e716db900 100644 --- a/app-backup/b2/b2-2.1.0.ebuild +++ b/app-backup/b2/b2-2.5.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..8} ) +PYTHON_COMPAT=( python3_{7..9} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=rdepend @@ -19,16 +19,23 @@ SLOT="0" KEYWORDS="~amd64 ~x86" PATCHES=( - "${FILESDIR}/${P}-nameclash.patch" + "${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.2.0[${PYTHON_USEDEP}] - =dev-python/b2sdk-1.8.0[${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 diff --git a/app-backup/b2/files/b2-2.1.0-nameclash.patch b/app-backup/b2/files/b2-2.1.0-nameclash.patch deleted file mode 100644 index 340176f66..0 --- a/app-backup/b2/files/b2-2.1.0-nameclash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.py b/setup.py -index fee3261..f90056b 100644 a/setup.py -+++ b/setup.py -@@ -140,6 +140,6 @@ setup( - # "scripts" keyword. Entry points provide cross-platform support and allow - # pip to create the appropriate form of executable for the target platform. - entry_points={ --'console_scripts': ['b2=b2.console_tool:main',], -+'console_scripts': ['backblaze2=b2.console_tool:main',], - }, - ) diff --git a/app-backup/b2/files/b2-2.5.0-disable-pip-requirement-installs.patch b/app-backup/b2/files/b2-2.5.0-disable-pip-requirement-installs.patch new file mode 100644 index 0..18cfaaf35 --- /dev/null +++ b/app-backup/b2/files/b2-2.5.0-disable-pip-requirement-installs.patch @@ -0,0 +1,23 @@ +# These configurations attempt to install missing dependencies using pip, which +# violates the network sandbox. Instead, we'll manage the dependencies in +# portage. +--- a/setup.py b/setup.py +@@ -103,7 +103,7 @@ setup( + # requirements files see: + # https://packaging.python.org/en/latest/requirements.html + dependency_links=[], +-install_requires=requirements, ++# install_requires=requirements, + + # List additional groups of dependencies here (e.g. development + # dependencies). You can install these using the following syntax, +@@ -116,7 +116,7 @@ setup( + 'sphinxcontrib-plantuml', 'sadisplay' + ], + }, +-setup_requires=['setuptools_scm<6.0'], # setuptools_scm>=6.0 doesn't support Python 3.5 ++# setup_requires=['setuptools_scm<6.0'], # setuptools_scm>=6.0 doesn't support Python 3.5 + use_scm_version=True, + + # If there are data files included in your packages that need to be diff --git a/app-backup/b2/files/b2-2.5.0-nameclash.patch b/app-backup/b2/files/b2-2.5.0-nameclash.patch new file mode 100644 index 0..507392ae1 --- /dev/null +++ b/app-backup/b2/files/b2-2.5.0-nameclash.patch @@ -0,0 +1,14 @@ +#
[gentoo-commits] repo/proj/guru:master commit in: app-backup/b2/
commit: 5e994531efe6e4def125d2cbafd90cfd37409ce5 Author: Wolfgang E. Sanyer gmail com> AuthorDate: Mon Jan 4 05:18:20 2021 + Commit: Andrew Ammerlaan riseup net> CommitDate: Mon Jan 4 05:18:20 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5e994531 app-backup/b2: remove proxy maintainer info from metadata Signed-off-by: Wolfgang E. Sanyer gmail.com> app-backup/b2/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/app-backup/b2/metadata.xml b/app-backup/b2/metadata.xml index 6e00138a..5440a39c 100644 --- a/app-backup/b2/metadata.xml +++ b/app-backup/b2/metadata.xml @@ -5,10 +5,6 @@ ezzieyguy...@gmail.com Wolfgang E. Sanyer - - proxy-ma...@gentoo.org - Proxy Maintainers - The command-line tool that gives easy access to all of the capabilities of B2 Cloud Storage.
[gentoo-commits] repo/proj/guru:master commit in: app-backup/b2/files/, app-backup/b2/
commit: 1d9279bbe078badae5c434759b070022ae23147c Author: Wolfgang E. Sanyer gmail com> AuthorDate: Mon Jan 4 02:03:40 2021 + Commit: Andrew Ammerlaan riseup net> CommitDate: Mon Jan 4 02:14:53 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1d9279bb app-backup/b2: new package, backblaze's cli client Signed-off-by: Wolfgang E. Sanyer gmail.com> app-backup/b2/Manifest | 1 + app-backup/b2/b2-2.1.0.ebuild | 40 ++ app-backup/b2/files/b2-2.1.0-nameclash.patch | 12 +++ .../b2/files/b2-2.1.0-skip-integration-test.patch | 12 +++ app-backup/b2/metadata.xml | 18 ++ 5 files changed, 83 insertions(+) diff --git a/app-backup/b2/Manifest b/app-backup/b2/Manifest new file mode 100644 index ..6cbf20eb --- /dev/null +++ b/app-backup/b2/Manifest @@ -0,0 +1 @@ +DIST b2-2.1.0.tar.gz 41812 BLAKE2B 0450b0e0e501a061a0934ac303414322331de3d55da54506b08515136b3084464b0bcf35ca90b6f5298456af3978055f4edf67004aa5351c9bac4e4ecc99a078 SHA512 13bc95226ac98122de401159e3e6149fc783162b33c8c6033538f9e7bcaa782d3f67334b83bd876ca15b73924b5b7af9d9cc62556c10adaf9a0de8c06f9014b6 diff --git a/app-backup/b2/b2-2.1.0.ebuild b/app-backup/b2/b2-2.1.0.ebuild new file mode 100644 index ..78feaef0 --- /dev/null +++ b/app-backup/b2/b2-2.1.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..8} ) + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="The 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}/${P}-nameclash.patch" + "${FILESDIR}/${P}-skip-integration-test.patch" +) + +RDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/arrow-0.8.0[${PYTHON_USEDEP}] + >=dev-python/b2sdk-1.2.0[${PYTHON_USEDEP}] + =dev-python/phx-class-registry-3.0.5[${PYTHON_USEDEP}] + ') +" + +distutils_enable_tests pytest + +pkg_postinst(){ + elog "The b2 executable has been renamed to backblaze2 in order to" + elog "avoid a name clash with b2 from boost-build" +} diff --git a/app-backup/b2/files/b2-2.1.0-nameclash.patch b/app-backup/b2/files/b2-2.1.0-nameclash.patch new file mode 100644 index ..340176f6 --- /dev/null +++ b/app-backup/b2/files/b2-2.1.0-nameclash.patch @@ -0,0 +1,12 @@ +diff --git a/setup.py b/setup.py +index fee3261..f90056b 100644 +--- a/setup.py b/setup.py +@@ -140,6 +140,6 @@ setup( + # "scripts" keyword. Entry points provide cross-platform support and allow + # pip to create the appropriate form of executable for the target platform. + entry_points={ +-'console_scripts': ['b2=b2.console_tool:main',], ++'console_scripts': ['backblaze2=b2.console_tool:main',], + }, + ) diff --git a/app-backup/b2/files/b2-2.1.0-skip-integration-test.patch b/app-backup/b2/files/b2-2.1.0-skip-integration-test.patch new file mode 100644 index ..40506bc9 --- /dev/null +++ b/app-backup/b2/files/b2-2.1.0-skip-integration-test.patch @@ -0,0 +1,12 @@ +diff --git a/test/integration/test_b2_command_line.py b/test/integration/test_b2_command_line.py +index 02b36ab..bd790ec 100644 +--- a/test/integration/test_b2_command_line.py b/test/integration/test_b2_command_line.py +@@ -870,6 +870,7 @@ def main(): + + + # TODO: rewrite to multiple tests ++@pytest.mark.skip(reason="Cannot do this in portage") + def test_integration(): + application_key_id = os.environ.get('B2_TEST_APPLICATION_KEY_ID') + if application_key_id is None: diff --git a/app-backup/b2/metadata.xml b/app-backup/b2/metadata.xml new file mode 100644 index ..6e00138a --- /dev/null +++ b/app-backup/b2/metadata.xml @@ -0,0 +1,18 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + ezzieyguy...@gmail.com + Wolfgang E. Sanyer + + + proxy-ma...@gentoo.org + Proxy Maintainers + + + The command-line tool that gives easy access to all of the capabilities + of B2 Cloud Storage. + + This program provides command-line access to the B2 service. + +