Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Heather Cynede <cynede@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/dotnet:master commit in: dev-libs/libgit2/, dev-libs/libgit2/files/
Date: Tue, 26 Jul 2016 13:35:13
Message-Id: 1469535749.b91495657d0247d129aad705a4787b48539b58a2.cynede@gentoo
1 commit: b91495657d0247d129aad705a4787b48539b58a2
2 Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
3 AuthorDate: Tue Jul 26 12:22:29 2016 +0000
4 Commit: Heather Cynede <cynede <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 26 12:22:29 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=b9149565
7
8 version bump (and EAPI bump)
9
10 .../files/libgit2-0.20.0-skip-blame-test.patch | 147 +++++++++++++++++++++
11 dev-libs/libgit2/libgit2-0.24.1.ebuild | 76 +++++++++++
12 dev-libs/libgit2/metadata.xml | 21 +++
13 3 files changed, 244 insertions(+)
14
15 diff --git a/dev-libs/libgit2/files/libgit2-0.20.0-skip-blame-test.patch b/dev-libs/libgit2/files/libgit2-0.20.0-skip-blame-test.patch
16 new file mode 100644
17 index 0000000..de70672
18 --- /dev/null
19 +++ b/dev-libs/libgit2/files/libgit2-0.20.0-skip-blame-test.patch
20 @@ -0,0 +1,147 @@
21 +Skip test that requires the libgit2 git repo.
22 +
23 +--- libgit2-0.20.0/tests/blame/simple.c
24 ++++ libgit2-0.20.0/tests/blame/simple.c
25 +@@ -130,74 +130,74 @@
26 + * bf477ed4 include/git2.h 45 (Michael Schubert 2012-02-15 00:33:38 +0100 59
27 + * d12299fe src/git.h 49 (Vicent Martí 2010-12-03 22:22:10 +0200 60
28 + */
29 +-void test_blame_simple__trivial_libgit2(void)
30 +-{
31 +- git_blame_options opts = GIT_BLAME_OPTIONS_INIT;
32 +- git_object *obj;
33 +-
34 +- cl_git_pass(git_repository_open(&g_repo, cl_fixture("../..")));
35 +-
36 +- /* This test can't work on a shallow clone */
37 +- if (git_repository_is_shallow(g_repo))
38 +- return;
39 +-
40 +- cl_git_pass(git_revparse_single(&obj, g_repo, "359fc2d"));
41 +- git_oid_cpy(&opts.newest_commit, git_object_id(obj));
42 +- git_object_free(obj);
43 +-
44 +- cl_git_pass(git_blame_file(&g_blame, g_repo, "include/git2.h", &opts));
45 +-
46 +- check_blame_hunk_index(g_repo, g_blame, 0, 1, 1, 0, "d12299fe", "src/git.h");
47 +- check_blame_hunk_index(g_repo, g_blame, 1, 2, 1, 0, "359fc2d2", "include/git2.h");
48 +- check_blame_hunk_index(g_repo, g_blame, 2, 3, 1, 0, "d12299fe", "src/git.h");
49 +- check_blame_hunk_index(g_repo, g_blame, 3, 4, 2, 0, "bb742ede", "include/git2.h");
50 +- check_blame_hunk_index(g_repo, g_blame, 4, 6, 5, 0, "d12299fe", "src/git.h");
51 +- check_blame_hunk_index(g_repo, g_blame, 5, 11, 1, 0, "96fab093", "include/git2.h");
52 +- check_blame_hunk_index(g_repo, g_blame, 6, 12, 1, 0, "9d1dcca2", "src/git2.h");
53 +- check_blame_hunk_index(g_repo, g_blame, 7, 13, 1, 0, "44908fe7", "src/git2.h");
54 +- check_blame_hunk_index(g_repo, g_blame, 8, 14, 1, 0, "a15c550d", "include/git2.h");
55 +- check_blame_hunk_index(g_repo, g_blame, 9, 15, 1, 0, "44908fe7", "src/git2.h");
56 +- check_blame_hunk_index(g_repo, g_blame, 10, 16, 1, 0, "d12299fe", "src/git.h");
57 +- check_blame_hunk_index(g_repo, g_blame, 11, 17, 1, 0, "44908fe7", "src/git2.h");
58 +- check_blame_hunk_index(g_repo, g_blame, 12, 18, 1, 0, "d12299fe", "src/git.h");
59 +- check_blame_hunk_index(g_repo, g_blame, 13, 19, 1, 0, "44908fe7", "src/git2.h");
60 +- check_blame_hunk_index(g_repo, g_blame, 14, 20, 1, 0, "638c2ca4", "src/git2.h");
61 +- check_blame_hunk_index(g_repo, g_blame, 15, 21, 1, 0, "44908fe7", "src/git2.h");
62 +- check_blame_hunk_index(g_repo, g_blame, 16, 22, 1, 0, "d12299fe", "src/git.h");
63 +- check_blame_hunk_index(g_repo, g_blame, 17, 23, 2, 0, "44908fe7", "src/git2.h");
64 +- check_blame_hunk_index(g_repo, g_blame, 18, 25, 1, 0, "bf787bd8", "include/git2.h");
65 +- check_blame_hunk_index(g_repo, g_blame, 19, 26, 1, 0, "0984c876", "include/git2.h");
66 +- check_blame_hunk_index(g_repo, g_blame, 20, 27, 1, 0, "2f8a8ab2", "src/git2.h");
67 +- check_blame_hunk_index(g_repo, g_blame, 21, 28, 1, 0, "27df4275", "include/git2.h");
68 +- check_blame_hunk_index(g_repo, g_blame, 22, 29, 1, 0, "a346992f", "include/git2.h");
69 +- check_blame_hunk_index(g_repo, g_blame, 23, 30, 1, 0, "d12299fe", "src/git.h");
70 +- check_blame_hunk_index(g_repo, g_blame, 24, 31, 5, 0, "44908fe7", "src/git2.h");
71 +- check_blame_hunk_index(g_repo, g_blame, 25, 36, 1, 0, "65b09b1d", "include/git2.h");
72 +- check_blame_hunk_index(g_repo, g_blame, 26, 37, 1, 0, "d12299fe", "src/git.h");
73 +- check_blame_hunk_index(g_repo, g_blame, 27, 38, 1, 0, "44908fe7", "src/git2.h");
74 +- check_blame_hunk_index(g_repo, g_blame, 28, 39, 1, 0, "5d4cd003", "include/git2.h");
75 +- check_blame_hunk_index(g_repo, g_blame, 29, 40, 1, 0, "41fb1ca0", "include/git2.h");
76 +- check_blame_hunk_index(g_repo, g_blame, 30, 41, 1, 0, "2dc31040", "include/git2.h");
77 +- check_blame_hunk_index(g_repo, g_blame, 31, 42, 1, 0, "764df57e", "include/git2.h");
78 +- check_blame_hunk_index(g_repo, g_blame, 32, 43, 1, 0, "5280f4e6", "include/git2.h");
79 +- check_blame_hunk_index(g_repo, g_blame, 33, 44, 1, 0, "613d5eb9", "include/git2.h");
80 +- check_blame_hunk_index(g_repo, g_blame, 34, 45, 1, 0, "d12299fe", "src/git.h");
81 +- check_blame_hunk_index(g_repo, g_blame, 35, 46, 1, 0, "111ee3fe", "include/git2.h");
82 +- check_blame_hunk_index(g_repo, g_blame, 36, 47, 1, 0, "f004c4a8", "include/git2.h");
83 +- check_blame_hunk_index(g_repo, g_blame, 37, 48, 1, 0, "111ee3fe", "include/git2.h");
84 +- check_blame_hunk_index(g_repo, g_blame, 38, 49, 1, 0, "9c82357b", "include/git2.h");
85 +- check_blame_hunk_index(g_repo, g_blame, 39, 50, 1, 0, "d6258deb", "include/git2.h");
86 +- check_blame_hunk_index(g_repo, g_blame, 40, 51, 1, 0, "b311e313", "include/git2.h");
87 +- check_blame_hunk_index(g_repo, g_blame, 41, 52, 1, 0, "3412391d", "include/git2.h");
88 +- check_blame_hunk_index(g_repo, g_blame, 42, 53, 1, 0, "bfc9ca59", "include/git2.h");
89 +- check_blame_hunk_index(g_repo, g_blame, 43, 54, 1, 0, "bf477ed4", "include/git2.h");
90 +- check_blame_hunk_index(g_repo, g_blame, 44, 55, 1, 0, "edebceff", "include/git2.h");
91 +- check_blame_hunk_index(g_repo, g_blame, 45, 56, 1, 0, "743a4b3b", "include/git2.h");
92 +- check_blame_hunk_index(g_repo, g_blame, 46, 57, 1, 0, "0a32dca5", "include/git2.h");
93 +- check_blame_hunk_index(g_repo, g_blame, 47, 58, 1, 0, "590fb68b", "include/git2.h");
94 +- check_blame_hunk_index(g_repo, g_blame, 48, 59, 1, 0, "bf477ed4", "include/git2.h");
95 +- check_blame_hunk_index(g_repo, g_blame, 49, 60, 1, 0, "d12299fe", "src/git.h");
96 +-}
97 ++//void test_blame_simple__trivial_libgit2(void)
98 ++//{
99 ++// git_blame_options opts = GIT_BLAME_OPTIONS_INIT;
100 ++// git_object *obj;
101 ++//
102 ++// cl_git_pass(git_repository_open(&g_repo, cl_fixture("../..")));
103 ++//
104 ++// /* This test can't work on a shallow clone */
105 ++// if (git_repository_is_shallow(g_repo))
106 ++// return;
107 ++//
108 ++// cl_git_pass(git_revparse_single(&obj, g_repo, "359fc2d"));
109 ++// git_oid_cpy(&opts.newest_commit, git_object_id(obj));
110 ++// git_object_free(obj);
111 ++//
112 ++// cl_git_pass(git_blame_file(&g_blame, g_repo, "include/git2.h", &opts));
113 ++//
114 ++// check_blame_hunk_index(g_repo, g_blame, 0, 1, 1, 0, "d12299fe", "src/git.h");
115 ++// check_blame_hunk_index(g_repo, g_blame, 1, 2, 1, 0, "359fc2d2", "include/git2.h");
116 ++// check_blame_hunk_index(g_repo, g_blame, 2, 3, 1, 0, "d12299fe", "src/git.h");
117 ++// check_blame_hunk_index(g_repo, g_blame, 3, 4, 2, 0, "bb742ede", "include/git2.h");
118 ++// check_blame_hunk_index(g_repo, g_blame, 4, 6, 5, 0, "d12299fe", "src/git.h");
119 ++// check_blame_hunk_index(g_repo, g_blame, 5, 11, 1, 0, "96fab093", "include/git2.h");
120 ++// check_blame_hunk_index(g_repo, g_blame, 6, 12, 1, 0, "9d1dcca2", "src/git2.h");
121 ++// check_blame_hunk_index(g_repo, g_blame, 7, 13, 1, 0, "44908fe7", "src/git2.h");
122 ++// check_blame_hunk_index(g_repo, g_blame, 8, 14, 1, 0, "a15c550d", "include/git2.h");
123 ++// check_blame_hunk_index(g_repo, g_blame, 9, 15, 1, 0, "44908fe7", "src/git2.h");
124 ++// check_blame_hunk_index(g_repo, g_blame, 10, 16, 1, 0, "d12299fe", "src/git.h");
125 ++// check_blame_hunk_index(g_repo, g_blame, 11, 17, 1, 0, "44908fe7", "src/git2.h");
126 ++// check_blame_hunk_index(g_repo, g_blame, 12, 18, 1, 0, "d12299fe", "src/git.h");
127 ++// check_blame_hunk_index(g_repo, g_blame, 13, 19, 1, 0, "44908fe7", "src/git2.h");
128 ++// check_blame_hunk_index(g_repo, g_blame, 14, 20, 1, 0, "638c2ca4", "src/git2.h");
129 ++// check_blame_hunk_index(g_repo, g_blame, 15, 21, 1, 0, "44908fe7", "src/git2.h");
130 ++// check_blame_hunk_index(g_repo, g_blame, 16, 22, 1, 0, "d12299fe", "src/git.h");
131 ++// check_blame_hunk_index(g_repo, g_blame, 17, 23, 2, 0, "44908fe7", "src/git2.h");
132 ++// check_blame_hunk_index(g_repo, g_blame, 18, 25, 1, 0, "bf787bd8", "include/git2.h");
133 ++// check_blame_hunk_index(g_repo, g_blame, 19, 26, 1, 0, "0984c876", "include/git2.h");
134 ++// check_blame_hunk_index(g_repo, g_blame, 20, 27, 1, 0, "2f8a8ab2", "src/git2.h");
135 ++// check_blame_hunk_index(g_repo, g_blame, 21, 28, 1, 0, "27df4275", "include/git2.h");
136 ++// check_blame_hunk_index(g_repo, g_blame, 22, 29, 1, 0, "a346992f", "include/git2.h");
137 ++// check_blame_hunk_index(g_repo, g_blame, 23, 30, 1, 0, "d12299fe", "src/git.h");
138 ++// check_blame_hunk_index(g_repo, g_blame, 24, 31, 5, 0, "44908fe7", "src/git2.h");
139 ++// check_blame_hunk_index(g_repo, g_blame, 25, 36, 1, 0, "65b09b1d", "include/git2.h");
140 ++// check_blame_hunk_index(g_repo, g_blame, 26, 37, 1, 0, "d12299fe", "src/git.h");
141 ++// check_blame_hunk_index(g_repo, g_blame, 27, 38, 1, 0, "44908fe7", "src/git2.h");
142 ++// check_blame_hunk_index(g_repo, g_blame, 28, 39, 1, 0, "5d4cd003", "include/git2.h");
143 ++// check_blame_hunk_index(g_repo, g_blame, 29, 40, 1, 0, "41fb1ca0", "include/git2.h");
144 ++// check_blame_hunk_index(g_repo, g_blame, 30, 41, 1, 0, "2dc31040", "include/git2.h");
145 ++// check_blame_hunk_index(g_repo, g_blame, 31, 42, 1, 0, "764df57e", "include/git2.h");
146 ++// check_blame_hunk_index(g_repo, g_blame, 32, 43, 1, 0, "5280f4e6", "include/git2.h");
147 ++// check_blame_hunk_index(g_repo, g_blame, 33, 44, 1, 0, "613d5eb9", "include/git2.h");
148 ++// check_blame_hunk_index(g_repo, g_blame, 34, 45, 1, 0, "d12299fe", "src/git.h");
149 ++// check_blame_hunk_index(g_repo, g_blame, 35, 46, 1, 0, "111ee3fe", "include/git2.h");
150 ++// check_blame_hunk_index(g_repo, g_blame, 36, 47, 1, 0, "f004c4a8", "include/git2.h");
151 ++// check_blame_hunk_index(g_repo, g_blame, 37, 48, 1, 0, "111ee3fe", "include/git2.h");
152 ++// check_blame_hunk_index(g_repo, g_blame, 38, 49, 1, 0, "9c82357b", "include/git2.h");
153 ++// check_blame_hunk_index(g_repo, g_blame, 39, 50, 1, 0, "d6258deb", "include/git2.h");
154 ++// check_blame_hunk_index(g_repo, g_blame, 40, 51, 1, 0, "b311e313", "include/git2.h");
155 ++// check_blame_hunk_index(g_repo, g_blame, 41, 52, 1, 0, "3412391d", "include/git2.h");
156 ++// check_blame_hunk_index(g_repo, g_blame, 42, 53, 1, 0, "bfc9ca59", "include/git2.h");
157 ++// check_blame_hunk_index(g_repo, g_blame, 43, 54, 1, 0, "bf477ed4", "include/git2.h");
158 ++// check_blame_hunk_index(g_repo, g_blame, 44, 55, 1, 0, "edebceff", "include/git2.h");
159 ++// check_blame_hunk_index(g_repo, g_blame, 45, 56, 1, 0, "743a4b3b", "include/git2.h");
160 ++// check_blame_hunk_index(g_repo, g_blame, 46, 57, 1, 0, "0a32dca5", "include/git2.h");
161 ++// check_blame_hunk_index(g_repo, g_blame, 47, 58, 1, 0, "590fb68b", "include/git2.h");
162 ++// check_blame_hunk_index(g_repo, g_blame, 48, 59, 1, 0, "bf477ed4", "include/git2.h");
163 ++// check_blame_hunk_index(g_repo, g_blame, 49, 60, 1, 0, "d12299fe", "src/git.h");
164 ++//}
165 +
166 +
167 + /*
168
169 diff --git a/dev-libs/libgit2/libgit2-0.24.1.ebuild b/dev-libs/libgit2/libgit2-0.24.1.ebuild
170 new file mode 100644
171 index 0000000..0577223
172 --- /dev/null
173 +++ b/dev-libs/libgit2/libgit2-0.24.1.ebuild
174 @@ -0,0 +1,76 @@
175 +# Copyright 1999-2016 Gentoo Foundation
176 +# Distributed under the terms of the GNU General Public License v2
177 +# $Id$
178 +
179 +EAPI=5
180 +
181 +inherit cmake-utils multilib
182 +
183 +if [[ ${PV} == "9999" ]] ; then
184 + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
185 + inherit git-r3
186 +else
187 + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
188 + KEYWORDS="~amd64 ~arm ~x86 ~ppc-macos"
189 +fi
190 +
191 +DESCRIPTION="A linkable library for Git"
192 +HOMEPAGE="https://libgit2.github.com/"
193 +
194 +LICENSE="GPL-2-with-linking-exception"
195 +SLOT="0/24"
196 +IUSE="examples gssapi libressl ssh test threads trace"
197 +
198 +RDEPEND="
199 + !libressl? ( dev-libs/openssl:0 )
200 + libressl? ( dev-libs/libressl )
201 + sys-libs/zlib
202 + net-libs/http-parser:=
203 + gssapi? ( virtual/krb5 )
204 + ssh? ( net-libs/libssh2 )
205 +"
206 +DEPEND="${RDEPEND}
207 + virtual/pkgconfig
208 +"
209 +
210 +DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
211 +
212 +src_prepare() {
213 + # skip online tests
214 + sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
215 +
216 + cmake-utils_src_prepare
217 +}
218 +
219 +src_configure() {
220 + local mycmakeargs=(
221 + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
222 + -DBUILD_CLAR=$(usex test)
223 + -DENABLE_TRACE=$(usex trace)
224 + -DUSE_GSSAPI=$(usex gssapi)
225 + -DUSE_SSH=$(usex ssh)
226 + -DUSE_THREADSAFE=$(usex threads)
227 + )
228 + cmake-utils_src_configure
229 +}
230 +
231 +src_test() {
232 + if [[ ${EUID} -eq 0 ]] ; then
233 + # repo::iterator::fs_preserves_error fails if run as root
234 + # since root can still access dirs with 0000 perms
235 + ewarn "Skipping tests: non-root privileges are required for all tests to pass"
236 + else
237 + local TEST_VERBOSE=1
238 + cmake-utils_src_test
239 + fi
240 +}
241 +
242 +src_install() {
243 + cmake-utils_src_install
244 +
245 + if use examples ; then
246 + egit_clean examples
247 + dodoc -r examples
248 + docompress -x /usr/share/doc/${PF}/examples
249 + fi
250 +}
251
252 diff --git a/dev-libs/libgit2/metadata.xml b/dev-libs/libgit2/metadata.xml
253 new file mode 100644
254 index 0000000..a4d94ca
255 --- /dev/null
256 +++ b/dev-libs/libgit2/metadata.xml
257 @@ -0,0 +1,21 @@
258 +<?xml version="1.0" encoding="UTF-8"?>
259 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
260 +<pkgmetadata>
261 + <maintainer type="person">
262 + <email>mrueg@g.o</email>
263 + <name>Manuel Rüger</name>
264 + </maintainer>
265 + <longdescription lang="en">
266 + libgit2 is a portable, pure C implementation of the Git core methods provided
267 + as a re-entrant linkable library with a solid API, allowing you to write native
268 + speed custom Git applications in any language which supports C bindings.
269 + </longdescription>
270 + <use>
271 + <flag name="gssapi">Enable GSSAPI support for SPNEGO auth</flag>
272 + <flag name="ssh">Enable SSH transport support</flag>
273 + <flag name="trace">Enable tracing support</flag>
274 + </use>
275 + <upstream>
276 + <remote-id type="github">libgit2/libgit2</remote-id>
277 + </upstream>
278 +</pkgmetadata>
Report Message
Find on MARC Find on Google Groups