From cc2a49d67c44bdb420de43fdf0e69fe182eaade8 Mon Sep 17 00:00:00 2001
From: Wynn Wolf Arbor
Date: Mon, 25 May 2020 14:31:35 +0200
Subject: www-servers/caddy-bin: Bump to 1.0.4-r2

Remove diropts invocation in favour of the changes in 2ea27a7, ensuring
correct directory permission and ownership through acct-user/caddy.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
---
 www-servers/caddy-bin/Manifest                  |  2 +-
 www-servers/caddy-bin/caddy-bin-1.0.4-r1.ebuild | 37 -------------------------
 www-servers/caddy-bin/caddy-bin-1.0.4-r2.ebuild | 35 +++++++++++++++++++++++
 3 files changed, 36 insertions(+), 38 deletions(-)
 delete mode 100644 www-servers/caddy-bin/caddy-bin-1.0.4-r1.ebuild
 create mode 100644 www-servers/caddy-bin/caddy-bin-1.0.4-r2.ebuild

diff --git a/www-servers/caddy-bin/Manifest b/www-servers/caddy-bin/Manifest
index cfd2f7b..e228c53 100644
--- a/www-servers/caddy-bin/Manifest
+++ b/www-servers/caddy-bin/Manifest
@@ -1,5 +1,5 @@
 AUX caddy.confd 130 BLAKE2B d238ba2f7cb00b587377a0aba525a04929b2fee6d4c30dc4c96f89f09b930969946876c2fb6c505dfcd266ef7203e9d90d2883a6553754ce5aaab2de4054cb5f SHA512 dd8c1dee1d69ffe2dc516c6435b4efec12270b963df82fb703447590640dc1bf7d285821be7b25ebe0ec3d69969cb3e679b7b796237da1bcddfc6acf20dceae1
 AUX caddy.initd 1100 BLAKE2B 3ed5283b7e0da25388b05f922ade8a18ed8dd79afd1c2a3e1a6174a8f12a747c5428ed2e81231f8c03fa250132d91913444986f01b3e1dcb09837fe5ab415f68 SHA512 490de25a6e4e00dce5ec0d82be927204562a69e3b322cd643af2429e46c82696815f808da4035fa79ece17de9e66b860f739171ba8ee98b1c81b086b4d76717a
 DIST caddy_v1.0.4_linux_amd64.tar.gz 11207935 BLAKE2B b8877bffb1fe72002336f45e7153cff5ff327ae17252efa62e77256b93906c987e182cc98586f694e56492314ba217c2eb8d1b5b3005e842aea1f764b92fa83d SHA512 c3e7ac2ad1cba15ef3184784a08c4f1dc3b867d551476a0902a9d04d08d975cb8786daebc3ae074f9026296cb3214a331b8bfbea909e7b1a3e51ade73382d42b
-EBUILD caddy-bin-1.0.4-r1.ebuild 734 BLAKE2B d2cc12e9bcfdc4bbb523f5ed603b2d09b8124d9c746a16f7e4c3b6b5d79f854e684dc0f94242499bdcf78656be48728472ae069636adc45661248703fb561e58 SHA512 b1ca41b69f8a8775b314373d3764286c0e925697a2c1998af3ed18ec34f5600aa6ffc7d0b8144eee26fc12bc5ed63177cb3ce6f0e4366f1a7a0e0e9e24a2eafc
+EBUILD caddy-bin-1.0.4-r2.ebuild 685 BLAKE2B 790da260b474c7b8f5f5a34aeba230f98d3295c176fe30663b737bc8beaa4047549c8c9f94a047bc237a1359015fea91ab681ba6f5437667c5ecef5654bf6b16 SHA512 5f7ac3504986177a6130c55366caaf8466490b8b305f37a3f8f43d041fbb8bd37cbbd6f4aa7357148b3e542268288dc8e286be9e634c1ea291deb48b3203d4d0
 MISC metadata.xml 223 BLAKE2B 2c1cd83f1f1d25a43ea978cd66b5c9f6020889613dfaed65d6745858a45d4bf50fda775305420e41c36cafd63d63746ed894411acbced66ab8ae04906dfb8592 SHA512 4f71eacfeb2b21a4ea746ce1663777937b920e942c94eef1fe93c3557e207c9fdb2569369d56637cba563dc50179d62195db6225123ecfedc303600b8a0bb49b
diff --git a/www-servers/caddy-bin/caddy-bin-1.0.4-r1.ebuild b/www-servers/caddy-bin/caddy-bin-1.0.4-r1.ebuild
deleted file mode 100644
index 7fc7264..0000000
--- a/www-servers/caddy-bin/caddy-bin-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps
-
-DESCRIPTION="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
-HOMEPAGE="https://github.com/mholt/caddy"
-
-SRC_URI="https://github.com/caddyserver/caddy/releases/download/v${PV}/caddy_v${PV}_linux_amd64.tar.gz"
-KEYWORDS="amd64"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	acct-user/caddy
-	acct-group/http"
-
-RDEPEND="!www-servers/caddy"
-
-FILECAPS=( cap_net_bind_service+ep /usr/bin/caddy )
-
-RESTRICT="test mirror"
-
-S="${WORKDIR}"
-
-src_install() {
-	dobin caddy
-
-	newinitd "${FILESDIR}"/caddy.initd caddy
-	newconfd "${FILESDIR}"/caddy.confd caddy
-
-	diropts -o caddy -g root -m 750 /var/lib/caddy
-}
diff --git a/www-servers/caddy-bin/caddy-bin-1.0.4-r2.ebuild b/www-servers/caddy-bin/caddy-bin-1.0.4-r2.ebuild
new file mode 100644
index 0000000..567d3f0
--- /dev/null
+++ b/www-servers/caddy-bin/caddy-bin-1.0.4-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps
+
+DESCRIPTION="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
+HOMEPAGE="https://github.com/mholt/caddy"
+
+SRC_URI="https://github.com/caddyserver/caddy/releases/download/v${PV}/caddy_v${PV}_linux_amd64.tar.gz"
+KEYWORDS="amd64"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	acct-user/caddy
+	acct-group/http"
+
+RDEPEND="!www-servers/caddy"
+
+FILECAPS=( cap_net_bind_service+ep /usr/bin/caddy )
+
+RESTRICT="test mirror"
+
+S="${WORKDIR}"
+
+src_install() {
+	dobin caddy
+
+	newinitd "${FILESDIR}"/caddy.initd caddy
+	newconfd "${FILESDIR}"/caddy.confd caddy
+}
-- 
cgit v1.2.3-2-gb3c3