gentoo resync : 15.01.2020

4 files changed, 14 insertions, 88 deletions

diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index eb6c00fcc1f4..4a8a06c93f9e 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,6 +1,4 @@
-DIST libgit2-0.28.3.tar.gz 4988580 BLAKE2B 93d87792b0aef6383845230880d749fa77f28ac8ece4564abf041ccbb672d17e6efb1ef9503879d45cf5f78b6f1e54dd2b2ab9eac0fb09ddb445310484bbd7fc SHA512 15444823b7d4885f7b8c3982f8905efc4a75913de016a9b2e0a24d5ce9746e6a549dffd5469036529557feff2ce7ece9328266eb312c80b96091ce0f65ee97ee
 DIST libgit2-0.28.4.tar.gz 4991720 BLAKE2B 7dc94dce69c27f6de3736b94b4d80b727e3e2a7db255a9eab7422cebd93a3ea1a6f47d1de6c3fbe4ba5bcb28ade9b23a989c5b54c06eafeaf30e382f3b859cdf SHA512 b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15
-EBUILD libgit2-0.28.3.ebuild 1684 BLAKE2B c13c366277f3e4b8f8b0fc074eaef7e3932483a2d2fe52aa43919457ecbba28676e0e08ca549c5e1d70701a5c55d06d32c3e460e5e6ee2e0bd71d9ef904731e2 SHA512 9a03f48114b70cb5b59a5c71c705dc0626d264173a1086ad5290d4d91f7ac52d886b5c926438caeddc9633cd9c19b5f6bf52785fd316c7682da7c69a56a68590
-EBUILD libgit2-0.28.4.ebuild 1684 BLAKE2B c13c366277f3e4b8f8b0fc074eaef7e3932483a2d2fe52aa43919457ecbba28676e0e08ca549c5e1d70701a5c55d06d32c3e460e5e6ee2e0bd71d9ef904731e2 SHA512 9a03f48114b70cb5b59a5c71c705dc0626d264173a1086ad5290d4d91f7ac52d886b5c926438caeddc9633cd9c19b5f6bf52785fd316c7682da7c69a56a68590
-EBUILD libgit2-9999.ebuild 1664 BLAKE2B ca592e3b60a50ee0ad16da964b1e9df3095e235d78aeec683582b38fd2b70395311778e453e59bbee913c2976e341f5bc947487ed58defc60d78ca63307ebd18 SHA512 ca41454b876cc379a6aac038b00ab48e01cd2fc728ba79e9164e144a1cd5b2fa7f563b9243d0af4c8d7f1538baece44cff31db260b137f265bee8ebc35050aca
+EBUILD libgit2-0.28.4.ebuild 1657 BLAKE2B 59e4dc8b77221684bd08cee0123117fc56dc00b25fcf2879e8eebfd49cab36b8b38d56b7045bb0712304b9c518d89fd65af614611f30079386823d56601bc1cf SHA512 184d553f4a849ef06e19e9366a92ea2ccfc5a2322d788202b324abfc62dd5d1101c9305743379b4ace46aa1073339bf35d1c61d6a425fd42b5c7317b117e3f68
+EBUILD libgit2-9999.ebuild 1661 BLAKE2B 58810e5332148cd646da00a829eb7c9668cc7659e28c2927d23e114cafb1c9dd840411f3cfd8e4ec629a185635cac1271890baa46e1a5e0a5ec8a8918c0dd656 SHA512 80813e0018838d4bb581413e7b6b054fb69976474e641c289955ec69dc8a974af01e701e53a9aeede5dd1e4d58af4d03a55813a5f84e101000ba2a500e1b01c6
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-0.28.3.ebuild b/dev-libs/libgit2/libgit2-0.28.3.ebuild
deleted file mode 100644
index 84b9ad2b9c54..000000000000
--- a/dev-libs/libgit2/libgit2-0.28.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils python-any-r1
-
-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/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:=
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${P/_/-}
-
-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)
-	)
-	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 -R offline
-	fi
-}
-
-src_install() {
-	cmake-utils_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
-}
diff --git a/dev-libs/libgit2/libgit2-0.28.4.ebuild b/dev-libs/libgit2/libgit2-0.28.4.ebuild
index 84b9ad2b9c54..fe94903c855e 100644
--- a/dev-libs/libgit2/libgit2-0.28.4.ebuild
+++ b/dev-libs/libgit2/libgit2-0.28.4.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils python-any-r1
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+inherit cmake python-any-r1
 
 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"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
+HOMEPAGE="https://libgit2.org"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/28"
@@ -46,7 +46,7 @@ src_configure() {
 		-DUSE_SSH=$(usex ssh)
 		-DTHREADSAFE=$(usex threads)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
@@ -56,12 +56,12 @@ src_test() {
 		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
 	else
 		local TEST_VERBOSE=1
-		cmake-utils_src_test -R offline
+		cmake_src_test -R offline
 	fi
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	dodoc docs/*.{md,txt}
 
 	if use examples ; then
diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild
index 5da98ce6f13c..0519a2c0e43f 100644
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ b/dev-libs/libgit2/libgit2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
@@ -11,11 +11,11 @@ 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 ~ppc64 ~x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
+HOMEPAGE="https://libgit2.org"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/28"