gentoo auto-resync : 16:03:2025 - 00:29:23

4 files changed, 15 insertions, 19 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index e832d2ae0078..796976b4e6c7 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index 8ef65587b0dd..88c4dace471c 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -2,17 +2,17 @@ AUX confd-2.7.5 150 BLAKE2B cd6cb3f151c7c20dccc84b80802e7dfd375897961b6335ec8a7b
 AUX initd-2.7.5 1562 BLAKE2B ee67b1f2c1a809454ec1b8b860300108d4b21183148ec28b881d096587c7728d765e7d15f0ba1587cf4f607e9e129ae8b4769b3afef1992128ed3a1c13fa4e36 SHA512 636e28583673dcb7c9756a684bb52700987e0d3a8cbd7084c7322c220ea4033206d050a64e66c609bf69d38d49e000df3fe15b969d6d7daabe05e5d8cc83a899
 AUX logrotated 39 BLAKE2B 2801a25d70fe62aa7487da24561fe9d0efd96c0c76764edcbb2332dfb7f9e9ae7a2dee2abf0f5877a378618ac6a56ca8494800465cdfae839af84606db0f920e SHA512 2aa59645a23d8a7a8566532830883393b4b5ead245fe2fd2d752603bbdbe5beddcce522a22add725899995b87be44f801d0bfa721e5da1ac18273f1119e73d26
 AUX remove-binary-altering-commands-2.7.5.patch 2269 BLAKE2B a87a3f7fc6dcb4754f859eec96ab582b85472137fd11a620786f9f6257165e3878fd14d24bead78758cc3e6288ca2024fef5f7415fea373c1b9cd4ad75b1468d SHA512 f06938b2c737c0c3eb4c721b7625fcc06308fd34fe595eec0986a8f65f5983f0af9033e23540e5be882590d566b4a753e9a4fd1bcda502d5e4578d9f3aac9b4e
-DIST caddy-2.7.6-docs.tar.gz 24583 BLAKE2B d3dbbb701d86cbfaf538f10911fdd3613b8c3c0f49ef9e229487d2a4fcef9eff79b56e9852d5c1ccd5a8d1d1898861fc8183c343c129901562b03a9092af9e61 SHA512 62e534d41e714b47265fd8089ad9e03a1a89903460976d8af27fa5f71173e076bab8574282213595e495be701b769e1a70ff9e7ec9576fbf8e821e672207faa5
-DIST caddy-2.7.6-r2-deps.tar.xz 8511804 BLAKE2B ad3c78ee483474754ad83284fabf249c376423217c2929740cd171446d0e755f121e380130c80f291422d39ca69ea7e6ac52f5ce5cdec740616099b665cef5af SHA512 c48d299d9a0b27ebe467f64dc433625de26293674d8153122ad6798a6b95ed4fe55f764a18d3e9211a8e2f966724d20996f1789e2e84dbb0181cfcf5340303fb
-DIST caddy-2.7.6.tar.gz 606077 BLAKE2B 1237edc164ec6095c9dff27c332925c4ce9d91a60e629770463bbffb1503b8b11e36033e852df3eb5bb69ffa448833b6ee2891dc0ba6dc9b43b6cce27d492179 SHA512 ef0cb6fd7f6f2a296290b4bb520300e043ad31cc612e734632ffa25cdaa23fd7d601ac4ceaa1c76285d54a07ee773360f795103ef3c2ec79516a4f18a5e844b5
 DIST caddy-2.8.4-deps.tar.xz 9995236 BLAKE2B c19901a458eae2d395fddb9ef8b02225f56e1cf5032a85493de58a9f797369997cb8be8fe52d6ec85333d26d879316f48af73fbd429ae2a4a3c6d2a5e57caea0 SHA512 2ff16025abb9b9a26abd2e2261b487ac34c31c09227ab573cdacad3a5206603a74a5585fa08041c2372469651d8a2a3410f2c562041aef3038c7ecc4fc8baec8
 DIST caddy-2.8.4-docs.tar.gz 24660 BLAKE2B 39628524c155b97f20ba00dec592d33e363086278ef96bd216807347d7b61a1a10d7bb50be84f84f3c4a6a972ff5034840700bf2bcd763cbcec75414a667b964 SHA512 c40a3e2b911ac106706e54022563685a0c920e35fe4716d878b79a3ebd8f422aa3bec847b3a0767a53453e40d8b21a3af1804a3c7bf62ddf61fc290c4129de0b
 DIST caddy-2.8.4.tar.gz 662064 BLAKE2B 77aa671c22e55dff6bab3d251fa9f0a082e41176bf82f5cc9be5b9bee4a234e568c73b8865da116d0db26efbccdd58eeadac80f9160a06946426277640cec11c SHA512 5c354d0ceb3e927b918594c8c7de51f658aba798ac23d41b751c55b728f9fc5c46fa1f8c2e86c838e58d7b3514bc11937a765b36fd87971ea1757c92a70e9665
 DIST caddy-2.9.0-deps.tar.xz 10147016 BLAKE2B 3f33fa41cea04e47ef30f3eba5de7b88731154e1598fd37bc55cb63905a98c2c3ee1119a7b386b2c9f278465484c6d4d00dd8bc90962d472fe0acd559f8675fa SHA512 74124dcb80f87eff1d6834569ac3e8428d55b99044f6cac043f6e997e3b2de1e31089ab712c1b2f4fb0d64b6732291dd30316bfc92c6b9000bd2cda39b4d0a90
 DIST caddy-2.9.0-docs.tar.gz 24713 BLAKE2B c022672d818bf56160a561c307bc2526f0e0c6cc920286a744fc800273c9240e2852955c8c7035edad7591a168a177bf5c15822bbaee8704c4c3ca44bc44314d SHA512 f6f8a8d465373b4b2672bdf5a8124d3cedc90c8eea933f1494e6e6eab85ee788320a04c6ca7ccedac0ecbb8a335e0e179a8dd4ba07aeca685f297e525d21c368
 DIST caddy-2.9.0.tar.gz 700749 BLAKE2B 299e5bcda972af0b50d51c135a844221222fef91a1b38d9fda70113087f3587253c8c1d6efda1895a1b64a42444b4d95cd4a80822bc9af7979b55b93b3e6a492 SHA512 e2e7f38d11a69159ef347acb93779a35778267440d55a80b90da75739aabc95ee385fb9256eb79e25326d5e16cf831746d98dc03ccfe97e11d8d52f521154a68
-EBUILD caddy-2.7.6-r2.ebuild 3264 BLAKE2B bbf3b4e68064269d510c5f4a7b03ea26952d59e882b7c7d909f4536643a22d45d70b5b44fa81ad5952691c7509cb8adce110d2b5fff25663ea9728592beb58db SHA512 9803cd8094c42d845f6139f37f4d221009f6124d82eec36027d70f9a9ca4548b3ced4257b6e02a5ad306301ee232dc78534cb1a0a798f9b50f719f7c7f19f71a
+DIST caddy-2.9.1-deps.tar.xz 10115764 BLAKE2B a5dbfe050f1e71dd40feea375f93ef94a31bd75dd6605e460265351719130be04e3883523e550256fe03dd976dbf117292b5f9f44ce8c70030c0f9def423ebb2 SHA512 5a794d5afff72eed255badfcb4043e4714a47ed44ad724d16cf6d3f5b73015700951cf67c3f4d7916a44553ad3c0e629d0f257fe6132dcfd8f882c914a04b1af
+DIST caddy-2.9.1-docs.tar.gz 24734 BLAKE2B 5c9dd78cd43cd2960f477f1fa89b8a6c4fc4e3d2c1b656051bde06afed8bebf5d1768fff77aab9fd8d5260044159e09e70474dd678cff245632fa7e14dcf05a0 SHA512 91efb7b10f68ab5e6bbfd2789a6f79c325d20692cb84a7651cce0487c97cd7699929e351ca78922ad34716958ebbf9b237e97465abdb263592745f4529cb4909
+DIST caddy-2.9.1.tar.gz 701830 BLAKE2B cb36a2dae6f5944ebe44e4233e1e558389394c2176725c8f771d98a69c81de523fa04aed504a9ab7ae97fea4dce7c774d62b799a255a2af658d8677e8c079471 SHA512 2ed36bfe8de3a2c7270e202b2d9ab4c3c78174fcd09c02e38d61d1bd57afa6471a2a690f15edcf91f2bfb105dbf2b0c2186d0c5e6f20ec169e98c66f8f71d0f8
 EBUILD caddy-2.8.4.ebuild 3240 BLAKE2B 23f62d20d52aef5adb90970e863335f24d010b0d873d3e8a45a250171b948dac5f45cfe1b686794d91c6a677dc9f1a9af9cdbe9056d599652d5daca729ab0a99 SHA512 9f3ea82c74b08e48329e0ffb7149035193f4adc9b9cab96d0be064430ed104f9df5e57ae6b51c971cb052f1a617f5cc88812608f263f4ddbedfaa92ee29c2854
-EBUILD caddy-2.9.0.ebuild 3168 BLAKE2B 8409d4476068527f0f0b120cc2e71ddbb39574b55926e51d0b61b5d5689987308b78bbfa6af14dc04b52c9343cc3d8eb353b3bdca2f702e657f55e46d8fb59f4 SHA512 bf9deda2dfb2a518df969b1c65991d829d4252d9f7eb7d4ba0f60e3f9fae7f5f0ef1988223372a3476afe78f311c75a0444aeca0cbdb9b2ee7b3096ccb024a25
+EBUILD caddy-2.9.0.ebuild 3166 BLAKE2B 9435efcba66f1446718aacf11711637016bfe31beeb44e318ad88b0ef8074bcfa94e28051ab0b4069f16cd407951b6b47801a8649f47eb9aa92ce2140be17462 SHA512 77f6e43d92e0c55293a0527c4066b423e619e6741db5f0ea398bb07d84cba58cd513107d75f89cba9ff6a9238e070ba2efef9c0cad443e250a91d1498ee57a3a
+EBUILD caddy-2.9.1.ebuild 3216 BLAKE2B 95aaed16e788ee07c512a3599f3909059e5570cc72cd8c70115bc94ae318c746fa03cc137773ee2aee625cde6aaf504d47ef7d1f8c1a167e0d8d3ce89ac7dfa9 SHA512 db422066bfa0b43a0e2fdcadf88dbe6c4e83f3aa74e5ba5a4734ad6e7790b0676c9aec7cae6736ea71b54ad1bd27ec4c8c049a8f6ca0d7bdb5af42613cb405aa
 EBUILD caddy-9999.ebuild 3216 BLAKE2B 95aaed16e788ee07c512a3599f3909059e5570cc72cd8c70115bc94ae318c746fa03cc137773ee2aee625cde6aaf504d47ef7d1f8c1a167e0d8d3ce89ac7dfa9 SHA512 db422066bfa0b43a0e2fdcadf88dbe6c4e83f3aa74e5ba5a4734ad6e7790b0676c9aec7cae6736ea71b54ad1bd27ec4c8c049a8f6ca0d7bdb5af42613cb405aa
 MISC metadata.xml 1212 BLAKE2B d5395939287c1f47d7c6e6590492ead98297a229620056bfe220c5b19b5d980f51c3ace25415e5c8f2c30cf65ff6690861b20871cf7088763f7509c799e94242 SHA512 947fba49f76b506cdf9889fd120acf0eaa6b82243c649944319d37232dc8cdf7c4ab1b3c418761c99ff0404e92f7957a61e5be8e44ca2635f93b9c2161e36dc5
diff --git a/www-servers/caddy/caddy-2.9.0.ebuild b/www-servers/caddy/caddy-2.9.0.ebuild
index c5b4c02a8bcf..d537a7b8cd57 100644
--- a/www-servers/caddy/caddy-2.9.0.ebuild
+++ b/www-servers/caddy/caddy-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ else
 		https://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz
 		https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz -> ${P}-docs.tar.gz
 "
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~riscv"
 fi
 
 # MAIN
diff --git a/www-servers/caddy/caddy-2.7.6-r2.ebuild b/www-servers/caddy/caddy-2.9.1.ebuild
index 4d96ac727530..15958c6dfe2c 100644
--- a/www-servers/caddy/caddy-2.7.6-r2.ebuild
+++ b/www-servers/caddy/caddy-2.9.1.ebuild
@@ -14,10 +14,10 @@ if [[ "${PV}" == 9999* ]]; then
 else
 	SRC_URI="
 		https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz
+		https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz
 		https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz -> ${P}-docs.tar.gz
 "
-	KEYWORDS="amd64 arm64 ~loong ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi
 
 # MAIN
@@ -38,10 +38,6 @@ FILECAPS=(
 	-m 755 'cap_net_bind_service=+ep' usr/bin/"${PN}"
 )
 
-PATCHES=(
-	"${FILESDIR}"/remove-binary-altering-commands-2.7.5.patch
-)
-
 # takes a module as an only arg
 add_custom_module() {
 	local LINE_NO=$(grep -n 'plug in Caddy modules here' cmd/caddy/main.go | awk -F: '{print $1;}' || die)
@@ -81,10 +77,10 @@ src_unpack() {
 
 src_prepare() {
 	default
-	sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;" ../dist-"${PV}"/init/*service || die
+	sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;" ../dist-*/init/*service || die
 
 	if [[ "${PV}" != 9999* ]]; then
-		mv ../vendor ./ || die
+		ln -sv ../vendor ./ || die
 		eapply ../go-mod-sum.patch
 
 		for moo in ${MY_MODULES}; do
@@ -114,18 +110,18 @@ src_install() {
 
 	dobin "${PN}"
 	insinto /etc/"${PN}"
-	doins ../dist-"${PV}"/config/Caddyfile
-	systemd_dounit ../dist-"${PV}"/init/*.service
+	doins ../dist-*/config/Caddyfile
+	systemd_dounit ../dist-*/init/*.service
 	newinitd "${FILESDIR}"/initd-2.7.5 "${PN}"
 	newconfd "${FILESDIR}"/confd-2.7.5 "${PN}"
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/logrotated" "${PN}"
 	insinto /usr/share/"${PN}"
-	doins ../dist-"${PV}"/welcome/index.html
+	doins ../dist-*/welcome/index.html
 
 	newbashcomp completion.bash "${PN}"
 	newfishcomp completion.fish "${PN}".fish
 	newzshcomp completion.zsh _"${PN}"
-	newdoc ../dist-"${PV}"/init/README.md systemd-services-README.md
+	newdoc ../dist-*/init/README.md systemd-services-README.md
 	doman manpages/*
 }