Merge updates from master

2026-07-15 01:53:25 -04:00 · 2021-09-08 15:36:13 +00:00
parent 67c7fe4608 a4a275a4a3
commit e2bfc9f06c
55 changed files with 1196 additions and 148 deletions
--- a/TODO.md
+++ b/TODO.md
@@ -78,7 +78,8 @@ Name | Buildsystem | Category | User | RFH
 [mfem](https://mfem.org/) | cmake | science | Alessandro-Barbieri | no
 [fmi-library](https://github.com/modelon-community/fmi-library) | cmake | science | Alessandro-Barbieri | no
 [aerodyn](https://github.com/OpenFAST/openfast/tree/main/modules/aerodyn) | cmake | science | Alessandro-Barbieri | no
-[llvm-ompss2](https://github.com/bsc-pm/llvm) | cmake | science | Alessandro-Barbieri | yes
+[llvm-ompss2](https://github.com/bsc-pm/llvm) | cmake | cluster | Alessandro-Barbieri | yes
+[pagmo](https://github.com/bsc-pm/llvm) | cmake | science | Alessandro-Barbieri | no
 [enarx](https://enarx.dev/) | cargo | util | Alessandro-Barbieri | no
 [airshipper](https://gitlab.com/veloren/airshipper) | cargo | game | | 
 [open-match](https://github.com/googleforgames/open-match) | go | devel | Alessandro-Barbieri | yes
--- a/app-admin/chezmoi/Manifest
+++ b/app-admin/chezmoi/Manifest
@@ -3,6 +3,7 @@ DIST chezmoi-2.0.12.tar.gz 2282385 BLAKE2B 49406135c3dc20a8509bc386aa903241edc30
 DIST chezmoi-2.1.5.tar.gz 2295979 BLAKE2B 093329a4164f975074a8282e87462f7fa23f7026fa1542c3c54fa30856662e8d5f6d929a3cd938aa011bdb8b305d0587a809cba699a4575821ab32c439bf9909 SHA512 761d218d78137f06185cddb46a1a6b6762c3bebac96bad961d9dd7b0d2d845e75fbde9678c354e3bfc466a45464a0eccdca099149bbe2b93ee4d71ebc848692b
 DIST chezmoi-2.1.6.tar.gz 2302728 BLAKE2B 597f6d8888272161f154606b989e387d878077745498bf7cc746eabe1c150a46641c0d4ce3cc4b0c5511d08b5badfafd32e0fa4da95f722b3719bfac29670b55 SHA512 7b8db14d9e57e491fc40ac870668e612413309f2f1eda5f6337eb5a92dd59ed74927869e289c5bac2a6a93346897a1b7506c3ed8afc854bbd7cbbe25115a5da4
 DIST chezmoi-2.2.0.tar.gz 2302988 BLAKE2B 4bb4888b8d43e38d582eb99abf9822b1b3449e8905438389265a2cd955ee5d17619ab2cf9e4d8d0187a3031f0dee2da78b0e9cce05134c0b9d9281c66551767a SHA512 30706a857a88625dfa7be12c7eb383c213a02a6736f7206da005d3255d4453e121146fe92df8c8516602b75150e4520e21abeaecfe5927525b6f7cb2b1d6d063
+DIST chezmoi-2.3.0.tar.gz 2304994 BLAKE2B a02d2fdbd6c68c832c2e69e535af1a7d85eb0fe484640179db30a2575975afc8cb94be7bf5150113ad807b4e4d4346b2d9fbf8ba4d08b4867f25d579d35da774 SHA512 ef27ed3cff846f75ef2797b49651acf72186176751422a1e7a194001c326023d7db63239b14b5142c223325adc3cd07d4c1b48dd11df6a291104e7ea33b9ca0e
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
--- a/app-admin/chezmoi/chezmoi-2.3.0.ebuild
+++ b/app-admin/chezmoi/chezmoi-2.3.0.ebuild
@@ -0,0 +1,892 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module bash-completion-r1
+
+DESCRIPTION="Manage your dotfiles across multiple machines, securely"
+HOMEPAGE="https://chezmoi.io"
+
+# Building this list can be done by:
+# cd $(mktemp -d)
+# PV="2.3.0"
+# wget "https://github.com/twpayne/chezmoi/archive/v${PV}.tar.gz"
+# tar -xvzf "v${PV}.tar.gz"
+# sed -Ee 's/^(.+) h1:.+$/\t"\1"/g' "chezmoi-${PV}/go.sum" > go.sum.out
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go v0.56.0/go.mod"
+	"cloud.google.com/go v0.57.0/go.mod"
+	"cloud.google.com/go v0.62.0/go.mod"
+	"cloud.google.com/go v0.65.0/go.mod"
+	"cloud.google.com/go v0.72.0/go.mod"
+	"cloud.google.com/go v0.74.0/go.mod"
+	"cloud.google.com/go v0.78.0/go.mod"
+	"cloud.google.com/go v0.79.0/go.mod"
+	"cloud.google.com/go v0.81.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/bigquery v1.5.0/go.mod"
+	"cloud.google.com/go/bigquery v1.7.0/go.mod"
+	"cloud.google.com/go/bigquery v1.8.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/firestore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.3.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"cloud.google.com/go/storage v1.8.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/Masterminds/goutils v1.1.1"
+	"github.com/Masterminds/goutils v1.1.1/go.mod"
+	"github.com/Masterminds/semver/v3 v3.1.1"
+	"github.com/Masterminds/semver/v3 v3.1.1/go.mod"
+	"github.com/Masterminds/sprig/v3 v3.2.2"
+	"github.com/Masterminds/sprig/v3 v3.2.2/go.mod"
+	"github.com/Microsoft/go-winio v0.4.14/go.mod"
+	"github.com/Microsoft/go-winio v0.4.16/go.mod"
+	"github.com/Microsoft/go-winio v0.5.0"
+	"github.com/Microsoft/go-winio v0.5.0/go.mod"
+	"github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod"
+	"github.com/ProtonMail/go-crypto v0.0.0-20210707164159-52430bf6b52c"
+	"github.com/ProtonMail/go-crypto v0.0.0-20210707164159-52430bf6b52c/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
+	"github.com/acomagu/bufpipe v1.0.3"
+	"github.com/acomagu/bufpipe v1.0.3/go.mod"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
+	"github.com/alecthomas/chroma v0.8.2/go.mod"
+	"github.com/alecthomas/chroma v0.9.2"
+	"github.com/alecthomas/chroma v0.9.2/go.mod"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
+	"github.com/alecthomas/colour v0.1.0"
+	"github.com/alecthomas/colour v0.1.0/go.mod"
+	"github.com/alecthomas/kong v0.2.4/go.mod"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod"
+	"github.com/alecthomas/repr v0.0.0-20201120212035-bb82daffcca2"
+	"github.com/alecthomas/repr v0.0.0-20201120212035-bb82daffcca2/go.mod"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/antihax/optional v1.0.0/go.mod"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5"
+	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod"
+	"github.com/aymerick/douceur v0.2.0"
+	"github.com/aymerick/douceur v0.2.0/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bketelsen/crypt v0.0.4/go.mod"
+	"github.com/bmatcuk/doublestar/v4 v4.0.2"
+	"github.com/bmatcuk/doublestar/v4 v4.0.2/go.mod"
+	"github.com/bradenhilton/cityhash v1.0.0"
+	"github.com/bradenhilton/cityhash v1.0.0/go.mod"
+	"github.com/bradenhilton/mozillainstallhash v1.0.0"
+	"github.com/bradenhilton/mozillainstallhash v1.0.0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/charmbracelet/glamour v0.3.0"
+	"github.com/charmbracelet/glamour v0.3.0/go.mod"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
+	"github.com/coreos/go-semver v0.3.0"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.3.2/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.9/go.mod"
+	"github.com/danieljoos/wincred v1.1.0/go.mod"
+	"github.com/danieljoos/wincred v1.1.2"
+	"github.com/danieljoos/wincred v1.1.2/go.mod"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dlclark/regexp2 v1.2.0/go.mod"
+	"github.com/dlclark/regexp2 v1.4.0"
+	"github.com/dlclark/regexp2 v1.4.0/go.mod"
+	"github.com/emirpasic/gods v1.12.0"
+	"github.com/emirpasic/gods v1.12.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.7/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/fsnotify/fsnotify v1.5.1"
+	"github.com/fsnotify/fsnotify v1.5.1/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/gliderlabs/ssh v0.2.2"
+	"github.com/gliderlabs/ssh v0.2.2/go.mod"
+	"github.com/go-git/gcfg v1.5.0"
+	"github.com/go-git/gcfg v1.5.0/go.mod"
+	"github.com/go-git/go-billy/v5 v5.2.0/go.mod"
+	"github.com/go-git/go-billy/v5 v5.3.1"
+	"github.com/go-git/go-billy/v5 v5.3.1/go.mod"
+	"github.com/go-git/go-git-fixtures/v4 v4.2.1"
+	"github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod"
+	"github.com/go-git/go-git/v5 v5.4.2"
+	"github.com/go-git/go-git/v5 v5.4.2/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+	"github.com/go-ole/go-ole v1.2.4/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.4"
+	"github.com/godbus/dbus/v5 v5.0.4/go.mod"
+	"github.com/gogo/protobuf v1.3.2/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/mock v1.4.3/go.mod"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/mock v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.4.3/go.mod"
+	"github.com/golang/protobuf v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.5.1/go.mod"
+	"github.com/golang/protobuf v1.5.2"
+	"github.com/golang/protobuf v1.5.2/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/go-cmp v0.5.3/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/go-cmp v0.5.6"
+	"github.com/google/go-cmp v0.5.6/go.mod"
+	"github.com/google/go-github/v38 v38.1.0"
+	"github.com/google/go-github/v38 v38.1.0/go.mod"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/go-querystring v1.1.0"
+	"github.com/google/go-querystring v1.1.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gops v0.3.19"
+	"github.com/google/gops v0.3.19/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/martian/v3 v3.1.0/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+	"github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod"
+	"github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
+	"github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod"
+	"github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/renameio v1.0.1"
+	"github.com/google/renameio v1.0.1/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/google/uuid v1.3.0"
+	"github.com/google/uuid v1.3.0/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00"
+	"github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod"
+	"github.com/gorilla/css v1.0.0"
+	"github.com/gorilla/css v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod"
+	"github.com/hashicorp/consul/api v1.1.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/huandu/xstrings v1.3.1/go.mod"
+	"github.com/huandu/xstrings v1.3.2"
+	"github.com/huandu/xstrings v1.3.2/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+	"github.com/imdario/mergo v0.3.11/go.mod"
+	"github.com/imdario/mergo v0.3.12"
+	"github.com/imdario/mergo v0.3.12/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99"
+	"github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod"
+	"github.com/jessevdk/go-flags v1.4.0/go.mod"
+	"github.com/jessevdk/go-flags v1.5.0/go.mod"
+	"github.com/json-iterator/go v1.1.11/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod"
+	"github.com/kevinburke/ssh_config v1.1.0"
+	"github.com/kevinburke/ssh_config v1.1.0/go.mod"
+	"github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19/go.mod"
+	"github.com/kisielk/errcheck v1.5.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/fs v0.1.0/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.1"
+	"github.com/kr/pretty v0.2.1/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.2.0"
+	"github.com/lucasb-eyer/go-colorful v1.2.0/go.mod"
+	"github.com/magiconair/properties v1.8.5"
+	"github.com/magiconair/properties v1.8.5/go.mod"
+	"github.com/matryer/is v1.2.0"
+	"github.com/matryer/is v1.2.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.6/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-isatty v0.0.13"
+	"github.com/mattn/go-isatty v0.0.13/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/mattn/go-runewidth v0.0.10/go.mod"
+	"github.com/mattn/go-runewidth v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.13"
+	"github.com/mattn/go-runewidth v0.0.13/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.6/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.15"
+	"github.com/microcosm-cc/bluemonday v1.0.15/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/copystructure v1.2.0"
+	"github.com/mitchellh/copystructure v1.2.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.4.1"
+	"github.com/mitchellh/mapstructure v1.4.1/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.2"
+	"github.com/mitchellh/reflectwalk v1.0.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/muesli/combinator v0.3.0"
+	"github.com/muesli/combinator v0.3.0/go.mod"
+	"github.com/muesli/reflow v0.2.0/go.mod"
+	"github.com/muesli/reflow v0.3.0"
+	"github.com/muesli/reflow v0.3.0/go.mod"
+	"github.com/muesli/termenv v0.8.1/go.mod"
+	"github.com/muesli/termenv v0.9.0"
+	"github.com/muesli/termenv v0.9.0/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.5"
+	"github.com/olekukonko/tablewriter v0.0.5/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pelletier/go-toml v1.9.3"
+	"github.com/pelletier/go-toml v1.9.3/go.mod"
+	"github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e"
+	"github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/sftp v1.10.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/rivo/uniseg v0.1.0/go.mod"
+	"github.com/rivo/uniseg v0.2.0"
+	"github.com/rivo/uniseg v0.2.0/go.mod"
+	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.8.0"
+	"github.com/rogpeppe/go-internal v1.8.0/go.mod"
+	"github.com/rs/xid v1.3.0/go.mod"
+	"github.com/rs/zerolog v1.24.0"
+	"github.com/rs/zerolog v1.24.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/sergi/go-diff v1.1.0"
+	"github.com/sergi/go-diff v1.1.0/go.mod"
+	"github.com/shirou/gopsutil/v3 v3.21.5/go.mod"
+	"github.com/shopspring/decimal v1.2.0"
+	"github.com/shopspring/decimal v1.2.0/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.7.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/assertions v1.2.0"
+	"github.com/smartystreets/assertions v1.2.0/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/spf13/afero v1.6.0"
+	"github.com/spf13/afero v1.6.0/go.mod"
+	"github.com/spf13/cast v1.3.1/go.mod"
+	"github.com/spf13/cast v1.4.1"
+	"github.com/spf13/cast v1.4.1/go.mod"
+	"github.com/spf13/cobra v1.2.1"
+	"github.com/spf13/cobra v1.2.1/go.mod"
+	"github.com/spf13/jwalterweatherman v1.1.0"
+	"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.8.1"
+	"github.com/spf13/viper v1.8.1/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.3.0"
+	"github.com/stretchr/objx v0.3.0/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/subosito/gotenv v1.2.0"
+	"github.com/subosito/gotenv v1.2.0/go.mod"
+	"github.com/tklauser/go-sysconf v0.3.4/go.mod"
+	"github.com/tklauser/numcpus v0.2.1/go.mod"
+	"github.com/twpayne/go-shell v0.3.0"
+	"github.com/twpayne/go-shell v0.3.0/go.mod"
+	"github.com/twpayne/go-vfs/v3 v3.0.0"
+	"github.com/twpayne/go-vfs/v3 v3.0.0/go.mod"
+	"github.com/twpayne/go-xdg/v6 v6.0.0"
+	"github.com/twpayne/go-xdg/v6 v6.0.0/go.mod"
+	"github.com/xanzy/ssh-agent v0.3.0/go.mod"
+	"github.com/xanzy/ssh-agent v0.3.1"
+	"github.com/xanzy/ssh-agent v0.3.1/go.mod"
+	"github.com/xlab/treeprint v1.1.0/go.mod"
+	"github.com/yuin/goldmark v1.1.25/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.1.32/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"github.com/yuin/goldmark v1.3.3/go.mod"
+	"github.com/yuin/goldmark v1.3.5/go.mod"
+	"github.com/yuin/goldmark v1.4.0"
+	"github.com/yuin/goldmark v1.4.0/go.mod"
+	"github.com/yuin/goldmark-emoji v1.0.1"
+	"github.com/yuin/goldmark-emoji v1.0.1/go.mod"
+	"github.com/zalando/go-keyring v0.1.1"
+	"github.com/zalando/go-keyring v0.1.1/go.mod"
+	"go.etcd.io/bbolt v1.3.6"
+	"go.etcd.io/bbolt v1.3.6/go.mod"
+	"go.etcd.io/etcd/api/v3 v3.5.0/go.mod"
+	"go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod"
+	"go.etcd.io/etcd/client/v2 v2.305.0/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.opencensus.io v0.22.4/go.mod"
+	"go.opencensus.io v0.22.5/go.mod"
+	"go.opencensus.io v0.23.0/go.mod"
+	"go.uber.org/atomic v1.7.0/go.mod"
+	"go.uber.org/atomic v1.9.0"
+	"go.uber.org/atomic v1.9.0/go.mod"
+	"go.uber.org/multierr v1.6.0/go.mod"
+	"go.uber.org/multierr v1.7.0"
+	"go.uber.org/multierr v1.7.0/go.mod"
+	"go.uber.org/zap v1.17.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod"
+	"golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod"
+	"golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod"
+	"golang.org/x/crypto v0.0.0-20210817164053-32db794688a5"
+	"golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod"
+	"golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/mod v0.4.0/go.mod"
+	"golang.org/x/mod v0.4.1/go.mod"
+	"golang.org/x/mod v0.4.2/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod"
+	"golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod"
+	"golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod"
+	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
+	"golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod"
+	"golang.org/x/net v0.0.0-20210825183410-e898025ed96a"
+	"golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f"
+	"golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+	"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
+	"golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
+	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+	"golang.org/x/sys v0.0.0-20210217105451-b926d437f341/go.mod"
+	"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
+	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+	"golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+	"golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod"
+	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+	"golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod"
+	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod"
+	"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
+	"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod"
+	"golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod"
+	"golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf"
+	"golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b"
+	"golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/text v0.3.6/go.mod"
+	"golang.org/x/text v0.3.7"
+	"golang.org/x/text v0.3.7/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+	"golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod"
+	"golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod"
+	"golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
+	"golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
+	"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
+	"golang.org/x/tools v0.1.0/go.mod"
+	"golang.org/x/tools v0.1.2/go.mod"
+	"golang.org/x/tools v0.1.5/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.19.0/go.mod"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/api v0.22.0/go.mod"
+	"google.golang.org/api v0.24.0/go.mod"
+	"google.golang.org/api v0.28.0/go.mod"
+	"google.golang.org/api v0.29.0/go.mod"
+	"google.golang.org/api v0.30.0/go.mod"
+	"google.golang.org/api v0.35.0/go.mod"
+	"google.golang.org/api v0.36.0/go.mod"
+	"google.golang.org/api v0.40.0/go.mod"
+	"google.golang.org/api v0.41.0/go.mod"
+	"google.golang.org/api v0.43.0/go.mod"
+	"google.golang.org/api v0.44.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/appengine v1.6.6/go.mod"
+	"google.golang.org/appengine v1.6.7"
+	"google.golang.org/appengine v1.6.7/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+	"google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+	"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+	"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
+	"google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod"
+	"google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod"
+	"google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
+	"google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod"
+	"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod"
+	"google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod"
+	"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod"
+	"google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod"
+	"google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.28.0/go.mod"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/grpc v1.30.0/go.mod"
+	"google.golang.org/grpc v1.31.0/go.mod"
+	"google.golang.org/grpc v1.31.1/go.mod"
+	"google.golang.org/grpc v1.33.1/go.mod"
+	"google.golang.org/grpc v1.33.2/go.mod"
+	"google.golang.org/grpc v1.34.0/go.mod"
+	"google.golang.org/grpc v1.35.0/go.mod"
+	"google.golang.org/grpc v1.36.0/go.mod"
+	"google.golang.org/grpc v1.36.1/go.mod"
+	"google.golang.org/grpc v1.38.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"google.golang.org/protobuf v1.26.0/go.mod"
+	"google.golang.org/protobuf v1.27.1"
+	"google.golang.org/protobuf v1.27.1/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c"
+	"gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/ini.v1 v1.62.0"
+	"gopkg.in/ini.v1 v1.62.0/go.mod"
+	"gopkg.in/warnings.v0 v0.1.2"
+	"gopkg.in/warnings.v0 v0.1.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"howett.net/plist v0.0.0-20201203080718-1454fab16a06"
+	"howett.net/plist v0.0.0-20201203080718-1454fab16a06/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/goversion v1.2.0/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+)
+
+SOURCE_PN="github.com/twpayne/${PN}"
+
+go-module_set_globals
+SRC_URI="https://${SOURCE_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror"
+
+DEPEND="dev-vcs/git"
+RDEPEND="${DEPEND}"
+
+DOCS=( "${S}/docs" )
+
+src_compile() {
+	go build -o ${PN} -v -work -x -ldflags \
+		"-X main.version=${PV} -X main.date=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+		|| die "compile failed"
+}
+
+src_test() {
+	go test -race -ldflags \
+		"-X github.com/twpayne/chezmoi/internal/chezmoitest.umaskStr=0o022" \
+		|| die "tests failed"
+}
+
+src_install() {
+	einstalldocs
+	dobin ${PN}
+
+	newbashcomp completions/${PN}-completion.bash ${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/${PN}.fish
+
+	insinto /usr/share/zsh/site-functions
+	newins completions/${PN}.zsh _${PN}
+
+}
--- a/app-doc/ford/ford-6.1.1.ebuild
+++ b/app-doc/ford/ford-6.1.1.ebuild
@@ -20,7 +20,7 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/${MY_PN}-${PV}"

 RDEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/graphviz[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
--- a/app-misc/anki-bin/anki-bin-2.1.45.ebuild
+++ b/app-misc/anki-bin/anki-bin-2.1.45.ebuild
@@ -27,7 +27,7 @@ $(python_gen_cond_dep '
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	dev-python/orjson-bin[${PYTHON_USEDEP}]
 	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/waitress[${PYTHON_USEDEP}]
--- a/app-misc/ssmtool/ssmtool-0.3.3.ebuild
+++ b/app-misc/ssmtool/ssmtool-0.3.3.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-python/PyQt5[${PYTHON_USEDEP}]
 	dev-python/simplemma[${PYTHON_USEDEP}]
 	~dev-python/googletrans-4.0.0_rc1[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/bidict[${PYTHON_USEDEP}]
--- a/app-office/beancount/beancount-2.3.3.ebuild
+++ b/app-office/beancount/beancount-2.3.3.ebuild
@@ -27,7 +27,7 @@ PATCHES=(

 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		>=dev-python/bottle-0.12[${PYTHON_USEDEP}]
 		>=dev-python/google-api-python-client-1.8.2[${PYTHON_USEDEP}]
 		>=dev-python/httplib2-0.10[${PYTHON_USEDEP}]
--- a/app-text/komikku/komikku-0.28.1.ebuild
+++ b/app-text/komikku/komikku-0.28.1.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	>=gui-libs/libhandy-1.2.0
 	>=x11-libs/gtk+-3.24.10
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/dateparser[${PYTHON_USEDEP}]
 		dev-python/keyring[${PYTHON_USEDEP}]
--- a/app-text/komikku/komikku-0.29.2.ebuild
+++ b/app-text/komikku/komikku-0.29.2.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	>=gui-libs/libhandy-1.2.0
 	>=x11-libs/gtk+-3.24.10:3
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/dateparser[${PYTHON_USEDEP}]
 		dev-python/keyring[${PYTHON_USEDEP}]
--- a/app-text/komikku/komikku-0.30.0.ebuild
+++ b/app-text/komikku/komikku-0.30.0.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	>=gui-libs/libhandy-1.2.0
 	>=x11-libs/gtk+-3.24.10:3
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/dateparser[${PYTHON_USEDEP}]
 		dev-python/keyring[${PYTHON_USEDEP}]
--- a/app-text/smu/smu-1.5.ebuild
+++ b/app-text/smu/smu-1.5.ebuild
@@ -3,6 +3,8 @@

 EAPI=8

+inherit toolchain-funcs
+
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Gottox/${PN}.git"
@@ -17,9 +19,14 @@ HOMEPAGE="https://github.com/Gottox/smu"
 LICENSE="MIT"
 SLOT="0"

+pkg_setup() {
+	export CC="$(tc-getCC)"
+}
+
 src_prepare() {
 	default
 	sed -i \
+		-e '/^CC/d' \
 		-e '/^CFLAGS/ s|-g -O0 ||;s|-Werror ||;s|^CFLAGS =|CFLAGS +=|;' \
 		-e '/^LDFLAGS/ s|^LDFLAGS =|LDFLAGS +=|' \
 		config.mk || die "sed failed"
--- a/app-text/smu/smu-9999.ebuild
+++ b/app-text/smu/smu-9999.ebuild
@@ -3,6 +3,8 @@

 EAPI=8

+inherit toolchain-funcs
+
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Gottox/smu.git"
@@ -17,9 +19,14 @@ HOMEPAGE="https://github.com/Gottox/smu"
 LICENSE="MIT"
 SLOT="0"

+pkg_setup() {
+	export CC="$(tc-getCC)"
+}
+
 src_prepare() {
 	default
 	sed -i \
+		-e '/^CC/d' \
 		-e '/^CFLAGS/ s|-g -O0 ||;s|-Werror ||;s|^CFLAGS =|CFLAGS +=|;' \
 		-e '/^LDFLAGS/ s|^LDFLAGS =|LDFLAGS +=|' \
 		config.mk || die "sed failed"
--- a/dev-R/Matrix/Matrix-1.3.4.ebuild
+++ b/dev-R/Matrix/Matrix-1.3.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7

 MYPV="$(ver_rs 2 -)"

-inherit R-packages toolchain-funcs
+inherit R-packages

 DESCRIPTION='Sparse and Dense Matrix Classes and Methods'
 KEYWORDS="~amd64"
@@ -17,8 +17,3 @@ DEPEND="
 	virtual/lattice
 "
 RDEPEND="${DEPEND}"
-
-src_prepare() {
-	tc-export AR
-	R-packages_src_prepare
-}
--- a/dev-R/RInside/RInside-0.2.16.ebuild
+++ b/dev-R/RInside/RInside-0.2.16.ebuild
@@ -3,7 +3,7 @@

 EAPI=7

-inherit R-packages toolchain-funcs
+inherit R-packages

 DESCRIPTION='C++ Classes to Embed R in C++ (and C) Applications'
 KEYWORDS="~amd64"
@@ -18,7 +18,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"

-src_prepare() {
-	tc-export AR
-	R-packages_src_prepare
+src_install() {
+	R-packages_src_install
+	find "${D}" -name "*.a" -delete || die
 }
--- a/dev-R/commonmark/commonmark-1.7.ebuild
+++ b/dev-R/commonmark/commonmark-1.7.ebuild
@@ -3,15 +3,10 @@

 EAPI=7

-inherit R-packages toolchain-funcs
+inherit R-packages

 DESCRIPTION='High Performance CommonMark and github markdown rendering in R'
 KEYWORDS="~amd64"
 LICENSE='BSD-2'

 RDEPEND="${DEPEND}"
-
-src_prepare() {
-	tc-export AR
-	R-packages_src_prepare
-}
--- a/dev-R/hunspell/hunspell-3.0.1.ebuild
+++ b/dev-R/hunspell/hunspell-3.0.1.ebuild
@@ -3,7 +3,7 @@

 EAPI=7

-inherit R-packages toolchain-funcs
+inherit R-packages

 DESCRIPTION='High-Performance Stemmer, Tokenizer and Spell Checker'
 KEYWORDS="~amd64"
@@ -20,7 +20,3 @@ RDEPEND="
 "

 #bundling status: https://github.com/ropensci/hunspell/issues/34
-src_prepare() {
-	tc-export AR
-	R-packages_src_prepare
-}
--- a/dev-R/jsonlite/jsonlite-1.7.2.ebuild
+++ b/dev-R/jsonlite/jsonlite-1.7.2.ebuild
@@ -3,14 +3,10 @@

 EAPI=7

-inherit R-packages toolchain-funcs
+inherit R-packages

 DESCRIPTION='A Simple and Robust JSON Parser and generator for R'
 KEYWORDS="~amd64"
 LICENSE='MIT'

 #unbundling status: https://github.com/jeroen/jsonlite/issues/201
-src_prepare() {
-	tc-export AR
-	R-packages_src_prepare
-}
--- a/dev-R/utf8/utf8-1.2.2.ebuild
+++ b/dev-R/utf8/utf8-1.2.2.ebuild
@@ -3,7 +3,7 @@

 EAPI="7"

-inherit R-packages toolchain-funcs
+inherit R-packages

 HOMEPAGE="
 	https://github.com/patperry/r-utf8
@@ -14,8 +14,3 @@ LICENSE='Apache-2.0'
 KEYWORDS="~amd64"
 DEPEND=">=dev-lang/R-2.1.0"
 RDEPEND="${DEPEND}"
-
-src_prepare() {
-	tc-export AR
-	R-packages_src_prepare
-}
--- a/dev-lang/fbc-bootstrap/Manifest
+++ b/dev-lang/fbc-bootstrap/Manifest
@@ -1 +1,2 @@
 DIST FreeBASIC-1.07.3-source-bootstrap.tar.xz 10702984 BLAKE2B dbf68351c54d9a1ec6f5952e7867bc370fdc36db406c9a76d18f9e85757c26f3c954d91ce56593af9ceacf1e24e8038ba7cfeaa66a988923fd5d57d5f160584d SHA512 59a06e633b2bf5054d2b5f7a9da7e539a51657a20d50ac2e055255dab30acc87e03596a53613e1d7f1ac74798d4919b5d7aa32b20a229c7725ebc1e53460b70e
+DIST FreeBASIC-1.08.1-source-bootstrap.tar.xz 12234408 BLAKE2B 5e10e784843253b15b22103d653a16cbabddd143d5b51990c87d4f1082c4ebed9a704bb50d065103bf3381377850cfa561a7dbbd99d11163b507cfc94c2827c7 SHA512 603ef6389ef6a90894dcca7bb31876dae8d1f4014da2b92f6a89cb23665e36130fdd98ffeed6c2e9fa90e549c2fc54450fa55932d22b6eead453b4aa6d4785c2
--- a/dev-lang/fbc-bootstrap/fbc-bootstrap-1.08.1.ebuild
+++ b/dev-lang/fbc-bootstrap/fbc-bootstrap-1.08.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Bootstrap package for dev-lang/fbc"
+HOMEPAGE="https://www.freebasic.net"
+SRC_URI="https://github.com/freebasic/fbc/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz"
+
+LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=( "${FILESDIR}"/fbc-1.08.1-Pass-ltinfo-to-linker.patch )
+
+S="${WORKDIR}/FreeBASIC-${PV}-source-bootstrap"
+
+src_compile() {
+	emake bootstrap-minimal \
+		AR=$(tc-getAR) AS=$(tc-getAS) CC=$(tc-getCC) CFLAGS="${CFLAGS}" V=1
+}
+
+src_install() {
+	newbin bin/fbc fbc-bootstrap
+	emake DESTDIR="${D}" prefix="/usr/share/freebasic-bootstrap" TARGET=${CHOST} install-includes
+	emake DESTDIR="${D}" prefix="/usr/share/freebasic-bootstrap" TARGET=${CHOST} install-rtlib
+}
--- a/dev-lang/fbc-bootstrap/files/fbc-1.08.1-Pass-ltinfo-to-linker.patch
+++ b/dev-lang/fbc-bootstrap/files/fbc-1.08.1-Pass-ltinfo-to-linker.patch
@@ -0,0 +1,25 @@
+From 5e209af787bf74327c0dcba1d75d6a5477dfb0cb Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Wed, 8 Sep 2021 11:27:39 +0900
+Subject: [PATCH] Pass -ltinfo to linker
+
+---
+ makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/makefile b/makefile
+index 04c5c3976..364dc9a0d 100644
+--- a/makefile
+++ b/makefile
+@@ -1368,7 +1368,7 @@ endif
+ # Use gcc to link fbc from the bootstrap .o's
+ # (assuming the rtlib was built already)
+ ifneq ($(filter darwin freebsd dragonfly linux netbsd openbsd solaris,$(TARGET_OS)),)
+-  BOOTSTRAP_LIBS := -lncurses -lm -pthread
+  BOOTSTRAP_LIBS := -ltinfo -lncurses -lm -pthread
+ endif
+ $(BOOTSTRAP_FBC): rtlib $(BOOTSTRAP_OBJ)
+ 	$(QUIET_LINK)$(CC) -o $@ $(libdir)/fbrt0.o bootstrap/$(FBTARGET)/*.o $(libdir)/libfb.a $(BOOTSTRAP_LIBS)
+-- 
+2.33.0
+
--- a/dev-lang/fbc/Manifest
+++ b/dev-lang/fbc/Manifest
@@ -1 +1,2 @@
 DIST fbc-1.07.3.tar.gz 9035460 BLAKE2B c0356c36ebd455954993ce5d4a983d06c33abc5bf0a059a44832d441514643c7d08e40268a7b3b9a0cba21368058199be395cc28dd7f87df23d576f78aece276 SHA512 6040248c433db3191678209401ff4a643c500d967d67352f1aeca347648056b0a2cdef25bbb7532fec0351a13984c72e80cb7b00faf3ead6c219422955d148fb
+DIST fbc-1.08.1.tar.gz 9395903 BLAKE2B 303def97f5e1c77f4941c6d08ed251b296dbc97f7e549f863feddd2775cf390962cda42e1751c647c560299f02ea60d29b312301faa78fbd6bba6ae8ab75f220 SHA512 1c56f4e1a56e0cfc309e5748e83a2ee98fe97a509e6fd3a7f51b1805a4cc40fefc3884b4434a62404c05001c84fdfa8b4e3debbfdb188ab42652a7a4020baea6
--- a/dev-lang/fbc/fbc-1.08.1.ebuild
+++ b/dev-lang/fbc/fbc-1.08.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A free/open source, multi-platform BASIC compiler."
+HOMEPAGE="https://www.freebasic.net"
+SRC_URI="https://github.com/freebasic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gpm libffi opengl X"
+
+DEPEND="
+	sys-libs/ncurses:=
+	gpm? ( sys-libs/gpm )
+	libffi? ( dev-libs/libffi )
+	opengl? ( virtual/opengl )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		x11-libs/libXrandr
+		x11-libs/libXrender
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="|| (
+		dev-lang/fbc
+		dev-lang/fbc-bootstrap )"
+
+DOCS="${S}/doc/fbc.1"
+
+src_compile() {
+	local xcflags=(
+		$(usex gpm "" "-DDISABLE_GPM")
+		$(usex libffi "" " -DDISABLE_FFI")
+		$(usex opengl "" " -DDISABLE_OPENGL")
+		$(usex X "" " -DDISABLE_X11")
+	)
+
+	local fbc="fbc"
+	local fbcflags=""
+	# fbc requires a space after the -Wl option
+	local fblflags="${LDFLAGS//-Wl,/-Wl }"
+
+	if has_version -b dev-lang/fbc-bootstrap; then
+		fbc="fbc-bootstrap"
+		fbcflags="-prefix ${EPREFIX}/usr/share/freebasic-bootstrap"
+		fblflags+=" -prefix ${EPREFIX}/usr/share/freebasic-bootstrap"
+	fi
+
+	# Build fbc
+	emake CFLAGS="${CFLAGS} ${xcflags[*]} -I/usr/$(get_libdir)/libffi/include" FBC="${fbc}" FBCFLAGS="${fbcflags}" FBLFLAGS="${fblflags}" TARGET="${CHOST}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="/usr" TARGET="${CHOST}" install
+	einstalldocs
+}
--- a/dev-python/md-environ/md-environ-0.1.0.ebuild
+++ b/dev-python/md-environ/md-environ-0.1.0.ebuild
@@ -16,3 +16,9 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"

 RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	# Fix QA Notice: setuptools warning
+	sed -i "s/description-file/description_file/" setup.cfg || die
+	eapply_user
+}
--- a/dev-python/os-api-ref/os-api-ref-2.2.0.ebuild
+++ b/dev-python/os-api-ref/os-api-ref-2.2.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 BDEPEND="
 	${RDEPEND}
 	test? (
-		>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-testing-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
--- a/dev-python/python-telegram-bot/python-telegram-bot-13.1.ebuild
+++ b/dev-python/python-telegram-bot/python-telegram-bot-13.1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 DEPEND="test? (
 	dev-python/APScheduler[${PYTHON_USEDEP}]
 	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/flaky[${PYTHON_USEDEP}]
 	dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
--- a/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild
+++ b/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 DEPEND="test? (
 	dev-python/APScheduler[${PYTHON_USEDEP}]
 	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/flaky[${PYTHON_USEDEP}]
 	dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
--- a/dev-python/sanic/sanic-21.3.4.ebuild
+++ b/dev-python/sanic/sanic-21.3.4.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		>=dev-python/httpcore-0.3.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-5.2.1[${PYTHON_USEDEP}]
 		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
--- a/dev-python/sanic/sanic-21.6.0.ebuild
+++ b/dev-python/sanic/sanic-21.6.0.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		>=dev-python/httpcore-0.3.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-5.2.1[${PYTHON_USEDEP}]
 		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
--- a/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.20.ebuild
+++ b/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.20.ebuild
@@ -26,6 +26,11 @@ RDEPEND="
 	x11-libs/gtk+:3
 "

+QA_FLAGS_IGNORED="
+	/opt/eclipse-parallel-bin/eclipse
+	/opt/eclipse-parallel-bin/plugins/org.eclipse.equinox.launcher.gtk.linux.*/eclipse_*.so
+"
+
 src_install() {
 	insinto "/opt/${PN}"
 	doins -r "${S}/."
--- a/dev-util/rust-analyzer-bin/Manifest
+++ b/dev-util/rust-analyzer-bin/Manifest
@@ -1,2 +1,2 @@
-DIST rust-analyzer-bin-2021.08.09.gz 11688726 BLAKE2B 1002048d93fdc357a28ab287fdb862442433f764c9f11249a4caf587bf968de1a9a4bdc44f1ce2c1a2e2833c223ed8ec0070f50f6421d06db206f477f3ca5971 SHA512 2129ef0839647b509a7d048ac2781d830dc7d83311e0b46ef5caf60fe306d22dcdfe584bcc7e3e53edd6dc2b1c0d2ab04741c607f2a7ac29a13b3f9a859b6ba0
 DIST rust-analyzer-bin-2021.08.30.gz 10987412 BLAKE2B 0bf2a487028375d5c851f0f5980cd6867140ae502739686045f1080729d6c79bbb7a44c0b9c6ae367fac0ac4250b8b032e20f22b118dd3259ad8b04c8564dd9b SHA512 f060c37d4abe2b8a485a77590e6b65eafac1917b58589dba61b2e35cd1d155d69c141b22e2152a530b0b92adb1b03a471489032f65833f3cbd1d6181539b4807
+DIST rust-analyzer-bin-2021.09.06.gz 11044387 BLAKE2B 1ff818280758837b55852775f9c0fb95a5b06beee68f4591bfe1cf86b61fcffa58322cfd017b13eb24fc9f6c6ade62b1dbdfc00a52894dce539c4604cbda9ae6 SHA512 a7d777981dab437ad4b0175f24c6ae309946a776f7828c8e31cba16853a7645cfaa9614143ec158645f5844bcdef8bb764f098a1b056334b2112fedba12c2995
--- a/dev-util/rust-analyzer-bin/rust-analyzer-bin-2021.09.06.ebuild
+++ b/dev-util/rust-analyzer-bin/rust-analyzer-bin-2021.09.06.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DESCRIPTION="An implementation of Language Server Protocol for the Rust programming language"
 HOMEPAGE="https://rust-analyzer.github.io"
-SRC_URI="https://github.com/rust-analyzer/rust-analyzer/releases/download/2021-08-09/rust-analyzer-x86_64-unknown-linux-gnu.gz -> ${P}.gz"
+SRC_URI="https://github.com/rust-analyzer/rust-analyzer/releases/download/2021-09-06/rust-analyzer-x86_64-unknown-linux-gnu.gz -> ${P}.gz"

 LICENSE="Apache-2.0 MIT-with-advertising"
 SLOT="0"
--- a/eclass/R-packages.eclass
+++ b/eclass/R-packages.eclass
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-inherit eutils
+inherit eutils toolchain-funcs

 EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install

@@ -34,7 +34,7 @@ R-packages_src_prepare() {


 R-packages_src_compile() {
-	MAKEFLAGS="CFLAGS=${CFLAGS// /\\ } CXXFLAGS=${CXXFLAGS// /\\ } FFLAGS=${FFLAGS// /\\ } FCFLAGS=${FCFLAGS// /\\ } LDFLAGS=${LDFLAGS// /\\ }" R CMD INSTALL . -l "${WORKDIR}" "--byte-compile" || die
+	MAKEFLAGS="AR=$(tc-getAR) CFLAGS=${CFLAGS// /\\ } CXXFLAGS=${CXXFLAGS// /\\ } FFLAGS=${FFLAGS// /\\ } FCFLAGS=${FCFLAGS// /\\ } LDFLAGS=${LDFLAGS// /\\ }" R CMD INSTALL . -l "${WORKDIR}" "--byte-compile" || die
 }

 R-packages_src_install() {
--- a/games-emulation/melonds/melonds-0.9.2.ebuild
+++ b/games-emulation/melonds/melonds-0.9.2.ebuild
@@ -31,10 +31,11 @@ DEPEND="
 	app-arch/libarchive
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	media-libs/libsdl2[sound,video]
-	net-libs/libslirp
 	net-libs/libpcap
+	net-libs/libslirp
 	opengl? ( media-libs/libepoxy )
 "
 RDEPEND="${DEPEND}"
--- a/games-emulation/melonds/melonds-0.9.3.ebuild
+++ b/games-emulation/melonds/melonds-0.9.3.ebuild
@@ -34,10 +34,11 @@ DEPEND="
 	app-arch/libarchive
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	media-libs/libsdl2[sound,video]
-	net-libs/libslirp
 	net-libs/libpcap
+	net-libs/libslirp
 	opengl? ( media-libs/libepoxy )
 "
 RDEPEND="${DEPEND}"
--- a/games-emulation/melonds/melonds-9999.ebuild
+++ b/games-emulation/melonds/melonds-9999.ebuild
@@ -34,10 +34,11 @@ DEPEND="
 	app-arch/libarchive
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	media-libs/libsdl2[sound,video]
-	net-libs/libslirp
 	net-libs/libpcap
+	net-libs/libslirp
 	opengl? ( media-libs/libepoxy )
 "
 RDEPEND="${DEPEND}"
--- a/games-misc/cbonsai/cbonsai-1.3.1-r1.ebuild
+++ b/games-misc/cbonsai/cbonsai-1.3.1-r1.ebuild
@@ -12,6 +12,8 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"

+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/scdoc
 	virtual/pkgconfig
@@ -26,4 +28,5 @@ src_compile() {

 src_install() {
 	PREFIX="${EPREFIX}/usr" DESTDIR="${D}" emake install
+	dodoc README.md
 }
--- a/media-gfx/fontbakery/fontbakery-0.7.38.ebuild
+++ b/media-gfx/fontbakery/fontbakery-0.7.38.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64"

 RDEPEND="
-	>=dev-python/beautifulsoup-4.9.3[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup4-4.9.3[${PYTHON_USEDEP}]
 	>=dev-python/beziers-0.3.1[${PYTHON_USEDEP}]
 	>=dev-python/cmarkgfm-0.5.3[${PYTHON_USEDEP}]
 	>=dev-python/collidoscope-0.0.6[${PYTHON_USEDEP}]
--- a/net-misc/tuir/tuir-1.29.0.ebuild
+++ b/net-misc/tuir/tuir-1.29.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"

 RDEPEND="
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/decorator[${PYTHON_USEDEP}]
 	dev-python/kitchen[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
--- a/sci-libs/dart/dart-6.10.1-r2.ebuild
+++ b/sci-libs/dart/dart-6.10.1-r2.ebuild
@@ -14,10 +14,12 @@ SRC_URI="https://github.com/dartsim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="bullet doc examples extras glut +ipopt +nlopt ode openscenegraph python test tutorials urdfdom"
+IUSE="bullet doc examples extras glut +ipopt +nlopt ode openscenegraph python test tests tutorials urdfdom"
 #TODO: pagmo
+#TODO: unbundle imgui
 RESTRICT="!test? ( test )"

+PATCHES=( "${FILESDIR}/${PN}-respect-ldflags.patch" )
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )

@@ -28,7 +30,6 @@ RDEPEND="
 	app-arch/lz4
 	>=dev-cpp/eigen-3.0.5
 	dev-libs/boost
-	dev-libs/tinyxml
 	dev-libs/tinyxml2
 	>=sci-libs/libccd-2.0
 	>=media-libs/assimp-3.0.0
@@ -76,10 +77,10 @@ src_configure() {

 src_compile() {
 	cmake_src_compile
-	use examples && cmake_src_compile examples
-#	use python && cmake_src_compile dartpy
-#	use test && cmake_src_compile tests
-#	use tutorials && cmake_src_compile tutorials
+	use examples && cmake_build examples
+	use python && cmake_build dartpy # no work to do ...
+	use test && cmake_build tests
+	use tutorials && cmake_build tutorials
 }

 src_install() {
--- a/sci-libs/dart/files/dart-respect-ldflags.patch
+++ b/sci-libs/dart/files/dart-respect-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -220,7 +220,7 @@
+   endif()
+   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_DEBUG}")
+   set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_DEBUG} -pg")
+-  set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
+ 
+   # Enforce to colorize compilation output
+   if(${DART_FORCE_COLORED_OUTPUT})
--- a/sci-libs/dart/metadata.xml
+++ b/sci-libs/dart/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="nlopt">NLopt Optimization Support</flag>
 		<flag name="ode">ODE Collision Detector Support</flag>
 		<flag name="openscenegraph">OpenSceneGraph GUI and examples</flag>
+		<flag name="tests">Build the tests</flag>
 		<flag name="tutorials">Build the tutorials</flag>
 		<flag name="urdfdom">URDF parser</flag>
 	</use>
--- a/sci-libs/meschach/Manifest
+++ b/sci-libs/meschach/Manifest
@@ -1,2 +1,3 @@
+DIST meschach-1.2b_p20170511.tar.gz 577104 BLAKE2B 83b47828c814d4a7f4957f02448babb0961383f61f329431ef74a8ec2800c196d5cb0e1363a258b06f18adccaf39d859e640f01bf7f98b5b0ac634adc5f58beb SHA512 054c9380ff2df4c8c3bda0eb20df2a9da8fe357fd939116a257bb2831d04893aad29999df0d2bd9434173a1246ec18a73779abdadc477f9c2dd9d027446393d1
 DIST meschach_1.2b-14.debian.tar.xz 40664 BLAKE2B 753cdcdf8ecd63be14a294a6607380462df8a74c1cc84fafcfe4140cb10eaeb590dbe12883e2a973691a920b1e7f4efdf884781b49ea947b1132ff213f4a2652 SHA512 9793127a1785fb757b61132db1c471a2ff7949c383870f10d0b24ea2e1dafcb9d9379b61698179f91fdba4405e18e1692efcc26b759b1a5d9519e8c46206636b
 DIST meschach_1.2b.orig.tar.gz 220166 BLAKE2B fe38d9887977f45cc54857fe9c33f1eb50d1192ce3cae643127962cfce7657d9890964aabd3690751648a3a850fbbb39c6fb2110f8b4fcd789c7b8efefcec2c5 SHA512 0b8748915739b624aa44b0bf6f2c59aaf3d09f69f9455220e4baeb423c094a89cc25c03d6ced0d58bfd7c5d6626f3995fc853119ab0f7d6af151d8479c326068
--- a/sci-libs/meschach/meschach-1.2b_p20170511.ebuild
+++ b/sci-libs/meschach/meschach-1.2b_p20170511.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake
+
+COMMIT="201bcf933bcd4d971c3ab50e0651c6e65ba004b9"
+MAJOR="$(ver_cut 1)"
+VERSION="$(ver_cut 1-2)"
+
+DESCRIPTION="Meschach is a C-language library of routines for performing matrix computations"
+HOMEPAGE="
+	https://github.com/yageek/Meschach
+	http://homepage.divms.uiowa.edu/~dstewart/meschach
+"
+S="${WORKDIR}/${PN^}-${COMMIT}"
+
+SRC_URI="https://github.com/yageek/Meschach/archive/${COMMIT}.tar.gz -> ${PF}.tar.gz"
+LICENSE="meschach"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+complex +double munroll old segmem +float +sparse unroll"
+
+#PATCHES=(
+#	"${FILESDIR}/.patch"
+#)
+
+src_configure() {
+	mycmakeargs=(
+		-DANDROID_COMPILE=OFF
+		-DCOMPLEX_OPTION=$(usex complex)
+		-DREAL_DBL_OPTION=$(usex double)
+		-DREAL_FLT_OPTION=$(usex float)
+		-DMUNROLL_OPTION=$(usex munroll)
+		-DSEGMENTED_OPTION=$(usex segmem)
+		-DSPARSE_OPTION=$(usex sparse)
+		-DVUNROLL_OPTION=$(usex unroll)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" || die
+	ln -s "lib${PN}.so" "lib${PN}.so.${MAJOR}" || die
+	ln -s "lib${PN}.so.${MAJOR}" "lib${PN}.so.${VERSION}" || die
+	dolib.so "lib${PN}.so"
+	dolib.so "lib${PN}.so.${MAJOR}"
+	dolib.so "lib${PN}.so.${VERSION}"
+
+#	exeinto "/usr/libexec/${PN}"
+#	doexe iotort
+#	doexe itertort
+#	doexe memtort
+#	doexe mfuntort
+#	doexe sptort
+#	doexe torture
+#	doexe ztorture
+	popd || die
+
+	insinto "/usr/include/${PN}"
+	doins *.h
+
+	insinto "/usr/share/${PN}"
+	doins *.dat
+
+	dodoc -r DOC/.
+	dodoc README.md
+}
--- a/sci-mathematics/chaco/chaco-2.2-r2.ebuild
+++ b/sci-mathematics/chaco/chaco-2.2-r2.ebuild
@@ -27,10 +27,12 @@ src_compile() {

 src_install() {
 	dodoc -r doc/.
-	dodoc -r "code/matlab"
+	insinto "/usr/share/octave/packages/${PN}"
+	doins -r code/matlab/*
 	cd "exec" || die
 	dobin "chaco"
 	dolib.so "libchaco.so"
-	dodoc *.coords *.graph "User_Params"
+	insinto "/usr/share/${PN}"
+	doins *.coords *.graph "User_Params"
 	newdoc README README_exec
 }
--- a/sys-cluster/nanos6/metadata.xml
+++ b/sys-cluster/nanos6/metadata.xml
@@ -10,12 +10,12 @@
 		<remote-id type="github">bsc-pm/nanos6</remote-id>
 	</upstream>
 	<use>
+		<flag name="ctf2prv">Build ctf2prv fast converter</flag>
 		<!--<flag name="cuda">enable CUDA</flag>-->
 		<flag name="debug">enable extra assertions and checks in debug - may cause significant slowdown</flag>
 		<flag name="dlb">enable dynamic management and sharing of computing resources</flag>
 		<flag name="execution-workflow">Enable execution using the Execution Workflow</flag>
 		<flag name="extrae">to generate execution traces for offline performance analysis with paraver</flag>
-		<!--<flag name="jemalloc">use jemalloc as the default memory allocator, providing better performance than the default glibc implementation</flag>-->
 		<flag name="memkind">Add support for <pkg>dev-libs/memkind</pkg> in memory allocator</flag>
 		<flag name="mercurium">Enable <pkg>sys-cluster/mcxx</pkg> support</flag>
 		<flag name="papi">enable <pkg>dev-libs/papi</pkg> support</flag>
--- a/sys-cluster/nanos6/nanos6-2.6-r4.ebuild
+++ b/sys-cluster/nanos6/nanos6-2.6-r4.ebuild
@@ -13,9 +13,9 @@ S="${WORKDIR}/${PN}-version-${PV}"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug dlb execution-workflow extrae memkind mercurium papi pqos test unwind"
-#jemalloc require custom stuff
-#TODO: cuda babeltrace2
+IUSE="ctf2prv debug dlb execution-workflow extrae memkind mercurium papi pqos test unwind"
+#jemalloc require custom jemalloc
+#TODO: cuda
 #TODO: llvm-libunwind

 RDEPEND="
@@ -24,6 +24,7 @@ RDEPEND="
 	sys-process/numactl
 	virtual/libelf

+	ctf2prv? ( dev-util/babeltrace2 )
 	dlb? ( sys-cluster/dlb )
 	extrae? ( sys-cluster/extrae[nanos] )
 	memkind? ( dev-libs/memkind )
@@ -32,13 +33,11 @@ RDEPEND="
 	pqos? ( sys-apps/intel-cmt-cat )
 	unwind? ( sys-libs/libunwind )
 "
-#	jemalloc? ( dev-libs/jemalloc )
 DEPEND="${RDEPEND}"

 PATCHES=( "${FILESDIR}/${P}-include-string.patch" )
-# https://github.com/bsc-pm/nanos6/issues/3
-RESTRICT="test"
-#RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( !mercurium )" # https://github.com/bsc-pm/nanos6/issues/3

 src_prepare() {
 	default
@@ -55,7 +54,6 @@ src_configure() {

 		--with-boost="${EPREFIX}/usr"
 		--with-libnuma="${EPREFIX}/usr"
-		--with-pic

 		--without-git
 		--without-k1om
@@ -64,15 +62,16 @@ src_configure() {

 		$(use_enable debug extra-debug)
 	)
+
 	use dlb && myconf+=( "--with-dlb=${EPREFIX}/usr" )
 	use memkind && myconf+=( "--with-memkind=${EPREFIX}/usr" )
 	use pqos && myconf+=( "--with-pqos=${EPREFIX}/usr" )

-#	if use babeltrace; then
-#		myconf+=( "--with-babeltrace2=${EPREFIX}/usr" )
-#	else
-#		myconf+=( "--without-babeltrace2" )
-#	fi
+	if use ctf2prv; then
+		myconf+=( "--with-babeltrace2=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-babeltrace2" )
+	fi
 	if use extrae; then
 		myconf+=( "--with-extrae=${EPREFIX}/usr" )
 	else
--- a/sys-cluster/wxparaver/wxparaver-4.9.0-r1.ebuild
+++ b/sys-cluster/wxparaver/wxparaver-4.9.0-r1.ebuild
@@ -27,6 +27,7 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-libs/openssl
 	sys-cluster/paraver-kernel
+	x11-libs/wxGTK:${WX_GTK_VER}

 	extrae? ( sys-cluster/extrae )
 "
--- a/sys-fs/gfs2-utils/Manifest
+++ b/sys-fs/gfs2-utils/Manifest
@@ -1,2 +1,3 @@
 DIST gfs2-utils-3.2.0.tar.xz 279696 BLAKE2B bc8691396d820be09fbeeb590727d51fdcbfb739029a10bcbca501eb12fb4e1853d8dd9c70a0cb04fc1bad1c88be7520809b2bffa1d454f8d07923f6993629ed SHA512 77b5448d46a27ee77b14fe5437b7932233a25f1d189b407a440657591e44c1d0d77b6253003b8b92d7fc4e363fa6eab97e01f5ca8de2529d5c60a94917e9ef18
 DIST gfs2-utils-3.3.0.tar.gz 370498 BLAKE2B 00835f4d162bebe64d11f5007b6408c7de4320d74ac29c4a1057e86d99a8ee236a70aa8cd25ca37872dbce1d72499c7b846fb3780752aad00aa4f61c20a51712 SHA512 f944d8ce69f2ae49a678d5c3d45ff5be19ce8836c7559528aff088c4e660c54b636f4ed37f8e5016325a196f1e0ed201d9e0e71134766fed866095aac66337a2
+DIST gfs2-utils-3.4.1.tar.gz 374633 BLAKE2B cbb46a150935950d817f28ce750a654b54a0e6c0bfe8fc6a08d812d51860c6b8c6833215b35af6cb7ae51a0e5eba7e3deab5520bbe3ee6de5dde414dd0a480a4 SHA512 f8d3412a383d2d0e8435196c95a5361a3b9e5ab581549e6d434f5a33791d666c80700ee93f53e1d31aa3c304b84b6d72596b0a77e0aa54b2d88ec988ffa3cf88
--- a/sys-process/iotop-c/Manifest
+++ b/sys-process/iotop-c/Manifest
@@ -1 +0,0 @@
-DIST iotop-c-1.17.tar.gz 40456 BLAKE2B 6698d6a71b945b15cca0244611995a0c2de932613f0e0fe4dcb3e10a6ad495fd56318d16c9d3ae9a896e9d735ead748f13bd085ca152fccc370be2755383bc5a SHA512 80a9eee8998aa68b81f1c40067e5da5ae703b0e4f29f41a9e9a8cb9eb40eecfb2bedfc952519b7a22d62e1c273a15d1b36e25e693142af99a45876bfb3e16eaf
--- a/sys-process/iotop-c/iotop-c-1.17-r1.ebuild
+++ b/sys-process/iotop-c/iotop-c-1.17-r1.ebuild
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps linux-info toolchain-funcs
-
-DESCRIPTION="top utility for IO (C port)"
-HOMEPAGE="https://github.com/Tomas-M/iotop"
-SRC_URI="https://github.com/Tomas-M/iotop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/iotop-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-libs/ncurses:=
-	!sys-process/iotop"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS"
-
-FILECAPS=(
-	cap_net_admin=eip usr/bin/iotop
-)
-
-src_compile() {
-	emake V=1 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" NO_FLTO=1
-}
-
-src_install() {
-	dobin iotop
-	dodoc README.md
-	doman iotop.8
-}
--- a/sys-process/iotop-c/metadata.xml
+++ b/sys-process/iotop-c/metadata.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>arthurzam+gentoo@gmail.com</email>
-		<name>Arthur Zamarin</name>
-	</maintainer>
-	<longdescription lang="en">
-Your Linux server is too slow or load is too high? One of the possible causes of such symptoms may be high IO (input/output) waiting time, which basically means that some of your processes need to read or write to a hard drive while it is too slow and not ready yet, serving data for some other processes.
-
-Common practice is to use iostat -x in order to find out which block device (hard drive) is slow, but such information is not always much helpful. It could help you much more if you knew which process reads or writes the most data from your slow disk, so you could possibly renice it using ionice or even kill it.
-
-IOTop will identify processes, which use high amount of input/output requests on your machine. It is similar to the well known top utility, but instead of showing you what consumes CPU the most, it lists processes by their IO consumption. Inspired by iotop python script from Guillaume Chazarain, but rewritten to C by Vyacheslav Trushkin so it now runs without python at all.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">Tomas-M/iotop</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/www-apps/twint/twint-2.1.20-r1.ebuild
+++ b/www-apps/twint/twint-2.1.20-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/aiohttp[${PYTHON_USEDEP}]
 	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
 	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/cchardet[${PYTHON_USEDEP}]
 	dev-python/elasticsearch-py[${PYTHON_USEDEP}]
 	dev-python/fake-useragent[${PYTHON_USEDEP}]
--- a/www-client/badwolf/badwolf-9999.ebuild
+++ b/www-client/badwolf/badwolf-9999.ebuild
@@ -33,24 +33,18 @@ RDEPEND="${DEPEND}"

 src_configure() {
 	[[ "${PV}" == "9999" ]] || restore_config config.h
-	default
-}

-src_compile() {
-	emake \
-		CC="${CC:-cc}" \
-		CFLAGS="${CFLAGS:--02 -Wall -Wextra}" \
-		LDFLAGS="${LDFLAGS}" \
-		PREFIX="/usr"
+	CC="${CC:-cc}" \
+	CFLAGS="${CFLAGS:--02 -Wall -Wextra}" \
+	LDFLAGS="${LDFLAGS}" \
+	DOCDIR="/usr/share/doc/${PF}" \
+	WITH_WEBKITGTK=4.0 \
+	PREFIX="/usr" \
+	./configure
 }

 src_install() {
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		PREFIX="/usr" \
-		install
+	default

 	[[ "${PV}" == "9999" ]] || save_config config.h
-	einstalldocs
 }
--- a/x11-wm/i3-rounded/i3-rounded-4.19.1.ebuild
+++ b/x11-wm/i3-rounded/i3-rounded-4.19.1.ebuild
@@ -7,7 +7,7 @@ inherit meson optfeature

 DESCRIPTION="i3-gaps fork with rounded corners support."
 HOMEPAGE="https://github.com/linobigatti/i3-rounded"
-SRC_URI="https://github.com/linobigatti/i3-rounded/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/linobigatti/i3-rounded/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
				`@@ -1 +0,0 @@`
				`DIST iotop-c-1.17.tar.gz 40456 BLAKE2B 6698d6a71b945b15cca0244611995a0c2de932613f0e0fe4dcb3e10a6ad495fd56318d16c9d3ae9a896e9d735ead748f13bd085ca152fccc370be2755383bc5a SHA512 80a9eee8998aa68b81f1c40067e5da5ae703b0e4f29f41a9e9a8cb9eb40eecfb2bedfc952519b7a22d62e1c273a15d1b36e25e693142af99a45876bfb3e16eaf`