change dependency of gitlab-ce on libgit2 to libgit2:0/24, and add ebuild for libgit2-0.24.0_rc1

This commit is contained in:
Manuel Friedli 2016-02-23 14:37:39 +01:00
parent 4477f8a938
commit ae6c9349be
6 changed files with 128 additions and 2 deletions

View File

@ -0,0 +1,4 @@
AUX libgit2-0.24.0_rc1-fix-version.patch 529 SHA256 b1726938ed7ac9dc744bad1c3894816defcf652e080f354f6e90253c1387d754 SHA512 a8db6a63781ce4fdc40f9f9eca193e8b4e8a6cc6a9fb547632f1d53483005cbae06fe35cf96768c0c577a4de1226e06c8a003cee4e1c6e1f3a328dbd7f44798b WHIRLPOOL ce13a604c0a555e05b10269c35b24eba3d0286254fc4c132d244b61479dc1d98f293babe7b3fbf24ee5cc0f6bef33db0ebc238a8e6078bd40e641b2077f8189c
DIST libgit2-0.24.0_rc1.tar.gz 4165326 SHA256 e956fb569ddaf2d1d29307b4dc361121160ea7ab052eb3dc1c07b95175cb842d SHA512 c73bee9aaba3a36fca35fa0e3183e5636fa9be2ba98b1b93562f390e5f74b0be817ba73781a13e7ae5f880411465877864ca244ad6ac52ccd89d905d5b103e6c WHIRLPOOL 9d442e2894548462e3bda477bbacf4ac2190e8b9cb8c2b34e443568249b6ab63dd316d267e12fad84acfbfbc0af8aa3674e9c5dd717fa8deac4d07e586f82377
EBUILD libgit2-0.24.0_rc1.ebuild 1838 SHA256 0fcac9187a311ca7086014839c9b87a67288d3b6043a1c7d9e0dbf25bba1149b SHA512 53648baaae16c63c775909eb426e721ac8d1f3059274a1f46eb0f3aa2331e7db3327346964c16d770a1bd6307f204d1136de682e29206d7aed6c5eaa304c1aa7 WHIRLPOOL 0820061b5c98811fa5d61a9fb753dd52983b475b975c2576c44e3a84a0dd298a000c4f13399b7d2c65d011d8f030ef5cde0f1b319263c9e004ffd39f3cd64aba
MISC metadata.xml 802 SHA256 446c2a35f3209339e906828d8250d3d784cb3796c4da5740cbd6ebf301d92f4a SHA512 9d2dba83bfd1791e2cf2afd2b939ed66456e4db0723f2789ea3b1227e14b0a7d685d9a7adcaae050b6574e99a9301ff1c484b024dbf8e3dcd44e56a14d84ee99 WHIRLPOOL 268fb7c0d932e4c7b8ce4554c2d04341c77eba94ba25066746b7289111e76446f3c411efc454b3a639aaa98b67c030392c6fab77185f8bc9dac4dce9b4a47e36

View File

@ -0,0 +1,20 @@
diff --git a/include/git2/version.h b/include/git2/version.h
index 6837e90..7572da1 100644
--- a/include/git2/version.h
+++ b/include/git2/version.h
@@ -7,12 +7,12 @@
#ifndef INCLUDE_git_version_h__
#define INCLUDE_git_version_h__
-#define LIBGIT2_VERSION "0.23.0"
+#define LIBGIT2_VERSION "0.24.0-rc1"
#define LIBGIT2_VER_MAJOR 0
-#define LIBGIT2_VER_MINOR 23
+#define LIBGIT2_VER_MINOR 24
#define LIBGIT2_VER_REVISION 0
#define LIBGIT2_VER_PATCH 0
-#define LIBGIT2_SOVERSION 23
+#define LIBGIT2_SOVERSION 24
#endif

View File

@ -0,0 +1,81 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit cmake-utils multilib
MY_PV=${PV/_/-}
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${MY_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/24"
IUSE="examples gssapi libressl ssh test threads trace"
S="${WORKDIR}/${PN}-${MY_PV}"
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
epatch "${FILESDIR}/${P}-fix-version.patch"
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
}

View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>manuel@fritteli.ch</email>
<name>Manuel Friedli</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="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>

View File

@ -33,6 +33,6 @@ EBUILD gitlab-ce-8.3.4.ebuild 11156 SHA256 6a9d5dffb4228ef4ad3eda9429d9429ab7cc9
EBUILD gitlab-ce-8.4.0.ebuild 11157 SHA256 d79254791765a17fa4885ab35e0f6f2c0423ecf9227cfa71f9f6c8bf6bd6a8f7 SHA512 63d6bc7a29c0e2fe5714ed69c3966a878e60d348aec42bf0db2032873a295c81f0d27a5b5e73001b1dfc238cd635ee873d6ec6e513ace99c88a4494412337aba WHIRLPOOL 4e916bde073bd223a4c0feec794dd6f717433b4c041ace203f263731bb201b14794529d752669e9b5faca07856d1bf62466956cb0532473bb3ae4d171b8655b6
EBUILD gitlab-ce-8.4.3.ebuild 11158 SHA256 134fedd2c467d11174a22055e58c822b953f9bdb9902aa0bdf0822c66344d364 SHA512 818c37d814074cb063c91adcfde0f1164fa89cba5a855c442470b5f0e47256f2078326f998b5502c996bf4a2c874cdc068685ad037d1dcf962c2c0bbe683e689 WHIRLPOOL a251afe289ab12dbef9114ebfcb00cf84080766e4d0c1737fa1ece1965210d4544a319af27823b4794c0bddc0cfbf6d3cb896bbe48fa02c623e0b4847b6302d2
EBUILD gitlab-ce-8.4.4.ebuild 11158 SHA256 134fedd2c467d11174a22055e58c822b953f9bdb9902aa0bdf0822c66344d364 SHA512 818c37d814074cb063c91adcfde0f1164fa89cba5a855c442470b5f0e47256f2078326f998b5502c996bf4a2c874cdc068685ad037d1dcf962c2c0bbe683e689 WHIRLPOOL a251afe289ab12dbef9114ebfcb00cf84080766e4d0c1737fa1ece1965210d4544a319af27823b4794c0bddc0cfbf6d3cb896bbe48fa02c623e0b4847b6302d2
EBUILD gitlab-ce-8.5.0.ebuild 11158 SHA256 30429c027251860479e423fe586a5a077e34b41618eea87e6efe8475e1c4e59f SHA512 816a6724fe564cd167bb083d688baaf9ef6482090f6f9d6703eb4225576406b799d7cf3644b0e3a5b825d7a9df54bcbbb94abe5caf611a7169b47ae09f3423e8 WHIRLPOOL 141605345be096b6b2be6d26015a78d3bbf2ce1dce9b5a7ba144ff0503b0f9d41ceb68cee1a68996f3022757a0b82748db7f9cba033ec5f4227a5af545daf3ad
EBUILD gitlab-ce-8.5.0.ebuild 11158 SHA256 b04a3e9bb4e562c05d04ee840581a6509af67c87b57b265b953e11c992fbf0ad SHA512 69b49eb9a847e81fbb89471ee25bd9aafe33d2f00b739248884989e2055578ce78ad1af60d113ba934fc5b26ad46b2a5df972f5cfa6fa307389652a50e37247b WHIRLPOOL 32658138ff627ffc10442239a375135aaad53b0a91ad5417550ea2682e77a454eeac44f379d63427310de9f32bb75f7d4c56d679dae6744bfe2970ab87c5aa28
EBUILD gitlab-ce-9999.ebuild 11174 SHA256 f74adae83defdce35c392341aaea5b49095e1ff59515d77b5968b460c46bc058 SHA512 0051b5c07cb2fce5170ec47f6e061747fe775383d633c6ceee8522bb168f487ea5273ce9f96714d1dbcd16f6cbff019e4ba3e5faa327ea169af276a65264abe4 WHIRLPOOL 553ffe2d3edd64c2cb9897f99266535352fc55d05a8194dcab9ff47f0fe3c84cda34e9a317d474c31abc509e56201dac4a901c8754b8a8b34e87fe6b2bbbbbf7
MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1

View File

@ -56,7 +56,7 @@ DEPEND="${GEMS_DEPEND}
dev-vcs/git
>=dev-vcs/gitlab-workhorse-0.6.4
kerberos? ( !app-crypt/heimdal )
rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/23 )"
rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
RDEPEND="${DEPEND}
>=dev-db/redis-2.8
virtual/mta