gentoo resync : 25.08.2020

3 files changed, 2 insertions, 35 deletions

diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index da2060b601bd..9e0f852e8861 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
@@ -1197,6 +1196,5 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d
 DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f361d08bba5f5689a0e8b51dc17f11fe893c1fb3c0b671d323c6f66448d0c73d26b64586ce2236cc91f44839eba5ebf2a858b04aa85b5bde847c5956b0a519 SHA512 ef74bbbbb50cb01b861dc25c1a1ee276cebb64a383a31f4acf3f78db0e1b5fa907c6ecb9a88e4819d4aa7d5fccced97b574c12e147c36677a8d4e5f73b55d04c
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv1.0.0.mod 76 BLAKE2B 2b8d5265d8f690bdfe78bc571e24d3b5f51dd9dadbf87cd5a5019ddf5a54cd8a9f895e65ecf216bad03687115d404d8e8637a6b2b5aafb19c6988340a1da3574 SHA512 c8b52c1a238330c05e1baf979ab78726f8276944b1d9ab93334f9020c7ca2cd3fb39008e1e56c5399916a6da6a1ff896346c6616ea1fe2cbacc01202a2d56e06
-EBUILD caddy-0.10.11.ebuild 740 BLAKE2B 5db6734ed49caa6fd0df9a95a393a3fb763ee8963fbff9ea3e370239bd10ef6da189335505b1e04ebbedf6cb204f317c04c16474c03b77d9d2bf600938019de6 SHA512 27e78b3ec41d60e3acd781ff59f93468a998b2fae789e8a71bb142c433a9e07153251b5bac08d0b982dbdc98773f934013525bb7c68f5dc302c562dbee18fde1
-EBUILD caddy-2.0.0.ebuild 66031 BLAKE2B 4209c138a6746778eab3f86a1e0e0d4c43569282e10ee223a7796fb052966c0e23f0c9aa2b753566ba18ad5b18d71ca46a0752e9e26a1e601ef18d3f06b3d401 SHA512 f476e53905841f4439e7781855e049a987c3b46b7f11ed4c869e87279ab0271dae35346be012379c5472726c7d2740264fa558047035d926bb5261d39b6d6adf
+EBUILD caddy-2.0.0.ebuild 66030 BLAKE2B 6b32af19bfa3a76058d88fc019f16e1b03d07fb6e1e15cd8c8d455f6aded141270fa1726f1a6b816a5349025f88dfda20345eb8eae963d61632f94abd1f8e759 SHA512 453fefda0c13df71a2fec8f31ed21edb32e0d1b5ab1a9249b72f32cca901d993ccfbcdf0ce3092afe598783e55767906808720616098ce0464602e7140a3e1f8
 MISC metadata.xml 243 BLAKE2B db1542294c2fef7bcf6f008542d87fc1661eeb5ba5caee9658a0b2f803f17c30b26523fe6d252f70d692b52e85ba7c7c16567316ce33a534cf250a169e2b0f36 SHA512 9f804a00b8c8d98d3c097b0487f8f528d3648a316214b0009292903d0930f6808fde06be5a3b2b938203ee124f9102e7f15a1446e468c26e057cba332f70c539
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 bc2df356b5fb..000000000000
--- 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 18347731925c..f14b1d5efd3e 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"