gentoo resync : 03.09.2021

3 files changed, 76 insertions, 2 deletions

diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 832043359f34..5b9a72472287 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,5 +1,7 @@
 DIST libgit2-1.1.0.tar.gz 5426975 BLAKE2B 2a1c1f71d2a2e06448c78eb46028fdcfd59682dccf2365851c4bd059cdd78842320f9a5ba7345e761611a5b4eba634faf2e26cc669097da0ba2e1c832c23059f SHA512 347bb68900181b44fa58a0417506c91383adb965607fce049a5b4c57ac9cc286e0a140d164c339b50fb6cd6951f47757c2917a2df44ba004bfaa4fb643946bb8
 DIST libgit2-1.1.1.tar.gz 5451203 BLAKE2B 46842ea270fc457d0960c1a825928eb2747b236e689ff785e9fc2bce919744d1da95a89e6fcf928bbe6a4981e2ff6a02989df92026ba181f2743e949982a18df SHA512 287255c81e5baa04d8fbce95efca8174cb34da8025cab979445d41e8361955f1d8c582d7705666ae9fc03c5215fc4f4f57e51d73d14ca9b063ed94077f88e6bc
+DIST libgit2-1.2.0.tar.gz 5589147 BLAKE2B b612e3a30b4675431879792132adee22cce57986b4f307507b896d823329f7e37514d9008e008075c395a4eca26aaf6ed6eb3943cf97370a0b04086240a5e1fc SHA512 428188de153fdf8ff5bf78949f4a3a89fba57b87a8b641f92fed501df6a8cfdb72e0ffe0bf61a98adf210a2867134eb4421ea4b8d8219331aabc3daddd92f5fc
 EBUILD libgit2-1.1.0-r2.ebuild 1661 BLAKE2B 1acd45d3b5aa96e3f7cfb75baed1137a7fbc6ddfaa42d5703e9890a191c4505f4dce87a3fb1f331454d136fcb46db7178436c8820cd7b7ea5e7b2812960d1ce8 SHA512 45ed2fab7ab54597e186def3362ec90c3318859fdc86f203a822e74214bf84275358b359bdf997eaa3e23c02cd014e15b093035ad8470202d93c86fa8c202402
-EBUILD libgit2-1.1.1.ebuild 1681 BLAKE2B aa34da7da67ed99c624ff95f029274d66e639e79e4105ad75331c369337991f0577035053b376a96c5929c1e8c903ced60d26e9edb2364e4f718624c4fb0c75c SHA512 58328beb2f53c7cc5dce32077c4e033271e3e6a5b120b4fed3379792da12c7d2f04d7037744dc1b86771a12409dd773248ef65570dc59984645da6eff5a016f3
+EBUILD libgit2-1.1.1.ebuild 1680 BLAKE2B 4510c60e5042887edbc7696b60efabe5a97484c07d5a4e2a3a07c38c5758d90b4612eee7806b07d1c581ec32b5bc34a1075a8b0d3065b81cb9ef6a591fe57983 SHA512 f8c10fb2dc80560ebd58f5dbdc6c0ac37082881bbe3922c1c73cd1fad866203dae2857cf53344fd0e0a888c3d1dfd96cc15970be1dd104cdb91399c347762633
+EBUILD libgit2-1.2.0.ebuild 1686 BLAKE2B d397aafdeeb75006880dabf9653b88921794cee0f79ecf2498fbeb303dd5816d74afe21c03076eaaa6e575d0e96f57d0e697d7e0e859ad97f4bc02860fe9c6f3 SHA512 55e66ddcf474bca68cc61ed829a22b830f083ff584239d23c62d48ec0ad45dca75294c7bff0d27bb425cc6152ea71dd03e05082da846e8fcf086dc38a136fd90
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-1.1.1.ebuild b/dev-libs/libgit2/libgit2-1.1.1.ebuild
index e5be2e907283..27ef1c642b19 100644
--- a/dev-libs/libgit2/libgit2-1.1.1.ebuild
+++ b/dev-libs/libgit2/libgit2-1.1.1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/1.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~ppc-macos"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgit2/libgit2-1.2.0.ebuild b/dev-libs/libgit2/libgit2-1.2.0.ebuild
new file mode 100644
index 000000000000..f2c774a8b63c
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.2.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-any-r1
+
+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/1.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+IUSE="examples gssapi +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	dev-libs/openssl:0=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+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/url/parse.c || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace ON OFF)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DUSE_HTTP_PARSER=system
+	)
+	cmake_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_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_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
+}