gentoo auto-resync : 30:10:2023 - 03:36:20

9 files changed, 245 insertions, 153 deletions

diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index 6e8c0a6924d9..da34219db1b1 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -1,21 +1,19 @@
 AUX caddy.service 370 BLAKE2B 004bc9b9cec8217aa2cc173c65ef69bb804a7d0ab1d61375c23fee92f755d03726a708591cd8d7b7a5741ab756f1383860c3a5bf5374c3db445a0341df62a74f SHA512 2911f3b9b57fb02398c08d661693d3268968f4a8176e18fee921c1d87ec515121f412901966811ef477ede73130adfe5842b8ceea1b691830b31f22eb41e14d3
 AUX caddy_config.json 603 BLAKE2B e4d4cacdd947f0266da8017c1872897aa53a5bd74f4e26de6a6432606b532760e7db85f442f2638675b015d37336adbea0acec9474dbbbb511ab05705c50a21d SHA512 0801dc5e3fce02ba3562eb5a8a3adeac7b8f0534847a70b5c3d531d1a8c56e923a78598fe357860a638e7112fc32e24e95c5997557910b87f7d131264079214d
 AUX confd 86 BLAKE2B f75f8a9440b90a66fc4f56d5ed2f97ff428bc061a555c48b8c51c822050de6af6b7c81afc92f01c38ab90f16c863fed3ed49a312d04582952f4292ed7bc9dc62 SHA512 24e6eb385c739c470ea7a896c80340de5d3857f829a665edf17a82e44ea5580fd28b1678a68c72a528174e63be2a08fa1dc376163394d6db822f67e3e169c9e8
+AUX confd-2.7.5 150 BLAKE2B cd6cb3f151c7c20dccc84b80802e7dfd375897961b6335ec8a7b0fd2338c1af14d20b5afbd5d704834c983ec52a7c286fbcd9f5feeb12fb4a6587a9c4cfbec7f SHA512 6adfa876ee1e2c01a74d462756e65b219c07bd61d16a9d5b8137472c808f36131e7309594d19862fa44eacc027131bb4bb5bce54a0caf22e4a2b91522c781ae6
 AUX initd 736 BLAKE2B 67baedfce797cb3aa51a953b9762f44a5fc0605152c124ed723607a93c01ec83fad1aa22d2b4faa9e4d38d8f74fcd1bf4da0fa34f2411259dd0f333649e3c3ce SHA512 e79a77050ac127f7416137eee8247b8bf455fb80616b4efd53b331ea4dba08f984c150b546ec075c8bd99bce8e1d1dea45c1646f8d20eaaf8e92314a1d8267c1
+AUX initd-2.7.5 1562 BLAKE2B ee67b1f2c1a809454ec1b8b860300108d4b21183148ec28b881d096587c7728d765e7d15f0ba1587cf4f607e9e129ae8b4769b3afef1992128ed3a1c13fa4e36 SHA512 636e28583673dcb7c9756a684bb52700987e0d3a8cbd7084c7322c220ea4033206d050a64e66c609bf69d38d49e000df3fe15b969d6d7daabe05e5d8cc83a899
 AUX logrotated 39 BLAKE2B 2801a25d70fe62aa7487da24561fe9d0efd96c0c76764edcbb2332dfb7f9e9ae7a2dee2abf0f5877a378618ac6a56ca8494800465cdfae839af84606db0f920e SHA512 2aa59645a23d8a7a8566532830883393b4b5ead245fe2fd2d752603bbdbe5beddcce522a22add725899995b87be44f801d0bfa721e5da1ac18273f1119e73d26
-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
-DIST caddy-2.6.2-deps.tar.xz 157577068 BLAKE2B 4ee60155de108ae1a0c897f3cd95549fff6add81b8c6b5cc1e4407d47eb8e81da825977ac9334fa884729759b88a8e23297a9c7b10a088d865ee6698cd444054 SHA512 ca7ab6522b6a3ba2741ad3c40044236196331fd0abcfdf480690a6dfd63127512e31cdc6219deff6b7ec9f6c7acaa672c161b738b87d22e655896bf1d5f70788
-DIST caddy-2.6.2.tar.gz 556197 BLAKE2B a3fd7e69a33ee045de7f4b8218d5bb41e1f740c744bf633554c93d298c06506f3b8f2f8ff739b423641958459fed84d6783a2ffe764ff175ee329eab9dc7dc19 SHA512 01761de707668d589af7eeecdd694c94e867d5710f0b72285b4d2e6fb26cf9e10baeed3920e9b9b292c75568c84ff79b400026e37d7dcc003cebb839469b6c1b
-DIST caddy-2.6.4-deps.tar.xz 126961712 BLAKE2B 45448376fb368639913360c96074a21b6907a0d573de403d46f150f004b24a0e328c210e6192d6540444bef6b33d4dbff7f44ad129bbe6cdfc344fb108500bf0 SHA512 f8d73a888c6f0e1c1467878162e3c34da35dcfc2ab7232db4f5e7ac5b51b2f91f6a98a07d732a8f17d9523226a21a8a9b1075a474e9d2b5f3c7869ef0a9e892a
-DIST caddy-2.6.4.tar.gz 568213 BLAKE2B 4837c8511002538ed6d7ac92743a834e76bdba3a35e92a3587ee29911c4a623d37948725a4c20967f3893abe7ce05a88aeb93af294045d722193a68ca7c69bff SHA512 438869a24c0f68e8d742752d3573cf7894c566344f85d0e262ddf26d91c711dd27a0422396bfdd94823c8ee4c7fd24ce222938f3339f1c19e706e64207fc483f
+AUX remove-binary-altering-commands-2.7.5.patch 2269 BLAKE2B a87a3f7fc6dcb4754f859eec96ab582b85472137fd11a620786f9f6257165e3878fd14d24bead78758cc3e6288ca2024fef5f7415fea373c1b9cd4ad75b1468d SHA512 f06938b2c737c0c3eb4c721b7625fcc06308fd34fe595eec0986a8f65f5983f0af9033e23540e5be882590d566b4a753e9a4fd1bcda502d5e4578d9f3aac9b4e
 DIST caddy-2.7.4-deps.tar.xz 146920768 BLAKE2B 25d99c7d73f7c9a63868ab496f27571d15181cee298e16a83c02b652b8b89cab615969897d11faadfdc3e9ca389783c3b610e219a16b0a146748d0ea2e3309ca SHA512 5cdb95bcf7435a76385d0fc9277bdaa317261698f1bf15b54e081b89bd971927c0f5ca9f42a693127fabca9c6a6eae81978c6b4978ff9962f67a83591d104e6a
 DIST caddy-2.7.4-docs.tar.gz 25264 BLAKE2B 2282ac0ddd76b0837d33cf24d01f13ac9c0c8e0abf043cf5ade0ec3a51fda2d7c15589574b159df00e2c25733f10ccc6f4cf6b3a97f9f831aa276f3adee84fd9 SHA512 179a13b89b0da1771dcaf798e33000b60f202804e728d8aca85a23a68b055ee6d12e5f75eb30257a412621ffd105035bd371bd7e448f876eeb91544fd3092344
 DIST caddy-2.7.4.tar.gz 625647 BLAKE2B be4749a2298d2e00e2a24324ee31090847be9ec4de49f47715c86e65750d01698b5a4a21990430cc7622fecce5b375ae8e3fb2ef832515ce9dcca8f2d26a9911 SHA512 e988ec4fa526d16b91a86f28fc13c606ab159815d5be45a2ea65bf91b5579a25efc8ff415b0aa98699f72bd3106ed02d49e48303d9c80e7fe6805ade416e7dff
-EBUILD caddy-2.5.2.ebuild 1041 BLAKE2B 5cfba3fe9efd2217f476ccc991692a34b366183407710e8d6ca178d40020e4bded01c2238d775c5a65221e2943a168824da12650b8500e8824650f99eb24191d SHA512 5c7724e4e150f1829cb43d452e716f6acd5e98dd636a4d00ff2c547d61b41bf908b80e15f7f295fb2c0908461d1940cb1a5d357bfb2d558b3a6920c1cbeb1667
-EBUILD caddy-2.6.2.ebuild 1041 BLAKE2B 5cfba3fe9efd2217f476ccc991692a34b366183407710e8d6ca178d40020e4bded01c2238d775c5a65221e2943a168824da12650b8500e8824650f99eb24191d SHA512 5c7724e4e150f1829cb43d452e716f6acd5e98dd636a4d00ff2c547d61b41bf908b80e15f7f295fb2c0908461d1940cb1a5d357bfb2d558b3a6920c1cbeb1667
-EBUILD caddy-2.6.4.ebuild 1039 BLAKE2B 0c850af6033ab4eb9778538235e6e52d39efd02cf8f74f30408f1ea6f813fcb8c014114db1f8bab12cc96fee35918a49eaa744198c01e4fdcd7525bc3f80e95c SHA512 2374b3d5a7cb2e23b65924e80c8ceb2e67e81295cbfcba659e8437f4f5ffa1b449732cceaf20c1b8c0d2170b4e2e46a50bac84857ec34464b0cff57f6fc9a10c
+DIST caddy-2.7.5-deps.tar.xz 161234532 BLAKE2B 130e3fd75d7d2976ef27c2afe0cede8da957ad1c8db7b2140ef69a732cf25c6a04bde43c836832a0f7c14dbb4ab9cd48b496b8ea644da411181ba79b4116d892 SHA512 3dcc834e8cc9851f114d173a812de4b3a5256f8458f2d20ed0c66109d1ede1ee8e1d85053347a194818495cdfcaab2bf86d1b12f94fe2f917e22bf25b8d9c411
+DIST caddy-2.7.5-docs.tar.gz 24578 BLAKE2B e08bfa37b157d8d4300198384bfc4c19cb0f539cc293311eaedcddffd4469026605c92f4388202db68beeadb2353666860daf3845ff5d69bb11afdb29eefe02b SHA512 635fdc1f2767cceacbddbbf56ba7207d558475c66ff9434a2b6edffd59d3711be0c6a4b4ffd2a6cf2eee53dcf22097c2b11eb44f0e9cc1d8455c1ea7c01bc498
+DIST caddy-2.7.5.tar.gz 611282 BLAKE2B 86c28922f80f931452e81b0c3fa52ed0b86b2325eb2a1adf1de830a7a339772063955fd3cb5ee888cbf8c1c905b98bb6a292b592a2983012ad4fefe33c361e82 SHA512 45f6790b7c3683a8001445e932d5678fd27d204500f7301d92c4d8421f24574e113bf7c335bd277b16abe07eb3d24258358f87c68cee38905fa6d0e6bcc1c24c
 EBUILD caddy-2.7.4-r1.ebuild 2170 BLAKE2B 2935ddec1231907e4baae92fbcbac0d295f5d729e78732491e5d00a1bd6b27b2b3d637eb091455cc36533fb39becfbaaff3cc1207982c1a19159fe02ef5092db SHA512 060e5d6a4d5adfb92f19d055d07b504fd6a480a80301f076ac9dc29ddd14476a104ca903b437cd7f65bd6d6aec1c0df842a7c461c0f247ebca5a2ed5e9a05ee0
 EBUILD caddy-2.7.4.ebuild 1051 BLAKE2B 0b8c0c2488872aa55de08268187639b2b32d963d96cd9d1ac9403493b4337e86edf0a88a90f147c6618e0a9bacaba546b422052ef7a96931f1676a85873645fe SHA512 b6d76553c27ff5c152399728783cb4a71327ddcfc4d103b8134a90ddf8f9e5c52b29bbb8dd0766c6c3aeb5517be6d1ae0b1ca789481b0b6c0ec9738d881cf562
-EBUILD caddy-9999.ebuild 2170 BLAKE2B 2935ddec1231907e4baae92fbcbac0d295f5d729e78732491e5d00a1bd6b27b2b3d637eb091455cc36533fb39becfbaaff3cc1207982c1a19159fe02ef5092db SHA512 060e5d6a4d5adfb92f19d055d07b504fd6a480a80301f076ac9dc29ddd14476a104ca903b437cd7f65bd6d6aec1c0df842a7c461c0f247ebca5a2ed5e9a05ee0
+EBUILD caddy-2.7.5.ebuild 2469 BLAKE2B b3c163339f611d1fdf3005ff6fcc67ad314bed89d3be7d2157f9aa8ef710386d065024fb253cb7bbc7cd487debf75ed57fc2776ba9f154fe6ce96f591a41400a SHA512 499fc3e8a9df1618e6ec523374486dc8e79d2979cf3a4887d05e419c3f100eaddc9e19ca5b969431b2e6f206e1eae14145dcc94857895a0eb80191f7f603627e
+EBUILD caddy-9999.ebuild 2518 BLAKE2B 5b466755e527dbefa752787d5899b873136e25a47377549f78544391cdaf22eea91cfcc08e45e93f94185a9b655108700cd83dc88eb58d7d87722702dcbfd96e SHA512 3d772453408f3a86555b94578e44a005b58c84181fefc370e00d67bea6475263184f4737bae5daa860c0b9053450cb602eb9aa836011849f5220e0d9ca82ba30
 MISC metadata.xml 719 BLAKE2B 45438c09f8b79545010ea772b979a89e01967e062e079183afcf75535f470ba802383ffa62033db16f3c052a2bed4a807e51478c9a9fefb2c8511d1956fce517 SHA512 910e936579bfbde8594a6d62cfe45eccb5e53a45b342b81cc42ff0964b0a6be95008bbbc469bc3288be19f3efaa7fc2c7d84e42cebb93cd5f13bd8d2f35a6367
diff --git a/www-servers/caddy/caddy-2.5.2.ebuild b/www-servers/caddy/caddy-2.5.2.ebuild
deleted file mode 100644
index c1adcb1cf8b0..000000000000
--- a/www-servers/caddy/caddy-2.5.2.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/~zmedico/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD ECL-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-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.6.2.ebuild b/www-servers/caddy/caddy-2.6.2.ebuild
deleted file mode 100644
index c1adcb1cf8b0..000000000000
--- a/www-servers/caddy/caddy-2.6.2.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/~zmedico/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD ECL-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-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.6.4.ebuild b/www-servers/caddy/caddy-2.6.4.ebuild
deleted file mode 100644
index d9b178386ab4..000000000000
--- a/www-servers/caddy/caddy-2.6.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-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/~zmedico/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD ECL-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-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.7.5.ebuild b/www-servers/caddy/caddy-2.7.5.ebuild
new file mode 100644
index 000000000000..a12ca413085a
--- /dev/null
+++ b/www-servers/caddy/caddy-2.7.5.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps go-module systemd shell-completion
+
+DESCRIPTION="Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS"
+HOMEPAGE="https://caddyserver.com"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/caddyserver/caddy.git"
+else
+	SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+	SRC_URI+=" https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz -> ${P}-docs.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+LICENSE+=" BSD ECL-2.0 MIT CC0-1.0"
+SLOT="0"
+RESTRICT="test"
+RDEPEND="
+	acct-user/http
+	acct-group/http"
+DEPEND="${RDEPEND}"
+
+FILECAPS=(
+	-m 755 'cap_net_bind_service=+ep' usr/bin/"${PN}"
+)
+
+PATCHES=(
+	"${FILESDIR}"/remove-binary-altering-commands-2.7.5.patch
+)
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		# unpack code
+		git-r3_src_unpack
+
+		# unpack docs and misc
+		EGIT_REPO_URI="https://github.com/caddyserver/dist.git"
+		EGIT_CHECKOUT_DIR="${WORKDIR}/dist-${PV}"
+		git-r3_src_unpack
+
+		go-module_live_vendor
+	else
+		go-module_src_unpack
+	fi
+}
+
+src_prepare(){
+	default
+	sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;" ../dist-"${PV}"/init/*service || die
+}
+
+src_compile() {
+	# https://github.com/caddyserver/caddy/blob/master/caddy.go#L843
+	if [[ ${PV} == 9999* ]]; then
+		local CUSTOM_VER="git-$(git rev-parse --short HEAD)"
+	else
+		local CUSTOM_VER="${PV}"
+	fi
+
+	ego build -ldflags "-X github.com/caddyserver/caddy/v2.CustomVersion=${CUSTOM_VER}" ./cmd/caddy
+	local sh
+	for sh in bash fish zsh; do
+		./caddy completion "${sh}" > completion."${sh}" || die
+	done
+	./caddy manpage -o manpages || die
+}
+
+src_install() {
+	default
+
+	dobin "${PN}"
+	insinto /etc/"${PN}"
+	doins ../dist-"${PV}"/config/Caddyfile
+	systemd_dounit ../dist-"${PV}"/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
+
+	newbashcomp completion.bash "${PN}"
+	newfishcomp completion.fish "${PN}".fish
+	newzshcomp completion.zsh _"${PN}"
+	newdoc ../dist-"${PV}"/init/README.md systemd-services-README.md
+	doman manpages/*
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+}
diff --git a/www-servers/caddy/caddy-9999.ebuild b/www-servers/caddy/caddy-9999.ebuild
index e60c54e02eb3..4940f75d7169 100644
--- a/www-servers/caddy/caddy-9999.ebuild
+++ b/www-servers/caddy/caddy-9999.ebuild
@@ -13,12 +13,13 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/caddyserver/caddy.git"
 else
 	SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+	SRC_URI+=" https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz"
 	SRC_URI+=" https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz -> ${P}-docs.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi
 
-LICENSE="Apache-2.0 BSD ECL-2.0 MIT CC0-1.0"
+LICENSE="Apache-2.0"
+LICENSE+=" BSD ECL-2.0 MIT CC0-1.0"
 SLOT="0"
 RESTRICT="test"
 RDEPEND="
@@ -30,6 +31,10 @@ FILECAPS=(
 	-m 755 'cap_net_bind_service=+ep' usr/bin/"${PN}"
 )
 
+PATCHES=(
+	"${FILESDIR}"/remove-binary-altering-commands-2.7.5.patch
+)
+
 src_unpack() {
 	if [[ "${PV}" == *9999* ]]; then
 		# unpack code
@@ -48,12 +53,19 @@ src_unpack() {
 
 src_prepare(){
 	default
-	sed -i -e "s|User=caddy|User=http|g;" ../dist-"${PV}"/init/*service || die
-	sed -i -e "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-"${PV}"/init/*service || die
 }
 
 src_compile() {
-	ego build ./cmd/caddy
+	# https://github.com/caddyserver/caddy/blob/master/caddy.go#L843
+	if [[ ${PV} == 9999* ]]; then
+		local CUSTOM_VER="git-$(git rev-parse --short HEAD)"
+	else
+		local CUSTOM_VER="${PV}"
+	fi
+
+	ego build -ldflags "-X github.com/caddyserver/caddy/v2.CustomVersion=${CUSTOM_VER}" ./cmd/caddy
+	local sh
 	for sh in bash fish zsh; do
 		./caddy completion "${sh}" > completion."${sh}" || die
 	done
@@ -65,10 +77,10 @@ src_install() {
 
 	dobin "${PN}"
 	insinto /etc/"${PN}"
-	newins ../dist-"${PV}"/config/Caddyfile Caddyfile.example
+	doins ../dist-"${PV}"/config/Caddyfile
 	systemd_dounit ../dist-"${PV}"/init/*.service
-	newinitd "${FILESDIR}/initd" "${PN}"
-	newconfd "${FILESDIR}/confd" "${PN}"
+	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}"
diff --git a/www-servers/caddy/files/confd-2.7.5 b/www-servers/caddy/files/confd-2.7.5
new file mode 100644
index 000000000000..62cca711638a
--- /dev/null
+++ b/www-servers/caddy/files/confd-2.7.5
@@ -0,0 +1,5 @@
+# command_user="http:http"
+# logfile="/var/log/caddy/caddy.log"
+#
+# caddy_config="/etc/caddy/Caddyfile"
+# command_args="run --config ${caddy_config}"
diff --git a/www-servers/caddy/files/initd-2.7.5 b/www-servers/caddy/files/initd-2.7.5
new file mode 100644
index 000000000000..408405c42a28
--- /dev/null
+++ b/www-servers/caddy/files/initd-2.7.5
@@ -0,0 +1,53 @@
+#!/sbin/openrc-run
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+description="Caddy web server"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+command="/usr/bin/caddy"
+command_user="${command_user:-"http:http"}"
+caddy_config="${caddy_config:-"/etc/caddy/Caddyfile"}"
+command_args="${command_args:-"run --config ${caddy_config}"}"
+command_background="true"
+logfile="${logfile:-"/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"}"
+start_stop_daemon_args="--user ${command_user%:*} --group ${command_user#*:}
+	--stdout ${logfile} --stderr ${logfile}"
+
+: "${supervisor:=supervise-daemon}"
+: "${respawn_delay:=5}"
+: "${respawn_max:=10}"
+: "${respawn_period:=60}"
+
+depend() {
+	need net
+}
+
+checkconfig() {
+    if [ ! -f "${caddy_config}" ] ; then
+        ewarn "${caddy_config} does not exist."
+        return 1
+    fi
+    "${command}" validate --config "${caddy_config}" >> "${logfile}" 2>&1
+}
+
+start() {
+    checkconfig || { eerror "Invalid configuration file !" && return 1; }
+	checkpath --directory --mode 755 --owner root "${pidfile%/*}"
+	checkpath --directory --mode 755 --owner "${command_user}" "${logfile%/*}"
+	default_start
+}
+
+reload() {
+    if ! service_started "${SVCNAME}" ; then
+        eerror "${SVCNAME} isn't running"
+        return 1
+    fi
+    checkconfig || { eerror "Invalid configuration file !" && return 1; }
+
+    ebegin "Reloading ${SVCNAME}"
+    "${command}" reload --force --config "${caddy_config}" > /dev/null 2>&1
+    eend $?
+}
diff --git a/www-servers/caddy/files/remove-binary-altering-commands-2.7.5.patch b/www-servers/caddy/files/remove-binary-altering-commands-2.7.5.patch
new file mode 100644
index 000000000000..54d2c4d91df9
--- /dev/null
+++ b/www-servers/caddy/files/remove-binary-altering-commands-2.7.5.patch
@@ -0,0 +1,61 @@
+# Remove commands which can modify binary outside of Portage.
+# Inspired from:
+# https://src.fedoraproject.org/rpms/caddy/blob/rawhide/f/0001-Disable-commands-that-can-alter-the-binary.patch
+# https://salsa.debian.org/go-team/packages/caddy/-/blob/debian/sid/debian/patches/0005-Remove-obsolote-subcommands.patch?ref_type=heads
+--- a/cmd/commands.go
++++ a/cmd/commands.go
+@@ -393,54 +393,10 @@
+ 			cmd.RunE = WrapCommandFuncForCobra(cmdFmt)
+ 		},
+ 	})
+ 
+ 	RegisterCommand(Command{
+-		Name:  "upgrade",
+-		Short: "Upgrade Caddy (EXPERIMENTAL)",
+-		Long: `
+-Downloads an updated Caddy binary with the same modules/plugins at the
+-latest versions. EXPERIMENTAL: May be changed or removed.
+-`,
+-		CobraFunc: func(cmd *cobra.Command) {
+-			cmd.Flags().BoolP("keep-backup", "k", false, "Keep the backed up binary, instead of deleting it")
+-			cmd.RunE = WrapCommandFuncForCobra(cmdUpgrade)
+-		},
+-	})
+-
+-	RegisterCommand(Command{
+-		Name:  "add-package",
+-		Usage: "<packages...>",
+-		Short: "Adds Caddy packages (EXPERIMENTAL)",
+-		Long: `
+-Downloads an updated Caddy binary with the specified packages (module/plugin)
+-added. Retains existing packages. Returns an error if the any of packages are
+-already included. EXPERIMENTAL: May be changed or removed.
+-`,
+-		CobraFunc: func(cmd *cobra.Command) {
+-			cmd.Flags().BoolP("keep-backup", "k", false, "Keep the backed up binary, instead of deleting it")
+-			cmd.RunE = WrapCommandFuncForCobra(cmdAddPackage)
+-		},
+-	})
+-
+-	RegisterCommand(Command{
+-		Name:  "remove-package",
+-		Func:  cmdRemovePackage,
+-		Usage: "<packages...>",
+-		Short: "Removes Caddy packages (EXPERIMENTAL)",
+-		Long: `
+-Downloads an updated Caddy binaries without the specified packages (module/plugin).
+-Returns an error if any of the packages are not included.
+-EXPERIMENTAL: May be changed or removed.
+-`,
+-		CobraFunc: func(cmd *cobra.Command) {
+-			cmd.Flags().BoolP("keep-backup", "k", false, "Keep the backed up binary, instead of deleting it")
+-			cmd.RunE = WrapCommandFuncForCobra(cmdRemovePackage)
+-		},
+-	})
+-
+-	RegisterCommand(Command{
+ 		Name:  "manpage",
+ 		Usage: "--directory <path>",
+ 		Short: "Generates the manual pages for Caddy commands",
+ 		Long: `
+ Generates the manual pages for Caddy commands into the designated directory