dev-libs/libgit2: revert cleanup wrt security bug #596758

This reverts commit 9b64de1489263019495731928a65665e3ab3daba.

3 files changed, 153 insertions, 0 deletions

diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 485c6a31238b..0a02cf073290 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1 +1,3 @@
+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.2.tar.gz 4177238 SHA256 00f0a7403143fba69601accc80cacf49becc568b890ba232f300c1b2a37475e6 SHA512 aaba85ef65e00b5916642121dbf0e785c20332f29312e772186eef0eebba5c997a60f94dfb651cbab25c3070c7b4cc37e8619d9cb9fed590e1fb0460bcb7af02 WHIRLPOOL 090cc7b3f8ec3db468128d1441b4c4b02e8ec02b1e9f3d73ced5973083c81a811ac0e50ecfb61470e4a85a57af94772a74e9cf9d71fccac17e36938b05892e8a
diff --git a/dev-libs/libgit2/libgit2-0.22.3.ebuild b/dev-libs/libgit2/libgit2-0.22.3.ebuild
new file mode 100644
index 000000000000..699bee950a24
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.22.3.ebuild
@@ -0,0 +1,75 @@
+# 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
new file mode 100644
index 000000000000..788147484001
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.23.4.ebuild
@@ -0,0 +1,76 @@
+# 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
+}