gentoo resync : 13.03.2018

5 files changed, 106 insertions, 17 deletions

diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 449b57a23738..d42d113b63d0 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,6 +1,8 @@
 DIST libgit2-0.26.0.tar.gz 4697149 BLAKE2B 468e679bd7093004fb19a7947102d09bb90c653f3957615ce5468fe4c602f61804877072445a90447d83c70277529d02762cd3f35d0879708ea8355c44fe3456 SHA512 988c616c99637f2c1f80c498de34820296b78c0601669475eba9d194490cfd2047131987e63a799599277893e5741f9bcc226ffa594327356047ed563f07d346
 DIST libgit2-0.26.2.tar.gz 4706513 BLAKE2B e11a7043d3f1b0a13d04129b7052d60beb401bc87f583f63dc514251dda001b622d8a7b5c7b65b8d6364244e4b15e09bd4ef789b120ef13214cd0430af8c76c1 SHA512 4601b4a09f2c70b41361eab5549d3f758ab5a62742e4ae0b07df0cf4f8d7b66a2eae09a1db410afcce0f6436162dbc4f8cbe97b08de1807960ddfce02e5d695b
+DIST libgit2-0.26.3.tar.gz 4728289 BLAKE2B b437732cb30d85487a7a1a16efd41d19fe7677635ae07393094cd2931a0fb6673f41b14122793a31dd317e27936df9844fcb2444ba916469e4673f42e9db04f6 SHA512 abcd3a904bed05c1f200be2ffbc2c44cebd1b548459ee834d5635c5eaf7bcd551a4993bcc1cb9fbeae9ea990c5ebc07655007ff4e623fa7c697f326c0ce12c3e
 EBUILD libgit2-0.26.0.ebuild 1748 BLAKE2B 2451d8d46de8edd0081fcfe74d2ec964eb0f85e7a490e1405cb1cfdc4ecba3485213de36d2efa0c44338baff7aec184c99e9d06e0e81976ff704421e4ed96a67 SHA512 9c971dda49e296e61330b81f3046043769d30513ffb5662f727b8c81f3a202c17203e914f571e82d887427858f13a6fa89a9567e029af75f39d7fe839b7f8fe1
-EBUILD libgit2-0.26.2.ebuild 1750 BLAKE2B 963531066ba9b8182d6b29d5590efc95e56e162ee69c27e7e95d6f3d67dbfb5810d804fc1c583017bec1f964ff98dffd24a648b041abccb9b967ba618e97f92f SHA512 f8c80f2d75ba90900672446daff1248ab0e0057ea6c9b4f4770b905b80d79a19101a7211e4eb28c99b8ebb30a4f3c65689125b8ec7a62f0fc3c116d9d6dfd562
-EBUILD libgit2-9999.ebuild 1750 BLAKE2B 1ae8ce701365c9ad24516656efaa2dc3a5cd6895f4435d002da5cc6535f82cf0084e641b0ad8ebd1faf7c3a711ec6710d232fc4dc716e6b292dc5f49e0a6a055 SHA512 fbdd070e25dbecf026cfd0106bf6253a29e75456bd2f9d75493c1013871e533da9bda26aade344dfc4e9dcf43657376523cb5e8e079fd49c5f26961465bf6e39
-MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
+EBUILD libgit2-0.26.2.ebuild 1748 BLAKE2B 2451d8d46de8edd0081fcfe74d2ec964eb0f85e7a490e1405cb1cfdc4ecba3485213de36d2efa0c44338baff7aec184c99e9d06e0e81976ff704421e4ed96a67 SHA512 9c971dda49e296e61330b81f3046043769d30513ffb5662f727b8c81f3a202c17203e914f571e82d887427858f13a6fa89a9567e029af75f39d7fe839b7f8fe1
+EBUILD libgit2-0.26.3.ebuild 1876 BLAKE2B 310c4ccb8a71663e9758bd80a7a903436e4add8d9df35942e88f2f833262670b4d091d3ec16009df70ba3b62a24368a775b9d495a78bfd9d9c4b58670b325b87 SHA512 f64f4911811a2a0d5b7a79585dda7156ed407d807ea650dd4709fc72b73daaa32b0f5d8fab53fb6dac0f94b863f586698a834f28030a7eef4a3fa2c6e8d5d860
+EBUILD libgit2-9999.ebuild 1882 BLAKE2B 43d84f718bd6cc1a3f6ae4492b1889ae371e4bae4daed87c6fcf90b4a56985017b4397bb0f1c7ae7d5e53670fb1947e5bd13cbd96966afdad01dc67d083d469e SHA512 e183504e2c6f883fc11f64266b95d4d673eb9f296311bb7ef316cc198067990af2c93a47e0920842502efe5fb95f83e282377804871dadfbbfe2a50b75a9dcdc
+MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.26.2.ebuild b/dev-libs/libgit2/libgit2-0.26.2.ebuild
index cf73d59aecae..467490437687 100644
--- a/dev-libs/libgit2/libgit2-0.26.2.ebuild
+++ b/dev-libs/libgit2/libgit2-0.26.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
diff --git a/dev-libs/libgit2/libgit2-0.26.3.ebuild b/dev-libs/libgit2/libgit2-0.26.3.ebuild
new file mode 100644
index 000000000000..549b491f6136
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.26.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+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 ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/26"
+IUSE="+curl examples gssapi libressl +ssh test +threads trace"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	net-libs/http-parser:=
+	curl? (
+		!libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
+		libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
+	)
+	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)"
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace)
+		-DUSE_GSSAPI=$(usex gssapi)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DCURL=$(usex curl)
+	)
+	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
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild
index 899540f73af0..677c3a9a8184 100644
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ b/dev-libs/libgit2/libgit2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils multilib
+inherit cmake-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
@@ -18,13 +18,17 @@ HOMEPAGE="https://libgit2.github.com/"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/26"
-IUSE="examples gssapi libressl +ssh test +threads trace"
+IUSE="+curl examples gssapi libressl +ssh test +threads trace"
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	sys-libs/zlib
 	net-libs/http-parser:=
+	curl? (
+		!libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
+		libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
+	)
 	gssapi? ( virtual/krb5 )
 	ssh? ( net-libs/libssh2 )
 "
@@ -36,7 +40,7 @@ DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
 
 src_prepare() {
 	# skip online tests
-	sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
+	sed -i '/libgit2_clar/s/-ionline/-xonline/' tests/CMakeLists.txt || die
 
 	cmake-utils_src_prepare
 }
@@ -44,11 +48,12 @@ 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)
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace)
+		-DUSE_GSSAPI=$(usex gssapi)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DCURL=$(usex curl)
 	)
 	cmake-utils_src_configure
 }
@@ -68,7 +73,7 @@ src_install() {
 	cmake-utils_src_install
 
 	if use examples ; then
-		egit_clean examples
+		find examples -name '.gitignore' -delete || die
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/dev-libs/libgit2/metadata.xml b/dev-libs/libgit2/metadata.xml
index 341b4d4cf6d8..e090ecb97fe2 100644
--- a/dev-libs/libgit2/metadata.xml
+++ b/dev-libs/libgit2/metadata.xml
@@ -15,6 +15,8 @@
 		speed custom Git applications in any language which supports C bindings.
 	</longdescription>
 	<use>
+		<flag name="curl">Use <pkg>net-misc/curl</pkg> for HTTP support
+			(otherwise, limited built-in implementation will be used)</flag>
 		<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>