gentoo resync : 28.04.2019

5 files changed, 14 insertions, 26 deletions

diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 610a3477ae78..21b75c5f5104 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -2,8 +2,8 @@ AUX libgit2-0.26.8-disable-oom-tests-on-32bit.patch 1775 BLAKE2B 4c3df3edfa76a57
 DIST libgit2-0.26.8.tar.gz 4742478 BLAKE2B 31326987961ed42740f6c0ddce6a80c278175899a62cabd65ce9eef60854553e6a91fd9947ca23945104d4e1b46f9ab0bb1a1a793d8dd87bed792528e5c32839 SHA512 efb9229b2882ac36910d75778d7431bec40f3529f2ad2dd6a950d5580ceb0d4dd798242a422ea6cbb880f515df4dfbb7055a65dd5a8106696d3d458851fca56e
 DIST libgit2-0.27.8.tar.gz 4783928 BLAKE2B 0f0f79a43de3e869d593dafc1b506ee0894143d2daedf2fe56683ad8f2edfd7d87bab784354b9fb1796fa8e08a36b9de88af65c7621a90d537cb585c89118197 SHA512 53ab69a0687afd315029fdbe0ce8192b7e88f7f1ff6bc9c4875718e638cecd64755a9942ad605e6c388c58c6b892b351d54c5405de8e0d5ba90406055a25ffaa
 DIST libgit2-0.28.1.tar.gz 4987204 BLAKE2B bb4f32b0b78a9faed3e5204f40cbda15d032719dfd581948cf175bc17a30356f97f20545e1f64ff6f3cd1dc4ff483af99edb29d7a10c56349ce74976c186886b SHA512 5a1bc5c6af6ad25cb8b2c446e75a774d2a615d4999ec3223d681c7b120d83e7cecd94f1ca549bac0802f5324e27e73cc5a6483ad410636c2f06f098b30b1b647
-EBUILD libgit2-0.26.8.ebuild 2053 BLAKE2B 1de5648ae2d9500af644cb1e8519962a463497f25bed279e6148d14dcc0235b4c388f9c94a53f7c0075896f46ba395ed6030d8a577061284c4ab11fe68a566c9 SHA512 2afea3b4bcd0bcf9602ae226762d4c7de609cf97408ea9ac560646d3c001467578adb6512df0c63eb9ed618606355f7087a041b0c2b12e549ac93dc23d1faa84
-EBUILD libgit2-0.27.8.ebuild 2055 BLAKE2B 1fc9de00757bce342fc97176725cd608244d6c22acb3517249cd6bd6df4aed15737345f42a76dd7ac76dccbe100a858e7bc92a23863f7bdc16ab578a6b03cf8f SHA512 5a40ae4d935ce482df78558d7aff2fec2368ad0286121bfd6b02433a4e5889dd8cc9a521696bfe5b0f753a3c61fa3092d89ad991160fb1d4f039e6d91f67c632
-EBUILD libgit2-0.28.1.ebuild 1689 BLAKE2B 65f1c812181d41fc28b38607bf30d4ae45eb6be38ec7e66ffae2d63479d572c9f4138c10ac83e8821ecb2cefe90f1ff1ea6ab943b5647b60e63ab24297de6022 SHA512 9a7b6cefffbb9cd6a594585519a1732408cc60bceb135c64d4a4d50af2eec147100c3d85fdd737fa5ce39162cb861247bf6f6dbf1c390c9ae1fd510ea7115528
-EBUILD libgit2-9999.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
+EBUILD libgit2-0.26.8.ebuild 2051 BLAKE2B 4859872a3feb9ca22bd344e39470c0f6b44fcf08e93ed7cc63a39c5ed02640c1e2dbac66c1eda916fd450830e504e8040ee41d43c4a85d293fb71641232febbb SHA512 675efffc1836dfa802ffeac98a218c2e0e4e0afc5d0e5974883cbc616f9e56a07d90a0ee26f838048663627d6d96dd7ff9da97138895681c17b1d93a6c8b9cec
+EBUILD libgit2-0.27.8.ebuild 2053 BLAKE2B 177c2d0f6514cff1b124755061c8be28c01deb4af54283ee56c79057428b36a61fff1a09deae180cef474701803fc8292671cc77537cc8659bb27c89e0cad0a0 SHA512 519816e85e64f933a15ea076dd92f6460225c962b556c379ac4830802920c4e1dcfcff39d7ce6fd3fd12302ef29cf92b0f2572e779934032d61a4a7f0df67658
+EBUILD libgit2-0.28.1.ebuild 1687 BLAKE2B 125a6d27dd61f165f6e5f6c94f1e46944cea35192944088b4b67bb7eb5afc3f9f52d5587ea16599c61424bde6d4cf8a7f1deefd969e59e20cb8ae06aa41f711b SHA512 b2862ca2cde1fb26962f72978a929dec46a098c87bea5560931b769177ab47704fb156ae5969a149f48f377612f3f806a93f1f3f71b6943f52aa16b7a08e65e9
+EBUILD libgit2-9999.ebuild 1664 BLAKE2B ca592e3b60a50ee0ad16da964b1e9df3095e235d78aeec683582b38fd2b70395311778e453e59bbee913c2976e341f5bc947487ed58defc60d78ca63307ebd18 SHA512 ca41454b876cc379a6aac038b00ab48e01cd2fc728ba79e9164e144a1cd5b2fa7f563b9243d0af4c8d7f1538baece44cff31db260b137f265bee8ebc35050aca
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.26.8.ebuild b/dev-libs/libgit2/libgit2-0.26.8.ebuild
index 34bc03ffb55f..89674ff077fc 100644
--- a/dev-libs/libgit2/libgit2-0.26.8.ebuild
+++ b/dev-libs/libgit2/libgit2-0.26.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-libs/libgit2/libgit2-0.27.8.ebuild b/dev-libs/libgit2/libgit2-0.27.8.ebuild
index 3815701da066..a590603f8e44 100644
--- a/dev-libs/libgit2/libgit2-0.27.8.ebuild
+++ b/dev-libs/libgit2/libgit2-0.27.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-libs/libgit2/libgit2-0.28.1.ebuild b/dev-libs/libgit2/libgit2-0.28.1.ebuild
index 5f6041d38921..3b50d8a40c7b 100644
--- a/dev-libs/libgit2/libgit2-0.28.1.ebuild
+++ b/dev-libs/libgit2/libgit2-0.28.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild
index d10065358a4f..5da98ce6f13c 100644
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ b/dev-libs/libgit2/libgit2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
@@ -18,18 +18,15 @@ DESCRIPTION="A linkable library for Git"
 HOMEPAGE="https://libgit2.github.com/"
 
 LICENSE="GPL-2-with-linking-exception"
-SLOT="0/27"
-IUSE="+curl examples gssapi libressl +ssh test +threads trace"
+SLOT="0/28"
+IUSE="examples gssapi libressl +ssh test +threads trace"
+RESTRICT="!test? ( test )"
 
 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 )
 "
@@ -38,15 +35,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
-	# skip online tests
-	sed -i '/libgit2_clar/s/-ionline/-xonline/' tests/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
@@ -55,7 +43,6 @@ src_configure() {
 		-DUSE_GSSAPI=$(usex gssapi)
 		-DUSE_SSH=$(usex ssh)
 		-DTHREADSAFE=$(usex threads)
-		-DCURL=$(usex curl)
 	)
 	cmake-utils_src_configure
 }
@@ -67,12 +54,13 @@ src_test() {
 		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
 	else
 		local TEST_VERBOSE=1
-		cmake-utils_src_test
+		cmake-utils_src_test -R offline
 	fi
 }
 
 src_install() {
 	cmake-utils_src_install
+	dodoc docs/*.{md,txt}
 
 	if use examples ; then
 		find examples -name '.gitignore' -delete || die