gentoo resync : 22.12.2021

6 files changed, 2 insertions, 180 deletions

diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index c75b9f9b0dd5..df12a7db0b8f 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,9 +1,3 @@
-AUX pygit2-1.6.1-libgit2-1.2.0.patch 1870 BLAKE2B ab6d4884c5330e98f5e889f4605d8b1d9527033603707e8c3414944261aade3dfc3c8d8a0bcf7efa0d73ddee9d1390db47325d52205ee6d00ce95f39dd0b01ed SHA512 f5fb9217812057e62db50fa4f10ae0d845c031565956c60bc2b498209b11effcbf4dbd2f253c303f4b2b7192403fc777e4854ae472dc6c3e2178c19a62acfdfa
-DIST pygit2-1.6.1.tar.gz 258338 BLAKE2B dc223e2a5231728c42ca7e0581483731fbab6ee090cf4aeeb27f186973b3c753fdf54c89679a88b97d834d717135f9b8f9a2adf492ed8572affa938c79d0f905 SHA512 67a78313493ba096cbae6805bda861495f33644fd180b5fb1cd99dcd226ef5a09ee85bd27d04d0697ef15503a4e902aa1384980870551f430fd9560ac949fe2f
-DIST pygit2-1.7.0.tar.gz 276292 BLAKE2B 6091e2916c4986cb545f23d3a31f262666f0349661ccc48769414e888d0ede48af3a80483b4638a3a2275b74ed9b42113bdeae678f03d76caa7e796c6011b50c SHA512 3a8654036d0ab875898ce60e81bcab48bdb6d6bd63c29dc98272c71b5c82391e3186da61083fba09faf722e176fed5c592a36edb53ae0b957726e74646d25616
 DIST pygit2-1.7.1.tar.gz 281791 BLAKE2B 51f7f23752acf0abf6000f2262019db7503506267f0f5306bd53e0e15378447d2da564818c1b6efccc4759587aba6b4d7b142c760e4e2796445cd6056e949825 SHA512 a6232039b6364c7a0905aba20f7e27b43892b7067fa95fdd464438869453360ecdb885f2012cdf0eb0734c91dc79b60db894d1d0fee81922b9fb3cf920950937
-EBUILD pygit2-1.6.1-r3.ebuild 899 BLAKE2B f0e695b2bf234ff19dc595164334bd5d9e4bf888f47f0a0e2971d518771c60f425a00f5a787eb208409a6d436ecfbff3689114bb7de586ad092ad37beeb1f4cf SHA512 43bcc3563769b934f0e5b9fc0e0d66cbbb3b80064a8329e4aefa640b712ee22a6e9f7c2441841cbeda6baf44e70f993d32632661aed939fa61acd86e3e3984d5
-EBUILD pygit2-1.6.1-r4.ebuild 953 BLAKE2B 7c5bd5c39c85732bfe50fad523d51fea9dc019edaedf397e66595f8bbc363d889cc5df02314c63d030ed3ad3787f93a04e43b62a95425a966fa69d93fa1040ca SHA512 ba30bc730c5bec5a5ac0db436de5e2ca4c0fd7c205f036c3370a051d6659d4c0af3008a45396c0a12956734fbc3123da8e807c45931948ef63a278f5bae9b94f
-EBUILD pygit2-1.7.0-r1.ebuild 889 BLAKE2B a9c2830744e3386f59567fce106452247e6d44f0d3214c4169d6ab53beb4e626a245c69cb70e07474c6d3145cb9a742bbfde06ce582df41269f9d8f72e1298d0 SHA512 c476479b7bdb50b3d7668213727e41d10436b771a8f1fb5c357b9b8b4b8c22f441496fbb1dff2142ce353374c396a65aaecac319e9549e18f134f9a6ec9eec82
-EBUILD pygit2-1.7.1.ebuild 891 BLAKE2B 6ab4809f57ac7de51b66bb42c3a1635d226dcc719eaba0aca8534438728ed42137d5628340a345093fff28ce2bf88a709a454463e39662a13d19e5ebc3f4a8af SHA512 14bd1fe1e6a344dda25b7010c527d311956c822eb26f7676fd77f33fa957354f1adcec96274f2e7c40b22e6e077bc3852fe0c84786ef367397bafa2e8346eedd
+EBUILD pygit2-1.7.1.ebuild 889 BLAKE2B a9c2830744e3386f59567fce106452247e6d44f0d3214c4169d6ab53beb4e626a245c69cb70e07474c6d3145cb9a742bbfde06ce582df41269f9d8f72e1298d0 SHA512 c476479b7bdb50b3d7668213727e41d10436b771a8f1fb5c357b9b8b4b8c22f441496fbb1dff2142ce353374c396a65aaecac319e9549e18f134f9a6ec9eec82
 MISC metadata.xml 490 BLAKE2B a53da88b5fe40a56d831bb5589d03d247ca1d1d843bde9a1fe6999563a42c076a9f6462b6947ae217086e5edde35a4788f4552636871891f9820534a6f0bade6 SHA512 57cb7356bbb0a22fce2d7ecd8ab346ef5c8155d0941d6a15bf2e98364e755d6e5e5d6aacf24017b4b827b983032e4d46f2363483ac66d6e3882c8be12e60fb39
diff --git a/dev-python/pygit2/files/pygit2-1.6.1-libgit2-1.2.0.patch b/dev-python/pygit2/files/pygit2-1.6.1-libgit2-1.2.0.patch
deleted file mode 100644
index d3e097ba62b3..000000000000
--- a/dev-python/pygit2/files/pygit2-1.6.1-libgit2-1.2.0.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From dcde9eff5950492ab0d2565a07fd18d765332a96 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com>
-Date: Thu, 16 Sep 2021 11:19:04 +0200
-Subject: [PATCH] Upgrade to libgit2 1.2
-
-Closes #1089
----
- Makefile                         |  2 +-
- build.sh                         | 14 +++++++-------
- pygit2/decl/remote.h             |  2 ++
- src/types.h                      |  4 ++--
- 10 files changed, 29 insertions(+), 25 deletions(-)
-
-diff --git a/pygit2/decl/remote.h b/pygit2/decl/remote.h
-index ff84371c3e1ce81a7e9914d4d4592638f41376bb..4e912c065cd6eaf19ef6d0304b0fd8f646edbff4 100644
---- a/pygit2/decl/remote.h
-+++ b/pygit2/decl/remote.h
-@@ -23,6 +23,7 @@ typedef struct {
-
- typedef int (*git_push_negotiation)(const git_push_update **updates, size_t len, void *payload);
- typedef int (*git_push_update_reference_cb)(const char *refname, const char *status, void *data);
-+typedef int (*git_remote_ready_cb)(git_remote *remote, int direction, void *payload);
- typedef int (*git_url_resolve_cb)(git_buf *url_resolved, const char *url, int direction, void *payload);
-
- struct git_remote_callbacks {
-@@ -38,6 +39,7 @@ struct git_remote_callbacks {
- 	git_push_update_reference_cb push_update_reference;
- 	git_push_negotiation push_negotiation;
- 	git_transport_cb transport;
-+	git_remote_ready_cb remote_ready;
- 	void *payload;
- 	git_url_resolve_cb resolve_url;
- };
-diff --git a/src/types.h b/src/types.h
-index ff967b81f76688f8f0958638d99a06f7bbacb99c..89ad3a00149a1326c3edfa20d2d69d629cb1d2a2 100644
---- a/src/types.h
-+++ b/src/types.h
-@@ -32,8 +32,8 @@
- #include <Python.h>
- #include <git2.h>
-
--#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 1)
--#error You need a compatible libgit2 version (1.1.x)
-+#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 2)
-+#error You need a compatible libgit2 version (1.2.x)
- #endif
-
- /*
diff --git a/dev-python/pygit2/pygit2-1.6.1-r3.ebuild b/dev-python/pygit2/pygit2-1.6.1-r3.ebuild
deleted file mode 100644
index 52934d483693..000000000000
--- a/dev-python/pygit2/pygit2-1.6.1-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	=dev-libs/libgit2-1.1*:=
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	pytest -vv hack/test || die
-}
diff --git a/dev-python/pygit2/pygit2-1.6.1-r4.ebuild b/dev-python/pygit2/pygit2-1.6.1-r4.ebuild
deleted file mode 100644
index 29a58cb47655..000000000000
--- a/dev-python/pygit2/pygit2-1.6.1-r4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-libs/libgit2-1.2*:=
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-libgit2-1.2.0.patch
-	)
-
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	epytest hack/test
-}
diff --git a/dev-python/pygit2/pygit2-1.7.0-r1.ebuild b/dev-python/pygit2/pygit2-1.7.0-r1.ebuild
deleted file mode 100644
index e1df5178654a..000000000000
--- a/dev-python/pygit2/pygit2-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	=dev-libs/libgit2-1.3*:=
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	epytest hack/test
-}
diff --git a/dev-python/pygit2/pygit2-1.7.1.ebuild b/dev-python/pygit2/pygit2-1.7.1.ebuild
index 985c2e9d1536..e1df5178654a 100644
--- a/dev-python/pygit2/pygit2-1.7.1.ebuild
+++ b/dev-python/pygit2/pygit2-1.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	=dev-libs/libgit2-1.3*:=