Sync with portage [Fri Jan 1 22:19:27 MSK 2021].

app-admin/consul-template/Manifest

@@ -1,5 +1,6 @@
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST consul-template-0.25.0.tar.gz 197301 BLAKE2B f6e7d87b6fbb1d56728af0116ce0cd3ace800fa2e1d1edea57acbcd9cd1f1cf9a625426ab139744083071a1641a99aa526d44f28a147bbb1f2afe714b83969fd SHA512 225e0e1f400b6ca6913758f0c4c77788977d4e6f861d50efa89662a652b1c8c648d269c9cb42ae5a590739ab1159a8b1a386cd9942a1c7dafc5200a8923b4c9b
+DIST consul-template-0.25.1.tar.gz 198375 BLAKE2B e5cb75193a50939b92f6b9db9e998577f1c62cf55944052a4e9ca574ea52fe7284b2395ee3ce237923cc79337453ec43d37c103f3a7bf0fc092c877164ed89fa SHA512 ac02d6c26daadda62aff9b908836a6ac342ebebb9429c7a75306c4a76a2ba6bc6ab97f26e17ebfa64c171622068f89d006d48ccd7bfa28a71b43245357cbf524
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod 37 BLAKE2B 74a94066231395cbd85f1dbbb68408161ef74781c0c686746f97365dceb3ca69e3b924a86e6639b5e4cbcf64928fa21245e6828339105a779a86bc4f132a5bf5 SHA512 da3a3499834784b7ace8158659956206fdb113000fdc84d54b6525805727e37029bdcf263afcbabe724d8b10f6601f1f38a985e6ac10fd0466907ae56da3edd7

app-admin/consul-template/consul-template-0.25.1.ebuild

@@ -0,0 +1,310 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+DESCRIPTION="Generic template rendering and notifications with Consul"
+HOMEPAGE="https://github.com/hashicorp/consul-template"
+
+EGO_SUM=(
+"cloud.google.com/go v0.26.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+"github.com/client9/misspell v0.3.4/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/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/fatih/structs v1.1.0/go.mod"
+"github.com/frankban/quicktest v1.4.0"
+"github.com/frankban/quicktest v1.4.0/go.mod"
+"github.com/go-ldap/ldap v3.0.2+incompatible/go.mod"
+"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/snappy v0.0.1"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0"
+"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"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/hashicorp/consul/api v1.4.0"
+"github.com/hashicorp/consul/api v1.4.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.4.0"
+"github.com/hashicorp/consul/sdk v0.4.0/go.mod"
+"github.com/hashicorp/errwrap v1.0.0"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-gatedio v0.5.0"
+"github.com/hashicorp/go-gatedio v0.5.0/go.mod"
+"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+"github.com/hashicorp/go-hclog v0.8.0/go.mod"
+"github.com/hashicorp/go-hclog v0.12.0"
+"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.1.0"
+"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.5"
+"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-plugin v1.0.1/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.4"
+"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.1"
+"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.2"
+"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.2"
+"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0"
+"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"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go-version v1.1.0/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"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.3"
+"github.com/hashicorp/golang-lru v0.5.3/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"
+"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/memberlist v0.1.4"
+"github.com/hashicorp/memberlist v0.1.4/go.mod"
+"github.com/hashicorp/serf v0.8.2/go.mod"
+"github.com/hashicorp/serf v0.8.3"
+"github.com/hashicorp/serf v0.8.3/go.mod"
+"github.com/hashicorp/vault/api v1.0.5-0.20190730042357-746c0b111519"
+"github.com/hashicorp/vault/api v1.0.5-0.20190730042357-746c0b111519/go.mod"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20190730042320-0dc007d98cc8"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20190730042320-0dc007d98cc8/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+"github.com/kr/pretty v0.1.0"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.10/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-isatty v0.0.12"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/mattn/go-shellwords v1.0.5"
+"github.com/mattn/go-shellwords v1.0.5/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/miekg/dns v1.0.14"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.15"
+"github.com/miekg/dns v1.1.15/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/copystructure 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 v0.0.0-20171004221916-a61a99592b77/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/gox v0.4.0/go.mod"
+"github.com/mitchellh/hashstructure v1.0.0"
+"github.com/mitchellh/hashstructure v1.0.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"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pascaldekloe/goe v0.1.0"
+"github.com/pascaldekloe/goe v0.1.0/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.2.5+incompatible"
+"github.com/pierrec/lz4 v2.2.5+incompatible/go.mod"
+"github.com/pkg/errors v0.8.1"
+"github.com/pkg/errors v0.8.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_golang v0.9.2/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+"github.com/ryanuber/go-glob v1.0.0"
+"github.com/ryanuber/go-glob v1.0.0/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4"
+"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/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-20190313153728-d0100b6bd8b3/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-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80"
+"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/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"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/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-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e"
+"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/text v0.3.0"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db"
+"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
+"golang.org/x/text v0.3.2"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/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-20190524140312-2c0ae7006135/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
+"google.golang.org/grpc v1.14.0/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.22.0/go.mod"
+"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/square/go-jose.v2 v2.3.1"
+"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.8"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/hashicorp/consul-template/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="
+	acct-group/consul-template
+	acct-user/consul-template"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# TODO: debug test failures
+RESTRICT="test"
+
+src_prepare() {
+	default
+	# remove -s and -w from the linker flags
+	sed \
+		-e '/-s \\/d' \
+		-e '/-w \\/d' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake GOBIN="${S}"/bin dev
+}
+
+src_test() {
+	emake GOBIN="${S}"/bin test
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md README.md
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}

app-admin/prelude-manager/Manifest

@@ -1,5 +1,2 @@
-DIST prelude-manager-3.0.0.tar.gz 1286459 BLAKE2B 0909b0d7501909de51cd580b6ce22a66b1900a3b5b7376d3aeb4136bf41128ab766a025d69d33c414a9623dabb0de144e2f21190c3c3cccb9c067db359aab1bd SHA512 4c16a353495179265375686ce9592c8cd044b4255060b78286466bd25f9b38634233c95af058e1c0b81e1b574ec9ada5b2db92d6d1f5594dfcddce572fd0fd67
-DIST prelude-manager-4.0.0.tar.gz 1353116 BLAKE2B 20aaa28797a67fd310807735bb08f0c21c3bd95950598a86c45144ee2474785aef0c7d569732c817509ae8ae52ffce5f43f3c071931f2960578681f91a8c9504 SHA512 793ed37c71eb4884cbbb49b11c7388ee291a35252255458ceadb4ce10d1392e8bad423f95e31bff4550a9cf1d04139e43729352554fd847048b6c8d14f813a8a
-DIST prelude-manager-4.1.1.tar.gz 1415847 BLAKE2B 7cea7209a680a38cf597a9678f3ac9a31b00187e4597e1aeed91bbe57a55981279e8399ee8c90a044e40873e595ca648736fa79090420d9bcd72b82588f7bb5e SHA512 4e9d09b56eb7ec55144caa06a04e458bf0462d8c0064a34aac5aa0fb96a30fbefe5a4956185b606ec58fc410e4cbcac8721e521b3396303b3bff88808042a966
 DIST prelude-manager-5.1.0.tar.gz 1510054 BLAKE2B 88ef666a76c58af1a8164c033b7e9c1ea869a18a66cb489d8c7fdbf1fa331006e7844aea4386ea3185902afd108af5eb1b46ee17686032de460d8c5b336fd658 SHA512 1f0e993f9bf684ec65a741db3cdaf537dc47bc2f77652a37c194db422dd5da2aa33b78d3ee454c78b28b44c022eacc7246ee99187b0b8779c12f3a67320d89a3
 DIST prelude-manager-5.2.0.tar.gz 1564874 BLAKE2B cd00aca6a533cdb47e311c4a8eed17d514f39de3b1c5a4b334b8e8c8c2d318b36d1fc843bf36be0383da2ae5f4e41a936fc70ad92d5b55ab56e9a34c36fc1dae SHA512 49f8fd10c7f3c5c816e6bc49ce8d47abfe56b4b0a1d8a564774f67ef5f0e3058c62ef9c88ca709b1fe2961ed832269fe811ddf57d4118879fa561970561507d6

app-admin/prelude-manager/files/prelude-manager-3.0.0-conf.patch

@@ -1,11 +0,0 @@
---- a/prelude-manager.conf.in
-+++ b/prelude-manager.conf.in
-@@ -361,7 +361,7 @@
- # (same source, target and classification combination) every 2 minutes
- # to reporting plugins (eg. to the database).
- [thresholding]
--path = alert.classification.text, alert.source.node.address.address, alert.target.node.address.address
-+path = alert.classification.text, alert.source(0).node.address(0).address, alert.target(0).node.address(0).address
- limit = 120
- count = 100
- hook = reporting

app-admin/prelude-manager/files/prelude-manager-3.0.0-configure.patch

@@ -1,57 +0,0 @@
-When : when you try to use enable with libmaxmind, libpreludedb, xml, libwrap, they are not working
-Why : Needed if you want to use useflags
---- a/configure.in
-+++ b/configure.in
-@@ -110,7 +110,10 @@
- dnl **************************************************
- LIBMAXMINDDB_MIN_VERSION=1.0.0
- 
--PKG_CHECK_MODULES([LIBMAXMINDDB], [libmaxminddb >= $LIBMAXMINDDB_MIN_VERSION], enable_libmaxminddb=yes, enable_libmaxminddb=no)
-+AC_ARG_ENABLE(libmaxminddb, AC_HELP_STRING(--enable-libmaxminddb, Define whether libmaxminddb is available), , enable_libmaxminddb="yes")
-+if test x$enable_libmaxminddb = xyes; then
-+	PKG_CHECK_MODULES([LIBMAXMINDDB], [libmaxminddb >= $LIBMAXMINDDB_MIN_VERSION], enable_libmaxminddb=yes, enable_libmaxminddb=no)
-+fi
- if test x$enable_libmaxminddb = xyes; then
- 	AC_CHECK_HEADER(maxminddb.h, enable_libmaxminddb=yes, enable_libmaxminddb=no)
- fi
-@@ -126,11 +129,14 @@
- dnl * Check for libpreludedb                         *
- dnl **************************************************
- 
--AM_PATH_LIBPRELUDEDB(3.0.0, enable_libpreludedb=yes, enable_libpreludedb=no, no)
--AM_CONDITIONAL(HAVE_LIBPRELUDEDB, test x$enable_libpreludedb = xyes)
-+AC_ARG_ENABLE(libpreludedb, AC_HELP_STRING(--enable-libpreludedb, Define whether libpreludedb is available), , enable_libpreludedb="yes")
-+if test x$enable_libpreludedb = xyes; then
-+	AM_PATH_LIBPRELUDEDB(3.0.0, enable_libpreludedb=yes, enable_libpreludedb=no, no)
-+fi
- if test x$enable_libpreludedb = xyes; then
-         AC_DEFINE_UNQUOTED(HAVE_LIBPRELUDEDB, , Define whether libpreludedb is available)
- fi
-+AM_CONDITIONAL(HAVE_LIBPRELUDEDB, test x$enable_libpreludedb = xyes)
- 
- 
- 
-@@ -138,7 +144,10 @@
- dnl * Check for the Libxml2                                *
- dnl ********************************************************
- 
--AM_PATH_XML2(, enable_xmlmod=yes, enable_xmlmod=no)
-+AC_ARG_ENABLE(xmlmod, AC_HELP_STRING(--enable-xmlmod, Enable XML), , enable_xmlmod="yes")
-+if test x$enable_xmlmod = xyes; then
-+	AM_PATH_XML2(, enable_xmlmod=yes, enable_xmlmod=no)
-+fi
- AM_CONDITIONAL(HAVE_XML2, test x$enable_xmlmod = xyes)
- 
- 
-@@ -147,9 +156,10 @@
- dnl * TCP WRAPPER CHECK                              *
- dnl **************************************************
- 
-+AC_ARG_WITH(libwrap, AC_HELP_STRING(--with-libwrap, Compile in libwrap (tcp_wrappers) support.), , with_libwrap="yes")
- AC_ARG_WITH(libwrap-prefix, AC_HELP_STRING(--with-libwrap-prefix@<:@=PFX@:>@,
-                                     Compile in libwrap (tcp_wrappers) support @<:@default=auto@:>@.),
--            libwrap_required=true, with_libwrap="yes")
-+            libwrap_required=true, )
- 
- if test x$with_libwrap != xno; then
-    LIBWRAP_INCLUDE="tcpd.h"

app-admin/prelude-manager/files/prelude-manager-3.0.0-run.patch

@@ -1,13 +0,0 @@
-When : everytime
-Why : since systemd, run dir has changed
---- a/configure.in
-+++ b/configure.in
-@@ -304,7 +304,7 @@
- 
- manager_failover_dir=$LOCALSTATEDIR/spool/prelude-manager/failover
- manager_scheduler_dir=$LOCALSTATEDIR/spool/prelude-manager/scheduler
--manager_run_dir=$LOCALSTATEDIR/run/prelude-manager
-+manager_run_dir=/run/prelude-manager
- 
- AC_DEFINE_UNQUOTED(REPORT_PLUGIN_DIR, "$report_plugin_dir", Prelude-Manager report plugin directory)
- AC_DEFINE_UNQUOTED(DECODE_PLUGIN_DIR, "$decode_plugin_dir", Prelude-Manager decode plugin directory)

app-admin/prelude-manager/prelude-manager-3.0.0.ebuild

@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils ltprune systemd
-
-DESCRIPTION="Bus communication for all Prelude modules"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tcpwrapper xml geoip dbx"
-
-RDEPEND="net-libs/gnutls
-	dev-libs/libprelude
-	dbx? ( dev-libs/libpreludedb )
-	tcpwrapper? ( sys-apps/tcp-wrappers )
-	xml? ( dev-libs/libxml2 )
-	geoip? ( dev-libs/libmaxminddb )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-conf.patch"
-	"${FILESDIR}/${P}-configure.patch"
-	"${FILESDIR}/${P}-run.patch"
-)
-
-src_prepare() {
-	default_src_prepare
-
-	mv "${S}/configure.in" "${S}/configure.ac" || die "mv failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		$(use_enable dbx libpreludedb) \
-		$(use_with tcpwrapper libwrap) \
-		$(use_enable xml xmlmod) \
-		$(use_enable geoip libmaxminddb)
-}
-
-src_install() {
-	default_src_install
-
-	rm -rv "${D}/run" || die "rm failed"
-	keepdir /var/spool/prelude-manager{,/failover,/scheduler}
-
-	prune_libtool_files --modules
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}

app-admin/prelude-manager/prelude-manager-4.0.0.ebuild

@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd
-
-DESCRIPTION="Bus communication for all Prelude modules"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbx geoip tcpwrapper xml"
-
-RDEPEND="net-libs/gnutls:=
-	~dev-libs/libprelude-${PV}
-	dbx? ( ~dev-libs/libpreludedb-${PV} )
-	geoip? ( dev-libs/libmaxminddb )
-	tcpwrapper? ( sys-apps/tcp-wrappers )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.0-run.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_with dbx libpreludedb-prefix) \
-		$(use_enable geoip libmaxminddb) \
-		$(use_with tcpwrapper libwrap) \
-		$(usex xml '' '--without-xml-prefix')
-}
-
-src_install() {
-	default
-
-	rm -rv "${ED%/}/run" || die "rm failed"
-	keepdir /var/spool/prelude-manager{,/failover,/scheduler}
-
-	find "${D}" -name '*.la' -delete || die
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}

app-admin/prelude-manager/prelude-manager-4.1.1.ebuild

@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd
-
-DESCRIPTION="Bus communication for all Prelude modules"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/4.1.0/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbx geoip tcpwrapper xml"
-
-RDEPEND="net-libs/gnutls:=
-	~dev-libs/libprelude-4.1.0
-	dbx? ( ~dev-libs/libpreludedb-4.1.0 )
-	geoip? ( dev-libs/libmaxminddb )
-	tcpwrapper? ( sys-apps/tcp-wrappers )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.0-run.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		$(use_with dbx libpreludedb-prefix)
-		$(use_enable geoip libmaxminddb)
-		$(use_with tcpwrapper libwrap)
-		$(usex xml '' '--without-xml-prefix')
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	rm -rv "${ED%/}/run" || die "rm failed"
-	keepdir /var/spool/prelude-manager{,/failover,/scheduler}
-
-	find "${D}" -name '*.la' -delete || die
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}

app-admin/salt/Manifest

@@ -1,5 +1,3 @@
-DIST salt-2019.2.7.tar.gz 14576515 BLAKE2B 4b2476c874a806de8664abd7852d5f856fc1946cc021d3ec8d206f69ec3cd809fe156d4d916d00304c36aad1dfab3a60309eb87d21ce7bb9afc7e8ea77ac23aa SHA512 e9a0d1ada0172239a31c6a8a628e71367aba072c06fe5420f4b864b9c67da89edd03f95abd46fd9ae414c2262b4e7e5c7f53c606f9f3f58e4c84129f2ed43c9e
-DIST salt-2019.2.8.tar.gz 14595964 BLAKE2B 7551bbfffe6e4f3107806ef95c9ad1b3fdff6274e8fa679bee143be203929df6d51dcc1e704d1e9458e8051197277257c68c7fd18cf54cad1c49314574c8471b SHA512 e4b45ee264a4e663c6039ca6c89ea0aeff1273b2b40b4d799a30cdb6b23cf568be81e4807ecb2832b2a596993f1512ef45d68e444f3b32e6f5a38d8ce548ddac
 DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f
 DIST salt-3000.5.tar.gz 15229450 BLAKE2B 135e9b9dcc461ac898231ce46e6a1359e6d60a43822320950bc0b83057f768dadf55320dd73df72d5bc917f324eef4661e6f75d8eb8e84aef958bd2df8924cfc SHA512 2579f65c24d22d77132057bd8cf37040d7d149624745dd68b4c44318be786580dcc34bf563f90d7de9ef5b726b2453bef4d8639bc8fbd9c5e691500520335317
 DIST salt-3000.6.tar.gz 15236781 BLAKE2B 5a532a6915b331fb532dc6e1651cf8fca3e1a5e9f29f6d75260fdb1162dbfeec755c65f7c6fc28b1cc7dc3ace978547830af31aafc1eee8419bbc7e695725787 SHA512 739e3671766c45a0ef1eb45933c7f00f14586e91f4c4a79cbed913a48961a48baee853206ba569491756e8a872d22f3635eb6bc1a366020e551c567b2334c508

app-admin/salt/files/salt-2019.2.0-remove-raet-tests.patch

@@ -1,43 +0,0 @@
-diff --git a/tests/unit/modules/test_event.py b/tests/unit/modules/test_event.py
-index e5d2c946ae..e9140670cb 100644
---- a/tests/unit/modules/test_event.py
-+++ b/tests/unit/modules/test_event.py
-@@ -47,12 +47,6 @@ class EventTestCase(TestCase, LoaderModuleMockMixin):
-             preload = {'id': 'id', 'tag': 'tag', 'data': 'data',
-                        'tok': 'salt', 'cmd': '_minion_event'}
- 
--            with patch.dict(event.__opts__, {'transport': 'raet',
--                                             'local': False}):
--                with patch.object(salt_transport_channel_factory, 'send',
--                                  return_value=None):
--                    self.assertTrue(event.fire_master('data', 'tag'))
--
-             with patch.dict(event.__opts__, {'transport': 'A',
-                                              'master_uri': 'localhost',
-                                              'local': False}):
-diff --git a/tests/unit/utils/test_verify.py b/tests/unit/utils/test_verify.py
-index 63b9ae3181..2c8294ef77 100644
---- a/tests/unit/utils/test_verify.py
-+++ b/tests/unit/utils/test_verify.py
-@@ -326,7 +326,7 @@ class TestVerifyLog(TestCase):
-         verify_log_files([path], getpass.getuser())
-         self.assertTrue(os.path.exists(path))
- 
--
-+@skipIf(True, "broken under sandbox")
- class TestCleanPath(TestCase):
-     '''
-     salt.utils.clean_path works as expected
-@@ -396,10 +396,10 @@ class TestCleanPathLink(TestCase):
-         test_path = os.path.join(self.from_path, 'test')
-         expect_path = os.path.join(self.to_path, 'test')
-         ret = clean_path(self.from_path, test_path)
--        assert ret == expect_path, "{} is not {}".format(ret, expect_path)
-+        assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path)
- 
-     def test_clean_path_symlinked_tgt(self):
-         test_path = os.path.join(self.to_path, 'test')
-         expect_path = os.path.join(self.to_path, 'test')
-         ret = clean_path(self.from_path, test_path)
--        assert ret == expect_path, "{} is not {}".format(ret, expect_path)
-+        assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path)

app-admin/salt/files/salt-2019.2.0-tests.patch

@@ -1,73 +0,0 @@
-diff --git a/tests/unit/fileserver/test_gitfs.py b/tests/unit/fileserver/test_gitfs.py
-index 4e93df4e62..38c13efb6b 100644
---- a/tests/unit/fileserver/test_gitfs.py
-+++ b/tests/unit/fileserver/test_gitfs.py
-@@ -151,6 +151,7 @@ class GitfsConfigTestCase(TestCase, LoaderModuleMockMixin):
-                 if exc.errno != errno.EEXIST:
-                     raise
- 
-+    @skipIf(True, 'currently failing on Gentoo')
-     def test_per_saltenv_config(self):
-         opts_override = textwrap.dedent('''
-             gitfs_root: salt
-diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py
-index 445df0c98a..17ca123172 100644
---- a/tests/unit/grains/test_core.py
-+++ b/tests/unit/grains/test_core.py
-@@ -710,6 +710,7 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
-                             )
- 
-     @skipIf(not salt.utils.platform.is_linux(), 'System is not Linux')
-+    @skipIf(True, 'Test assumes running under Xen')
-     def test_xen_virtual(self):
-         '''
-         Test if OS grains are parsed correctly in Ubuntu Xenial Xerus
-diff --git a/tests/unit/utils/test_asynchronous.py b/tests/unit/utils/test_asynchronous.py
-index 694a7aebfe..704f2d894f 100644
---- a/tests/unit/utils/test_asynchronous.py
-+++ b/tests/unit/utils/test_asynchronous.py
-@@ -3,6 +3,8 @@
- # Import Python Libs
- from __future__ import absolute_import, print_function, unicode_literals
- 
-+from unittest import skipIf
-+
- # Import 3rd-party libs
- import tornado.testing
- import tornado.gen
-@@ -35,6 +37,7 @@ class HelperB(object):
- 
- 
- class TestSyncWrapper(AsyncTestCase):
-+    @skipIf(True, "fails in sandbox")
-     @tornado.testing.gen_test
-     def test_helpers(self):
-         '''
-@@ -56,6 +59,7 @@ class TestSyncWrapper(AsyncTestCase):
-         ret = sync.sleep()
-         self.assertTrue(ret)
- 
-+    @skipIf(True, "fails in sandbox")
-     def test_double(self):
-         '''
-         Test when the asynchronous wrapper object itself creates a wrap of another thing
-@@ -67,6 +71,7 @@ class TestSyncWrapper(AsyncTestCase):
-         ret = sync.sleep()
-         self.assertFalse(ret)
- 
-+    @skipIf(True, "fails in sandbox")
-     def test_double_sameloop(self):
-         '''
-         Test asynchronous wrappers initiated from the same IOLoop, to ensure that
-diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py
-index da666ef4c7..e3523049b7 100644
---- a/tests/unit/utils/test_jinja.py
-+++ b/tests/unit/utils/test_jinja.py
-@@ -1102,6 +1102,7 @@ class TestCustomExtensions(TestCase):
-                                      dict(opts=self.local_opts, saltenv='test', salt=self.local_salt))
-         self.assertEqual(rendered, '16777216')
- 
-+    @skipIf(True, 'Skipping tests that require internet access')
-     @flaky
-     def test_http_query(self):
-         '''

app-admin/salt/files/salt-2019.2.2-newer-deps.patch

@@ -1,136 +0,0 @@
-diff --git a/salt/modules/dockercompose.py b/salt/modules/dockercompose.py
-index 61e937536c..0f37e0d43a 100644
---- a/salt/modules/dockercompose.py
-+++ b/salt/modules/dockercompose.py
-@@ -241,7 +241,7 @@ def __load_docker_compose(path):
-                                     None, None)
-     try:
-         with salt.utils.files.fopen(file_path, 'r') as fl:
--            loaded = yaml.load(fl)
-+            loaded = yaml.safe_load(fl)
-     except EnvironmentError:
-         return None, __standardize_result(False,
-                                     'Could not read {0}'.format(file_path),
-@@ -371,7 +371,7 @@ def __load_compose_definitions(path, definition):
-                                               None, None)
-     else:
-         try:
--            loaded_definition = yaml.load(definition)
-+            loaded_definition = yaml.safe_load(definition)
-         except yaml.YAMLError as yerr:
-             msg = 'Could not parse {0} {1}'.format(definition, yerr)
-             return None, None, __standardize_result(False, msg,
-diff --git a/tests/integration/utils/test_win_runas.py b/tests/integration/utils/test_win_runas.py
-index 3042a77991..d4057a4d03 100644
---- a/tests/integration/utils/test_win_runas.py
-+++ b/tests/integration/utils/test_win_runas.py
-@@ -539,7 +539,7 @@ class RunAsTest(ModuleCase):
-         win32serviceutil.StartService('test service')
-         wait_for_service('test service')
-         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
--            ret = yaml.load(fp)
-+            ret = yaml.safe_load(fp)
-         assert ret['retcode'] == 1, ret
-
-     @with_system_user('test-runas', on_existing='delete', delete=True,
-@@ -560,7 +560,7 @@ class RunAsTest(ModuleCase):
-         win32serviceutil.StartService('test service')
-         wait_for_service('test service')
-         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
--            ret = yaml.load(fp)
-+            ret = yaml.safe_load(fp)
-         assert ret['retcode'] == 1, ret
-
-     @with_system_user('test-runas-admin', on_existing='delete', delete=True,
-@@ -581,7 +581,7 @@ class RunAsTest(ModuleCase):
-         win32serviceutil.StartService('test service')
-         wait_for_service('test service')
-         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
--            ret = yaml.load(fp)
-+            ret = yaml.safe_load(fp)
-         assert ret['retcode'] == 0, ret
-
-     @with_system_user('test-runas-admin', on_existing='delete', delete=True,
-@@ -602,7 +602,7 @@ class RunAsTest(ModuleCase):
-         win32serviceutil.StartService('test service')
-         wait_for_service('test service')
-         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
--            ret = yaml.load(fp)
-+            ret = yaml.safe_load(fp)
-         assert ret['retcode'] == 0, ret
-
-     def test_runas_service_system_user(self):
-@@ -621,5 +621,5 @@ class RunAsTest(ModuleCase):
-         win32serviceutil.StartService('test service')
-         wait_for_service('test service')
-         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
--            ret = yaml.load(fp)
-+            ret = yaml.safe_load(fp)
-         assert ret['retcode'] == 0, ret
-diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py
-index a07fcbab6b..79072bb89e 100644
---- a/tests/unit/utils/test_schema.py
-+++ b/tests/unit/utils/test_schema.py
-@@ -5,6 +5,7 @@
-
- # Import python libs
- from __future__ import absolute_import, print_function, unicode_literals
-+import sys
- import copy
-
- # Import Salt Testing Libs
-@@ -506,10 +507,7 @@ class ConfigTestCase(TestCase):
-                 {'personal_access_token': 'foo'},
-                 Requirements.serialize()
-             )
--        if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'):
--            self.assertIn('\'ssh_key_file\' is a required property', excinfo.exception.message)
--        else:
--            self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
-+        self.assertIn('\'ssh_key_file\' is a required property', excinfo.exception.message)
-
-     def test_boolean_config(self):
-         item = schema.BooleanItem(title='Hungry', description='Are you hungry?')
-@@ -1733,10 +1731,11 @@ class ConfigTestCase(TestCase):
-
-         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
-             jsonschema.validate({'item': {'sides': '4', 'color': 'blue'}}, TestConf.serialize())
--        if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'):
--            self.assertIn('\'4\' is not of type \'boolean\'', excinfo.exception.message)
-+
-+        if sys.hexversion >= 0x03000000:
-+            self.assertIn("'4' is not of type 'boolean'", excinfo.exception.message)
-         else:
--            self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
-+            self.assertIn("u'4' is not of type u'boolean'", excinfo.exception.message)
-
-         class TestConf(schema.Schema):
-             item = schema.DictItem(
-@@ -1839,10 +1838,10 @@ class ConfigTestCase(TestCase):
-
-         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
-             jsonschema.validate({'item': ['maybe']}, TestConf.serialize())
--        if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'):
--            self.assertIn('\'maybe\' is not one of [\'yes\']', excinfo.exception.message)
-+        if sys.hexversion >= 0x03000000:
-+            self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message)
-         else:
--            self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
-+            self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message)
-
-         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
-             jsonschema.validate({'item': 2}, TestConf.serialize())
-@@ -1894,10 +1893,10 @@ class ConfigTestCase(TestCase):
-
-         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
-             jsonschema.validate({'item': ['maybe']}, TestConf.serialize())
--        if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'):
--            self.assertIn('\'maybe\' is not one of [\'yes\']', excinfo.exception.message)
-+        if sys.hexversion >= 0x03000000:
-+            self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message)
-         else:
--            self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
-+            self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message)
-
-         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
-             jsonschema.validate({'item': 2}, TestConf.serialize())

app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch

@@ -1,28 +0,0 @@
-diff --git a/tests/unit/utils/test_network.py b/tests/unit/utils/test_network.py
-index af5cbbab2b..15236c127a 100644
---- a/tests/unit/utils/test_network.py
-+++ b/tests/unit/utils/test_network.py
-@@ -1,6 +1,7 @@
- # -*- coding: utf-8 -*-
- # Import Python libs
- from __future__ import absolute_import, unicode_literals, print_function
-+import sys
- import logging
- import socket
- import textwrap
-@@ -249,6 +250,7 @@ class NetworkTestCase(TestCase):
-                 log.error('bad host_port value: "%s" failed to trigger ValueError exception', host_port)
-                 raise _e_
- 
-+    @skipIf(sys.hexversion < 0x03000000, "https://github.com/testing-cabal/mock/issues/323")
-     def test_dns_check(self):
-         hosts = [
-             {'host': '10.10.0.3',
-@@ -302,6 +304,7 @@ class NetworkTestCase(TestCase):
-                                         "Invalid or unresolveable address"):
-                 network.dns_check('foo', '1')
- 
-+    @skipIf(sys.hexversion < 0x03000000, "https://github.com/testing-cabal/mock/issues/323")
-     def test_test_addrs(self):
-         # subset of real data from getaddrinfo against saltstack.com
-         addrinfo = [(30, 2, 17, '', ('2600:9000:21eb:a800:8:1031:abc0:93a1', 0, 0, 0)),

app-admin/salt/salt-2019.2.7.ebuild

@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
-	https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova
-	openssl portage profile redis selinux test vim-syntax"
-
-RDEPEND="
-	sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/libnacl[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	<dev-python/msgpack-1.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
-	<www-servers/tornado-5.0[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-	openssl? (
-		dev-libs/openssl:0=[-bindist]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
-		<dev-python/pytest-salt-2020.0.0[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
-		${RDEPEND}
-	)"
-
-DOCS=( README.rst AUTHORS )
-
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/salt-2019.2.0-tests.patch"
-	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
-	"${FILESDIR}/salt-2019.2.2-newer-deps.patch"
-	"${FILESDIR}/salt-2019.2.2-workaround-broken-mock-on-py2.patch"
-	"${FILESDIR}/salt-2019.2.0-remove-raet-tests.patch"
-)
-
-python_prepare() {
-	# remove tests with external dependencies that may not be available
-	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
-	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
-	rm tests/unit/states/test_boto_vpc.py || die
-
-	# breaks with permission errors
-	rm tests/unit/utils/test_cache.py || die
-
-	# remove raet due to deps being dropped
-	rm tests/unit/modules/test_raet_publish.py \
-		salt/transport/raet.py \
-		salt/daemons/test/test_raetkey.py || die
-
-	# allow the use of the renamed msgpack
-	sed -i '/^msgpack/d' requirements/base.txt || die
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local tempdir
-	# testsuite likes lots of files
-	ulimit -n 3072 || die
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
-
-	(
-		cleanup() { rm -f "${tempdir}" || die; }
-
-		trap cleanup EXIT
-
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
-
-		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
-			TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose \
-			|| die "testing failed with ${EPYTHON}"
-	)
-}

app-admin/salt/salt-2019.2.8.ebuild

@@ -1,151 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
-	https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova
-	openssl portage profile redis selinux test vim-syntax"
-
-RDEPEND="
-	sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/libnacl[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	<dev-python/msgpack-1.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
-	<www-servers/tornado-5.0[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-	openssl? (
-		dev-libs/openssl:0=[-bindist]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
-		<dev-python/pytest-salt-2020.0.0[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
-		${RDEPEND}
-	)"
-
-DOCS=( README.rst AUTHORS )
-
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/salt-2019.2.0-tests.patch"
-	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
-	"${FILESDIR}/salt-2019.2.2-newer-deps.patch"
-	"${FILESDIR}/salt-2019.2.2-workaround-broken-mock-on-py2.patch"
-	"${FILESDIR}/salt-2019.2.0-remove-raet-tests.patch"
-	"${FILESDIR}/salt-2019.2.8-ansible-roster-fix.patch"
-)
-
-python_prepare() {
-	# remove tests with external dependencies that may not be available
-	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
-	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
-	rm tests/unit/states/test_boto_vpc.py || die
-
-	# breaks with permission errors
-	rm tests/unit/utils/test_cache.py || die
-
-	# remove raet due to deps being dropped
-	rm tests/unit/modules/test_raet_publish.py \
-		salt/transport/raet.py \
-		salt/daemons/test/test_raetkey.py || die
-
-	# allow the use of the renamed msgpack
-	sed -i '/^msgpack/d' requirements/base.txt || die
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local tempdir
-	# testsuite likes lots of files
-	ulimit -n 3072 || die
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
-
-	(
-		cleanup() { rm -f "${tempdir}" || die; }
-
-		trap cleanup EXIT
-
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
-
-		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
-			TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose \
-			|| die "testing failed with ${EPYTHON}"
-	)
-}

app-crypt/yubikey-manager/Manifest

@@ -1,2 +1 @@
-DIST yubikey-manager-3.1.0.tar.gz 115010 BLAKE2B 1b27b9af7f3adac87a1bca58929bffef2ae397b359f70580a07193d2bd2f8cd4d2d867053f6494f1e262668443388d79dfe3775f2c3d0a5528840df8826cdf91 SHA512 518eedb52cfcf725c13114c433f848b97f711e94fa9c71685916fb8cb20e5bfc431f648b0ec710ef9ebed2bc8ddd8722ca1c9865d7a1b29537b719e167ed5f60
 DIST yubikey-manager-3.1.1.tar.gz 116632 BLAKE2B 252c419280143fa6f44daf3de8ec27bbdc3218e4552e39799e1daca5b46939c4042ae1d43abeab110fe1abaf2e87d94c270442ee6fce05e26927add5b34e9f66 SHA512 8229d5442ddf89fe90abb0153aa005cb0d149a84634b994dc283f7cbac2f72d4b913c238c277c6aa07f431aed8905008aeb11e594e730be71c9ca88150a6ef68

app-crypt/yubikey-manager/yubikey-manager-3.1.0-r1.ebuild

@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
-# the official source for tarballs, not Github
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/fido2-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/fido2-0.8.0[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sys-auth/ykpers-1.19.0
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-	)
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOC_CONTENTS
-
-	distutils-r1_python_install_all
-
-	DOC_CONTENTS="
-		The 'openpgp' command may require the package 'app-crypt/ccid'
-		to be installed on the system. Furthermore, make sure that pcscd
-		daemon is running and has correct access permissions to USB
-		devices.
-	"
-	readme.gentoo_create_doc
-
-	doman "${S}"/man/ykman.1
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}

app-emulation/qemu-guest-agent/Manifest

@@ -1,4 +1,2 @@
-DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
-DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
 DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
 DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf

app-emulation/qemu-guest-agent/files/qemu-guest-agent-2.5.0-sysmacros.patch

@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/580924
-
-Linux C libs are moving away from implicit header pollution with sys/types.h
-
---- a/include/qemu/osdep.h
-+++ b/include/qemu/osdep.h
-@@ -78,6 +78,10 @@ extern int daemon(int, int);
- #include <assert.h>
- #include <signal.h>
- 
-+#ifdef __linux__
-+#include <sys/sysmacros.h>
-+#endif
-+
- #ifdef __OpenBSD__
- #include <sys/signal.h>
- #endif

app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild

@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils systemd toolchain-funcs udev python-any-r1
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
-HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/glib"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
-)
-
-src_configure() {
-	tc-export AR LD OBJCOPY RANLIB
-
-	local myconf=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir="/usr/$(get_libdir)"
-		--localstatedir=/
-		--disable-bsd-user
-		--disable-linux-user
-		--disable-system
-		--disable-strip
-		--disable-tools
-		--disable-werror
-		--enable-guest-agent
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-	)
-	echo "./configure ${myconf[*]}"
-	./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	emake V=1 qemu-ga
-}
-
-src_install() {
-	dobin qemu-ga
-
-	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
-	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
-
-	# systemd stuff
-	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
-
-	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
-		qemu-guest-agent.service
-}
-
-pkg_postinst() {
-	elog "You should add 'qemu-guest-agent' to the default runlevel."
-	elog "e.g. rc-update add qemu-guest-agent default"
-}

app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild

@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils systemd toolchain-funcs udev python-any-r1
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
-HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/glib"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
-)
-
-src_configure() {
-	tc-export AR LD OBJCOPY RANLIB
-
-	local myconf=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir="/usr/$(get_libdir)"
-		--localstatedir=/
-		--disable-bsd-user
-		--disable-linux-user
-		--disable-system
-		--disable-strip
-		--disable-tools
-		--disable-werror
-		--enable-guest-agent
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-	)
-	echo "./configure ${myconf[*]}"
-	./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	emake V=1 qemu-ga
-}
-
-src_install() {
-	dobin qemu-ga
-
-	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
-	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
-
-	# systemd stuff
-	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
-
-	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
-		qemu-guest-agent.service
-}
-
-pkg_postinst() {
-	elog "You should add 'qemu-guest-agent' to the default runlevel."
-	elog "e.g. rc-update add qemu-guest-agent default"
-}

app-emulation/sen/Manifest

@@ -1,3 +1 @@
-DIST sen-0.6.0.tar.gz 55113 BLAKE2B 5f6affbea94005c0adc9ac544d40d94cd9a9eca930b979c19174d21d73fdd887d21802a5241c02ba212a45c4a7873f22c7372aeb69955e1f97e444ef74d91929 SHA512 5573a0d6da5ae395e947bf34c54313e4e3a0251dc1868c52bbfe9ad11463397da83a0c9ac3f1912da2e6f49341c84d40dcab900d41b4a32ebac44d1dde3ac82b
-DIST sen-0.6.1.tar.gz 55357 BLAKE2B 0d58f0ea11eeff29161925018425c918b3260c754d1b658e2ebd3c88e0c371feb0f1815af61979206bee529c369a90ace895d25e645ef0d76c563abd8b74c943 SHA512 2f1cadf745ca7e12d3e92534e76984072b9678055b9911f76b1a6d3cbd43266ad1eeb4d5e7bb8742db91c4da4aef684fa644c33de6fa2494c37688e9747e0efa
 DIST sen-0.6.1_p20200905.tar.gz 1913978 BLAKE2B 189bff583770265de29ca3e54cad1283051c05eccab4fc98160801e50b31376188c52e49b43972292fe231b376ba42879fb34d7b1ae70c2246d676a6e25f670b SHA512 cd1899c1b4c5c7cf7f1f2f5e557bd609a7d7619dbc3fc6457f5ef5ce5c9ab43d92a6fbfa228c43d543d4f46c7928d74dbed9ab8346cabc772c8e7c63a7c07bfe

app-emulation/sen/sen-0.6.0.ebuild

@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminal User Interface for docker engine"
-HOMEPAGE="https://github.com/TomasTomecek/sen"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/urwidtrees[${PYTHON_USEDEP}]
-	dev-python/docker-py[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/flexmock[${PYTHON_USEDEP}]
-	)
-	"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r docs
-}
-
-python_test() {
-	pytest -vv tests || die "pytest failed"
-}

app-emulation/sen/sen-0.6.1.ebuild

@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminal User Interface for docker engine"
-HOMEPAGE="https://github.com/TomasTomecek/sen"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/urwidtrees[${PYTHON_USEDEP}]
-	dev-python/docker-py[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/flexmock[${PYTHON_USEDEP}]
-	)
-	"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r docs
-}
-
-python_test() {
-	pytest -vv tests || die "pytest failed"
-}

app-misc/anki/Manifest

@@ -1,3 +1 @@
-DIST anki-2.1.0_beta27.tgz 4127906 BLAKE2B b4f83cc30dc3e89f3ca17c03ba8dcfc9a487de43d8ac564d5dc83488e286c302816c8a8140aa764b596404194c5f3727218deec303ef201ccaef38b945d8b32d SHA512 50b4ece1361ecafdfe08dad04e9b622b1e8ba2224bfef7e4660c95f81cb8f525d892170548d741ff53bc19ff4c13863f488a71c31c8328511fea3203d2c345f1
-DIST anki-2.1.13.tgz 4248906 BLAKE2B 82a2a9a556cbf3596af22a73a2865815561cdd408b249443fc7e144734fdc2b62317120db71475afd7b0d4027f19e53c47437132028ef78b158ec3624f54a33f SHA512 921ef48b16c0c8c83b85523aa0a5b828210b210cd51fa471f57e9aa6777a1aced30c7e24084ef0c2f14c9d846a19091923d13faaff7ed9075860fc23f8ba1cd3
 DIST anki-2.1.15.tgz 4269571 BLAKE2B 00b351f5ffacb363642e02bf806bcd7c0d9446c9815a75328e7fa37c848b271b135510de17cc012e8cc96d8a52a183a49de84b6f85f562a370255bd36c6f866e SHA512 f3acfa6ff62d43fa461efddd81a8570304ada53b97bd494fdbbe0a0439700d7a52aa62ead31cbaed731be0df96a6cc845a7cf92dcf65f3080dc63282fe5941c3

app-misc/anki/anki-2.1.0_beta27.ebuild

@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 xdg
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="https://apps.ankiweb.net"
-
-MY_P="${P/_/}"
-SRC_URI="https://apps.ankiweb.net/downloads/beta/${MY_P}-source.tgz -> ${P}.tgz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex +recording +sound test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		|| (
-			(
-				>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
-				dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
-			)
-			<dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_MULTI_USEDEP}]
-		)
-		>=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
-		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
-		recording? (
-			media-sound/lame
-			>=dev-python/pyaudio-0.2.4[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-	sound? ( media-video/mplayer )
-	latex? (
-		app-text/texlive
-		app-text/dvipng
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-}
-
-src_compile() {
-	:;
-}
-
-src_test() {
-	sed -e "s:nosetests:${EPYTHON} ${EROOT}usr/bin/nosetests:" \
-		-i tools/tests.sh || die
-	./tools/tests.sh || die
-}
-
-src_install() {
-	cp tools/runanki.system tools/anki
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1