gentoo resync : 25.01.2020

13 files changed, 209 insertions, 139 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index dfddbeb56e11..4c045a4efbd3 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
index 21cb5e11e1c8..57b0a399a661 100644
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@@ -10,6 +10,7 @@ DIST fluentd-1.3.3.gem 438784 BLAKE2B 186aa4af59707c6a68a6f82b94b233e3f52eb11745
 DIST fluentd-1.4.0.gem 440832 BLAKE2B 8f25cc6ca4ceb164156fe3ff3a14a18109f0943587cc5cad49185ee442e3cf381fa6859e36c8df94241f8a9922102fd479e39b08c394c46d6edc7bcf58abecee SHA512 e817cc128a29e5c30c40e08985f84d3a8e713cdcfd0e05af7d08d3b7dd5cb6810b85c455a3c425bd84775cdc060e74530dd264bf5fe354b5038c3a2d779d42c6
 DIST fluentd-1.4.1.gem 442368 BLAKE2B fff0b5677a41637caa6ba3725797df7b1573c13ed9742cd125e89a5a8c1ac380c23d84c3f89e0c11ac109dc757c0bed93b8d79ce4c722a90d04c9a0bbd5d8887 SHA512 64bda77b818f2e35cf941b02119b08c9a52c03c8b94f7c2c5ab9c92e31010e296babe996cf400c41a3b34f92a16d577e81cbd6f204270b0a1d1370c6cfe83bfe
 DIST fluentd-1.4.2.gem 443392 BLAKE2B 0aadec57268c69d45f4cf0e36be59e957b283f33f3dd6ac9bac0294c084b0e7d0e8fc28b1f12c3f5548dbcf6c1e562ff4a2c7f52bf7b0126fdafef102ba9562c SHA512 e67226a1e1fc6debda93b8efef9f19efb8eab7e0951a63ed646f2d01259f08d972c276aff8bf704acb64a10705460c4d68ac527cce1999707611cef79b4ae5cc
+DIST fluentd-1.9.0.gem 500224 BLAKE2B c09fc4d40e931ef2dc669cac1358c3b15baf434b7920f9481644953986dd1c3d140c4f4f8b53dd46d5972207ca7b1cb355f7fc51830b1adbb275c82ea9a7b979 SHA512 145b14b77900b2c7e4b83923d0d06465c7c5fdbfcdf39d1ab0be31a91e9003da7086b02b5fe9b4367956d892aadd65ac3ee34cafdf4f746c630a306af245b69d
 EBUILD fluentd-1.2.6-r1.ebuild 1353 BLAKE2B da8e47f5f09abf639374137691b7329767e3bc0febbdb58299811456f168e9d6b3a8ab00758a2a1dd8654d0a60bb97b47842e249728d99ef1c9886a87759d7da SHA512 bc101637c4a80853b7b7403debb7d25069508020e75d1e3ca597f327e615bf60fe0793ebd8a437c3bc3734fe2556756589525959a40625fb979dc698ba3bc320
 EBUILD fluentd-1.3.1.ebuild 1324 BLAKE2B b790236e46c31cbd53337cdf38ce51d8184f1bcca6fd7b5722b39afa1b6218f0e94a79a551495c6355ec18ce600ff362c4741e27427c9608bf8ef4436c162395 SHA512 bdd1ee61c01eda0f9e38ecf3467461f3afb2bba08615680aaf8e7139e94af08e87f8c17bd98499ef55f93da2a6ad2a607bfd590f6e70d21e4b4b4ebb8154b7fb
 EBUILD fluentd-1.3.2.ebuild 1324 BLAKE2B b790236e46c31cbd53337cdf38ce51d8184f1bcca6fd7b5722b39afa1b6218f0e94a79a551495c6355ec18ce600ff362c4741e27427c9608bf8ef4436c162395 SHA512 bdd1ee61c01eda0f9e38ecf3467461f3afb2bba08615680aaf8e7139e94af08e87f8c17bd98499ef55f93da2a6ad2a607bfd590f6e70d21e4b4b4ebb8154b7fb
@@ -17,4 +18,5 @@ EBUILD fluentd-1.3.3.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b2066
 EBUILD fluentd-1.4.0.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b206610e9556354ea67c1c7e80767e71e0536679b2b88f9add97ba022904de131ee6790db4c2082a03da83bbc0a34f SHA512 163bab1c25d763e212d43ecf4c1d6e50c04100fd3ddc35907ac0f09870fa966e4ea60f2fec9b052ddcd8c24e77f110b14b601bd5aa6fcd04d94cb5cb500c9fac
 EBUILD fluentd-1.4.1.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b206610e9556354ea67c1c7e80767e71e0536679b2b88f9add97ba022904de131ee6790db4c2082a03da83bbc0a34f SHA512 163bab1c25d763e212d43ecf4c1d6e50c04100fd3ddc35907ac0f09870fa966e4ea60f2fec9b052ddcd8c24e77f110b14b601bd5aa6fcd04d94cb5cb500c9fac
 EBUILD fluentd-1.4.2.ebuild 1412 BLAKE2B d5cc7d2c2cfeb8726d6f61ee437f2017f8f4c67db49d0bd39aaa35374082b2c5336f3160838d542cbc4bcb82ef2244f1231eacafa438c1c791eb3741354bdeaf SHA512 4c8100bbda3e6c0b92c477c89d26d0f958b57a2285e8feb004d43f3f2b085befa5c845c43f96454ae9e08b5d98042b5f5dfc8a4ba0060b8c14f794dc95c960de
+EBUILD fluentd-1.9.0.ebuild 1413 BLAKE2B 0e864b68ce2be97d4db38a171c2887c2d836383176d1e89bb318852d5aa79449e74e47a85abd5724cb484f9aeb5b3d85ea92d1477bab5caecea3e53151e16730 SHA512 b99bd88db9564afccbad2c62fb167351365c40682e767a92b758227c9e65d677682da62159e704423cf080761c89823d69a373aafe375b2a68c69653b8d350c9
 MISC metadata.xml 557 BLAKE2B a4f765631fe109d217f577b3de01c7fe4901e7b7ad92d38e2844720188f3316e0c6f288065aa1b4e27e53d4b1f562d65839502d755081423b55e239119beccac SHA512 214770043d1c60e385a509faa12f4b7c04bbe0137b9dd9082c49fa6adea2e1a4555e38695bdb7b14cffe6a700430202e2ab711ddcfe413c6a7986584010f133f
diff --git a/app-admin/fluentd/fluentd-1.9.0.ebuild b/app-admin/fluentd/fluentd-1.9.0.ebuild
new file mode 100644
index 000000000000..501d09685987
--- /dev/null
+++ b/app-admin/fluentd/fluentd-1.9.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem user
+
+DESCRIPTION="data collector and unified logging layer (project under CNCF)"
+HOMEPAGE="https://www.fluentd.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "
+	>=dev-ruby/coolio-1.4.5
+	>=dev-ruby/http_parser_rb-0.5.1
+	>=dev-ruby/msgpack-1.3.1
+	>=dev-ruby/serverengine-2.0.4
+	>=dev-ruby/sigdump-0.2.2
+	>=dev-ruby/strptime-0.2.2
+	>=dev-ruby/tzinfo-1.0
+	>=dev-ruby/yajl-ruby-1.0"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tzinfo-data/d' \
+		-e '/dig_rb/d' \
+		"${PN}".gemspec || die "'sed failed"
+
+	# Avoid test dependency on unpackaged oj
+	rm -f test/test_event_time.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+	keepdir /var/log/fluentd
+	fowners fluentd:adm /var/log/fluentd
+	insinto /etc/fluent
+	doins fluent.conf
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "A default configuration file has been installed in"
+		elog "${EROOT}/etc/fluent/fluent.conf. You will need to edit"
+		elog "this file to match your configuration."
+	fi
+}
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index cb3405d960bb..2cfbab683258 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -61,5 +61,7 @@ DIST github.com-spf13-viper-v1.4.0.tar.gz 44183 BLAKE2B 4294bc3c5076f1305618f4ca
 DIST github.com-stretchr-objx-v0.2.0.tar.gz 79981 BLAKE2B 142269aa50602af8a00dd5f9acb0c85d3287c3d1fbfd953675c6023e597dad88462560ad02d3d20671fa1f3c89fdf66e46a94015e5c492287fb4973beb84d2c8 SHA512 d2b9b907c33b52e6ae5ef58280b3e8b2aa03bb7fe055275850cbe95ed4c62663867abe6ad7a5790ee10ecfab9c0cc7cbcefea1d3971454c02fb198c792402b36
 DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1a8c591c6439d1072c53299db1508495c02712b187623552196421321c5e64aedc0fba6acdbd68db53ddbc8e5d6a78fd783e6f7344783b1 SHA512 29dc8389f0efba9caeb2d2d5704878c93f3b00c21e6ad2712bac52bbc09c460d9028aecbfd5430f200a15fd0e8c8d0157e084b72463d82ceecc5459d93d4d896
 DIST kube-bench-0.2.2.tar.gz 262782 BLAKE2B f952bdb545fe220c34e6568c52b8450b66f251ec3b5d059ece92c4eec9d5505f1208366c2b7fbc351513e2bd51b93bb2ab05ddb6179cb0135c658c6f6da6b38c SHA512 7b3814a12b1c0299ebec58e8d41b8fceb61e395890d088fc942aacc72482b3458b874b7d67d5b41b57c378dfc3f7c695474461440bf767ac94dad935963a0962
+DIST kube-bench-0.2.3.tar.gz 264829 BLAKE2B 023c4ed3f4d38b8e571aae4f2f7fe25cd1768b0fc0441c1d0aea63359ebc671f19ce0c30663844c6eeb13464d18429a34b0021ceaacfb26389b6f47a1ac8e07b SHA512 df4681fc02a60947cfcee96f82b8962607432ca9a2d1ed430631a1311a107ade79fc17ce2e58ee6e75473473d22c5915825c3a65f3bf791e0c1dd01c0addea06
 EBUILD kube-bench-0.2.2.ebuild 3684 BLAKE2B aeca87cb41272d8edfe5004b5670e7a55d66a0741b961ee34b22208af63fb08bb68e84fb39ac963f2ab389eacf290b2bbc7d660ad248a598ebae5c051ef5cab5 SHA512 fef02a4817f6e8e937919e365d5dd75de2837187691cbc39a85bb8bd34c5563dfee7dde38e463fe043aad334ee7eb6613e737b52d8efc93af90e8faf6bc443bc
+EBUILD kube-bench-0.2.3.ebuild 3479 BLAKE2B b477c4063c623abb207aee5414b65a906d3b14fc8d57ea0c63a6c66b5eadecd4e84f25f6e3df06d75a92ae0df4dcc4b27ffbcbc3c925494a0e947765ebf0fd6c SHA512 85fa3ae54d5fb298a895735f83a48c2a9bc2a268f9e4132b59f2980c2353ca6baebefbcecad3a7360a6a28e1e326d1e8ee405992b984f4fc7612fb3de2ce609d
 MISC metadata.xml 336 BLAKE2B 277f263a32b6d7452d2b675e4434e56f44d4d68d2b502bb59d6c54ee29dae0e02af8c17c157850f1792c0d0268701aef7c669f171b1a9b4d629b297593d4d3e3 SHA512 5b0fdd5ea1e4da321fb30b752fadf565cdede02a8a001259569ce28294cde66dabbd42c73a3abe682b3cd223ccd28a31a269432f05acf015e3215a03f693b155
diff --git a/app-admin/kube-bench/kube-bench-0.2.3.ebuild b/app-admin/kube-bench/kube-bench-0.2.3.ebuild
new file mode 100644
index 000000000000..e2bf247ebc4e
--- /dev/null
+++ b/app-admin/kube-bench/kube-bench-0.2.3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/aquasecurity/kube-bench
+inherit go-module
+
+DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
+HOMEPAGE="https://github.com/aquasecurity/kube-bench"
+
+EGO_VENDOR=(
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/urlesc de5bf2ad4578"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/emicklei/go-restful v2.9.6"
+	"github.com/evanphx/json-patch v4.5.0"
+	"github.com/fatih/color v1.5.0"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/go-openapi/jsonpointer v0.19.2"
+	"github.com/go-openapi/jsonreference v0.19.2"
+	"github.com/go-openapi/spec v0.19.2"
+	"github.com/go-openapi/swag v0.19.2"
+	"github.com/gogo/protobuf v1.2.1"
+	"github.com/golang/glog 23def4e6c14b"
+	"github.com/golang/protobuf v1.3.1"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/googleapis/gnostic v0.3.0"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/imdario/mergo v0.3.5"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/jinzhu/gorm 5174cc5c242a"
+	"github.com/jinzhu/inflection 1c35d901db3d"
+	"github.com/json-iterator/go v1.1.6"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/lib/pq 83612a56d3dd"
+	"github.com/magiconair/properties v1.8.0"
+	"github.com/mailru/easyjson da37f6c1e481"
+	"github.com/mattn/go-colorable 5411d3eea597"
+	"github.com/mattn/go-isatty 57fdcb988a5c"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/modern-go/concurrent bacd9c7ef1dd"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/onsi/ginkgo v1.10.1"
+	"github.com/pelletier/go-toml v1.2.0"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/sirupsen/logrus v1.4.1"
+	"github.com/spf13/afero v1.2.2"
+	"github.com/spf13/cast v1.3.0"
+	"github.com/spf13/cobra v0.0.3"
+	"github.com/spf13/jwalterweatherman v1.0.0"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/viper v1.4.0"
+	"github.com/stretchr/objx v0.2.0"
+	"github.com/stretchr/testify v1.3.0"
+	"golang.org/x/crypto 5c40567a22f8 github.com/golang/crypto"
+	"golang.org/x/net 3b0461eec859 github.com/golang/net"
+	"golang.org/x/oauth2 9f3314589c9a github.com/golang/oauth2"
+	"golang.org/x/sys d432491b9138 github.com/golang/sys"
+	"golang.org/x/text v0.3.2 github.com/golang/text"
+	"golang.org/x/time 9d24e82272b4 github.com/golang/time"
+	"google.golang.org/appengine v1.5.0 github.com/golang/appengine"
+	"gopkg.in/inf.v0 v0.9.1 github.com/go-inf/inf"
+	"gopkg.in/yaml.v2 v2.2.4 github.com/go-yaml/yaml"
+	"k8s.io/api 6e4e0e4f393b github.com/kubernetes/api"
+	"k8s.io/apimachinery 6a84e37a896d github.com/kubernetes/apimachinery"
+	"k8s.io/client-go v11.0.0 github.com/kubernetes/client-go"
+	"k8s.io/klog v0.3.3 github.com/kubernetes/klog"
+	"k8s.io/kube-openapi db7b694dc208 github.com/kubernetes/kube-openapi"
+	"k8s.io/utils 6ca3b61696b6 github.com/kubernetes/utils"
+	"sigs.k8s.io/kind v0.5.1 github.com/kubernetes-sigs/kind"
+	"sigs.k8s.io/kustomize/v3 4b67a6de1296 github.com/kubernetes-sigs/kustomize"
+	"sigs.k8s.io/yaml v1.1.0 github.com/kubernetes-sigs/yaml"
+)
+
+SRC_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
+$(go-module_vendor_uris)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT+=" test"
+
+src_compile() {
+	go build -ldflags "-X ${EGO_PN}/cmd.KubeBenchVersion=${PV}" -o ${PN} . || die
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /etc/kube-bench
+	doins -r cfg
+}
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 146a6f66bff9..2d10011f6ed8 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,11 +1,5 @@
 DIST r10k-3.2.0.gem 206336 BLAKE2B badc840ec7e6793daf205f1352899fa909e9a922a353a52841809dc80fd03758a865e0cb8210e58bb5c25968207d537b3f19c1903fbb519c50b6af2dd27eb5fb SHA512 7ea00ec28ba631877d33fa8b00b25e1c69346b787499ec7b26118c16acecf6bd39fcdc4618af016ebf5b62850b6d984510f7e9153dd4e99771def299b7d0703d
-DIST r10k-3.3.0.gem 206848 BLAKE2B 92fedb9871c6e22df3a3f8c4cf18feac1bf3ef51e2e67b3001c811bc81397eda71bc9da94ef860d6e39b989fd1c1a3b9dae402142496f17c4427ff2de62188fd SHA512 674c5c386885dd1476264d8bc047ddad0411b6344350662021ede8a5352e95fd50a72f62127b00bf6b2bc8e6b3835b017128788707610d510a64eee13b9f4d4f
-DIST r10k-3.3.1.gem 208384 BLAKE2B 81e7de3d2fabd038240478ab7ace4fba181a4370544f964b438a6b96de34a741f653aff018ece21453b119ae6b12f06934cc82be8a6b78cd5a72277195a5fe81 SHA512 20f9c92fbabed82521d452f339d9d2fd8cc438cac1cc11385a6e2874a5d55fe6425ddfcd281d8e63ee043adec5fbbfba0c37ef0c6e15d498c64ba550740ccd6e
-DIST r10k-3.3.2.gem 208384 BLAKE2B 8d5ce5d7fb2497b701fdf7cd0a742db7b221a2b327464b553b9dbd893ecfbda2498302fb14cda89df7030c6b48dfb048d23d5c271773a3974e75b115ad0e3c49 SHA512 ccc71c856f204aafe9f15b497c3881aaa3beff50c36647e06590cbbaebaed58514eb30a5d57bbee4ba071e3586083c0b07decbd68c859667e6eb6bb57a40aef5
 DIST r10k-3.3.3.gem 208384 BLAKE2B 8c20a516c721970e4edb57160972dfa992d79a90794d7428f7083dee48f68ea87fdd6b182acd3df1ec9c8b50a2a72543d2ffb4b5361d6960fb46d021e3c2d592 SHA512 b1a407cd0bcafc9d7d15ff0d40f54d93d19be48032858aeb42955cdf14799fa75445f4ec462dd05a19cda972d155a0fc0be641d1998fd5e02c0ea5f1d971ea08
 EBUILD r10k-3.2.0.ebuild 933 BLAKE2B 6e7df53cab2a25bb5bf6fa4218cd670b742a68aeeb5402dd09d1f34861d0596250b915965a06b4cc8c157009d671046c00758cb576223d108e6b8d40067a23a6 SHA512 66c0c7e12e9f934c9e5f3024021e31ef4dce674f3eb27763bdc60413c9ef79dd101ed5cdcbdeec6cab9332fcbb60454754aea7c05f251b23327fef6f227eb7c8
-EBUILD r10k-3.3.0.ebuild 941 BLAKE2B d66e537eb1478ad0acf777d35efde0ecdad4594c5032ce01cfcb873eecef8e9fe65f237a0465ecc2f2368fb3019e728f54c7eebcfd06f461362f65ebc9cceb4f SHA512 eee05605d5294656c76a5207b25ced88a7162cfc15308660bb51fd9d22d13ccea24c288d21d540b8da108bcfe18e6539c589f0f2d3dd420ec1050850d7f19365
-EBUILD r10k-3.3.1.ebuild 916 BLAKE2B db2bdfab6af08c85fafdc36a9cf45e340ca0a65a0d8917c793d020e23d5773d77e71b40926be7e03a7161e4b0c8cbf80452ed928bd198594cc26fa55616d5158 SHA512 18d544b67913d9f0cb8f5cd0ac906b7ca482cb9bfa926b8feb98bef68447ba7450bc52ad00a2ca60289ef93a45340e8d8f96771e5647004b816fbd871e69ad4d
-EBUILD r10k-3.3.2.ebuild 916 BLAKE2B db2bdfab6af08c85fafdc36a9cf45e340ca0a65a0d8917c793d020e23d5773d77e71b40926be7e03a7161e4b0c8cbf80452ed928bd198594cc26fa55616d5158 SHA512 18d544b67913d9f0cb8f5cd0ac906b7ca482cb9bfa926b8feb98bef68447ba7450bc52ad00a2ca60289ef93a45340e8d8f96771e5647004b816fbd871e69ad4d
 EBUILD r10k-3.3.3.ebuild 916 BLAKE2B db2bdfab6af08c85fafdc36a9cf45e340ca0a65a0d8917c793d020e23d5773d77e71b40926be7e03a7161e4b0c8cbf80452ed928bd198594cc26fa55616d5158 SHA512 18d544b67913d9f0cb8f5cd0ac906b7ca482cb9bfa926b8feb98bef68447ba7450bc52ad00a2ca60289ef93a45340e8d8f96771e5647004b816fbd871e69ad4d
 MISC metadata.xml 582 BLAKE2B e3b514385b7b851b3ce037de51024108005224c75fba470db28fe6e4d6b3632ace21a8e829198e0b22d1ba0e76b1a5c01df10426ea497ec3b00e20e578608d2d SHA512 fb8913a9f806ac0b2035dc788ee78536fff96ffb635454f668d7836d8ba849fea158e628da12743c1844b658961866b3d64e8faf700c7e373065045175785536
diff --git a/app-admin/r10k/r10k-3.3.0.ebuild b/app-admin/r10k/r10k-3.3.0.ebuild
deleted file mode 100644
index a1ebf57c283f..000000000000
--- a/app-admin/r10k/r10k-3.3.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Puppet environment and module deployment"
-HOMEPAGE="https://github.com/puppetlabs/r10k"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+git"
-
-ruby_add_rdepend "
-	~dev-ruby/colored-1.2
-	~dev-ruby/cri-2.15.6
-	>=dev-ruby/gettext-setup-0.24:0
-	~dev-ruby/log4r-1.1.10
-	>=dev-ruby/multi_json-1.10:0
-	>=dev-ruby/puppet_forge-2.2.8
-	=dev-ruby/puppet_forge-2.2*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/archive-tar-minitar
-)"
-
-RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
-
-all_ruby_prepare() {
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid specs for unpackaged rugget git provider
-	rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
-}
diff --git a/app-admin/r10k/r10k-3.3.1.ebuild b/app-admin/r10k/r10k-3.3.1.ebuild
deleted file mode 100644
index 1826c94b4704..000000000000
--- a/app-admin/r10k/r10k-3.3.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Puppet environment and module deployment"
-HOMEPAGE="https://github.com/puppetlabs/r10k"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+git"
-
-ruby_add_rdepend "
-	~dev-ruby/colored-1.2
-	~dev-ruby/cri-2.15.6
-	>=dev-ruby/gettext-setup-0.24:0
-	~dev-ruby/log4r-1.1.10
-	>=dev-ruby/multi_json-1.10:0
-	=dev-ruby/puppet_forge-2.3*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/archive-tar-minitar
-)"
-
-RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
-
-all_ruby_prepare() {
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid specs for unpackaged rugget git provider
-	rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
-}
diff --git a/app-admin/r10k/r10k-3.3.2.ebuild b/app-admin/r10k/r10k-3.3.2.ebuild
deleted file mode 100644
index 1826c94b4704..000000000000
--- a/app-admin/r10k/r10k-3.3.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Puppet environment and module deployment"
-HOMEPAGE="https://github.com/puppetlabs/r10k"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+git"
-
-ruby_add_rdepend "
-	~dev-ruby/colored-1.2
-	~dev-ruby/cri-2.15.6
-	>=dev-ruby/gettext-setup-0.24:0
-	~dev-ruby/log4r-1.1.10
-	>=dev-ruby/multi_json-1.10:0
-	=dev-ruby/puppet_forge-2.3*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/archive-tar-minitar
-)"
-
-RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
-
-all_ruby_prepare() {
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid specs for unpackaged rugget git provider
-	rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
-}
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index be5412bc8bad..8e4ff0671fcf 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -7,7 +7,7 @@ DIST sysstat-12.2.1.tar.gz 1227707 BLAKE2B 566382d83a0230517d22e2630a9cb1aa631d7
 DIST sysstat-12.3.1.tar.gz 1245248 BLAKE2B 69848c452642be992c7b4af33268c0d6b30f16e5ea44ec13b00ab57e6ec3b498d92b707a53757de9066138a9ee92b995765f44f75f692e1b3c68d829519d53ca SHA512 f67a2dac22748217687bd7f58521c0719754f13298fb5faed8a6d58c2bb1f8620428191d0415e816eea07bb3ca81453e057d03c7db0096430ad7d6ba6b7b611e
 EBUILD sysstat-12.0.5.ebuild 1693 BLAKE2B a70bf736b6ab9884abcea8a31b01494b4880fa6c3cbf2911f00660e704ad6ede2059debe19c858f58106543651bae91ad6c9d339a45f109cb126e371b848d2ed SHA512 7b94c3b44265af2e49d79b2738343f60dec9b31f315be518507e0245995840b3a84d5ca5ee3cfbe286c4c22815adbb6b1a8ece9f3452ef8e3f201e8f3a28e330
 EBUILD sysstat-12.2.0-r1.ebuild 1707 BLAKE2B a859050b87eed7b87090b236656a307ae87e3df1a297891800fb161632605b370b05c177ad080e5504bb4f3eb4fcda1a0d82076fbf10779a61dd03e754b11449 SHA512 312f999a2cd27a09f06970a141da3b0c70f271526dd97c2c228f241ec37d233153ffc728cf070da20d5db8eaa93981648a593668f982af295a08088ee4061227
-EBUILD sysstat-12.2.1.ebuild 1707 BLAKE2B a859050b87eed7b87090b236656a307ae87e3df1a297891800fb161632605b370b05c177ad080e5504bb4f3eb4fcda1a0d82076fbf10779a61dd03e754b11449 SHA512 312f999a2cd27a09f06970a141da3b0c70f271526dd97c2c228f241ec37d233153ffc728cf070da20d5db8eaa93981648a593668f982af295a08088ee4061227
+EBUILD sysstat-12.2.1.ebuild 1706 BLAKE2B 166338ad571eab1f6d467de161223f05afd90a887621361dd4eedb7277115ebfcaf1a862b4f0eee8a405df1e230d298acc2ffa233d336afae6095a9f4c61dfa3 SHA512 fc013d64f160b5604a05b037f5436fd49a8042efb9b0fcfeb4f0dca331b58dcc5c6c56b31448674c6dd2ba8b4289f6754299f00daf477610f8509bcf2109a9b1
 EBUILD sysstat-12.3.1.ebuild 1707 BLAKE2B a859050b87eed7b87090b236656a307ae87e3df1a297891800fb161632605b370b05c177ad080e5504bb4f3eb4fcda1a0d82076fbf10779a61dd03e754b11449 SHA512 312f999a2cd27a09f06970a141da3b0c70f271526dd97c2c228f241ec37d233153ffc728cf070da20d5db8eaa93981648a593668f982af295a08088ee4061227
 EBUILD sysstat-999999.ebuild 1603 BLAKE2B 3346b2979dd44d34cfc9450dd4d81e6d0269464a0e59ccb6692d5a65a46e93ca58637a8500978e644ef5ca3262f60775b8771a38bb217dd498b37eded65c8280 SHA512 45f259cd23638e4c5621f782c61d933fb11d927ef7fa2da2e7ffc6e061fa1701499cba841aba2c77c182f653b24b2b86f37ce487c7b0905707daac0aa2a1be3e
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/app-admin/sysstat/sysstat-12.2.1.ebuild b/app-admin/sysstat/sysstat-12.2.1.ebuild
index cbea517ec677..eb4208e42b35 100644
--- a/app-admin/sysstat/sysstat-12.2.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="debug nls lm-sensors selinux static"
 
 CDEPEND="
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 6e87ebce45d2..edb0dd98ce4f 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -1,5 +1,7 @@
 DIST terraform-0.12.17.tar.gz 10508005 BLAKE2B facef6de57333586445ce8839c03ccd633fe9ac68619e384b71fff921afeaf260e01b8783d61e4cc04882aa644e8eb706b08c88216f093d85e0fd081363c4103 SHA512 6311fdbf6764e585126a1e177dc498634a799ba1a68ba98682e2be29d14b40c09d0a780555f10bbde0587445d31a1e0d9810226f9e6bd3fcb248428ceb864c87
 DIST terraform-0.12.19.tar.gz 10526213 BLAKE2B 89acdb2e099532a922d49ac3d0049c522b7936817afb7836ebf643ef21fd35f3be495cde5a92ea93add144dada0f54de55b4b42a668bff08c9db789a1d4a77d1 SHA512 3acf327bdbaeddf6f13fc1a2a2335675dd3910137ef685224e7c1eafddf18d0aaa8c24aa3b1b5027b21905d2d87fbe3d49904e196c9881063d01670c4de3db66
+DIST terraform-0.12.20.tar.gz 10383312 BLAKE2B c9e9c7e8328cfbeb533d12a2acee133cc049b06e9a30c9fdc5708c674c272af264ae34c8c850924ae08885237a2e4d6c55d43d92b350104c6afe66d2f50e31ec SHA512 df92422426e7ebaf2c3a6b953de9fc9fcb461f7227835e728bbccf5b796995d818a39817913d6010fadb8b3618710f77f50e36eb6ce4176e7312b68c7d7f7e96
 EBUILD terraform-0.12.17.ebuild 1106 BLAKE2B 93d76a95bdb6ec98cab68cd32950208ed629736ed67f14db9b9939229c60b100ba3e9542f0ef892846e7df01bb6fe8778349598d99bf0f78506706a190510338 SHA512 57a8732da235be34eadf501bdaa0ecae0523a08a4f40250a1db8b0a03b5091458fe1754241e9109d307e4e9d2b78fb3770c0660d78a5fef36226cbd5e7e8737f
 EBUILD terraform-0.12.19.ebuild 1107 BLAKE2B e3512147aa9c4528641b465180d0c9678856b743b3852903ba77b284ba978c620f777aab6656132b8d9ce1258d1f6f6f1f9d6db94b76b1d49b9590619c937f5b SHA512 4d65da7087d667e3d5878d9a8377293f13d537b335478d666994d71d803b45385de1e8dda07c88498d46f3edbda41ebe2539e66f22cd1a4c8210ced449195125
+EBUILD terraform-0.12.20.ebuild 1107 BLAKE2B e3512147aa9c4528641b465180d0c9678856b743b3852903ba77b284ba978c620f777aab6656132b8d9ce1258d1f6f6f1f9d6db94b76b1d49b9590619c937f5b SHA512 4d65da7087d667e3d5878d9a8377293f13d537b335478d666994d71d803b45385de1e8dda07c88498d46f3edbda41ebe2539e66f22cd1a4c8210ced449195125
 MISC metadata.xml 1185 BLAKE2B 4e3e36b75d012f5a48886bc4cbce9f2f597b15060cf5298036690e3832e909ac6e08a729b477de9b893a38ea8cb634c8abefeb5776a14a790f5b4d8a7b86bc38 SHA512 8f52d688db4c37ddbdbca03c5a2f8fc49fa9a0765902e34559408f5f14230c12bc2b160768d3c9cbc978a0ee01e5f3c8a50aef00786a96f42725db54cb845d03
diff --git a/app-admin/terraform/terraform-0.12.20.ebuild b/app-admin/terraform/terraform-0.12.20.ebuild
new file mode 100644
index 000000000000..4196f78931b6
--- /dev/null
+++ b/app-admin/terraform/terraform-0.12.20.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-base go-module
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+
+EGO_PN="github.com/hashicorp/${PN}"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_prepare() {
+	default
+	# the sed command is necessary to generate tests outside of the
+	# default git root of `terraform', in our case the working dir
+	# is `work/$PN-$PV'
+	# sed -i -e "s/!=\s\+\"terraform\"/!=\ \"${P}\"/" \
+	# 	./scripts/generate-plugins.go || die
+}
+
+src_compile() {
+	GOCACHE="${T}/go-cache" go build \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/terraform
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}