From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1147386-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 1202B138350
for <garchives@archives.gentoo.org>; Fri, 21 Feb 2020 10:08:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C11B1E0940;
Fri, 21 Feb 2020 10:08:35 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 919B0E0940
for <gentoo-commits@lists.gentoo.org>; Fri, 21 Feb 2020 10:08:35 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E043A34EEE3
for <gentoo-commits@lists.gentoo.org>; Fri, 21 Feb 2020 10:08:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D51514F
for <gentoo-commits@lists.gentoo.org>; Fri, 21 Feb 2020 10:08:30 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1582279704.ea9c71b3c0b9a157e73f19eb7d96a93e6191a8e7.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libgit2/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/libgit2/libgit2-0.99.0.ebuild dev-libs/libgit2/libgit2-9999.ebuild
X-VCS-Directories: dev-libs/libgit2/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: ea9c71b3c0b9a157e73f19eb7d96a93e6191a8e7
X-VCS-Branch: master
Date: Fri, 21 Feb 2020 10:08:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0d658c38-6189-4f32-afdf-3a9cca8c2d3b
X-Archives-Hash: afc1418c512309d2e06c4fc8cdb73408
commit: ea9c71b3c0b9a157e73f19eb7d96a93e6191a8e7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 21 06:47:03 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 10:08:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea9c71b3
dev-libs/libgit2: Remove unmaintained live ebuild
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-libs/libgit2/libgit2-0.99.0.ebuild | 19 +++++----
dev-libs/libgit2/libgit2-9999.ebuild | 70 ----------------------------------
2 files changed, 9 insertions(+), 80 deletions(-)
diff --git a/dev-libs/libgit2/libgit2-0.99.0.ebuild b/dev-libs/libgit2/libgit2-0.99.0.ebuild
index 23bd171e310..3abe4784a16 100644
--- a/dev-libs/libgit2/libgit2-0.99.0.ebuild
+++ b/dev-libs/libgit2/libgit2-0.99.0.ebuild
@@ -6,19 +6,14 @@ EAPI=7
PYTHON_COMPAT=( python3_{6,7} )
inherit cmake python-any-r1
-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 ~ppc64 ~x86 ~ppc-macos"
-fi
-
DESCRIPTION="A linkable library for Git"
HOMEPAGE="https://libgit2.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${P/_/-}
LICENSE="GPL-2-with-linking-exception"
-SLOT="0/28"
+SLOT="0/0.99"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos"
IUSE="examples gssapi libressl +ssh test +threads trace"
RESTRICT="!test? ( test )"
@@ -35,7 +30,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
-S=${WORKDIR}/${P/_/-}
+src_prepare() {
+ cmake_src_prepare
+ # relying on forked http-parser to support some obscure URI form
+ sed -i -e '/empty_port/s:test:_&:' tests/network/urlparse.c || die
+}
src_configure() {
local mycmakeargs=(
diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild
deleted file mode 100644
index 41394dc15ba..00000000000
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-utils python-any-r1
-
-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 ~ppc64 ~x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.org"
-
-LICENSE="GPL-2-with-linking-exception"
-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:=
- gssapi? ( virtual/krb5 )
- ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
-"
-
-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)
- )
- 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 -R offline
- fi
-}
-
-src_install() {
- cmake-utils_src_install
- dodoc docs/*.{md,txt}
-
- if use examples ; then
- find examples -name '.gitignore' -delete || die
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}