gentoo auto-resync : 13:10:2024 - 04:04:06

5 files changed, 5 insertions, 51 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index f50f877a5f8a..a7b686ba72bb 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 80a99b0101b5..143e815f56b0 100644
--- a/dev-vcs/git-delete-merged-branches/Manifest
+++ b/dev-vcs/git-delete-merged-branches/Manifest
@@ -1,6 +1,4 @@
-DIST git-delete-merged-branches-7.4.0.tar.gz 40887 BLAKE2B e267a0d1154d8adc8cb3a8ab0cfbab687b61b5d17bea63ea6946bbfe41b4cbdbbe288f16e120f7823f3bb50c4e6d61d3ca643fa3fe961bce5c26cc2a64287573 SHA512 90459162bb6d7cf9746ca0497a89f998b6a7b0cf165425e74375c55f99fa7ada3b8db66b567b41985e0728785c922c1a7cbdd30b4aab4700acf6a34a3d5056f3
 DIST git_delete_merged_branches-7.4.1.tar.gz 41639 BLAKE2B 527c849d92f0dcfbeebee312a2ac0120e5758eb42845a4570cacabe0f963b7a3b1122437e30f7add96f79b89ad9461b17bc1e3d6cff58b9741a9c7f9a8b13324 SHA512 582d2a83ed49971cf948ac5677f96a57469fbf829abc65accd106d594f384af98552be18dc157c56acff688b9b22209328b5d60a08a264a8c328196208183642
-EBUILD git-delete-merged-branches-7.4.0-r1.ebuild 1000 BLAKE2B 89737b4e8498e440fa4fa44d360b0760b25102045d76baf27d0aee251a2a1eeb5e41bb571ba502e6eb16b090d7ef420509d357e9030aec0ce0b9c0e3c654c575 SHA512 3d7a06c09adf9dfaf35a3ba07fb00f125f1565249da6620edb52dc39d5900754d2aeac5ad27d5d70ad2a58f0e2d8e22f2ad18c2c51514fe2a939dbbb99212946
-EBUILD git-delete-merged-branches-7.4.0.ebuild 1000 BLAKE2B c572298d411208ca3c86cb8ac9f0cbf7c5fcf082471389bd13e0cda95885e40296734cd01860c00686aa3102fdeeded86039c1ea05cf301c341cb77db8e05b55 SHA512 194756625b4cd0954314f448212b4f0277befde21f26bf429109446fb6268c988dc1e7e807e10449b5c67130af4a91cfa8a7a75e84f34b605b615150f5c33b7f
-EBUILD git-delete-merged-branches-7.4.1.ebuild 981 BLAKE2B 87ad9a60070b274dc1059d27f9e5b9d8702722708b71e848bd6eeaadbdac94d649764c3f72f6b1298c6d3fc1d51d230399d535c390bd2115d475f587d07d0741 SHA512 750cdeb5dbb4b4bc8384ec7395846e458958a51073ef4cdec09d65cce66d859ef0c298b80953243b5bccccc16a89f010ba1bbb6f63fd6eed38e665b5384b3af6
+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
 MISC metadata.xml 582 BLAKE2B 45e782537ad6d6a54a50ae84e5e1ab46ad9d06297397d30c2314bd15b39c4099f755a2884ccb072e4516499bba240814cffa727862db5a5fc1472b45d7ef7cbd SHA512 e99038593f4bdebdd3874e88f50f4f73dca01272024e2e2d998559b53c1c755d33592865ec4706e99202f2d1f4293578dda7c3812e991a3e7b7da9d1d78dc76c
diff --git a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0.ebuild b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0.ebuild
deleted file mode 100644
index 0c18b27b3266..000000000000
--- a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-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-delete-merged-branches/git-delete-merged-branches-7.4.0-r1.ebuild b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.1-r1.ebuild
index 867e9ec66282..33ddb9d11f84 100644
--- a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0-r1.ebuild
+++ b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.1-r1.ebuild
@@ -4,8 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{9..13} )
 
 inherit distutils-r1 pypi
 
@@ -14,7 +13,7 @@ HOMEPAGE="https://github.com/hartwork/git-delete-merged-branches"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="full-name-executable test"
 
 COMMON_DEPEND="
diff --git a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.1.ebuild b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.1.ebuild
index c4a0f2880132..705e64d6e59d 100644
--- a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.1.ebuild
+++ b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hartwork/git-delete-merged-branches"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="full-name-executable test"
 
 COMMON_DEPEND="