[gentoo-commits] repo/gentoo:master commit in: www-servers/caddy/

["William Hubbs" <williamh@gentoo.org>]

commit:     06dda2863c91c8ec869b3bd62cd23c71b8bbc72b
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 18:41:57 2020 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 18:58:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06dda286

www-servers/caddy: stable 2.0.0 on amd64

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 www-servers/caddy/Manifest             |  1 -
 www-servers/caddy/caddy-0.10.11.ebuild | 31 -------------------------------
 www-servers/caddy/caddy-2.0.0.ebuild   |  2 +-
 3 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index ff5a6a9b375..bf628c491b1 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -1,4 +1,3 @@
-DIST caddy-0.10.11.tar.gz 2860871 BLAKE2B 9050ee76a325c5ae183dcafec05b0d234a1308103f617908ec31a2bd8c3ce55c8d9ced9e30a36d616ff2c6f1581e1496bed4379a6f1ba3d0b5e7f9242edfabf8 SHA512 03539ae59f654d56ad0b441e7f67eb51135b1ffd539f9eb5953445089e72d3eab905ad9b08b001ef27e5054b760887a898b89ea85b48b4f852398b073e6e4924
 DIST caddy-2.0.0.tar.gz 350050 BLAKE2B 5cf53b85fa267d6686ce00754d4653013aab56e1fd076f4c4f8c864d57f924ab3fedaba4bce24972159e83ce7ae3889b75d5d0e259c8d77a0620e0b53b3888e2 SHA512 b7393f117e33529990424a78804c0e04a86ff8af8393564134066ab7b6a1d64a141b73708928209c1f29147a2f8fd94b2056f11642b8205b6de4ede6a783f2af
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273

diff --git a/www-servers/caddy/caddy-0.10.11.ebuild b/www-servers/caddy/caddy-0.10.11.ebuild
deleted file mode 100644
index bc2df356b5f..00000000000
--- a/www-servers/caddy/caddy-0.10.11.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/mholt/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
-HOMEPAGE="https://github.com/mholt/caddy"
-
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" go install -ldflags "-X github.com/mholt/caddy/caddy/caddymain.gitTag=${PV}" ${EGO_PN}/caddy || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc src/${EGO_PN}/README.md src/${EGO_PN}/dist/CHANGES.txt
-}

diff --git a/www-servers/caddy/caddy-2.0.0.ebuild b/www-servers/caddy/caddy-2.0.0.ebuild
index 18347731925..f14b1d5efd3 100644
--- a/www-servers/caddy/caddy-2.0.0.ebuild
+++ b/www-servers/caddy/caddy-2.0.0.ebuild
@@ -1212,7 +1212,7 @@ SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RESTRICT+=" test"