gentoo auto-resync : 03:06:2024 - 00:07:25

6 files changed, 86 insertions, 2 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index aeda17c7804c..5d91cae9c86c 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-filter-repo/Manifest b/dev-vcs/git-filter-repo/Manifest
index 446257d1ed08..2c162dd80ea0 100644
--- a/dev-vcs/git-filter-repo/Manifest
+++ b/dev-vcs/git-filter-repo/Manifest
@@ -1,3 +1,4 @@
+AUX git-filter-repo-2.38.0-new-git.patch 1373 BLAKE2B 4c078e9c4fea40054ff4f2c5f6282c2993c5de61c62c80e0fabeb1aaa3e639cad95eb2d8987a63dd6ce1efd0865427a04c22f77dfb6072796605b57aca93d394 SHA512 09d7979141bbe529c898b5e349016a2c810770992f800c064379567006e78f05de2665e6f1e99c3083a83630a313a9c0b5c528e3d628e91a637f88ccbcc1d973
 DIST git-filter-repo-2.38.0.tar.xz 153772 BLAKE2B 491269226c5db9fa57bb5e2038e2c8cb3e82577ff1ba8b34920857c2ec4275d4491e8e17f5bd34e63148ae0d6f7bb57ab3d1d36ffecd390579e0fdc773046d71 SHA512 786c27c1952a5e3625c924e71958cfd61d9065d32754a3e957f258767ccb5b147778c5d499eb82c7c1bf36a2f5a50b1cde372ebbc927aeeedbd713e5ab6563d8
-EBUILD git-filter-repo-2.38.0-r2.ebuild 1343 BLAKE2B af7186865e0eed2292234388a5b2a92453d1b92dbe245ef30eee0a8f7c46be6dc11823f061e725d77e69e03da3eaff9cc6259380b1ffa9146fa04665209d6c5f SHA512 b0d2aa30fd0dcb81bc9dad525c0a87ec858cc1d5d338afb83bf72f00d79af5662ae10c7ead429ef5f1adf2937835fa7ef6dbd6e9b5a7355824d976f8e424869c
+EBUILD git-filter-repo-2.38.0-r3.ebuild 1494 BLAKE2B 79203ea21bbdf780a7faa2543b3aec3dd22315c696449d1ac61c735ffcc4289d0b5ef4866fdee45d70f3870d673bcd92d98d56a3118d0d5fdcab06b7e8af8faf SHA512 01ebd5da5bdcd93d6735df2059db107b82a3ed95798833ba8c3c7322ea14202c11962f02efae36cc3916331400a0a0ff3e20b26f830116eb154792b851f8da8e
 MISC metadata.xml 332 BLAKE2B 768cfa834a427091d08c837a789a642a1542d9cfc0075426f43f6316e7a405841c2b858aec27d82b7201807d0aa2af759d2daf6a5b3ac86629bbf8a970d5f781 SHA512 9d4e308e7fb88017a68b0e2b6b612c39c805d10fa143824e7e9b7a881f5b7f132e0b77d0c51ffe57cca773cd4439ae31888ef90854ec0801f6d074d37b3a35ee
diff --git a/dev-vcs/git-filter-repo/files/git-filter-repo-2.38.0-new-git.patch b/dev-vcs/git-filter-repo/files/git-filter-repo-2.38.0-new-git.patch
new file mode 100644
index 000000000000..d54c6a7f8223
--- /dev/null
+++ b/dev-vcs/git-filter-repo/files/git-filter-repo-2.38.0-new-git.patch
@@ -0,0 +1,30 @@
+https://github.com/newren/git-filter-repo/issues/523
+https://github.com/newren/git-filter-repo/pull/526
+
+From 1db1650e6e14443a5a8163213434aec5e190f193 Mon Sep 17 00:00:00 2001
+From: Vladimir Petko <vladimir.petko@canonical.com>
+Date: Fri, 8 Dec 2023 15:05:34 +1300
+Subject: [PATCH] support git 2.43
+
+Git 2.43 changes --mark-tags to --[no-]mark-tags and --reencode to --[no-]reencode. Use both options for the detection check.
+
+Signed-off-by: Vladimir Petko <vladimir.petko@canonical.com>
+--- a/git-filter-repo
++++ b/git-filter-repo
+@@ -2067,13 +2067,13 @@ EXAMPLES
+     if b'--anonymize-map' not in output: # pragma: no cover
+       global date_format_permissive
+       date_format_permissive = False
+-    if b'--mark-tags' not in output: # pragma: no cover
++    if not any(x in output for x in [b'--mark-tags',b'--[no-]mark-tags']): # pragma: no cover
+       global write_marks
+       write_marks = False
+       if args.state_branch:
+         # We need a version of git-fast-export with --mark-tags
+         raise SystemExit(_("Error: need git >= 2.24.0"))
+-    if b'--reencode' not in output: # pragma: no cover
++    if not any(x in output for x in [b'--reencode',  b'--[no-]reencode']): # pragma: no cover
+       if args.preserve_commit_encoding:
+         # We need a version of git-fast-export with --reencode
+         raise SystemExit(_("Error: need git >= 2.23.0"))
+
diff --git a/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r2.ebuild b/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r3.ebuild
index c54f9866d9bd..fe82886559bc 100644
--- a/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r2.ebuild
+++ b/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1
 
 DESCRIPTION="Quickly rewrite git repository history (filter-branch replacement)"
@@ -27,6 +27,14 @@ BDEPEND="
 # requires a valid source of version info, this one is for distros
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 
+python_prepare_all() {
+	cd .. || die
+	eapply "${FILESDIR}"/git-filter-repo-2.38.0-new-git.patch
+	cd "${S}" || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	cd .. || die
 	bash t/run_tests || die
diff --git a/dev-vcs/python-gitlab/Manifest b/dev-vcs/python-gitlab/Manifest
index b723e023f84b..a298df71c85c 100644
--- a/dev-vcs/python-gitlab/Manifest
+++ b/dev-vcs/python-gitlab/Manifest
@@ -1,3 +1,5 @@
 DIST python-gitlab-3.13.0.tar.gz 270646 BLAKE2B ff7e3c35525ac1bf1cb6dc6e668ca9c8aeefb12073636f115c8e078aa4b9f623f6d847d8487e85e9a325b6f0ad1ef93826631cb32fd86c0bd9023688aac5add9 SHA512 373347392d7030c817a8dcb4cceea71d0609f9e09dce348514c1ca024307094b1a72e287c871ce5fcba9b9d4cdfcc7dc6b4495e2b225b845a3dff2e2dfc4fe82
+DIST python-gitlab-4.6.0.tar.gz 470253 BLAKE2B 25859017478c9c1896088bd706da1980f5c90dff075fa8a9373933852e1a83daf543f7a48acce4619da7077cdfaf64b0cc9f868cd99ee4d8868294f3328d0d13 SHA512 1d0178dd4d0456b25d5d6ecbcb39137cbc273bf4ac1863b696d39fcdb50c927b606b18ea3b21ce66e92102979584bc3922e65577e0d0c72ae937e984ec21cbc3
 EBUILD python-gitlab-3.13.0.ebuild 996 BLAKE2B 606d0da9842aae4538739b8920363111d95c9b25424615669193207640cc999da854e2c1a882eadba9369e1317e0fc0e6fee40d8ff605874a0da88aaf45b8c7c SHA512 b6b4a746e2ceb29b995eca5adad37885c81b88c0beb8dc605e819215fd58c3574afe4aebc4549bce56b2a93331a2594e0052122f2b7c4a756fc7a7d5ac92a37e
+EBUILD python-gitlab-4.6.0.ebuild 1086 BLAKE2B 66e3974c3f31453fa6bb562442f4dc6f4eaaa4195b15a74e5d48ef4d31aebb87ea47d8c2e8d2340e10769e087dbc40d4fb8d6c2cb27a96b8ce477533aae439a6 SHA512 a7abe19049706087d62c345ae80a6993cc6fb8cef4114257e0befd0225f1c7a1e46f0fa1fb6dc5f69b1f332ecb85c8ddfee29c321853b77eafec77f7d10ca4d2
 MISC metadata.xml 467 BLAKE2B fe85595edfdf791a5ae099188cdcffbbb80802f62a7ce0f95576f2b217e91e3b835fdf4989a196678c91e66108bc969108fadc1b04ba026273c8bb71dfe52d6b SHA512 8e3332d042520e9ae097575c6b25ca3f1b9b706676fc79f54bfa639be6baabb060e2e0da290008f6ea4cf592e4b538a068abb593f7019b87d4b9aedeedc446eb
diff --git a/dev-vcs/python-gitlab/python-gitlab-4.6.0.ebuild b/dev-vcs/python-gitlab/python-gitlab-4.6.0.ebuild
new file mode 100644
index 000000000000..4da36920b512
--- /dev/null
+++ b/dev-vcs/python-gitlab/python-gitlab-4.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+MY_PN="${PN/-/_}"
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1
+
+DESCRIPTION="Python command line interface to gitlab API"
+HOMEPAGE="https://github.com/python-gitlab/python-gitlab/"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/python-gitlab/python-gitlab"
+	inherit git-r3
+else
+	inherit pypi
+	SRC_URI="$(pypi_sdist_url) -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+BDEPEND="test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		>=dev-python/pytest-console-scripts-1.3.1[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.2[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND=">=dev-python/requests-2.32.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-1.0.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r *.rst docs
+}