commit: 1e4ca566e3d2368f98b1b0753805a0b84e54d30d Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Apr 10 14:31:24 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Apr 10 15:07:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4ca566
dev-libs/libgit2: Update live ebuild Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-libs/libgit2/libgit2-9999.ebuild | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild index d10065358a4..bfad5c3fdc1 100644 --- a/dev-libs/libgit2/libgit2-9999.ebuild +++ b/dev-libs/libgit2/libgit2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,18 +18,15 @@ DESCRIPTION="A linkable library for Git" HOMEPAGE="https://libgit2.github.com/"; LICENSE="GPL-2-with-linking-exception" -SLOT="0/27" -IUSE="+curl examples gssapi libressl +ssh test +threads trace" +SLOT="0/28" +IUSE="examples gssapi libressl +ssh test +threads trace" +RESTRICT="!test? ( test )" RDEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= - curl? ( - !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) - libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) - ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) " @@ -38,15 +35,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md ) - -src_prepare() { - # skip online tests - sed -i '/libgit2_clar/s/-ionline/-xonline/' tests/CMakeLists.txt || die - - cmake-utils_src_prepare -} - src_configure() { local mycmakeargs=( -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" @@ -55,7 +43,6 @@ src_configure() { -DUSE_GSSAPI=$(usex gssapi) -DUSE_SSH=$(usex ssh) -DTHREADSAFE=$(usex threads) - -DCURL=$(usex curl) ) cmake-utils_src_configure } @@ -67,12 +54,13 @@ src_test() { ewarn "Skipping tests: non-root privileges are required for all tests to pass" else local TEST_VERBOSE=1 - cmake-utils_src_test + cmake-utils_src_test -R offline fi } src_install() { cmake-utils_src_install + dodoc docs/*.{md,txt} if use examples ; then find examples -name '.gitignore' -delete || die
