gentoo auto-resync : 18:06:2024 - 00:10:02

2 files changed, 0 insertions, 131 deletions

diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index ec641605e1ff..0678379a5c4c 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -3,13 +3,11 @@ AUX initd-2.7.5 1562 BLAKE2B ee67b1f2c1a809454ec1b8b860300108d4b21183148ec28b881
 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-r1-deps.tar.xz 129331604 BLAKE2B 50b83c012c70637936c83ec765758cdcd80014ca224d76a746de8640a6b36ae15ce11ec57d9fdb20a5f7b3add946209c6dde7bb4e4bd4a47ffe3ffc8971725db SHA512 a4bc56de4f7ec8e9967dde3d7ca4cbb74cba9ce0b8906ffe16f8dae3f52fff1164827942df8154eadbae80cce3ee603535b9135cf8a5126d84a9017e8aece078
 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.0_beta2-deps.tar.xz 9983432 BLAKE2B 5ce369219b03688a18f01d7e0f14158a4831bdb02f90c9d4cd2554c8a516f8575155473134197c58c6b65b8752b2fc6a2cdf56b4eaacde20a01233c3f5b1dd38 SHA512 e4fd9432adb4cc98b1f765d5b7f3920030fc433e838a5b7f388f8ba220fe0f23e0c0ce5da01507e3241d03f3e7f010a49dde6ba49402f363fb005bb879c2c1a6
 DIST caddy-2.8.0_beta2-docs.tar.gz 24678 BLAKE2B 5e03bada381b63a4549715c25f651e51eed81fc97d9e89cadb1128db55ba8344335590b10ac57a70395f7b57aa8ece93c5a8c2b6f4dd8e199f703bbed2147631 SHA512 d185e77d8020e7afd05a8dd7798fc29a9688268088129be8f813768f2fdd19abbd9e14440d80445c16844976f0740f5aa377ffc8084263c337d313c03adf7556
 DIST caddy-2.8.0_beta2.tar.gz 656863 BLAKE2B 6d1364798629949611c8cc5094e0f91928c9a50fc7de2a084b85402cce07e553d9da2652f1fa55daac8c94c877beb08de7226b7f3befd57367b901e593be1d2c SHA512 64c3f6fb4e32947ff55307f71b416aeb8610d8fd3273514c59c6ebcf323a3552ceea0e3f6281ba4a879d24f1fa02d232e6f634e53fa9edebbce76f78c174032d
-EBUILD caddy-2.7.6-r1.ebuild 3452 BLAKE2B 6834808498445fc62ccd707e59e3c7124ca17ae27233dd15e4ad46c958d31ae562f16dd7e35c460c0fb9a9e2f8159bc1e72bef8c7cbe56643059d400b8d33179 SHA512 ee135d4f0087c6510af3036652ffbfd717989d6264766f0890a94773fc40038bbda19d5e8e47927ef69bbe0c230ac03a09af0aafd665ba54fadf5d1a6444167f
 EBUILD caddy-2.7.6-r2.ebuild 3264 BLAKE2B bbf3b4e68064269d510c5f4a7b03ea26952d59e882b7c7d909f4536643a22d45d70b5b44fa81ad5952691c7509cb8adce110d2b5fff25663ea9728592beb58db SHA512 9803cd8094c42d845f6139f37f4d221009f6124d82eec36027d70f9a9ca4548b3ced4257b6e02a5ad306301ee232dc78534cb1a0a798f9b50f719f7c7f19f71a
 EBUILD caddy-2.8.0_beta2.ebuild 3287 BLAKE2B aa0c713f1a3743cdf02c5af08898c935014b848c0a544c570fd3c6ac100052dfa5ba458a3557bea1d5b80696c23fe5a4afc44e6ce5fa8973c343b3a982884b20 SHA512 f909abcd9eba665ae65a8e2a7c3c59a27222adf9b9c7e88435eb1d4758070a6051839fb936a094037f72f15e67b91b1368fd8d3ae8444ed217f94c17a2b936c3
 EBUILD caddy-9999.ebuild 3383 BLAKE2B 14c684f4db78d7a3666d6eb57edbf0096d3ea8787875cb649fed182ba42969c5d8c51e7920fe72bfdbf4eeef81885b4cf19e430003e5779f27eceb930a6fcbc7 SHA512 e0bbc7c0dd1bab605199dc90ed6eaa2a1e64a7f2f220277dbdf0cc6ba60a7a8a9eed60fdf62dde47eada44d40ed46c1174ecc3ac7326acb5fe189e86828f0e14
diff --git a/www-servers/caddy/caddy-2.7.6-r1.ebuild b/www-servers/caddy/caddy-2.7.6-r1.ebuild
deleted file mode 100644
index 5397520fab65..000000000000
--- a/www-servers/caddy/caddy-2.7.6-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2024 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
-		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"
-fi
-
-# MAIN
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD ECL-2.0 MIT CC0-1.0"
-SLOT="0"
-
-IUSE='events-handlers-exec'
-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
-)
-
-# 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;}')
-	sed -i -e "${LINE_NO:?}a \        _ \"$1\"" cmd/caddy/main.go || die
-}
-
-src_unpack() {
-	if [[ "${PV}" == 9999* ]]; then
-		# clone main git repo
-		git-r3_src_unpack
-
-		# get extra modules
-		if use events-handlers-exec; then
-			pushd "${P}"
-			add_custom_module 'github.com/mholt/caddy-events-exec' || die
-			ego get github.com/mholt/caddy-events-exec
-			popd
-		fi
-
-		# clone dist repo (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
-
-	if use events-handlers-exec && [[ "${PV}" != 9999* ]]; then
-		add_custom_module 'github.com/mholt/caddy-events-exec' || die
-		cat <<-EOF >> go.sum || die
-			github.com/mholt/caddy-events-exec v0.0.0-20231121214933-055bfd2e8b82 h1:uRsPaFNQJRDrYcSsgnH0hFhCWFXfgB8QVH8yjX+u154=
-			github.com/mholt/caddy-events-exec v0.0.0-20231121214933-055bfd2e8b82/go.mod h1:Y9JjT8YLxpmk7PeUkvsWAhzzRdC6rXP7QjAHiwmvjD0=
-		EOF
-
-		cat <<-EOF >> go.mod || die
-			require (
-					github.com/mholt/caddy-events-exec v0.0.0-20231121214933-055bfd2e8b82 // indirect
-			)
-		EOF
-	fi
-}
-
-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/*
-}