Gentoo Archives: gentoo-commits

From: "Wolfgang E. Sanyer" <ezzieyguywuf@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-backup/b2/, app-backup/b2/files/
Date: Wed, 02 Jun 2021 18:20:37
Message-Id: 1622658023.89f08bb73b7d5a71a8bde54458bc3bf6fad0ab34.ezzieyguywuf@gentoo
1 commit: 89f08bb73b7d5a71a8bde54458bc3bf6fad0ab34
2 Author: Wolfgang E. Sanyer <ezzieyguywuf <AT> gmail <DOT> com>
3 AuthorDate: Wed Jun 2 18:12:41 2021 +0000
4 Commit: Wolfgang E. Sanyer <ezzieyguywuf <AT> gmail <DOT> com>
5 CommitDate: Wed Jun 2 18:20:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=89f08bb7
7
8 app-backup/b2: bump to 2.5.0
9
10 Signed-off-by: Wolfgang E. Sanyer <ezzieyguywuf <AT> gmail.com>
11
12 app-backup/b2/Manifest | 2 +-
13 app-backup/b2/{b2-2.1.0.ebuild => b2-2.5.0.ebuild} | 15 ++++++++++----
14 app-backup/b2/files/b2-2.1.0-nameclash.patch | 12 -----------
15 ...b2-2.5.0-disable-pip-requirement-installs.patch | 23 ++++++++++++++++++++++
16 app-backup/b2/files/b2-2.5.0-nameclash.patch | 14 +++++++++++++
17 5 files changed, 49 insertions(+), 17 deletions(-)
18
19 diff --git a/app-backup/b2/Manifest b/app-backup/b2/Manifest
20 index 6cbf20eb0..79c31e99d 100644
21 --- a/app-backup/b2/Manifest
22 +++ b/app-backup/b2/Manifest
23 @@ -1 +1 @@
24 -DIST b2-2.1.0.tar.gz 41812 BLAKE2B 0450b0e0e501a061a0934ac303414322331de3d55da54506b08515136b3084464b0bcf35ca90b6f5298456af3978055f4edf67004aa5351c9bac4e4ecc99a078 SHA512 13bc95226ac98122de401159e3e6149fc783162b33c8c6033538f9e7bcaa782d3f67334b83bd876ca15b73924b5b7af9d9cc62556c10adaf9a0de8c06f9014b6
25 +DIST b2-2.5.0.tar.gz 72245 BLAKE2B 321114925d594af631a2d489b46a45d35113f561c19223ba62a2777c3c4d578a5ec494c86f35ea4574f81c569de18eba1622a0a8af83379a61ac1341f9050597 SHA512 f9377bd1bbc61d4297afc4080173695df7d3f8461ba0b3c47c408e5cdfd195542a81a4110316d132dab69a90ab6e0a9bf2b08b7b2e4317d29ce8e49d327819ca
26
27 diff --git a/app-backup/b2/b2-2.1.0.ebuild b/app-backup/b2/b2-2.5.0.ebuild
28 similarity index 72%
29 rename from app-backup/b2/b2-2.1.0.ebuild
30 rename to app-backup/b2/b2-2.5.0.ebuild
31 index 86c355f36..e716db900 100644
32 --- a/app-backup/b2/b2-2.1.0.ebuild
33 +++ b/app-backup/b2/b2-2.5.0.ebuild
34 @@ -3,7 +3,7 @@
35
36 EAPI=7
37
38 -PYTHON_COMPAT=( python3_{7..8} )
39 +PYTHON_COMPAT=( python3_{7..9} )
40
41 DISTUTILS_SINGLE_IMPL=1
42 DISTUTILS_USE_SETUPTOOLS=rdepend
43 @@ -19,16 +19,23 @@ SLOT="0"
44 KEYWORDS="~amd64 ~x86"
45
46 PATCHES=(
47 - "${FILESDIR}/${P}-nameclash.patch"
48 + "${FILESDIR}/${PN}-2.5.0-nameclash.patch"
49 + "${FILESDIR}/${PN}-2.5.0-disable-pip-requirement-installs.patch"
50 )
51
52 RDEPEND="
53 $(python_gen_cond_dep '
54 >=dev-python/arrow-0.8.0[${PYTHON_USEDEP}]
55 - >=dev-python/b2sdk-1.2.0[${PYTHON_USEDEP}]
56 - <dev-python/b2sdk-1.3.0[${PYTHON_USEDEP}]
57 + >=dev-python/b2sdk-1.8.0[${PYTHON_USEDEP}]
58 >=dev-python/phx-class-registry-3.0.5[${PYTHON_USEDEP}]
59 + >=dev-python/rst2ansi-0.1.5[${PYTHON_USEDEP}]
60 ')
61 + $(python_gen_cond_dep '
62 + <dev-python/importlib_metadata-3.0.0[${PYTHON_USEDEP}]
63 + ' pypy3 python3_7)
64 + $(python_gen_cond_dep '
65 + >=dev-python/importlib_metadata-3.3.0[${PYTHON_USEDEP}]
66 + ' pypy3 python3_8)
67 "
68
69 distutils_enable_tests pytest
70
71 diff --git a/app-backup/b2/files/b2-2.1.0-nameclash.patch b/app-backup/b2/files/b2-2.1.0-nameclash.patch
72 deleted file mode 100644
73 index 340176f66..000000000
74 --- a/app-backup/b2/files/b2-2.1.0-nameclash.patch
75 +++ /dev/null
76 @@ -1,12 +0,0 @@
77 -diff --git a/setup.py b/setup.py
78 -index fee3261..f90056b 100644
79 ---- a/setup.py
80 -+++ b/setup.py
81 -@@ -140,6 +140,6 @@ setup(
82 - # "scripts" keyword. Entry points provide cross-platform support and allow
83 - # pip to create the appropriate form of executable for the target platform.
84 - entry_points={
85 -- 'console_scripts': ['b2=b2.console_tool:main',],
86 -+ 'console_scripts': ['backblaze2=b2.console_tool:main',],
87 - },
88 - )
89
90 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
91 new file mode 100644
92 index 000000000..18cfaaf35
93 --- /dev/null
94 +++ b/app-backup/b2/files/b2-2.5.0-disable-pip-requirement-installs.patch
95 @@ -0,0 +1,23 @@
96 +# These configurations attempt to install missing dependencies using pip, which
97 +# violates the network sandbox. Instead, we'll manage the dependencies in
98 +# portage.
99 +--- a/setup.py
100 ++++ b/setup.py
101 +@@ -103,7 +103,7 @@ setup(
102 + # requirements files see:
103 + # https://packaging.python.org/en/latest/requirements.html
104 + dependency_links=[],
105 +- install_requires=requirements,
106 ++ # install_requires=requirements,
107 +
108 + # List additional groups of dependencies here (e.g. development
109 + # dependencies). You can install these using the following syntax,
110 +@@ -116,7 +116,7 @@ setup(
111 + 'sphinxcontrib-plantuml', 'sadisplay'
112 + ],
113 + },
114 +- setup_requires=['setuptools_scm<6.0'], # setuptools_scm>=6.0 doesn't support Python 3.5
115 ++ # setup_requires=['setuptools_scm<6.0'], # setuptools_scm>=6.0 doesn't support Python 3.5
116 + use_scm_version=True,
117 +
118 + # If there are data files included in your packages that need to be
119
120 diff --git a/app-backup/b2/files/b2-2.5.0-nameclash.patch b/app-backup/b2/files/b2-2.5.0-nameclash.patch
121 new file mode 100644
122 index 000000000..507392ae1
123 --- /dev/null
124 +++ b/app-backup/b2/files/b2-2.5.0-nameclash.patch
125 @@ -0,0 +1,14 @@
126 +# boost installs an executable named b2, which clashes with the default name for
127 +# this package. This package changes the executable name to avoid this clash.
128 +diff --git a/setup.py b/setup.py
129 +index f9c1bbe..76ca28f 100644
130 +--- a/setup.py
131 ++++ b/setup.py
132 +@@ -135,6 +135,6 @@ setup(
133 + # "scripts" keyword. Entry points provide cross-platform support and allow
134 + # pip to create the appropriate form of executable for the target platform.
135 + entry_points={
136 +- 'console_scripts': ['b2=b2.console_tool:main'],
137 ++ 'console_scripts': ['backblaze2=b2.console_tool:main'],
138 + },
139 + )