commit: 89f08bb73b7d5a71a8bde54458bc3bf6fad0ab34
Author: Wolfgang E. Sanyer <ezzieyguywuf <AT> gmail <DOT> com>
AuthorDate: Wed Jun 2 18:12:41 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jun 2 18:20:23 2021 +0000
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 <ezzieyguywuf <AT> 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.3.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.0.0[${PYTHON_USEDEP}]
+ ' pypy3 python3_7)
+ $(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..000000000
--- 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 000000000..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 000000000..507392ae1
--- /dev/null
+++ b/app-backup/b2/files/b2-2.5.0-nameclash.patch
@@ -0,0 +1,14 @@
+# boost installs an executable named b2, which clashes with the default name
for
+# this package. This package changes the executable name to avoid this clash.
+diff --git a/setup.py b/setup.py
+index f9c1bbe..76ca28f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -135,6 +135,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'],
+ },
+ )
