gentoo auto-resync : 15:04:2024 - 12:04:02

3 files changed, 10 insertions, 90 deletions

diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index d3e2e9afa79c..364c28ebef87 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -6,17 +6,14 @@ AUX etcd.service-r1 458 BLAKE2B 4e2dd4934350821d01de1a0d9b8c4a402eeb87bf81a24f48
 AUX etcd.tmpfiles.d.conf 72 BLAKE2B b567592de5cc69c8e55ef16c537d0ad9207fd5f932bd2ca622f66909362033bb3387289af4675be53c0a5a7cf513805c4dfe45391091128a6ada3ffea4377420 SHA512 403fa63c0284811c655e5e9f3e7f6eb81ad6c10a1b0eb8df400e7e85c621c56b9580457bbb2a823c0ae3c2fac10f6b8bfb73991a10d9373e87f10b906d8d50cd
 DIST etcd-3.4.26-deps.tar.xz 39352316 BLAKE2B 8b1a30d645b1ea756ac944d2d3f7e0c5b9491bab54d4d74c6525c519e5297a1e8e2a97f70a50a5681cf8941d2e4978d5c3717fccb552042bcd42e7c4bd2b29a8 SHA512 eb3af2910030a165699158a3dfe7e1267f29c0720865026da2a95941c7e1e19db793e177e9ca5a9f3b134c1a9a83b4a0613a32a30282b68fe3aef75b8dacae59
 DIST etcd-3.4.26.tar.gz 6043999 BLAKE2B 03f3bd0388e59dea9300b9a811b426ce03f1001750259dcd8386566efaa64783746f0353f83c1d01960004a77cea08a194aba394d91808aad15b5d4bb8f151cf SHA512 b2048070adb1df6e98c06e0e951f7940815dab238fe4ba49c36681a638f39eb7e40fed691baf70410d01467965094d70f008d0046b1b550b2ac1ed19ac89ca47
-DIST etcd-3.4.28-deps.tar.xz 66108144 BLAKE2B 81bef927202231a7b8a1856327d371060b15aadf6189dd3950946a8274df5eb6845b6a645f27f8c231d1bf6baef40777b433e0f9f96f6faf136cef53ec66220f SHA512 5cf3810309c28559a3b793a2c7e329aea13f0e1ec83a033bf8d1f34b4aa7a357446bbe654f56175b52822c08e22e335be39592955b369ddc91a276c90c582820
-DIST etcd-3.4.28.tar.gz 6052858 BLAKE2B 8c6dbebf3570c88e53ff5d13b0192502bc93d50076b9b66bd3ef4a313e734a1dc630366203b8e5d22ce29e9e8498e5e9304a6b02973d2defd4b65425ee24becb SHA512 409f82c9979ee34327f0f1f6fd171ccbeb6a044ca4e1f137dd803172e2b79f5f14d68eea67b12c90401dc93fe830b7adf77f8c06c2730f3205d367a957fc43cc
 DIST etcd-3.4.31-deps.tar.xz 2212704 BLAKE2B 8b30941eefdb3811fb331014b69eb8d5b9c691b8ace1004432e5b05bb787bb3ba3ce872f881af2a559d7b955fae890a4ec0e8b10daa06cf388447af1b6a92679 SHA512 85915f5738493bfe3c09208649e26cfdc612df900916686006a437c44aad5afb2ab69b0840550e37544a50b79d2d3718e2cbdfd037e47bcaa8e33a8a6a95105f
 DIST etcd-3.4.31.tar.gz 6072806 BLAKE2B 30aa5b79d2fd0ba639bc766c104d5df28af50ae5398d860af3b3aff91c143ccd899538b341501386bac55dedc00086654de6e4ab9b237053b199a8de2fa509ec SHA512 4a7e366ced86ea86a324ab972ea47be56456c0aa8744e5ec07d499a56bdc9179ebc3bc2f33bd67c2d341181a5bcc703abc5a7c2e57879169a351457b4a0274f3
-DIST etcd-3.5.10-deps.tar.xz 95341332 BLAKE2B 45aed0b80e5c0b3100b870b3f663a09ca8998f52e462a5a618c871d9baed898bd7bf23d2d1f33ff6eb3ad40fcd6692d4c9e5501b27cdc93a4be23aea464ac769 SHA512 59acb7de1a89014c75054cd06659f3220fd0a361e16a26d7bb26c2177266493808f9817dd7393df04c4ab14d46ddfd9ec9a36442e9656cf871971034ff1c99ed
-DIST etcd-3.5.10.tar.gz 4073085 BLAKE2B d6b6c60dee15ffc42e3510837eefc543d16bdbda532828cd6a846f9d12921e24df948b93b4951f8e660be9967e540f59ecba558094558f67ec5aa4059dee60de SHA512 965e8666653c6012643b01fd9e1bbd3b01294590985e91c54a81ea9f6940ebdf4d6c48f04b082a094e09b4959eba92e0bfed46d364ff54d8791ab7d42d2a725c
 DIST etcd-3.5.12-deps.tar.xz 3935756 BLAKE2B c043cc55f59549734f38b1a734106bd25a1bbeb47f84e00a6b4308bad6086a6f0e0f3dee151bf1708bac269be124c782ea48c3761ee5e1d130a002989f99f2d3 SHA512 caae360e315756fe933bd87a7ce543d904084a745b5e42844a293bbf17c121d245f9f3645cd9992de5203c9efe4efcd4226ba294afb5a3550c114de78dad3110
 DIST etcd-3.5.12.tar.gz 4083299 BLAKE2B 85615cf9095a440ef73aa59f5582293de543f7e473c8049712ff13646276c9441039c96c4e42aaedfddcfb3baede8d37f0ef68bb5ddabdb3f4833c8591ee1c8c SHA512 6fc8bd64ad63cff71c7645253273418fb3fa262c2da1742dc345576caa733af7cd75acad2f57610c5883e6bf16cffd36bc5a0c89cbbb0793c00c2a4db1c6d14b
+DIST etcd-3.5.13-deps.tar.xz 5004004 BLAKE2B effc3c3fb8e6fff789f96030e485fb887b0f973e5943e66f744ce2d41c65c0756a81850be8f8cca96f50214a59e0eeac694c4669d809ddcee0771acc1703d9ff SHA512 ed80d70a14cf049e3af22757ad5cc4abd1ce563e00e0d422d38c82d66fe4381822ef1344de3ef803dedc2bfc038dabb520ad58fd489b8916529d24357628f002
+DIST etcd-3.5.13.tar.gz 4089792 BLAKE2B be7a46af3978108b7e25adabe736ac111a01ab7fcb8e142b75c0c87aa33905d42d10b721ebc982e834110388669d028e6a612c9745e2f5c93210dd05ffccba7d SHA512 dc85d80079b61e96eb06eb573d41d8972060392e49140a2414c283ea9edfef7b01d5554e50c7ab37c6ad079b373ae12a1b84dbcc533addc1d4d30a2a5abf7b7b
 EBUILD etcd-3.4.26.ebuild 2043 BLAKE2B e97ddd6c5a5b08280249748ba46ed169bceb12c3f1db5009275cd54d9fca65878cfc29aa6f8247162326e1b6b582511684703a6dbdce9106974a7e656e87144d SHA512 f00e48beec1d548bf5303e629ea7aea5e1a88da78f894f72b0815ac8df7d684f31da874337a013fb21b70e404478eba07f872ba5ac4034c191b70ac402547523
-EBUILD etcd-3.4.28.ebuild 2044 BLAKE2B b26b3c01605a38fe3447709a651a47daf010d080baa0ecfd7bf666ffa9dd502985793a75f167621eb7143ec7c0811cb5b3eb9c6d6fb7848b2f6503565d216e1f SHA512 24ef72b9e448192701e7636d4977e5dbbdc0f412a168961b5fcc617b0c58223cbe8f9edaddbcb132dbe960473a4f560691ad1dda8eec622e5ae25345a9541d00
 EBUILD etcd-3.4.31.ebuild 2044 BLAKE2B 6e527a0a48a368426300a7b24f73651e56074260684ead38996a418e2cc51490a0ee5621cafc767bf426c385d44bf9be9cff3b296d75849c9d0c8d2fd2f9db2c SHA512 ad5b18908d458864acbaf9e4ac570b5dda321bec9f989549d25aaec3682e0819b086f015f12fd10ae69e4895466152610d74c0cd062cb37e9b99051e7ce1d429
-EBUILD etcd-3.5.10.ebuild 2058 BLAKE2B 7076076365e9f30a08db9891134a8fa7f6ab83921aa232eea3b9b7d0d63eabe5c44cacf182a2e4dc22109e6c7417a45c326ae6fea9250f9175ffc550421ce620 SHA512 807820038f60953b4882a23973cc84e6c6db113378ebad7f1312f44952b082315f2440cb367f9f7c2c5e945387b244ebc1e25bf92f2f2e4b17a71b35450c0d24
 EBUILD etcd-3.5.12.ebuild 2096 BLAKE2B bb57169405e88223504a9239214c7a734d7dc7ed636497b2182eec0437c7d88ecf0b303434d4ad2393296a06276377afc328b37e63e9f24e862fd3cd7dd66bba SHA512 d6062044f38bd380d74a52c921962c1902addb8c5a30a93c7fe08fd7a236d85b1b56ad0d2e5682bad255f3dd89cc45b5c5e2cca8ba6b94faf0ec2595a52700bf
+EBUILD etcd-3.5.13.ebuild 2108 BLAKE2B 3ea78bf883260ffb5666188676bd26cbe1dbd48276d991ccdce24ac87ff321eb7759b66e400f68fb37cb3b286ca9a3b8da0b4767c335e32d7ec41466704b1466 SHA512 4e898666dc76d4d3611977f0162cd36f2332b716b3fa3d2938797e4fff511a13232168e32c6944151b7137306258c46eeef8b52ec7ea8d68aaff09b0bf53f652
 MISC metadata.xml 421 BLAKE2B 5498a48643720f59f55d3b37d21fa80a4d8c984e7dc0e9beaccdb4f08d53819025e5849e481a7ce14fc519de15fdbed622f3c3912335cf81a678c522ba367b32 SHA512 ed8b5d3b552fdc284301ed63b941c2ce87cc808718dc15191597932d6543606907a175c929416f51193c63e12d79fef7993d0f91d9d0f70aacf75447c3744b73
diff --git a/dev-db/etcd/etcd-3.4.28.ebuild b/dev-db/etcd/etcd-3.4.28.ebuild
deleted file mode 100644
index 9084f1072095..000000000000
--- a/dev-db/etcd/etcd-3.4.28.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd tmpfiles
-GIT_COMMIT=adf6bd245
-
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/etcd-io/etcd"
-SRC_URI="https://github.com/etcd-io/etcd/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~riscv"
-IUSE="doc +server"
-
-COMMON_DEPEND="server? (
-	acct-group/etcd
-	acct-user/etcd
-	)"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# Tests fail with this error:
-# fatal error: checkptr: unsafe pointer conversion
-RESTRICT="test"
-
-src_prepare() {
-	export GO_BUILD_FLAGS="-v -x"
-	default
-	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
-		-i "${S}"/build || die
-	sed -e 's:\(for p in \)shellcheck :\1 :' \
-		-e 's:^			gofmt \\$:\\:' \
-		-e 's:^			govet \\$:\\:' \
-		-e 's:^			govet_shadow \\$:\\:' \
-		-i "${S}"/test || die
-
-	sed -e "s|GO_BUILD_FLAGS=\"[^\"]*\"|GO_BUILD_FLAGS=\"${GO_BUILD_FLAGS}\"|" \
-		-e "s|go test |go test ${GO_BUILD_FLAGS} |" \
-		-i ./test || die
-}
-
-src_compile() {
-	./build || die
-}
-
-src_test() {
-	./test || die
-}
-
-src_install() {
-	dobin bin/etcdctl
-	use doc && dodoc -r Documentation
-	if use server; then
-		insinto /etc/${PN}
-		sed -e 's|^data-dir:|\0 /var/lib/etcd|' -i etcd.conf.yml.sample || die
-		newins etcd.conf.yml.sample etcd.conf.yml
-		dobin bin/etcd
-		dodoc README.md
-		systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
-		newtmpfiles "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-		newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-		newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-		keepdir /var/lib/${PN} /var/log/${PN}
-		fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
-		fperms 0700 /var/lib/${PN}
-		fperms 0755 /var/log/${PN}
-	fi
-}
-
-pkg_postinst() {
-	if use server; then
-		tmpfiles_process ${PN}.conf
-	fi
-}
diff --git a/dev-db/etcd/etcd-3.5.10.ebuild b/dev-db/etcd/etcd-3.5.13.ebuild
index ab2651f2f3fc..77d02b80751b 100644
--- a/dev-db/etcd/etcd-3.5.10.ebuild
+++ b/dev-db/etcd/etcd-3.5.13.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 inherit go-module systemd tmpfiles
-GIT_COMMIT=0223ca52b
+GIT_COMMIT=c9063a0dc
 
 DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
 HOMEPAGE="https://github.com/etcd-io/etcd"
 SRC_URI="https://github.com/etcd-io/etcd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
 
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
+LICENSE="Apache-2.0"
+LICENSE+=" BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~loong ~riscv"
 IUSE="doc +server"
@@ -25,12 +26,13 @@ RDEPEND="${COMMON_DEPEND}"
 # Tests fail with this error:
 # fatal error: checkptr: unsafe pointer conversion
 RESTRICT="test"
+PATCHES=("${S}/go-mod-sum.patch")
 
 src_prepare() {
 	export GO_BUILD_FLAGS="-v -x"
 	default
-	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
-		-i "${S}"/build || die
+	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|" \
+		-i "${S}"/build.sh || die
 	sed -e 's:\(for p in \)shellcheck :\1 :' \
 		-e 's:^			gofmt \\$:\\:' \
 		-e 's:^			govet \\$:\\:' \