1 |
commit: b9ecc3e323e2f214c1a0a62d2ab2f548dcfd6e76 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 21 07:10:27 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 21 09:42:45 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9ecc3e3 |
7 |
|
8 |
dev-python/pygit2: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pygit2/Manifest | 2 - |
13 |
.../pygit2/files/pygit2-1.6.1-libgit2-1.2.0.patch | 48 ---------------------- |
14 |
dev-python/pygit2/pygit2-1.6.1-r3.ebuild | 40 ------------------ |
15 |
dev-python/pygit2/pygit2-1.6.1-r4.ebuild | 44 -------------------- |
16 |
dev-python/pygit2/pygit2-1.7.0-r1.ebuild | 40 ------------------ |
17 |
5 files changed, 174 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest |
20 |
index eecec9ef872f..746e9bae01ab 100644 |
21 |
--- a/dev-python/pygit2/Manifest |
22 |
+++ b/dev-python/pygit2/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST pygit2-1.6.1.tar.gz 258338 BLAKE2B dc223e2a5231728c42ca7e0581483731fbab6ee090cf4aeeb27f186973b3c753fdf54c89679a88b97d834d717135f9b8f9a2adf492ed8572affa938c79d0f905 SHA512 67a78313493ba096cbae6805bda861495f33644fd180b5fb1cd99dcd226ef5a09ee85bd27d04d0697ef15503a4e902aa1384980870551f430fd9560ac949fe2f |
25 |
-DIST pygit2-1.7.0.tar.gz 276292 BLAKE2B 6091e2916c4986cb545f23d3a31f262666f0349661ccc48769414e888d0ede48af3a80483b4638a3a2275b74ed9b42113bdeae678f03d76caa7e796c6011b50c SHA512 3a8654036d0ab875898ce60e81bcab48bdb6d6bd63c29dc98272c71b5c82391e3186da61083fba09faf722e176fed5c592a36edb53ae0b957726e74646d25616 |
26 |
DIST pygit2-1.7.1.tar.gz 281791 BLAKE2B 51f7f23752acf0abf6000f2262019db7503506267f0f5306bd53e0e15378447d2da564818c1b6efccc4759587aba6b4d7b142c760e4e2796445cd6056e949825 SHA512 a6232039b6364c7a0905aba20f7e27b43892b7067fa95fdd464438869453360ecdb885f2012cdf0eb0734c91dc79b60db894d1d0fee81922b9fb3cf920950937 |
27 |
|
28 |
diff --git a/dev-python/pygit2/files/pygit2-1.6.1-libgit2-1.2.0.patch b/dev-python/pygit2/files/pygit2-1.6.1-libgit2-1.2.0.patch |
29 |
deleted file mode 100644 |
30 |
index d3e097ba62b3..000000000000 |
31 |
--- a/dev-python/pygit2/files/pygit2-1.6.1-libgit2-1.2.0.patch |
32 |
+++ /dev/null |
33 |
@@ -1,48 +0,0 @@ |
34 |
-From dcde9eff5950492ab0d2565a07fd18d765332a96 Mon Sep 17 00:00:00 2001 |
35 |
-From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@×××××.com> |
36 |
-Date: Thu, 16 Sep 2021 11:19:04 +0200 |
37 |
-Subject: [PATCH] Upgrade to libgit2 1.2 |
38 |
- |
39 |
-Closes #1089 |
40 |
---- |
41 |
- Makefile | 2 +- |
42 |
- build.sh | 14 +++++++------- |
43 |
- pygit2/decl/remote.h | 2 ++ |
44 |
- src/types.h | 4 ++-- |
45 |
- 10 files changed, 29 insertions(+), 25 deletions(-) |
46 |
- |
47 |
-diff --git a/pygit2/decl/remote.h b/pygit2/decl/remote.h |
48 |
-index ff84371c3e1ce81a7e9914d4d4592638f41376bb..4e912c065cd6eaf19ef6d0304b0fd8f646edbff4 100644 |
49 |
---- a/pygit2/decl/remote.h |
50 |
-+++ b/pygit2/decl/remote.h |
51 |
-@@ -23,6 +23,7 @@ typedef struct { |
52 |
- |
53 |
- typedef int (*git_push_negotiation)(const git_push_update **updates, size_t len, void *payload); |
54 |
- typedef int (*git_push_update_reference_cb)(const char *refname, const char *status, void *data); |
55 |
-+typedef int (*git_remote_ready_cb)(git_remote *remote, int direction, void *payload); |
56 |
- typedef int (*git_url_resolve_cb)(git_buf *url_resolved, const char *url, int direction, void *payload); |
57 |
- |
58 |
- struct git_remote_callbacks { |
59 |
-@@ -38,6 +39,7 @@ struct git_remote_callbacks { |
60 |
- git_push_update_reference_cb push_update_reference; |
61 |
- git_push_negotiation push_negotiation; |
62 |
- git_transport_cb transport; |
63 |
-+ git_remote_ready_cb remote_ready; |
64 |
- void *payload; |
65 |
- git_url_resolve_cb resolve_url; |
66 |
- }; |
67 |
-diff --git a/src/types.h b/src/types.h |
68 |
-index ff967b81f76688f8f0958638d99a06f7bbacb99c..89ad3a00149a1326c3edfa20d2d69d629cb1d2a2 100644 |
69 |
---- a/src/types.h |
70 |
-+++ b/src/types.h |
71 |
-@@ -32,8 +32,8 @@ |
72 |
- #include <Python.h> |
73 |
- #include <git2.h> |
74 |
- |
75 |
--#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 1) |
76 |
--#error You need a compatible libgit2 version (1.1.x) |
77 |
-+#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 2) |
78 |
-+#error You need a compatible libgit2 version (1.2.x) |
79 |
- #endif |
80 |
- |
81 |
- /* |
82 |
|
83 |
diff --git a/dev-python/pygit2/pygit2-1.6.1-r3.ebuild b/dev-python/pygit2/pygit2-1.6.1-r3.ebuild |
84 |
deleted file mode 100644 |
85 |
index 52934d483693..000000000000 |
86 |
--- a/dev-python/pygit2/pygit2-1.6.1-r3.ebuild |
87 |
+++ /dev/null |
88 |
@@ -1,40 +0,0 @@ |
89 |
-# Copyright 1999-2021 Gentoo Authors |
90 |
-# Distributed under the terms of the GNU General Public License v2 |
91 |
- |
92 |
-EAPI=7 |
93 |
-PYTHON_COMPAT=( python3_{8..10} ) |
94 |
- |
95 |
-inherit distutils-r1 |
96 |
- |
97 |
-DESCRIPTION="Python bindings for libgit2" |
98 |
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/" |
99 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
100 |
- |
101 |
-LICENSE="GPL-2-with-linking-exception" |
102 |
-SLOT="0" |
103 |
-KEYWORDS="amd64 x86" |
104 |
- |
105 |
-RDEPEND=" |
106 |
- =dev-libs/libgit2-1.1*:= |
107 |
- >=dev-python/cffi-1.0:=[${PYTHON_USEDEP}] |
108 |
-" |
109 |
-DEPEND="${RDEPEND}" |
110 |
- |
111 |
-distutils_enable_tests pytest |
112 |
- |
113 |
-src_prepare() { |
114 |
- distutils-r1_src_prepare |
115 |
- |
116 |
- # unconditionally prevent it from using network |
117 |
- sed -i -e '/has_network/s:True:False:' test/utils.py || die |
118 |
- |
119 |
- # we need to move them away to prevent pytest from forcing '..' |
120 |
- # for imports |
121 |
- mkdir hack || die |
122 |
- mv test hack/ || die |
123 |
- ln -s hack/test test || die |
124 |
-} |
125 |
- |
126 |
-python_test() { |
127 |
- pytest -vv hack/test || die |
128 |
-} |
129 |
|
130 |
diff --git a/dev-python/pygit2/pygit2-1.6.1-r4.ebuild b/dev-python/pygit2/pygit2-1.6.1-r4.ebuild |
131 |
deleted file mode 100644 |
132 |
index 29a58cb47655..000000000000 |
133 |
--- a/dev-python/pygit2/pygit2-1.6.1-r4.ebuild |
134 |
+++ /dev/null |
135 |
@@ -1,44 +0,0 @@ |
136 |
-# Copyright 1999-2021 Gentoo Authors |
137 |
-# Distributed under the terms of the GNU General Public License v2 |
138 |
- |
139 |
-EAPI=8 |
140 |
- |
141 |
-PYTHON_COMPAT=( python3_{8..10} ) |
142 |
-inherit distutils-r1 |
143 |
- |
144 |
-DESCRIPTION="Python bindings for libgit2" |
145 |
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/" |
146 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
147 |
- |
148 |
-LICENSE="GPL-2-with-linking-exception" |
149 |
-SLOT="0" |
150 |
-KEYWORDS="~amd64 ~x86" |
151 |
- |
152 |
-RDEPEND=" |
153 |
- =dev-libs/libgit2-1.2*:= |
154 |
- >=dev-python/cffi-1.0:=[${PYTHON_USEDEP}] |
155 |
-" |
156 |
-DEPEND="${RDEPEND}" |
157 |
- |
158 |
-distutils_enable_tests pytest |
159 |
- |
160 |
-src_prepare() { |
161 |
- local PATCHES=( |
162 |
- "${FILESDIR}"/${P}-libgit2-1.2.0.patch |
163 |
- ) |
164 |
- |
165 |
- distutils-r1_src_prepare |
166 |
- |
167 |
- # unconditionally prevent it from using network |
168 |
- sed -i -e '/has_network/s:True:False:' test/utils.py || die |
169 |
- |
170 |
- # we need to move them away to prevent pytest from forcing '..' |
171 |
- # for imports |
172 |
- mkdir hack || die |
173 |
- mv test hack/ || die |
174 |
- ln -s hack/test test || die |
175 |
-} |
176 |
- |
177 |
-python_test() { |
178 |
- epytest hack/test |
179 |
-} |
180 |
|
181 |
diff --git a/dev-python/pygit2/pygit2-1.7.0-r1.ebuild b/dev-python/pygit2/pygit2-1.7.0-r1.ebuild |
182 |
deleted file mode 100644 |
183 |
index e1df5178654a..000000000000 |
184 |
--- a/dev-python/pygit2/pygit2-1.7.0-r1.ebuild |
185 |
+++ /dev/null |
186 |
@@ -1,40 +0,0 @@ |
187 |
-# Copyright 1999-2021 Gentoo Authors |
188 |
-# Distributed under the terms of the GNU General Public License v2 |
189 |
- |
190 |
-EAPI=8 |
191 |
- |
192 |
-PYTHON_COMPAT=( python3_{8..10} ) |
193 |
-inherit distutils-r1 |
194 |
- |
195 |
-DESCRIPTION="Python bindings for libgit2" |
196 |
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/" |
197 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
198 |
- |
199 |
-LICENSE="GPL-2-with-linking-exception" |
200 |
-SLOT="0" |
201 |
-KEYWORDS="amd64 x86" |
202 |
- |
203 |
-RDEPEND=" |
204 |
- =dev-libs/libgit2-1.3*:= |
205 |
- >=dev-python/cffi-1.0:=[${PYTHON_USEDEP}] |
206 |
-" |
207 |
-DEPEND="${RDEPEND}" |
208 |
- |
209 |
-distutils_enable_tests pytest |
210 |
- |
211 |
-src_prepare() { |
212 |
- distutils-r1_src_prepare |
213 |
- |
214 |
- # unconditionally prevent it from using network |
215 |
- sed -i -e '/has_network/s:True:False:' test/utils.py || die |
216 |
- |
217 |
- # we need to move them away to prevent pytest from forcing '..' |
218 |
- # for imports |
219 |
- mkdir hack || die |
220 |
- mv test hack/ || die |
221 |
- ln -s hack/test test || die |
222 |
-} |
223 |
- |
224 |
-python_test() { |
225 |
- epytest hack/test |
226 |
-} |