Gentoo Archives: gentoo-commits

From: Stefan Strogin <stefan.strogin@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-libs/libgit2/files/, dev-libs/libgit2/
Date: Thu, 28 Feb 2019 23:54:33
Message-Id: 1551396694.6e20675c7a5e1678d4720581a0582b9a949e04bd.steils@gentoo
commit:     6e20675c7a5e1678d4720581a0582b9a949e04bd
Author:     Stefan Strogin <stefan.strogin <AT> gmail <DOT> com>
AuthorDate: Thu Feb 28 23:31:34 2019 +0000
Commit:     Stefan Strogin <stefan.strogin <AT> gmail <DOT> com>
CommitDate: Thu Feb 28 23:31:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=6e20675c

dev-libs/libgit2: drop; fixed upstream and in gentoo.git

Upstream patch for LibreSSL >=2.7.0:
https://github.com/libgit2/libgit2/commit/7490d449b518115a1ae86b01397e95c38e39cff1

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com>

 dev-libs/libgit2/Manifest                          |  1 -
 .../files/libgit2-libressl27-backport26.patch      | 28 --------
 dev-libs/libgit2/libgit2-0.26.5.ebuild             | 82 ----------------------
 dev-libs/libgit2/metadata.xml                      | 27 -------
 4 files changed, 138 deletions(-)

diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
deleted file mode 100644
index 94baede..0000000
--- a/dev-libs/libgit2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libgit2-0.26.5.tar.gz 4734075 BLAKE2B cdc34a5792576d97d8bc8a8c998e610e9c2caab4899f55bfd11da382d73d3061277ac068edd20c8e31d7cf5c3b26ca688fd67eb43ca7b9e0b82413fb04d04b3f SHA512 7dd7c567ad776db76b3514e6532f52841a4279b58dc51b44d39ab53b6911220cb60ee8f37b4c6ad6f369edbbd43a2591cf5f46aca354282f56735c8b215d533b

diff --git a/dev-libs/libgit2/files/libgit2-libressl27-backport26.patch b/dev-libs/libgit2/files/libgit2-libressl27-backport26.patch
deleted file mode 100644
index 26dc964..0000000
--- a/dev-libs/libgit2/files/libgit2-libressl27-backport26.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/openssl_stream.c b/src/openssl_stream.c
-index 6bab6b54a..f6f908a76 100644
---- a/src/openssl_stream.c
-+++ b/src/openssl_stream.c
-@@ -103,7 +103,8 @@ int git_openssl_stream_global_init(void)
- 	ssl_opts |= SSL_OP_NO_COMPRESSION;
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+     (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
- 	SSL_load_error_strings();
- 	OpenSSL_add_ssl_algorithms();
- #else
-diff --git a/src/openssl_stream.h b/src/openssl_stream.h
-index f5e59dab1..75bea07cf 100644
---- a/src/openssl_stream.h
-+++ b/src/openssl_stream.h
-@@ -27,7 +27,8 @@ extern int git_openssl_stream_new(git_stream **out, const char *host, const char
- 
- 
- 
--# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+# if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+      (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- 
- GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name)
- {

diff --git a/dev-libs/libgit2/libgit2-0.26.5.ebuild b/dev-libs/libgit2/libgit2-0.26.5.ebuild
deleted file mode 100644
index 0aebcf7..0000000
--- a/dev-libs/libgit2/libgit2-0.26.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/26"
-IUSE="+curl examples gssapi libressl +ssh test +threads trace"
-
-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 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-PATCHES=( "${FILESDIR}/libgit2-libressl27-backport26.patch" )
-
-src_prepare() {
-	# skip online tests
-	sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DBUILD_CLAR=$(usex test)
-		-DENABLE_TRACE=$(usex trace)
-		-DUSE_GSSAPI=$(usex gssapi)
-		-DUSE_SSH=$(usex ssh)
-		-DTHREADSAFE=$(usex threads)
-		-DCURL=$(usex curl)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake-utils_src_test
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}

diff --git a/dev-libs/libgit2/metadata.xml b/dev-libs/libgit2/metadata.xml
deleted file mode 100644
index e090ecb..0000000
--- a/dev-libs/libgit2/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@g.o</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>gnome@g.o</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<longdescription lang="en">
-		libgit2 is a portable, pure C implementation of the Git core methods provided
-		as a re-entrant linkable library with a solid API, allowing you to write native
-		speed custom Git applications in any language which supports C bindings.
-	</longdescription>
-	<use>
-		<flag name="curl">Use <pkg>net-misc/curl</pkg> for HTTP support
-			(otherwise, limited built-in implementation will be used)</flag>
-		<flag name="gssapi">Enable GSSAPI support for SPNEGO auth</flag>
-		<flag name="ssh">Enable SSH transport support</flag>
-		<flag name="trace">Enable tracing support</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">libgit2/libgit2</remote-id>
-	</upstream>
-</pkgmetadata>