gentoo auto-resync : 11:09:2024 - 12:30:54

5 files changed, 3 insertions, 28 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 347ac080b19b..cb0e6d022750 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-crypt/Manifest b/dev-vcs/git-crypt/Manifest
index 8eba6da41ae8..789fa7d21c28 100644
--- a/dev-vcs/git-crypt/Manifest
+++ b/dev-vcs/git-crypt/Manifest
@@ -1,5 +1,3 @@
-DIST git-crypt-0.6.0.tar.gz 57584 BLAKE2B 6557121ef4a3f49b2294f7c6268a55323b7ec192b851fac548e76a9301c65655be72f67eecc248205cefcb0184d52a55f8a462ccec0082552fce3115a18b7267 SHA512 06fd9f6dbdc5c9fa9196f3e81a87cd3688089623b2658daf9c98809d5ca14df0b7ca69fdfe8279abf575957c366f2f93bd5a6885092eb533bd0d1ed9fe9dfac5
 DIST git-crypt-0.7.0.tar.gz 57621 BLAKE2B 3307420f2ddeb6742ea53b8e58351dfa68e34e8d83cf6eada626fc9778387c356cd38cfa29f70729ebe39fb9acb9388e489487be7839e40d0a4a47a1b12f4ece SHA512 88eb730f0f0b4622c1a3ce64c62fa97a9a4da0716f4cce86fad8d700e2cb248dae8fc9e92996448564903564dbcddaa1f87201cf7ebc77144660f3044ae92904
-EBUILD git-crypt-0.6.0-r1.ebuild 490 BLAKE2B 74bb5b907cd33f7810e802780d7d1ff49c973eed60ed1ec1b34f9e8644a0dc82545d453a5143d3c66f3f743e82df38f796f92e37fb05dd58a4b244ae3a7d952b SHA512 a710297799d4bbe154abe757e6f157321c3ac1b379cd108af4ada1505f45ad0d2647b1a0613e704a349068f9dfc39bee755393a0f66fd7be2b0c9f0e55fa8e8f
 EBUILD git-crypt-0.7.0.ebuild 715 BLAKE2B 1dd2f2d3fdb0b162402cef8733727714b56906c54277aa14c773463ae04ceddb92924f01a3471f0f21967b61a6409463f8574089aba3b2c40238334912aa0cb8 SHA512 1640bcb22f78f5e80f1ffc3750409cbd223d1234f34583851647db9c3fc847b68f3f4dfd01d2bc318e96732958426bbffedbc7ffcda05a2e6e70f6a0df500e42
 MISC metadata.xml 247 BLAKE2B 05f2a0f2b2f1ac968ed92c5d4ffc66421f91a19759f60e01d055de91fbd9871678561d144a03dcd6f39971ba7d7444042ce3d698508dab169d586427a51763be SHA512 dac25200faaac22943382193113794462c4861abe2146ed0fee8876dd3ead1d7206d207c787fdffe46b9fb010764c896dc7e77aa6234fc0839ff4de325dd622c
diff --git a/dev-vcs/git-crypt/git-crypt-0.6.0-r1.ebuild b/dev-vcs/git-crypt/git-crypt-0.6.0-r1.ebuild
deleted file mode 100644
index d1f3a018f685..000000000000
--- a/dev-vcs/git-crypt/git-crypt-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="transparent file encryption in git"
-HOMEPAGE="https://www.agwa.name/projects/git-crypt/"
-SRC_URI="https://github.com/AGWA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/openssl:=
-	dev-vcs/git
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	mkdir -p "${D}"/usr/bin || die
-	emake PREFIX="${D}"/usr install
-}
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 81b6c5d9af0d..f11976cc2657 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -2,5 +2,5 @@ DIST 1.0.2-hg65.patch 1697 BLAKE2B a620b6624eaad4ff233e9cda97d160acc11402e668a78
 DIST hg-git-1.0.2.tar.bz2 171241 BLAKE2B fd953178daff4e283cdacfacafd64c40efff73d0e4a175faa4e032bf38ccc1ef04bd715c4f38dd5d83ab1b0f52a1f329d2a1fb95c13ea83311c47786c3738600 SHA512 8df398c059131b4a8f4ab68fde743cfd82b19b3a184ea92f53ac69ba74e0b9cb94366d4a22d595ea44667493f050bd31ee3e9d7632cdb16507c57e156cd611e9
 DIST hg-git-1.1.1.tar.bz2 179321 BLAKE2B 8f6083be5c123d079dec0ca5ae150faa2658b1bd0ca235516fe13c99df19a570f3f6721c2760947a14356aa261568ac61e53000b1be6a5ee806dea3ccf3ff65e SHA512 fc7f880683f423f2d44342f51325bb522749e33bedc418397bb2f42e46d90fd3b7c949d97ccb6e776bbfc8543bb6ecaef191b271fd7e618612bba5596f6849ef
 EBUILD hg-git-1.0.2-r1.ebuild 911 BLAKE2B 0e1009d5c34e08c52c94a869e1b9603b46a45a98b580fc93dfca895cd8be05fb52a3b71d2575d0382952ba814cd80720d0e9aafdc13222e9516020ff8ba6ed87 SHA512 baade88dfa2f7ffdcc8871fc82f008e058778bc42c8d0accdddf5d5cc95e4ffcc0fe06116a9d309862ba1384a72e015fb2f4eeba9a73a398acf330385b633bd9
-EBUILD hg-git-1.1.1.ebuild 722 BLAKE2B 0867e7216151755efa67db7b844b21a09fdc69aa6512ff61c9c6d150c1e32ad344f7ca4cb47c8763ef9d860ae2667dcf89f394d37640c0a4c0ed19c3616624d7 SHA512 c4c2dc9576434342c2b818b98d0ff301b586f7d43765fe1f9a02e57a3e846dd53a62011f953f5c88bd4d8e9a8cbe11047e80c3c185070ccc90973c99bc96ac72
+EBUILD hg-git-1.1.1.ebuild 720 BLAKE2B 3159266af7b3ddd9198dd7efbaef512f1e9e345dce5e8fae029e63e39fe82d334448fbd6a9f3523a6b48e17e698ca488d36a199841fa031229e61500a1edcacb SHA512 e6f1e16ebee8e88032bd1f41435f7ec597ccdf63cdb9a9c5ebd1cd225ef235abfaee57d148fea1da24eedb2ba6fe525ef1586d0061686c59ef005d93660cf533
 MISC metadata.xml 400 BLAKE2B f24a18b5a8a3e617fbd9f4070e06f14f32fdf95e3cc01b2562755f9db99650f6fb66110d8fb78409463f1eac6404c1492094f15ff28f1df5cc8834ddbec27790 SHA512 76f620b0d1622cb7c5ec23ef6ddd90431d709eebaad6d5e8e6bcfc1150900b0c3e7fc92d668b6c422ea94ccfb7cccbe2eb0854401f813ce9ef9304bccd793e59
diff --git a/dev-vcs/hg-git/hg-git-1.1.1.ebuild b/dev-vcs/hg-git/hg-git-1.1.1.ebuild
index 3b13b528170f..187e7873942e 100644
--- a/dev-vcs/hg-git/hg-git-1.1.1.ebuild
+++ b/dev-vcs/hg-git/hg-git-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-vcs/mercurial-6.1[${PYTHON_USEDEP}]