Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libgit2/
Date: Wed, 10 Apr 2019 15:07:38
Message-Id: 1554908841.1e4ca566e3d2368f98b1b0753805a0b84e54d30d.mgorny@gentoo
1 commit: 1e4ca566e3d2368f98b1b0753805a0b84e54d30d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 10 14:31:24 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 10 15:07:21 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4ca566
7
8 dev-libs/libgit2: Update live ebuild
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-libs/libgit2/libgit2-9999.ebuild | 24 ++++++------------------
13 1 file changed, 6 insertions(+), 18 deletions(-)
14
15 diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild
16 index d10065358a4..bfad5c3fdc1 100644
17 --- a/dev-libs/libgit2/libgit2-9999.ebuild
18 +++ b/dev-libs/libgit2/libgit2-9999.ebuild
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2018 Gentoo Foundation
21 +# Copyright 1999-2019 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 EAPI=6
25 @@ -18,18 +18,15 @@ DESCRIPTION="A linkable library for Git"
26 HOMEPAGE="https://libgit2.github.com/"
27
28 LICENSE="GPL-2-with-linking-exception"
29 -SLOT="0/27"
30 -IUSE="+curl examples gssapi libressl +ssh test +threads trace"
31 +SLOT="0/28"
32 +IUSE="examples gssapi libressl +ssh test +threads trace"
33 +RESTRICT="!test? ( test )"
34
35 RDEPEND="
36 !libressl? ( dev-libs/openssl:0= )
37 libressl? ( dev-libs/libressl:0= )
38 sys-libs/zlib
39 net-libs/http-parser:=
40 - curl? (
41 - !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
42 - libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
43 - )
44 gssapi? ( virtual/krb5 )
45 ssh? ( net-libs/libssh2 )
46 "
47 @@ -38,15 +35,6 @@ DEPEND="${RDEPEND}
48 virtual/pkgconfig
49 "
50
51 -DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
52 -
53 -src_prepare() {
54 - # skip online tests
55 - sed -i '/libgit2_clar/s/-ionline/-xonline/' tests/CMakeLists.txt || die
56 -
57 - cmake-utils_src_prepare
58 -}
59 -
60 src_configure() {
61 local mycmakeargs=(
62 -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
63 @@ -55,7 +43,6 @@ src_configure() {
64 -DUSE_GSSAPI=$(usex gssapi)
65 -DUSE_SSH=$(usex ssh)
66 -DTHREADSAFE=$(usex threads)
67 - -DCURL=$(usex curl)
68 )
69 cmake-utils_src_configure
70 }
71 @@ -67,12 +54,13 @@ src_test() {
72 ewarn "Skipping tests: non-root privileges are required for all tests to pass"
73 else
74 local TEST_VERBOSE=1
75 - cmake-utils_src_test
76 + cmake-utils_src_test -R offline
77 fi
78 }
79
80 src_install() {
81 cmake-utils_src_install
82 + dodoc docs/*.{md,txt}
83
84 if use examples ; then
85 find examples -name '.gitignore' -delete || die