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

3 files changed, 10 insertions, 70 deletions

diff --git a/app-admin/serf/Manifest b/app-admin/serf/Manifest
index d91f0af82498..1919d7125530 100644
--- a/app-admin/serf/Manifest
+++ b/app-admin/serf/Manifest
@@ -2,13 +2,9 @@ AUX serf.confd 240 BLAKE2B 1eda4261a82a35e8b70cd0192180b4f3cf534656fc96092643b52
 AUX serf.initd 683 BLAKE2B 3e6fcda3250eabcec44daa3b51b36fff0cdb49b4b232123d69b1e29b8100874c4e126f5e3aaffebcac898651f4f84a8515308422b867e55a79f189c4d9a322b9 SHA512 a223d1e002eae3f91b941eb75a2741bb5fc22c78f4ab8ada430ee5e34f85f28410acc26e503eae672911161fab6847c6a7733b51cdad29fa4b4f67cfdc879597
 AUX serf.logrotated 81 BLAKE2B 7f09c81d7efa52d1e970b0603fa2c89809aca99166efb1026e0794957dfd4229a961a345e27da045c2f34ab1785e6e2bd5e796d32814787244656e97ad5cb518 SHA512 9d3664c123e846de81a2f574a9c2610e254d5ddad1c23b67ef7b8841e933c7aea93a419becaf45af9594ea98ac36d23883bebf3d344205c4756f3e1df9e87518
 AUX serf.service 286 BLAKE2B d0a7157101e18f80047688318a16995d24f0d06d444104ace3aaea9cb4c43b3ea164804f105dc94a03aa8e800228db9d2007510885cddb82e50b41d7aa8927ed SHA512 928dfca39afd79b113b299e4de25635fc9f68c64c77951d690797ed5796515d060fc36286f0dc1da63923042e3d8612ca8b1696dd511cb2fbd06550151d2a05b
-DIST serf-0.10.0-deps.tar.xz 24363004 BLAKE2B f0fed10ffa8ff536263f6fde5a87e9584c35a681e7821a91d123aa8bd149ca1b9024d454f8163de458e4b928e887736c3247661afbc3f46b2ba38bef09d4516d SHA512 73815e512fda8aa00241bff84e1ee2414106a4b1a6189e66aa80967152acafde56eeafd15b87cbaefcbedc093f1c42cfb19b9d5776473c4c580416c2b671931a
-DIST serf-0.10.0.tar.gz 446394 BLAKE2B 627e9ee776e217db09dde4bb22d1f317c884f887d918ba69de9bb65160eb00280c1ae5f53119570732f462c35381bd24a81405761b8ec63193295b6245298049 SHA512 53cb42b4a5f94fbb9e099739af0e31bb00cc261ea16325c3e5b9f081bb31299b5b8e42bc92d0f83ae78e511854589a95ab011930f373c1ad148c152b73adf485
 DIST serf-0.10.1-deps.tar.xz 24356192 BLAKE2B f635b7f4ea496aeac3148132ff0c4fcd2de037a2fc4c7c0c3943f2531b816a8002eb1e14a2204a30c206630f94400f953ae872e18bd2164c1d688f80961d54b8 SHA512 401e5bb706b3bf6521401ad4d40b02b331e71c6a0886796002046c83dffcffc735b803634d96bff5220d1069f418881daa9432412c4bcf6b7f3b37036d1a3a20
+DIST serf-0.10.1-r1-deps.tar.xz 760452 BLAKE2B 3e2b55d59fd2d94e8cee9082346e827fc1d7ff7d3fb01663d4ae0001a5c29c47212a29c3a98a544dbd4576f157c4c49abea8477c204f96c012b3f4c469724886 SHA512 2a288309d3e5a9486231ddbcd86cee28e950c778dda60247a23692d7e57f0386fdc88e6aff45f5407acd4e604e122f7b010111668340eee1e77f85c80e69803a
 DIST serf-0.10.1.tar.gz 447396 BLAKE2B a5b1aadf2e7d9b807406d8bd1d2db799f7a629a4db3abb3558c405b7bf81b5bef618157e51887ac631f3b42ca9eab3107ead8ead938ed0a1267299b2c47e0a18 SHA512 50febac6a634b7e19e58a2591371228fe7c1865673f48d082ed57cff1ac9c404d6a3b328d85b82cb92f05973a34396b824fdd9cb81f3e12c586b3f56d6734fa8
-DIST serf-0.9.8-deps.tar.xz 24178272 BLAKE2B 6a82fa025245f0c393b55d87a10195a9ed5f314b3cb772b54b01b858b9f6b393991cc206f269b39efe9a9061aeff948191ae48070eb7c1e5bf77781c97173952 SHA512 ec12d4b27044f58e897984adb3855413e2d3a624f62dffe981353bb5bfbbcbe64501080ef543bc446633716bbfe3ef29c3c93c44db8599b5639e2ef8d20d8eee
-DIST serf-0.9.8.tar.gz 444968 BLAKE2B 023413f75444f8e785bd7c5029e84ef58abca1c227f69dd8c16111c30afb38ff331e39cd8c30539f133229829bb9517516ff0e18e49b2dc9fb53df2ed40224b3 SHA512 1501ad6587f77840f7ad95d2886aafa3c28ffa533e862df0ebe5a4822078de09370c2ca1826d47dc6ff84e8598fb3711125a16e399a935ac39bad887e532c402
-EBUILD serf-0.10.0.ebuild 1218 BLAKE2B 688658ba3bd985aab9d20a3313b74709db937fdba88020bdfd14c641787072889c17c27b5eda4cde9cfc580edcb33bdd0d226ca89004a130b9e58aeb14bb1791 SHA512 f1a5912546200c3812bc075104f1abdb5d0a59611f66b3f52c41f4be6c5bc1113e2d380a4bf64dbebe36139db21dd9ce58762333c8bdd1ed364d402a1d9d76ec
+EBUILD serf-0.10.1-r1.ebuild 1212 BLAKE2B ab39b236b134d6214afe23ab23101012ca87e8d11952a23cf21f9b91e918558bd88193c37c7d132e2c3f7f14b7957b1b9c86576dc4e06d8a43acf61e9339e3c1 SHA512 96dd5ba7c1481a42af6d9ccf70bf640c31462ec717a34a861b75a0fb1379bcb6e97a3f5cb5f7fd5c4037b9cb44585a5c62c3cea6fe62ebad2455207dae444942
 EBUILD serf-0.10.1.ebuild 1218 BLAKE2B 688658ba3bd985aab9d20a3313b74709db937fdba88020bdfd14c641787072889c17c27b5eda4cde9cfc580edcb33bdd0d226ca89004a130b9e58aeb14bb1791 SHA512 f1a5912546200c3812bc075104f1abdb5d0a59611f66b3f52c41f4be6c5bc1113e2d380a4bf64dbebe36139db21dd9ce58762333c8bdd1ed364d402a1d9d76ec
-EBUILD serf-0.9.8.ebuild 1218 BLAKE2B 688658ba3bd985aab9d20a3313b74709db937fdba88020bdfd14c641787072889c17c27b5eda4cde9cfc580edcb33bdd0d226ca89004a130b9e58aeb14bb1791 SHA512 f1a5912546200c3812bc075104f1abdb5d0a59611f66b3f52c41f4be6c5bc1113e2d380a4bf64dbebe36139db21dd9ce58762333c8bdd1ed364d402a1d9d76ec
 MISC metadata.xml 298 BLAKE2B d9e0f6a71fa3a3fff0fa469d70032a93dbd2dbe50903a687d77880a555ca7d4d007fcc95466804045a2610f1ce2c1d17ceb6796767f14bb80549d596eb1f03c3 SHA512 9830254ed456b995d7c06bedc27d4c2fd9eda67038b8dd7756bc5a6ea2b0317849f9c4ec66759a7335d099a6de168e48d726e9537a7b182253574ae45b6ce941
diff --git a/app-admin/serf/serf-0.10.0.ebuild b/app-admin/serf/serf-0.10.1-r1.ebuild
index 540d5af97180..97a6a9dac3d6 100644
--- a/app-admin/serf/serf-0.10.0.ebuild
+++ b/app-admin/serf/serf-0.10.1-r1.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit go-module systemd
 
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/serf"
 DESCRIPTION="Service orchestration and management tool"
 HOMEPAGE="https://www.serfdom.io/"
 SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+	https://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz"
 
+LICENSE="MPL-2.0"
+LICENSE+=" Apache-2.0 BSD MIT"
 SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
-IUSE=""
+KEYWORDS="~amd64"
 RESTRICT+=" test"
-BDEPEND=""
 RDEPEND="
 	acct-user/serf
 	acct-group/serf"
+PATCHES=("${S}/go-mod-sum.patch")
 
 src_prepare() {
 	default
@@ -31,7 +30,7 @@ src_prepare() {
 
 src_compile() {
 	mkdir -p ./bin
-	go build -o ./bin/serf ./cmd/serf || die
+	ego build -o ./bin/serf ./cmd/serf || die
 }
 
 src_install() {
diff --git a/app-admin/serf/serf-0.9.8.ebuild b/app-admin/serf/serf-0.9.8.ebuild
deleted file mode 100644
index 540d5af97180..000000000000
--- a/app-admin/serf/serf-0.9.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module systemd
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/serf"
-DESCRIPTION="Service orchestration and management tool"
-HOMEPAGE="https://www.serfdom.io/"
-SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
-
-SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
-IUSE=""
-RESTRICT+=" test"
-BDEPEND=""
-RDEPEND="
-	acct-user/serf
-	acct-group/serf"
-
-src_prepare() {
-	default
-	sed -e 's|\(^VERSION[[:space:]]*:=\).*|\1'${PV}'|' \
-		-e 's|\(GITSHA[[:space:]]*:=\).*|\1'${PV}'|' \
-		-e 's|\(GITBRANCH[[:space:]]*:=\).*|\1'${PV}'|' \
-		-i  GNUmakefile || die
-}
-
-src_compile() {
-	mkdir -p ./bin
-	go build -o ./bin/serf ./cmd/serf || die
-}
-
-src_install() {
-	local x
-
-	dobin "${S}/bin/${PN}"
-
-	keepdir /etc/serf.d
-	insinto /etc/serf.d
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners serf:serf "${x}"
-	done
-
-	newinitd "${FILESDIR}/serf.initd" "${PN}"
-	newconfd "${FILESDIR}/serf.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/serf.service"
-}