gentoo auto-resync : 09:03:2025 - 01:48:35

5 files changed, 46 insertions, 2 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index e7fde69db84b..794aefa6d054 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-delete-merged-branches/Manifest b/dev-vcs/git-delete-merged-branches/Manifest
index cc11f977a05c..9d8d7d321e1a 100644
--- a/dev-vcs/git-delete-merged-branches/Manifest
+++ b/dev-vcs/git-delete-merged-branches/Manifest
@@ -1,6 +1,8 @@
 DIST git_delete_merged_branches-7.4.1.tar.gz 41639 BLAKE2B 527c849d92f0dcfbeebee312a2ac0120e5758eb42845a4570cacabe0f963b7a3b1122437e30f7add96f79b89ad9461b17bc1e3d6cff58b9741a9c7f9a8b13324 SHA512 582d2a83ed49971cf948ac5677f96a57469fbf829abc65accd106d594f384af98552be18dc157c56acff688b9b22209328b5d60a08a264a8c328196208183642
 DIST git_delete_merged_branches-7.4.2.tar.gz 41632 BLAKE2B 4af195011fda93272baf5b11db3872cdd5db9d782b653986c1dd80f02882d0c665114b9ca61666fa317bbc5ad527905be7b2441fa376e34af3ec05fe442bc1e6 SHA512 2f2c3356037afca482a61f2de4a955e24598bff75b7d436a54a8e16c8648339cfe9c00a594dc01d03782bd0f5d4471a935396291daaad45f26be104ff10a2550
+DIST git_delete_merged_branches-7.5.0.tar.gz 42131 BLAKE2B 97e441252536feeea0e6adff24c94440e521de24ff56f467925db1f3bc93837c3903656825c06855c06dd3160686c7b7317f8d32ee64c211b06436c8a6534220 SHA512 6892a33f1632164ab3e46b7dbf9cc2b900471107dbc94123c741ad995c13596c916ad633d08b7b042c88338f42e5f08b87706694f88495d3208473c62f9b1f33
 EBUILD git-delete-merged-branches-7.4.1-r1.ebuild 981 BLAKE2B ca9485ced1c4200748a6364238b6c9ba63733d1feaa872905052cd26c38671a7acbee340d7b4d80beb88287054d59d529e8ab068de53e4c9a0635c4bfb1b87a4 SHA512 ef65415b3dd5d0abf1446f1f7364530cc531cdb9e84d9c1115bd0f729d1de374a4108e1dc58ceb48b9c445c3dc030ef2b1edbe3805a15b35ef3b4f9bdf17ace3
 EBUILD git-delete-merged-branches-7.4.1.ebuild 980 BLAKE2B d1dcfb3de87e7a823a3832cf75742c296582bae869fbf387b466502fdec10728c8d089454199f7ff9a1345ed38165df2b2fc14812c6e78884ebe52a13325b699 SHA512 ffd847be77a20692d6c2e88d7a7cdc8a1e47d6c077f7551c827b6b287ed91fda1e451290115ca62c1c6040b8ffca8738ef3112126ce7adeea7aa8bca60e20c0c
 EBUILD git-delete-merged-branches-7.4.2.ebuild 980 BLAKE2B 5668e644c8b452ffa1de7622f22eb6614a56e9b874b51bdc4eea10193d4ead8ff3002a4ae0672658fe01eef0bcd14a900c338a5b1fbb2e03bf78f69c21601bdb SHA512 6606d6952d562637a78114c87c7a245fecf6e1f209b4edc6cca35210cc5c387387672d3613a9b4e35ab57139e7ab1cd521df03e6ea0fb6338e3c1897e4dd0a65
+EBUILD git-delete-merged-branches-7.5.0.ebuild 981 BLAKE2B e204cf7e3986325f4cab2f9180b0e708b18c105c84db15d6aa33336f7d9435e026562532664010a4bda5a836cb82dc62a0e1b5ba5e9d91bc814c47ca6df2e197 SHA512 04a61ed8797a6aee8f4109ffa284c2ad7df8eb410132002a61b58f0da68bab90b4b40c05c5b5f3a9d6e28420c060d6b608edaf64cb439a1d3c49cd026b2b45fd
 MISC metadata.xml 582 BLAKE2B 45e782537ad6d6a54a50ae84e5e1ab46ad9d06297397d30c2314bd15b39c4099f755a2884ccb072e4516499bba240814cffa727862db5a5fc1472b45d7ef7cbd SHA512 e99038593f4bdebdd3874e88f50f4f73dca01272024e2e2d998559b53c1c755d33592865ec4706e99202f2d1f4293578dda7c3812e991a3e7b7da9d1d78dc76c
diff --git a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.5.0.ebuild b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.5.0.ebuild
new file mode 100644
index 000000000000..b94e12ca1b8f
--- /dev/null
+++ b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Command-line tool to delete merged Git branches"
+HOMEPAGE="https://github.com/hartwork/git-delete-merged-branches"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="full-name-executable test"
+
+COMMON_DEPEND="
+	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.18[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	full-name-executable? ( !dev-vcs/git-extras )
+	dev-vcs/git
+"
+
+RESTRICT="!test? ( test )"
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	if ! use full-name-executable; then
+	    rm "${D}"/usr/bin/git-delete-merged-branches || die
+	    rm "${D}"/usr/share/man/man1/git-delete-merged-branches.1* || die
+	fi
+}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 1f96731c23b7..71a92a463ba6 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -21,7 +21,7 @@ DIST git-manpages-2.45.3.tar.xz 576480 BLAKE2B 61eeccea65dcae72e0151459ad4a225d4
 DIST git-manpages-2.48.1.tar.xz 590608 BLAKE2B 54ff646cd1d5ce93e8e37eef4682e81a1c95f99903b2d760f70e51f2c9f02378f6de5464a5fcca24c08f8327ec114cdd1684eee07fd2512af7e9615c47104a99 SHA512 b086ac89e77b1af58beff26576fb5c3a1dfe8641315ab0b60819dcf0ba9e5be4173deaa77fa1f95d8594895a583ed629c469714b0a5e87fecd36e5be397ba8f5
 EBUILD git-2.45.2.ebuild 16448 BLAKE2B eecc66b8793b6a99e40c28fea1ef68bbb25902981bf18a09d7e8f2e6c00a27133b3fc2318f9460acba64d341cf6ad8970d2e855e6c4baffc982ec8830db8d2f8 SHA512 47dd7ec8dbd7256bfcdcb810abd6d47aababde17e68343cf5941dd529232ca0ecd321c2d1aa23f17ce8bd501203d39ddfa1bf3e4bb63c84f9c06e5c76fff5179
 EBUILD git-2.45.3.ebuild 16448 BLAKE2B 849adc38c76ee0dba0523cad77db4a06b74b891815555578dff3a40db29b91a17f2cdd6e0727cbf842781bb3f5c215cf880f7949f157fc2f9dfbd13afc2768b9 SHA512 f1ebde7f07478fd40aedc5eca9826e1fc4684f1f808dbd29e2cbdd620df130646a5acf5f54cf160b92bb4aa1fe31afddde3101814ebb9c4a5505021806f1d23b
-EBUILD git-2.48.1.ebuild 12078 BLAKE2B 2ac2d37274f6cf7dab7ab2b3185442a06d77705921f1460e172b7c36a1f1894e25f980bad424397524ffd6314d921ea995973539fa38a0e8204d810e271a15c7 SHA512 a7281c6841465ca537dcf0a79c41cb5abca3f3875c261a083c628fef194bd556a22582441a0a3f9c2746087c4689c6b663bb96f593ff7e9d9fb5dee9b2c38fa0
+EBUILD git-2.48.1.ebuild 12071 BLAKE2B 81aa7062264d905515637a6daa6651758314c8bb40b11f421b8df9fc237d35c399b6359a960f8b8ce3a9083627a8d977f861a63680aafeccb42be392bc18c2ea SHA512 3892716e933efec6f25f08dd27b2a843f1b48ab6fd44c5f80c576f287c3de9b122aa5a62de7e048eac8b9116eade43bd63638eed216296740d096d21f29adc0c
 EBUILD git-9999-r1.ebuild 11872 BLAKE2B 92a624df4df88a3643f8195d05e22cfbef5a06b65f9585b1f5321fb4445aaafbfbfa0671aa618ebe7c05ded4c2d494e876e87cc4f49c6b60118ce5b66e2cc711 SHA512 75275bb877781c96fbccf0c590d3001104137ee4683de16a6f5e8447e73adbaa867ae50bd70fe73e9ac28eaf83992abb03a3d7472ee59d5a4c536df2d86a2f06
 EBUILD git-9999-r2.ebuild 11872 BLAKE2B 92a624df4df88a3643f8195d05e22cfbef5a06b65f9585b1f5321fb4445aaafbfbfa0671aa618ebe7c05ded4c2d494e876e87cc4f49c6b60118ce5b66e2cc711 SHA512 75275bb877781c96fbccf0c590d3001104137ee4683de16a6f5e8447e73adbaa867ae50bd70fe73e9ac28eaf83992abb03a3d7472ee59d5a4c536df2d86a2f06
 EBUILD git-9999-r3.ebuild 11909 BLAKE2B f84e78cc57a931d46bf030f3841e21ab096a651499e7306e6df9cf747c8563a680bcb3559137fcd98bc5831c41850251fc77dee65707e08b91e65f66584a3a1c SHA512 7124b6a329846f44ca6690109534439ac7374a83c0abdb2b42c839ec902b735ac4cad087f8ac6b353a274e6e23f16192f63f14e1531452628ebadd59a3491d85
diff --git a/dev-vcs/git/git-2.48.1.ebuild b/dev-vcs/git/git-2.48.1.ebuild
index 99cdc1b16654..ba42dcd3bf8c 100644
--- a/dev-vcs/git/git-2.48.1.ebuild
+++ b/dev-vcs/git/git-2.48.1.ebuild
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 fi