gentoo resync : 17.02.2021

28 files changed, 154 insertions, 49 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index ab06ef0d0aa9..56f5fd07cfde 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index ef6f7cfe9daf..a14be63843c4 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -2,6 +2,6 @@ AUX clsync.conf 589 BLAKE2B fb7736b0972c91916770c6cfca693267bdf0cb3f6ad540388967
 AUX clsync.confd 645 BLAKE2B f2e2f70f5a88ea3a416f4151637d63f79cce483b499ee0c1b5005ef8e9d16558f0d1c23ddd182335f7e963172bafaf4b41a37c1288f7fe55e7a57e2868418ae1 SHA512 75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5
 AUX clsync.initd 555 BLAKE2B 18b3f0e1e8e079eb306709d2b55b99100ce3efa852f285d7ac9acd4269fe41e0fe5d1b7c12fa966dc01f60a598d6178cf5c8b6a2cd21410bdcf0f66c1facf1d2 SHA512 a5ee987466dec0e8ca7ce2502bd71d000419e03f33e1585e47fa5d91fdb5321f949f3d3ca566e68a0aedcc50ab6a84a92210aa866520d1703805958a2bfa270a
 DIST clsync-0.4.5.tar.gz 276096 BLAKE2B 4fa534b342a806ca691f8a65455cb800800f7a943fa3f0913a26c37d2cd0f9d762630ad01eeb80bdd0d90a0731bed5f2aa60444a654972da9479c116e0e937aa SHA512 6568f3c49ac4fe11e54593ba23eed392d0b7d9b5bf052983c4a5a2befbb807dbd3f9d13412264f8909998702f869d1cd6db77d89bd9491414b1f3213437c5212
-EBUILD clsync-0.4.5.ebuild 3794 BLAKE2B 5502b5762d47acae15ba682468ed51ce5fe74876af09dba4a141e2ac5990330bbfaea5b293b2aaac14540b25baa1e7047fcdbc847bc9f9d6c73f4ce950278363 SHA512 a69f2355c0d96bc1787bf769ad3bf2b8354d5986472d9bad67b656378ce0ebec1ea962689540a185264bce82e3b01ea3a89e91c94b145f7f965c60cccb3b0426
-EBUILD clsync-9999.ebuild 3787 BLAKE2B bdbe927f14f77f9ce3a456543226dd60ec5ee77fe995b215453f45efeec59a51a69632466c3fe2150884d1a1a13d4bd31ed3f28c77ae92a4c3c70d5297a29322 SHA512 4c8be692a96362156fbb863cb27ca8ea932bfd8a9a46db27c186b8cf5f178d11171718559d0e8719f1f300a87db11a62602db54652fbb4c6995d047e5d985ee3
+EBUILD clsync-0.4.5.ebuild 3772 BLAKE2B bbeaacf3e865006340e4e5307f74670153ee05ca315d0b23a27985b9f1e88c68f88191fb0ece986158d95aba05ed82b5a945e2d85edcd035129655abfc2a4467 SHA512 28321eced9cd6cd2a04a19f8efd21396562b064cb1ae4b51e0db092336501502b2a61dd0a9dcf7b5443f15f71d9529aa5724a95729d9286c8971725947863e16
+EBUILD clsync-9999.ebuild 3774 BLAKE2B f25f17c603edae049010daf1e4773062deded5ad54f7e0f99005d47e7245f8e9c8f51baeb56ea3a5cf3e62a4147a7a7cf6b23813667ab210ef6ac3583d8f5e01 SHA512 0ea8a1e2a36aa2be5426f0694d81c48f0840f92e495381ea5c143c966cb2cf3ec4e53e691bdf6d5f2240cf8b11a28ba3441f3a30b0ebfe5ead11f215faac1365
 MISC metadata.xml 2138 BLAKE2B 95be20be2bd87c771de6f49269bfa7e54b2a10f6c0166648130198647fcc37b86dab3501c1df8f5ef211dd0ef04f60244fec80907c95e78efd9f7c6b148023bb SHA512 0a70059c2f24248056a5aade206eafb457b39f37ab559d61284941cfcd6b01ff40328049e2edacd9a8f1a8dbbb313aed4add7092629c6bdfca0c1151ab8d69ca
diff --git a/app-admin/clsync/clsync-0.4.5.ebuild b/app-admin/clsync/clsync-0.4.5.ebuild
index 2d61d65f2f08..239047ab2b24 100644
--- a/app-admin/clsync/clsync-0.4.5.ebuild
+++ b/app-admin/clsync/clsync-0.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,6 @@ EAPI=7
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/clsync/clsync.git"
 	inherit git-r3
-	KEYWORDS="amd64 x86"
 else
 	SRC_URI="https://github.com/clsync/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 x86"
diff --git a/app-admin/clsync/clsync-9999.ebuild b/app-admin/clsync/clsync-9999.ebuild
index c17448327bb2..3c91bb41d6fe 100644
--- a/app-admin/clsync/clsync-9999.ebuild
+++ b/app-admin/clsync/clsync-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,6 @@ EAPI=7
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/clsync/clsync.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/clsync/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/app-admin/doctl/Manifest b/app-admin/doctl/Manifest
index 334772578b82..f976fcb4d9cf 100644
--- a/app-admin/doctl/Manifest
+++ b/app-admin/doctl/Manifest
@@ -1,4 +1,6 @@
 DIST doctl-1.55.0.tar.gz 5157504 BLAKE2B 1d3db2ee4ca71a459456e72f035648c5ba73c5372c3369b360e1ee3cc44ec1155295e5f425611c307371f902c7ffed7dbce2f959266f79ecb8f149144fc86596 SHA512 6cea86e184ea25d5a6740d4090148fbe053ce93ebe8f2344f5a2bf62283381ed2a9574862a5ba39f34a52bf85af550313b7dd316a321f31089673f898d37cf78
+DIST doctl-1.56.0.tar.gz 5163349 BLAKE2B 10f169f7ccf31b416509043f42bff3fd60a5618530217b46d2bd0797d70eba914d314b376b5fdd801ba12ee4746e17b4e7a33316d9adcb95403ac3a92152d86e SHA512 4102f58ea0925b110d4ddf2146cdec0a4252881b7724c34c4ef0c86f848b107380d6b425e11a885841d39f52d6cb00bfab5671d663efcfe5ba02dcae8b5975c9
 EBUILD doctl-1.55.0.ebuild 1052 BLAKE2B 35c7455909cd2473f76475f8018a70f04d39797144dd066317c5169dddda96eff650360ed81bebe770afbfd65f35c72300200b7f87ac4a468a38891861f46dc9 SHA512 a1c6467a53f6367e2ae79c77777fa56f12d9b215b51043adc5729ee4dfb2fdcf00657af4616c0d4a0b28ad6e9652b5ddb3cc0a3a0c4807261d550a3130920de9
-EBUILD doctl-9999.ebuild 1070 BLAKE2B 7d2dc8ba1e8eeeaab13f95daa8ab64cbbe3e87e1467684696c51db6f59a9b61570aeb2475d3012218c0bea8710f01e80871f80cca7ec9cd0df8d363bfd03cbbf SHA512 9bcf8071bb9e09cc032bd3ef850899f208dd68d715fcdaeffdc9f8248289031af7942d16c9ec30d9aa3197c03db0c02f5898be50fe04418e39055ae024106642
+EBUILD doctl-1.56.0.ebuild 1293 BLAKE2B 518183156896035326550d0b8e0054bb83be446cad52cafad07f2bd9a602761e263e0782c5f7eccce9d75863521fc2e99d9f8da74ddf2c490d0f5532367da230 SHA512 bd8c37680fd859bb274f1b489c5953c4190eec0405da2c239c1e523217585d73920bd636a596b1c951a9f5edc916ab2945bb3ecf2c4999d04cacefc819b71d70
+EBUILD doctl-9999.ebuild 1215 BLAKE2B d6aec05a7a515bc9f4073944c1a9267f996fa239e98001909db2b58f2c480c7792a5aaa72375629b384f6d1a983e2e83d35fb868a277b104f2183aa02c1cd565 SHA512 658203b8e3c26b8813409781c197a20964e7f850dc5ac467e222d72cba5004243d766ef4fd8210e89117cf3381f0978eb94a9a4a10492f3b169bec6165db8e28
 MISC metadata.xml 639 BLAKE2B f0d6454d5d90aca55ca539f51583c08c1a6dec8bf79586ce2bdf3140c8fedc20fd22da3db92565c856f507e983de12de6c798bd8116d998f43b06857b1c77a24 SHA512 c21ed1e14490427fb76174e8182bc2b960ea60aafe5f5218eebdb06d04a51497f18cc00e5ea264181440ca80e765f9856c362c0bf01e31531ca8980f5db074b7
diff --git a/app-admin/doctl/doctl-1.56.0.ebuild b/app-admin/doctl/doctl-1.56.0.ebuild
new file mode 100644
index 000000000000..c1ed045f556d
--- /dev/null
+++ b/app-admin/doctl/doctl-1.56.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="A command line tool for DigitalOcean services"
+HOMEPAGE="https://github.com/digitalocean/doctl"
+SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+	LDFLAGS="-X github.com/digitalocean/doctl.Major=$(ver_cut 1)
+		-X github.com/digitalocean/doctl.Minor=$(ver_cut 2)
+		-X github.com/digitalocean/doctl.Patch=$(ver_cut 3-)
+		-X github.com/digitalocean/doctl.Label=release"
+	GOFLAGS="-v -x -mod=vendor" \
+		go build -ldflags "$LDFLAGS" ./cmd/... || die "build failed"
+
+	./doctl completion bash > doctl.bash || die "completion for bash failed"
+	./doctl completion zsh > doctl.zsh || die "completion for sh failed"
+	./doctl completion fish > doctl.fish || die "completion for fish failed"
+}
+
+src_test() {
+	GOFLAGS="-v -x -mod=vendor" \
+		go test -work ./do/... ./pkg/... . || die "test failed"
+}
+
+src_install() {
+	einstalldocs
+	dobin doctl
+
+	newbashcomp doctl.bash doctl
+	insinto /usr/share/zsh/site-functions
+	newins doctl.zsh _doctl
+	insinto /usr/share/fish/completion
+	newins doctl.fish doctl
+}
diff --git a/app-admin/doctl/doctl-9999.ebuild b/app-admin/doctl/doctl-9999.ebuild
index 59e3c4d9aa3c..654c28a745f8 100644
--- a/app-admin/doctl/doctl-9999.ebuild
+++ b/app-admin/doctl/doctl-9999.ebuild
@@ -21,8 +21,10 @@ src_unpack() {
 }
 
 src_compile() {
+	LDFLAGS="-X github.com/digitalocean/doctl.Build=$(git rev-parse --short HEAD)
+		-X github.com/digitalocean/doctl.Label=dev"
 	GOFLAGS="-v -x -mod=vendor" \
-		go build ./cmd/... || die "build failed"
+		go build -ldflags "$LDFLAGS" ./cmd/... || die "build failed"
 
 	./doctl completion bash > doctl.bash || die "completion for bash failed"
 	./doctl completion zsh > doctl.zsh || die "completion for sh failed"
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 80b2c36d8d34..9e78e64f6b78 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,6 @@
 DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
 DIST eselect-1.4.17.tar.xz 178980 BLAKE2B d905ac88bc009080912af75e64c7920d745788866fa3cb35466d68a652efbbd6984d6e1efeed76d9a344aed94705b74c85aa43e9c037d4d548d2e24afa69bd7a SHA512 35dc4c52f44c4f64db9c0dc2aec57b3055a6d36760b1bbbd094ad11b3f9e71a731444802632817b89c3b511f1dc9bb92046b59322d177e13fdc501ed767b591e
 EBUILD eselect-1.4.16.ebuild 1548 BLAKE2B 01fa31bf8ddd0a4180d003a077431ad59579b6bba23f310c14021baf38f5de04142598f00478a91f88823fafbc3be2d0a653fbe105f1a3ffdef29e42b83daf8f SHA512 ef73f2ef644b9edc9154a7d1faa7a81ad2b53c4b7e6e02d57993499f16b0359d508e1c0d5923ace609fa5b52c2f0b6c6ea267cb8380aeb8d518d5702056bc8ce
-EBUILD eselect-1.4.17.ebuild 1537 BLAKE2B 472d1cd75b703b3222e35abb1a1082c5e2d3e2212481317ebc82f4b63b0d0453b85f09cd11f57ab9e3507fd96deb8997187e2a3b25b2ca52464ea74e11253654 SHA512 3d862e49dbb4c9358ce156ea6ccdb8e3dc7bb77aefb36b2dec7e6e691b3db1a6e25195a45e3452d8ddeae3ae8da5683c6bfb4a78c53c8e4dc9a3cefcc2bf25bd
+EBUILD eselect-1.4.17.ebuild 1534 BLAKE2B b14bcc0325019945b9820c088ba2e083031bfc8cc5bd0758fadb68e8967446834a3ab5598f8a60f286c418aa25dd75e941df7259c55570a841c49500d514395d SHA512 839fea97289c1b820cb5e2faa3eae5970fc85ec6de6b2d820bdc07d9907eb2416524431657d43495d839389f3eb3a3f756669cb00b0cbf3765a33cb460b305a3
 EBUILD eselect-9999.ebuild 1394 BLAKE2B fb62991371b697680959344974f4d7d4cdedba39337b12d004588d118632be5cd26c2026024fd6a2cc1e448f196c3367b82ba3fe347617149602c4730f8083d1 SHA512 78c75a30e9a8bfb370620b25cd200be9c6a8724858548cd1ab76926194f9d96a25c7441463d1dcb7a2aa3a6c947b1a656d6a0b455eb95e9ad9a1535f8cb349ce
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.17.ebuild b/app-admin/eselect/eselect-1.4.17.ebuild
index 972d5e63fb09..f4f2698d7b9b 100644
--- a/app-admin/eselect/eselect-1.4.17.ebuild
+++ b/app-admin/eselect/eselect-1.4.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 DEPEND="sys-apps/sed
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index f657f0463e26..fc9f8f5d0b56 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -9,5 +9,5 @@ DIST fam_2.7.0-17.2.diff.gz 28826 BLAKE2B 880f8614304b048a24be03231ec26a02901bef
 DIST fam_2.7.0-17.3.diff.gz 28847 BLAKE2B d46e0d60d438459b43e24d2757771f02f3b5eec1b297f16a0359b26d14fbfba9701ebdc63d9b4dbbe2247cc7b38b9670ed9900a896224a3c4d8affc1481a8a79 SHA512 67d339e1cd4409897b044aa9b4c755a43b939982ee70c0ab5d99afd807994ad1f571a52bf04125a633cc3a735e99ff9e156caf2fb4288f5c008121a4eb9379b6
 DIST fam_2.7.0.orig.tar.gz 301945 BLAKE2B 9219c15b998bbac49e76eeac86f2de666ac49dca773c82ff6220c11ee77f0381b93ddbeeb500a7775bff3cc29ad6e7008e12304f0b0e361cbcc951d9f995a229 SHA512 dae6e883ef10214b1506d342e32cb5c59d0b4b7b66c1b099daa836958651ff3b04d526b4e516abd96e51587a97a8950e9517d1b38c6f7e6637ee3e7d20243531
 EBUILD fam-2.7.0_p17_p2.ebuild 1768 BLAKE2B a913d5b761c70f175d9f7e5f9666881f2f054fda5dbea96fa613bd0841eeba15ef5cc2905bd139d96af479f813b985c7e2e27a2312434ff0e50d99625b0d9a2a SHA512 38dad20f2f0b2a822ca6bb1f6df5e8339657e562f1cf19db2454901e0b817ea6d6ae5166fa57e47574199b7e4939c9687d1f8b23648922206cbbf5101c20bcf9
-EBUILD fam-2.7.0_p17_p3.ebuild 1997 BLAKE2B 4c3ac414f63d97ffca1a466a95910b08e31b4b8bf0e21f6d9271c46d8afa4f2246d7df8b98f516b7345bcc62068266390e5a6d4e3af32029bcf803e3f6ac8ff8 SHA512 fdbbc9949864b1a16917d51069af9a5b46659d4cc248fb80f623bf8beb3a478d4a041c7a7c7b08c38200ad4259302c9428425021169a6cf387d621705380ec25
+EBUILD fam-2.7.0_p17_p3.ebuild 1995 BLAKE2B f2b4379db8c20659dd0c73183c7dc1288ccee69f96fb133620cb11e2a09e1e54ab03d8330c8dcbc568263dbbbf29d9a9b0a5445f09563574f345adc5e281b625 SHA512 7a172de2846509f8c952a402c6189ac0b1426b7b14ad0ed891880a7ef68066676fe706b516ffb506b35c3baf2a763a775fab5dabcdbdbfab19f6bb78bd51a4bb
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/fam/fam-2.7.0_p17_p3.ebuild b/app-admin/fam/fam-2.7.0_p17_p3.ebuild
index 953a5b1fef6a..6050c4509a3f 100644
--- a/app-admin/fam/fam-2.7.0_p17_p3.ebuild
+++ b/app-admin/fam/fam-2.7.0_p17_p3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 617d9e2b2ad0..9e4d699823bd 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,8 +1,8 @@
 DIST keepassxc-2.6.2-src.tar.xz 5720788 BLAKE2B c6bcc0af594c3b697d8e74752edb0389c80c72008bd57dcc36d9606462ea4bc9c6012a9f3f31702a9c0f88004fdc66f1ee4fbebd8a501227f4579ea8f3f1078f SHA512 b297edc4fae32b65430802094bd63dc301addae36859365a3009899d5bc20b32934e174ea56bf3fd1ee633a263ab36b577cba5aaa75bf4ad597f44606f7b5fd1
 DIST keepassxc-2.6.3-src.tar.xz 7562816 BLAKE2B 1b33850ed996a2f07b1665309bb4680329a0f858d89e9e89f7ca39a84f27f1a4364bd8526d1907b4fc4d5dd586b3dc48d9d9b6235b78b52edc4db08ca72d79fa SHA512 37f97c0851731badffc9c40ed2dcc5c8fc200ea96b32281c21cf199799681abbd74fb191140022ad7872d69ee139e12646e19697010f539690e4e0f0f1c92558
 DIST keepassxc-2.6.4-src.tar.xz 7575164 BLAKE2B ca02e59c7355f7f7e14bb4fa318fab66d354e84d1025847b413b7e838dc5a42024b963dea1e3ba2060c51da7daed2ee5b220e5dab72b5813d39c04b49c6ba9ba SHA512 3bde0c8670ba14be80c6f3676bd447b0855a2af2915a395ee236c2d4c6e4b859936351643d679480aae1fcf55ed4315447ae927ac9bdedeb0332593cb4e9fedb
-EBUILD keepassxc-2.6.2.ebuild 2063 BLAKE2B 8f692d143bb7102d5b3ab2440b9d6ccc66dc08ce9753265592ecf125896852fa6c79745db673ecde2e55d1de84edb76d5118354173f05902695e628da357b1ba SHA512 d43414563780fac5c23f0b3f7dfadaada0af309e49a2366e83b288ea181be9d662b5f366d1d73b8c16ab8b5d8e1bb958c3dcef06a132ca1c16f66099811bb71b
-EBUILD keepassxc-2.6.3.ebuild 2063 BLAKE2B 8f692d143bb7102d5b3ab2440b9d6ccc66dc08ce9753265592ecf125896852fa6c79745db673ecde2e55d1de84edb76d5118354173f05902695e628da357b1ba SHA512 d43414563780fac5c23f0b3f7dfadaada0af309e49a2366e83b288ea181be9d662b5f366d1d73b8c16ab8b5d8e1bb958c3dcef06a132ca1c16f66099811bb71b
-EBUILD keepassxc-2.6.4.ebuild 2159 BLAKE2B dd466bdd8ad1bffbcc491eeb4bfb54733bf25090a7203a7618e6ac12c01556a57d430942b4f74a3d8971d86dc38097bc6ba12fd39030bcab5a9fc59b850cd8cc SHA512 712ecd33e744d48841ba6ac82378a87dad09cf25d80a98c6097761563b56f73f96bacccab267bf78d1b4f75b2c15d81721d9ae918a9c1ad140b34d8cae9f2f2d
-EBUILD keepassxc-9999.ebuild 2159 BLAKE2B dd466bdd8ad1bffbcc491eeb4bfb54733bf25090a7203a7618e6ac12c01556a57d430942b4f74a3d8971d86dc38097bc6ba12fd39030bcab5a9fc59b850cd8cc SHA512 712ecd33e744d48841ba6ac82378a87dad09cf25d80a98c6097761563b56f73f96bacccab267bf78d1b4f75b2c15d81721d9ae918a9c1ad140b34d8cae9f2f2d
+EBUILD keepassxc-2.6.2-r1.ebuild 2065 BLAKE2B 05bb7bd036ee8383d6834f6fdcd9fb30f807009b2fa2ced6bb106f4e433168038ee0d67d84322f371cce9031748f664c44464e14ecafdde134b0742088c1fb2e SHA512 8982866bb8a6c38b6022eee2aac334963f25bee074ea660f36195b1972f4d2c22e107c508cd3ec05b12fbeda0997fa87dd4125401d0e6093cd18dbfebe5c4879
+EBUILD keepassxc-2.6.3-r1.ebuild 2065 BLAKE2B 05bb7bd036ee8383d6834f6fdcd9fb30f807009b2fa2ced6bb106f4e433168038ee0d67d84322f371cce9031748f664c44464e14ecafdde134b0742088c1fb2e SHA512 8982866bb8a6c38b6022eee2aac334963f25bee074ea660f36195b1972f4d2c22e107c508cd3ec05b12fbeda0997fa87dd4125401d0e6093cd18dbfebe5c4879
+EBUILD keepassxc-2.6.4-r1.ebuild 2161 BLAKE2B 7b2c67880cb3134f5774f7288bdc5002b532421fdcd554ed59f26bf1bd785f93e703159898f6d415ad5a898ed964572879e223a18fff09288b9abd0336023448 SHA512 5eb8b76d4132332f6dc2d097babff375425bd907c57e017d02bc89088183b53b1ac85f4cf58c97dda31dc45aa06b9ba8e1e6fec6d198e14aa752780c5d6bc8dd
+EBUILD keepassxc-9999.ebuild 2161 BLAKE2B 7b2c67880cb3134f5774f7288bdc5002b532421fdcd554ed59f26bf1bd785f93e703159898f6d415ad5a898ed964572879e223a18fff09288b9abd0336023448 SHA512 5eb8b76d4132332f6dc2d097babff375425bd907c57e017d02bc89088183b53b1ac85f4cf58c97dda31dc45aa06b9ba8e1e6fec6d198e14aa752780c5d6bc8dd
 MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e
diff --git a/app-admin/keepassxc/keepassxc-2.6.2.ebuild b/app-admin/keepassxc/keepassxc-2.6.2-r1.ebuild
index 5b51acf9ec34..b91f2ed7a168 100644
--- a/app-admin/keepassxc/keepassxc-2.6.2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.2-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 		x11-libs/libXi
 		x11-libs/libXtst
 	)
-	keeshare? ( dev-libs/quazip )
+	keeshare? ( dev-libs/quazip:0 )
 	yubikey? ( sys-auth/ykpers )
 "
 
diff --git a/app-admin/keepassxc/keepassxc-2.6.3.ebuild b/app-admin/keepassxc/keepassxc-2.6.3-r1.ebuild
index 5b51acf9ec34..b91f2ed7a168 100644
--- a/app-admin/keepassxc/keepassxc-2.6.3.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.3-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 		x11-libs/libXi
 		x11-libs/libXtst
 	)
-	keeshare? ( dev-libs/quazip )
+	keeshare? ( dev-libs/quazip:0 )
 	yubikey? ( sys-auth/ykpers )
 "
 
diff --git a/app-admin/keepassxc/keepassxc-2.6.4.ebuild b/app-admin/keepassxc/keepassxc-2.6.4-r1.ebuild
index 8c4efa1bb14e..10b1cb7ce9d7 100644
--- a/app-admin/keepassxc/keepassxc-2.6.4.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.4-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 		x11-libs/libXi
 		x11-libs/libXtst
 	)
-	keeshare? ( dev-libs/quazip )
+	keeshare? ( dev-libs/quazip:0 )
 	yubikey? ( sys-auth/ykpers )
 "
 
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 8c4efa1bb14e..10b1cb7ce9d7 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 		x11-libs/libXi
 		x11-libs/libXtst
 	)
-	keeshare? ( dev-libs/quazip )
+	keeshare? ( dev-libs/quazip:0 )
 	yubikey? ( sys-auth/ykpers )
 "
 
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 0c03c5070311..04f3cfc5e5a4 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -11,8 +11,8 @@ DIST rsyslog-8.2012.0.tar.gz 3118101 BLAKE2B 26550c90ff5502c051c30996f7a1eabfdd9
 DIST rsyslog-doc-8.2008.0.tar.gz 8378149 BLAKE2B 0f6bc116a03821899d33c7960e517725487b89ea2aabc7f5d0fbd4962d82a06558737bcee67af02105006c670ec736eb5ba0b7811b25a1e627a99555121b2999 SHA512 5b8bed19017c65469eb8ea7725ef162595b30f520605f37447498ab69b5cfe8f939cee7e7915ecbf3c025871408fd7af6d45ba960a83096f83a397df4cefef09
 DIST rsyslog-doc-8.2010.0.tar.gz 8428326 BLAKE2B ee8eb2bdbb1f6c7122559b63ddc1ae6ac7fbfb23d661410feb39d7ddce332851e785bb447fb67dd2de8ff62e91fe865fbf7dec8bf62d7fe51181e3c6bbbe64db SHA512 072fb05a0117dc0970a4e5e302abbaf5dc065c2a0962c4160e7efb86fedad89a2caa546cd2bf4af07b7f5e2fa5267cf02889d911f7a6916725e6aea1760ab253
 DIST rsyslog-doc-8.2012.0.tar.gz 6417145 BLAKE2B d8377f40b0311e8e7dcca274c251c0de7706490e3048c8d69d479120e06ca1e0b3ec9fce0a04928984d440da3aef196965f8c1b45afe8931c893b4baa72f4e87 SHA512 5647f499230276066abced34c2ca352268ba24fbd00cb7b5e3d0a2494977dd6f781cf8d1e7c7a9210d23c451ff162acda81ee93afa3f8f08fd555123e9daeece
-EBUILD rsyslog-8.2008.0.ebuild 12543 BLAKE2B 92426f314a29540d5b8c22cba2dc3a58a41494f51f75ee8bc54abb8628d2fd05182cbaec26b0279d3bea6251d1ebf86f207732db76459c7b7f856bae60de9027 SHA512 69f0d15c01fccafd62cf972f016d815b3bcb19677ce21a131a797ad1a20e64bc4ceb21fdfee145089db8b034cde891bb7fe7164b1ca74db192e316f4e3c20d97
-EBUILD rsyslog-8.2010.0.ebuild 12887 BLAKE2B 22d0a7646ae668dde9d45a3609ac4f51daa34234f1f92fa2050bc602ca5791f424c65b0e6c3017dd900688830c0c506bcd0034f1ee2fc3d14154af23ac8e0cf8 SHA512 bdf57551c70c727056127992c40c54843a4988d4fddbf70388986585ccb693ff9edc698f48f7ba2e76560962b4cb13c4b058271ab383d7a2671069830cd97f46
-EBUILD rsyslog-8.2012.0-r1.ebuild 12947 BLAKE2B bbfd82ee3a6c9c2d4c148f924060a7a908b2879d334c0fa011ef463d8a0b34338d9a497ce1906b10f33438772cdfb2bbd7cfa6319a3aa2a775f97cd433ce5271 SHA512 07c2930a418577132e0aaefe27546b668fbd7633aa461ac60af84825a86cf2a78615aca40c882709775ce1772b7441415c42b4a201e8a13f3be1c2324dc8bb94
-EBUILD rsyslog-8.2012.0.ebuild 12887 BLAKE2B 22d0a7646ae668dde9d45a3609ac4f51daa34234f1f92fa2050bc602ca5791f424c65b0e6c3017dd900688830c0c506bcd0034f1ee2fc3d14154af23ac8e0cf8 SHA512 bdf57551c70c727056127992c40c54843a4988d4fddbf70388986585ccb693ff9edc698f48f7ba2e76560962b4cb13c4b058271ab383d7a2671069830cd97f46
+EBUILD rsyslog-8.2008.0.ebuild 12545 BLAKE2B a249ff4e1a2c31f08fa145f47cdd034f59053835115c8896ec097cd045aeb07657ca25feb936a7a9f5dde18d2a5d459dac7878fcaddd1014c23c6ff467d22b25 SHA512 da31bc4bb1023b507ea29754417ff8b88eccf9e37f4f1d06147770b46abf15946581330758c28153f4173db04dd5e6b136487c8bc969cf5285f8ba21c4a81a3e
+EBUILD rsyslog-8.2010.0.ebuild 12889 BLAKE2B eb56b396c1613b38355971a2251b6b341160f4e806c2235469efa49d9b52d40cc9dee89d3ed0ba4c1c657431617fc2d510afffefee9a45610767f947fa796c37 SHA512 ff532d1e9e1b203be3aaf0fea0fbfca4e6ea5d2fb29f883f309d92f4605b19529abe957b1ad2d624c4f9b80fbd890bfee578f4ff7771a309906352b918c7a978
+EBUILD rsyslog-8.2012.0-r1.ebuild 12949 BLAKE2B 5043b13319455f26430a85c8bccf427bc59ffbc20739f39127de55afe72542903ebd108de75939bef1099203cad75aad836e96fc3e954a7b90867820be3bcb90 SHA512 1e772f0e010e9247993b1a22f0ea8360e269146cd6581ac6b73513431f23c292bedf09ab832e85ea9a00db1cc077a36499af8061a40dec172059453655173240
+EBUILD rsyslog-8.2012.0.ebuild 12889 BLAKE2B eb56b396c1613b38355971a2251b6b341160f4e806c2235469efa49d9b52d40cc9dee89d3ed0ba4c1c657431617fc2d510afffefee9a45610767f947fa796c37 SHA512 ff532d1e9e1b203be3aaf0fea0fbfca4e6ea5d2fb29f883f309d92f4605b19529abe957b1ad2d624c4f9b80fbd890bfee578f4ff7771a309906352b918c7a978
 MISC metadata.xml 4070 BLAKE2B 3fde04df2bf0b93058d14787780f7f78b5014cdaa303101ef0fb637d1f0b165e453885ae307f137d98052719f992cd1a3f46da2f923bc97030ba629801190d5d SHA512 df868d04339eade02eb55b218f43c85c9efe2bf70cadf2ec1d59dc9f0d546ba9dbcd9ac5e3f9cbad05a8f4629ce5979668aba1fb8b027c51c7f8468b2e9b732a
diff --git a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild b/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
index 32bb3a17bceb..106618ed65f3 100644
--- a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -174,12 +174,12 @@ src_configure() {
 		$(use_enable test testbench)
 		$(use_enable test libfaketime)
 		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
+		# Input Plugins without dependencies
 		--enable-imdiag
 		--enable-imfile
 		--enable-impstats
 		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
+		# Message Modificiation Plugins without dependencies
 		--enable-mmanon
 		--enable-mmaudit
 		--enable-mmcount
diff --git a/app-admin/rsyslog/rsyslog-8.2010.0.ebuild b/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
index 5b5c70c31e51..5302087c872d 100644
--- a/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -183,14 +183,14 @@ src_configure() {
 		$(use_enable test testbench)
 		$(use_enable test libfaketime)
 		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
+		# Input Plugins without dependencies
 		--enable-imbatchreport
 		--enable-imdiag
 		--enable-imfile
 		--enable-improg
 		--enable-impstats
 		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
+		# Message Modificiation Plugins without dependencies
 		--enable-mmanon
 		--enable-mmaudit
 		--enable-mmcount
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
index 52cb79ec9ae0..cd133449943a 100644
--- a/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
@@ -183,14 +183,14 @@ src_configure() {
 		$(use_enable test testbench)
 		$(use_enable test libfaketime)
 		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
+		# Input Plugins without dependencies
 		--enable-imbatchreport
 		--enable-imdiag
 		--enable-imfile
 		--enable-improg
 		--enable-impstats
 		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
+		# Message Modificiation Plugins without dependencies
 		--enable-mmanon
 		--enable-mmaudit
 		--enable-mmcount
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0.ebuild b/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
index 5b5c70c31e51..5302087c872d 100644
--- a/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -183,14 +183,14 @@ src_configure() {
 		$(use_enable test testbench)
 		$(use_enable test libfaketime)
 		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
+		# Input Plugins without dependencies
 		--enable-imbatchreport
 		--enable-imdiag
 		--enable-imfile
 		--enable-improg
 		--enable-impstats
 		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
+		# Message Modificiation Plugins without dependencies
 		--enable-mmanon
 		--enable-mmaudit
 		--enable-mmcount
diff --git a/app-admin/selint/Manifest b/app-admin/selint/Manifest
index fd42b059f330..d3c3a13fa00f 100644
--- a/app-admin/selint/Manifest
+++ b/app-admin/selint/Manifest
@@ -1,4 +1,6 @@
 DIST selint-1.1.0.tar.gz 283926 BLAKE2B 0908f8830ce4b569c54e8c025dd92c39af59172fee0b8061f5b8cdaf61222979a78c3726a5647af9161ce7e4a7ddd5bee64772afecd2024368afa76294b3d317 SHA512 3af358e0f42a285a0360ce2b4db9014ef1e4f0b792623007f88cf510799080975d9e44817e8911bbd32b141704a7fd11e1b4d8f91e124d0fa91c38f71a978c91
+DIST selint-1.2.0.tar.gz 306527 BLAKE2B 842d796d3beea327ac937b977123a9248f317f0ab88e8187ff5ef7b7da2efd9b6c4bccda2dc1fd4661691904f90f346df0120f9398733e62942e70bef5c3c5ab SHA512 e289cb0a25454b1fd5f5435e11f3d956e6c545bbbbe79b7a47d40681746d8eb66bb78bdb541f2629a4f23435853568a8e52d10e6f8dde8e8ddb03f4493ea7504
 EBUILD selint-1.1.0.ebuild 775 BLAKE2B 7c358a6a1d05bf970dca2f2bcc0bfb0d7e81afcf280c639a21cc6e09deb524121f09e01e546ebfa4ce83b6304e717d7dc768b00d3ad24e452a8263a4b5b1f8c6 SHA512 c1e72456363af31d31e8513afafde25dbfb8d75c870a57901c5199e73e6764f56aede0ab65461e8cb6fd0d92c2a762bcaa8865245f9958cded22567e2a958398
+EBUILD selint-1.2.0.ebuild 798 BLAKE2B 270d5d392ea0fee58efddaff5c696cbff1dd100a3d95dca3ab544818314bdcb5558be02afd338f48e3d16b45e2e0b3c57d71906bfccabb67e411c9a3d5e5b0cb SHA512 2cd9154b6a16254a08b31346d0963b74e85e3fe224c1c0268bb951f4a03b84f85e7ef83936231977b01271ca1e2d9b0eed1c84f2c78aaeb5fd0f6ef82d14dba8
 EBUILD selint-9999.ebuild 777 BLAKE2B 01aefb1c3a19bee5325c75b318000d99f159bf23edc1e399c769c3eda57c7361a6ac87e3837ae79573f588450710b72183ad1b51158817b068a4852eaac7420b SHA512 495108a5bd26315c85f092b0880e3703b1207e45770a59a0cbdeaa68d3c8fbdffd508b229776587d71d4841721c75af919967fa02e27df9af82a87ede9784cbb
 MISC metadata.xml 335 BLAKE2B ab88b7d7fedc27d0ba41b77fc133a0ad8b42aa295bb5b64c5bb4924d8081cb1ac3480b07d7c8a04ff8da1c49f47983e33a63cef3de08baac4cb448d656ec6cb9 SHA512 e94ae02402e90d9475fd328454223fa95714c3292877a9cc31e98c393f59dde7ddd9be34afe8b2f2d318105794ca3faa7617166d123259d147115619b14d7d12
diff --git a/app-admin/selint/selint-1.2.0.ebuild b/app-admin/selint/selint-1.2.0.ebuild
new file mode 100644
index 000000000000..a0e18d3a3fef
--- /dev/null
+++ b/app-admin/selint/selint-1.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Static code analysis of refpolicy style SELinux policy"
+HOMEPAGE="https://github.com/TresysTechnology/selint/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/TresysTechnology/selint.git"
+else
+	SRC_URI="https://github.com/TresysTechnology/selint/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/confuse:=
+	dev-libs/uthash"
+
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_with test check)
+}
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 9708d053ebe4..a63eb6d5a627 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -3,7 +3,7 @@ AUX sshguard-2.4.1-conf.patch 1203 BLAKE2B db97df31d61de23622faaaffdef23c5f55dac
 AUX sshguard.confd 634 BLAKE2B f083e6d4f7df6cefae89ef382a82cd7c5863c6a2ded34aee61ab028f8320c35552b80d5d8222ed35adb13a70cf6096eb5d88749f5b5ff72ca483f27fd1c0de56 SHA512 72b2a9c995bcb604516525f8190eaf35fa57e18274f83a8d00fd5b223b598c0c4ffd8b7ce89b1139c89380e5a7181c8024a6041375c445edb29c8f8b49abee50
 AUX sshguard.initd-r2 389 BLAKE2B b4098e0baf82e1c1f1978d6b3916fe9f2e67891d02b7b842492558f9b44c1c0c23204d88c036f49e069c42b0fbbdba31d8292419a2d22e603f29926228a8a223 SHA512 951ea1479836d1b318c35be03c340e5101aa3663bf2581cd0d928de2fea36f0b7906e50d9abf1b6b11fa682427e8d72b45bc95bb8f40a85fb471bfe354108108
 DIST sshguard-2.4.1.tar.gz 723940 BLAKE2B 04e72b9959ef3ead418d2a6fe8029b0806a4d91c91f7cd36c236c7203cca1afc67305b21de0b1dee1594b188564f201ff2770d54d4c57c54b4d23db15e0298a0 SHA512 bae7485d963454f2a6dc4b7d96506b03fb49013fe3ab3d81e315ea88bd8067e7a2305cdf25e411720ac014a68ee9635cdbcef65a7dc806b7fc942f099a9d5ba8
-EBUILD sshguard-2.4.1-r1.ebuild 960 BLAKE2B 43cec652fbde0e0d569661bd52bba0ed35c7c5916b272de160df1abdd439ddd8c6f06c6d7beb7ccea5585241e4c5a2a6c431e953496e9a6366ca561fb1679fac SHA512 e35123be0d62e9d1858430b9ccc4a4457c9c1c31b8ebfcc7f274b11cbd72bdf7a24c4d71f84b056abfc42ed7a0da3cb437baf0d46b67866a0172c16ca5193060
+EBUILD sshguard-2.4.1-r1.ebuild 1093 BLAKE2B 25f612896845751aa576aac877f1fae43e81fffe2830de361eb8f597034d1b60e5429d2e37ac87f29ea6f416a8710b2c7227827af71e8394b7a97da7ffd14fde SHA512 1a32abb81945b0fa36e8a8828dd95d328ce11df7d2d8d975daf523f5bd1af44f7e4b62c30f41e10a925cb0cc72e39590ff0cfc73b66d1d2b3cf4480113d5d90e
 EBUILD sshguard-2.4.1.ebuild 753 BLAKE2B 71a9c76e2204a0c23a282c434d6514cfa0b828df4a0cf1e304d32835c0de525624258024cb0d81e559bd4f4666632fb01820fc55090a77fe4e487ac5f2a3e122 SHA512 99f02f936b5be1cee0865c613798730202f7464e4e4b437b9f0e962edb1a0b799f8959d578e36c7b38b25eb48f7e0a93048bbc368213a2fba145e40743ae5a3f
-EBUILD sshguard-99999.ebuild 799 BLAKE2B 38b307936f73e2926466241496fdf59a6cf7def5e60405674a1a07666cdbf0042310977e79078352e623244670e22a8cd41b2ff7969b2ca6577441beca55ca69 SHA512 a33dbdc779c7021aecfa9927eb7e41313ce8b82f3509f1a33e8beacae5597db7e8f5b1a1484edee7e03956fe07d9a39717673985bc8988dba0e20835cd722aea
+EBUILD sshguard-99999.ebuild 1095 BLAKE2B c5d6d6d4450f4d98fe6f4486f05b93105ed46297068f960f82ca7df8410c15e8a731f7570f9afa7657b085f52df7fdf2c3796e83915c435967b9a00df44d1fec SHA512 3f3b35389987a9bd004425b3fe15a3ace3abdc6370341ae2af66cd7688b90106810e0e6da349179140c02b5a36f3a44246cd40f62c5596a23b8c711df95d77b9
 MISC metadata.xml 459 BLAKE2B 52a25ead1bb594b1929641a855e1ced3b2e9f8323892ff4f387f3f27cf329bfd6b89fe2ec567b9a4da3daf1792440421c466c95bdc206ac0d6a5e53339454fde SHA512 1389c2bbcfe412dcc96cb62f3e5a61aafa782adbef69e9861a380fc845f3f81d9412c6a1c3e8ac927fefd1e1959e4991dff450e4802cdff2c2924f1e350ae12c
diff --git a/app-admin/sshguard/sshguard-2.4.1-r1.ebuild b/app-admin/sshguard/sshguard-2.4.1-r1.ebuild
index 7def7a057974..dee670ce9642 100644
--- a/app-admin/sshguard/sshguard-2.4.1-r1.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.1-r1.ebuild
@@ -3,14 +3,20 @@
 
 EAPI=7
 
-inherit systemd
+inherit autotools systemd
 DESCRIPTION="protects hosts from brute force attacks against ssh"
 HOMEPAGE="https://www.sshguard.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+if [[ "${PV}" == 99999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}"
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="
 	sys-devel/flex
@@ -25,6 +31,7 @@ DOCS=(
 	examples/net.sshguard.plist
 	examples/whitelistfile.example
 )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.1-conf.patch
 )
@@ -34,6 +41,7 @@ src_prepare() {
 	sed -i -e "/ExecStartPre/s:/usr/sbin:/sbin:g" \
 		-e "/ExecStart/s:/usr/local/sbin:/usr/sbin:g" \
 		"${S}"/examples/${PN}.service || die
+	eautoreconf
 }
 
 src_install() {
diff --git a/app-admin/sshguard/sshguard-99999.ebuild b/app-admin/sshguard/sshguard-99999.ebuild
index 0f9a63205b67..ee4653a215e3 100644
--- a/app-admin/sshguard/sshguard-99999.ebuild
+++ b/app-admin/sshguard/sshguard-99999.ebuild
@@ -1,16 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools git-r3
 
+inherit autotools systemd
 DESCRIPTION="protects hosts from brute force attacks against ssh"
 HOMEPAGE="https://www.sshguard.net/"
-EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}"
+
+if [[ "${PV}" == 99999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}"
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
 
 DEPEND="
 	sys-devel/flex
@@ -23,15 +29,18 @@ DOCS=(
 	CONTRIBUTING.rst
 	README.rst
 	examples/net.sshguard.plist
-	examples/sshguard.service
 	examples/whitelistfile.example
 )
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-conf.patch
+	"${FILESDIR}"/${PN}-2.4.1-conf.patch
 )
 
 src_prepare() {
 	default
+	sed -i -e "/ExecStartPre/s:/usr/sbin:/sbin:g" \
+		-e "/ExecStart/s:/usr/local/sbin:/usr/sbin:g" \
+		"${S}"/examples/${PN}.service || die
 	eautoreconf
 }
 
@@ -43,4 +52,6 @@ src_install() {
 
 	insinto /etc
 	newins examples/sshguard.conf.sample sshguard.conf
+
+	systemd_dounit "${S}"/examples/sshguard.service
 }
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 3fac915577d6..577ba016e56b 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -1,4 +1,4 @@
 DIST webapp-config-1.55.tar.bz2 72583 BLAKE2B be958dc991f0e1f6835d9c29350b7d97e3f23d52971f6013165ce59a8f4b32ac6262c9719956d1bcdbe60797f07d77910b44a749ae545c4dc15f765525144709 SHA512 44294b276fd036908438cd984ebf70433639caa18d8330bab348433b4f39ea2c42c57fa8de4f0a6198f7875429a3ef9ebe61321c288d910f9be8b3414865f438
 EBUILD webapp-config-1.55-r1.ebuild 1662 BLAKE2B 5881a0bfed6b2c145a31308b322a28febe0f4b1902ffde16be0bd5355e75301f30cd0442b571f6cbd97343c52c266fe6e127e12294fe7fe3df6eafd4518cb1b0 SHA512 4ea665a79781f1e3d974a829db4ada642c91881f5339497b0b079eb0d9b9b7cc0233b3783ea45e6e3afd110cf04e0941364170498119c61fe7a02159c544ce57
-EBUILD webapp-config-9999.ebuild 1785 BLAKE2B 31bc457da060792cbcd2dd12d139992e314348a14870197c3c7b1e1b59977e3ee0664a30caca49946ac204f42f4a35d4d256c83013c174d68c4fcf2f3139089d SHA512 1b5e50427df7b315b27876b16ea19f132dd8a04e71808d7b982ed8bd28e498e2c81c461b978e23739816a6b82ec895671af9a52e13cb363ade11d47153c9f35c
+EBUILD webapp-config-9999.ebuild 1772 BLAKE2B 82dc59f436c4916ddd823b03ef0b1bf303a90167bda50b666d16633183fe297ad4e498445af39f767a7e3ad6e80d05dca27e58af68a4992fba8477910d80270e SHA512 1a40a7654ea5bc4ed44d9b1ffbbb27dec4d5de817b4413250ab0a664ec468e74b7329fc2417b74c8bba70450d33093bef1910a64b35d8035e5311d8a3b4e58c0
 MISC metadata.xml 549 BLAKE2B 44f2ec07f40387bd51440d500cacc4ff24cbb3d1ec2e1c9bec29119a589e4c4bb005723d861be2ab9c1929d74d209c10771de5500eedb56e44265969129201be SHA512 1c99c9b52ab10378a3716d3f6dd1d6f70f61ac6bcf0c8a934254b71376a429f601358ad1108292e03ab780bc6c53810fd8a484e42a4ad6f959fb1903ed591b7b
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 92b02e9b3589..82ce38d5fbd8 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,6 @@ if [[ ${PV} = 9999* ]]
 then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"