commit: a12a8785eeb5956a42b804038011a3d90009f274
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 13:50:15 2017 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 13:50:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a12a8785
dev-libs/libgit2: Remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-libs/libgit2/Manifest | 2 -
.../files/libgit2-0.20.0-skip-blame-test.patch | 147 ---------------------
dev-libs/libgit2/libgit2-0.22.3.ebuild | 75 -----------
dev-libs/libgit2/libgit2-0.23.4.ebuild | 76 -----------
4 files changed, 300 deletions(-)
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 440a8e3..469bb1f 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,3 +1 @@
-DIST libgit2-0.22.3.tar.gz 3594098 SHA256
511fe60e7c12c3525b4e0489861e5c1fe0e331d604bee9a3dfb8420c2f288f60 SHA512
2bbb04789702d206e65b18d96752113d2c1b0af7b7779cf7c90c326ec47f535b36327b0171ae1f614179c24275e2c04c51d62e44eedba87530509a29c15ab25c
WHIRLPOOL
2fbb2739856e6cef3ae1a103e1b999b3362c79536423e5cd6d46d60276a14e87298ec36e2e03e8ea0fa8ebe28a140ba20ce077fb30ab3fc0d1337ec3b04fde87
-DIST libgit2-0.23.4.tar.gz 4065303 SHA256
c7f5e2d7381dbc4d7e878013d14f9993ae8a41bd23f032718e39ffba57894029 SHA512
f2f6244dfee4dab2dc5ef9607808404467a1f6baa684aa4e24b7116e7e7f63f396eef3282c1bcffbef47f19824731c2887deadbe3b2dad8a075b0639e5965d9e
WHIRLPOOL
7346fd24616ba68929f02d686229a2f91caf2bf44ff88aadbb663ffb776dc6a5a222f0a9d7145ac9ef08ebcd321671e5c3d0175eca77230955bfaa2ca375ca6a
DIST libgit2-0.24.6.tar.gz 4178476 SHA256
7b441a96967ff525e790f8b66859faba5c6be4c347124011f536ae9075ebc30c SHA512
ea928629450f6619c17e76cf32e5d76ddd9e00d914b8a0fc2efdcc32ae271637c124a27a8d4c595b8dcf2048551b22f1bc3c5b6394b3022a2f852a06f7ab3396
WHIRLPOOL
210a1d75e56883d8c82cf549f103414cf8365762f585d1c7939f40f73f430199680d01a0092cbb91a1f65446d74f26cd757ded98dd9d504f7064452c3183d1a2
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
deleted file mode 100644
index de70672..00000000
--- a/dev-libs/libgit2/files/libgit2-0.20.0-skip-blame-test.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-Skip test that requires the libgit2 git repo.
-
---- libgit2-0.20.0/tests/blame/simple.c
-+++ libgit2-0.20.0/tests/blame/simple.c
-@@ -130,74 +130,74 @@
- * bf477ed4 include/git2.h 45 (Michael Schubert 2012-02-15 00:33:38 +0100
59
- * d12299fe src/git.h 49 (Vicent Martí 2010-12-03 22:22:10 +0200
60
- */
--void test_blame_simple__trivial_libgit2(void)
--{
-- git_blame_options opts = GIT_BLAME_OPTIONS_INIT;
-- git_object *obj;
--
-- cl_git_pass(git_repository_open(&g_repo, cl_fixture("../..")));
--
-- /* This test can't work on a shallow clone */
-- if (git_repository_is_shallow(g_repo))
-- return;
--
-- cl_git_pass(git_revparse_single(&obj, g_repo, "359fc2d"));
-- git_oid_cpy(&opts.newest_commit, git_object_id(obj));
-- git_object_free(obj);
--
-- cl_git_pass(git_blame_file(&g_blame, g_repo, "include/git2.h", &opts));
--
-- check_blame_hunk_index(g_repo, g_blame, 0, 1, 1, 0, "d12299fe",
"src/git.h");
-- check_blame_hunk_index(g_repo, g_blame, 1, 2, 1, 0, "359fc2d2",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 2, 3, 1, 0, "d12299fe",
"src/git.h");
-- check_blame_hunk_index(g_repo, g_blame, 3, 4, 2, 0, "bb742ede",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 4, 6, 5, 0, "d12299fe",
"src/git.h");
-- check_blame_hunk_index(g_repo, g_blame, 5, 11, 1, 0, "96fab093",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 6, 12, 1, 0, "9d1dcca2",
"src/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 7, 13, 1, 0, "44908fe7",
"src/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 8, 14, 1, 0, "a15c550d",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 9, 15, 1, 0, "44908fe7",
"src/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 10, 16, 1, 0, "d12299fe",
"src/git.h");
-- check_blame_hunk_index(g_repo, g_blame, 11, 17, 1, 0, "44908fe7",
"src/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 12, 18, 1, 0, "d12299fe",
"src/git.h");
-- check_blame_hunk_index(g_repo, g_blame, 13, 19, 1, 0, "44908fe7",
"src/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 14, 20, 1, 0, "638c2ca4",
"src/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 15, 21, 1, 0, "44908fe7",
"src/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 16, 22, 1, 0, "d12299fe",
"src/git.h");
-- check_blame_hunk_index(g_repo, g_blame, 17, 23, 2, 0, "44908fe7",
"src/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 18, 25, 1, 0, "bf787bd8",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 19, 26, 1, 0, "0984c876",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 20, 27, 1, 0, "2f8a8ab2",
"src/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 21, 28, 1, 0, "27df4275",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 22, 29, 1, 0, "a346992f",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 23, 30, 1, 0, "d12299fe",
"src/git.h");
-- check_blame_hunk_index(g_repo, g_blame, 24, 31, 5, 0, "44908fe7",
"src/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 25, 36, 1, 0, "65b09b1d",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 26, 37, 1, 0, "d12299fe",
"src/git.h");
-- check_blame_hunk_index(g_repo, g_blame, 27, 38, 1, 0, "44908fe7",
"src/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 28, 39, 1, 0, "5d4cd003",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 29, 40, 1, 0, "41fb1ca0",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 30, 41, 1, 0, "2dc31040",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 31, 42, 1, 0, "764df57e",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 32, 43, 1, 0, "5280f4e6",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 33, 44, 1, 0, "613d5eb9",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 34, 45, 1, 0, "d12299fe",
"src/git.h");
-- check_blame_hunk_index(g_repo, g_blame, 35, 46, 1, 0, "111ee3fe",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 36, 47, 1, 0, "f004c4a8",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 37, 48, 1, 0, "111ee3fe",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 38, 49, 1, 0, "9c82357b",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 39, 50, 1, 0, "d6258deb",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 40, 51, 1, 0, "b311e313",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 41, 52, 1, 0, "3412391d",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 42, 53, 1, 0, "bfc9ca59",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 43, 54, 1, 0, "bf477ed4",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 44, 55, 1, 0, "edebceff",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 45, 56, 1, 0, "743a4b3b",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 46, 57, 1, 0, "0a32dca5",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 47, 58, 1, 0, "590fb68b",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 48, 59, 1, 0, "bf477ed4",
"include/git2.h");
-- check_blame_hunk_index(g_repo, g_blame, 49, 60, 1, 0, "d12299fe",
"src/git.h");
--}
-+//void test_blame_simple__trivial_libgit2(void)
-+//{
-+// git_blame_options opts = GIT_BLAME_OPTIONS_INIT;
-+// git_object *obj;
-+//
-+// cl_git_pass(git_repository_open(&g_repo, cl_fixture("../..")));
-+//
-+// /* This test can't work on a shallow clone */
-+// if (git_repository_is_shallow(g_repo))
-+// return;
-+//
-+// cl_git_pass(git_revparse_single(&obj, g_repo, "359fc2d"));
-+// git_oid_cpy(&opts.newest_commit, git_object_id(obj));
-+// git_object_free(obj);
-+//
-+// cl_git_pass(git_blame_file(&g_blame, g_repo, "include/git2.h", &opts));
-+//
-+// check_blame_hunk_index(g_repo, g_blame, 0, 1, 1, 0, "d12299fe",
"src/git.h");
-+// check_blame_hunk_index(g_repo, g_blame, 1, 2, 1, 0, "359fc2d2",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 2, 3, 1, 0, "d12299fe",
"src/git.h");
-+// check_blame_hunk_index(g_repo, g_blame, 3, 4, 2, 0, "bb742ede",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 4, 6, 5, 0, "d12299fe",
"src/git.h");
-+// check_blame_hunk_index(g_repo, g_blame, 5, 11, 1, 0, "96fab093",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 6, 12, 1, 0, "9d1dcca2",
"src/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 7, 13, 1, 0, "44908fe7",
"src/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 8, 14, 1, 0, "a15c550d",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 9, 15, 1, 0, "44908fe7",
"src/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 10, 16, 1, 0, "d12299fe",
"src/git.h");
-+// check_blame_hunk_index(g_repo, g_blame, 11, 17, 1, 0, "44908fe7",
"src/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 12, 18, 1, 0, "d12299fe",
"src/git.h");
-+// check_blame_hunk_index(g_repo, g_blame, 13, 19, 1, 0, "44908fe7",
"src/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 14, 20, 1, 0, "638c2ca4",
"src/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 15, 21, 1, 0, "44908fe7",
"src/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 16, 22, 1, 0, "d12299fe",
"src/git.h");
-+// check_blame_hunk_index(g_repo, g_blame, 17, 23, 2, 0, "44908fe7",
"src/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 18, 25, 1, 0, "bf787bd8",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 19, 26, 1, 0, "0984c876",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 20, 27, 1, 0, "2f8a8ab2",
"src/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 21, 28, 1, 0, "27df4275",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 22, 29, 1, 0, "a346992f",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 23, 30, 1, 0, "d12299fe",
"src/git.h");
-+// check_blame_hunk_index(g_repo, g_blame, 24, 31, 5, 0, "44908fe7",
"src/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 25, 36, 1, 0, "65b09b1d",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 26, 37, 1, 0, "d12299fe",
"src/git.h");
-+// check_blame_hunk_index(g_repo, g_blame, 27, 38, 1, 0, "44908fe7",
"src/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 28, 39, 1, 0, "5d4cd003",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 29, 40, 1, 0, "41fb1ca0",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 30, 41, 1, 0, "2dc31040",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 31, 42, 1, 0, "764df57e",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 32, 43, 1, 0, "5280f4e6",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 33, 44, 1, 0, "613d5eb9",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 34, 45, 1, 0, "d12299fe",
"src/git.h");
-+// check_blame_hunk_index(g_repo, g_blame, 35, 46, 1, 0, "111ee3fe",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 36, 47, 1, 0, "f004c4a8",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 37, 48, 1, 0, "111ee3fe",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 38, 49, 1, 0, "9c82357b",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 39, 50, 1, 0, "d6258deb",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 40, 51, 1, 0, "b311e313",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 41, 52, 1, 0, "3412391d",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 42, 53, 1, 0, "bfc9ca59",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 43, 54, 1, 0, "bf477ed4",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 44, 55, 1, 0, "edebceff",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 45, 56, 1, 0, "743a4b3b",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 46, 57, 1, 0, "0a32dca5",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 47, 58, 1, 0, "590fb68b",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 48, 59, 1, 0, "bf477ed4",
"include/git2.h");
-+// check_blame_hunk_index(g_repo, g_blame, 49, 60, 1, 0, "d12299fe",
"src/git.h");
-+//}
-
-
- /*
diff --git a/dev-libs/libgit2/libgit2-0.22.3.ebuild
b/dev-libs/libgit2/libgit2-0.22.3.ebuild
deleted file mode 100644
index 699bee9..00000000
--- a/dev-libs/libgit2/libgit2-0.22.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-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 x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/";
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/22"
-IUSE="examples gssapi ssh test threads trace"
-
-RDEPEND="
- dev-libs/openssl:0
- sys-libs/zlib
- net-libs/http-parser
- gssapi? ( virtual/krb5 )
- ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-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)"
- $(cmake-utils_use_build test CLAR)
- $(cmake-utils_use_enable trace TRACE)
- $(cmake-utils_use_use gssapi GSSAPI)
- $(cmake-utils_use_use ssh SSH)
- $(cmake-utils_use threads THREADSAFE)
- )
- 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
- egit_clean examples
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/dev-libs/libgit2/libgit2-0.23.4.ebuild
b/dev-libs/libgit2/libgit2-0.23.4.ebuild
deleted file mode 100644
index 7881474..00000000
--- a/dev-libs/libgit2/libgit2-0.23.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-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 x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/";
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/23"
-IUSE="examples gssapi libressl ssh test threads trace"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- sys-libs/zlib
- net-libs/http-parser:=
- gssapi? ( virtual/krb5 )
- ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-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)"
- $(cmake-utils_use_build test CLAR)
- $(cmake-utils_use_enable trace TRACE)
- $(cmake-utils_use_use gssapi GSSAPI)
- $(cmake-utils_use_use ssh SSH)
- $(cmake-utils_use threads THREADSAFE)
- )
- 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
- egit_clean examples
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
