gentoo auto-resync : 23:07:2022 - 08:50:15

4 files changed, 2 insertions, 50 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 6224fb76db09..e66d58f1b0d6 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index 72a32209357e..0c0ea7055070 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -3,10 +3,7 @@ AUX caddy_config.json 603 BLAKE2B e4d4cacdd947f0266da8017c1872897aa53a5bd74f4e26
 AUX confd 86 BLAKE2B f75f8a9440b90a66fc4f56d5ed2f97ff428bc061a555c48b8c51c822050de6af6b7c81afc92f01c38ab90f16c863fed3ed49a312d04582952f4292ed7bc9dc62 SHA512 24e6eb385c739c470ea7a896c80340de5d3857f829a665edf17a82e44ea5580fd28b1678a68c72a528174e63be2a08fa1dc376163394d6db822f67e3e169c9e8
 AUX initd 736 BLAKE2B 67baedfce797cb3aa51a953b9762f44a5fc0605152c124ed723607a93c01ec83fad1aa22d2b4faa9e4d38d8f74fcd1bf4da0fa34f2411259dd0f333649e3c3ce SHA512 e79a77050ac127f7416137eee8247b8bf455fb80616b4efd53b331ea4dba08f984c150b546ec075c8bd99bce8e1d1dea45c1646f8d20eaaf8e92314a1d8267c1
 AUX logrotated 39 BLAKE2B 2801a25d70fe62aa7487da24561fe9d0efd96c0c76764edcbb2332dfb7f9e9ae7a2dee2abf0f5877a378618ac6a56ca8494800465cdfae839af84606db0f920e SHA512 2aa59645a23d8a7a8566532830883393b4b5ead245fe2fd2d752603bbdbe5beddcce522a22add725899995b87be44f801d0bfa721e5da1ac18273f1119e73d26
-DIST caddy-2.5.1-deps.tar.xz 133130008 BLAKE2B 1ef818f057a46109cea61d4821981909a8da93227eb691611a1356415d56d829b4ae922e6dc0b67e7252e2bf5a2738935b4e15e0131c85d7e9a40781410ad202 SHA512 5c0c52d2e5349c32c59211de8b210f4e9a49d21ce0182f2b3999d4dfb220e9c99a5981b155db3ab425325615509e2ed7443654cfc72e11a186bb479e2471e631
-DIST caddy-2.5.1.tar.gz 524858 BLAKE2B 727dbdecce1d16d7f53db0e1fd0a83d3739b0d19226683ed41a3831a8701c657aa49240f05f5985a1f381fc45a68e54420356bab56980e7b1afc85e47b942747 SHA512 fe110e9f71f58cd090f695dfaf3e129cd03e4eefabfeddc4d92b2ae8686c849fc7d0e3911014f9a0ce214add9af28b8668af383b83d3dd833ff3666cd14c66b8
 DIST caddy-2.5.2-deps.tar.xz 121709464 BLAKE2B d15157536916aae8a63dcdcdd01bef7fa37c2f7174b8a43222d3a150b16efa153274b0158a6e86893f02310453b9b176529295021c51b85956de69e60653414f SHA512 6600a30bf3b63ceeae98a60377be43f16723e6e0cbd65ed626c3777cb5c39eb3fea5769a6cc0f987da978df8efc917825e85f118810a23504d396a94f3e270ae
 DIST caddy-2.5.2.tar.gz 538564 BLAKE2B dcdaacc63ec0481a9add35ac79c4d02d0a262dc4a1b5215877843797817832cf07e2ecaa2c8f73173f5e0bf38d4d15f2f6c5909f0dc3c8a178db9b001af5206f SHA512 98eb10075b6eacd93cfe893f7df6d8d8ce41649b6a6b78937c1ee7ba82ebdf483204d98c5e45501617abfe426d3b12a9a413e49304e1b62569ab3bad489e2c66
-EBUILD caddy-2.5.1.ebuild 1035 BLAKE2B 09ca6ac612db90187ee199d52b6719729d8189922f296d34340b8b21345a77bef89905e2737fb965717463e85e4a947edfdd756641b80208c2973a856d26782b SHA512 8d726c01f4207836c0fc775eb663c0c0177f948f7f804e03579116c8024bf3d07bdbadc2824585ec35c7049d90c1546cc21f96851a9f9cee0e071590301b2429
-EBUILD caddy-2.5.2.ebuild 1035 BLAKE2B cf19aa108fee501a74ef1219cca270871be2bb315ed8ddc6378dfaa6750ecde2787a0b9967f41732518c385e16b517672434ec31b58bad5d9a8d41dc7a602cb0 SHA512 634d6b0e2999b5d3edbb88fe5a731d8cceb8601db301017469d14af0d187b6c072727d0e6c327405a4ecb76b0118f659d3e6735d3213488830895ac20c5a368c
+EBUILD caddy-2.5.2.ebuild 1034 BLAKE2B d3cd17df1570d39e3ad24f6e3c30286e89bbdfc39af73dde6245bdb4e78f084472f55da121d19fbb6752858756f39b527937cbf78752b543668a6ffd6e10f36c SHA512 6ebf7ce0fb94fd5c1cbf0d5a7578c3614ca29d5cccb2b8c5b9f9b44fa3b6f5672ec06a6abc86956c39559b0c0b4eb2b8f4e47a2b43604625ca986795b46e86b8
 MISC metadata.xml 327 BLAKE2B c733fe2ddb3626e38631dea64fc3edf837fc52c8454ed7a37f2859a9759db43db0ef018753649276f846cf4a67b705f2080d7bf55856848c8fb2a2a5db43cb4a SHA512 c52162e031367163930279cf1ebb06b5a59a5d0d13769fe79f6ee146c4752865ac6e4bb13fb8087a569be125dc6d8ee0b2d052088f27d2ae327ba6a31160252b
diff --git a/www-servers/caddy/caddy-2.5.1.ebuild b/www-servers/caddy/caddy-2.5.1.ebuild
deleted file mode 100644
index 227be730e1a8..000000000000
--- a/www-servers/caddy/caddy-2.5.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit fcaps go-module systemd
-
-DESCRIPTION="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
-HOMEPAGE="https://caddyserver.com"
-SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD ECL-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RDEPEND="
-	acct-user/http
-	acct-group/http"
-DEPEND="${RDEPEND}"
-
-RESTRICT+=" test"
-
-FILECAPS=(
-	-m 755 'cap_net_bind_service=+ep' usr/bin/${PN}
-)
-
-src_compile() {
-	ego build ./cmd/caddy
-}
-
-src_install() {
-	dobin caddy
-	dodoc README.md
-	keepdir /etc/caddy
-	insinto /etc/caddy
-	newins "${FILESDIR}"/caddy_config.json caddy_config.json.example
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newinitd "${FILESDIR}/initd" "${PN}"
-	newconfd "${FILESDIR}/confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotated" "${PN}"
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-}
diff --git a/www-servers/caddy/caddy-2.5.2.ebuild b/www-servers/caddy/caddy-2.5.2.ebuild
index e614f052fbc5..afa2465aba28 100644
--- a/www-servers/caddy/caddy-2.5.2.ebuild
+++ b/www-servers/caddy/caddy-2.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0 BSD ECL-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 RDEPEND="
 	acct-user/http
 	acct-group/http"