Sync with portage [Fri May 22 00:55:50 MSK 2020].

4 years ago · 93972fe6bb
parent 166af77aed
commit 93972fe6bb
852 changed files with 3694 additions and 14706 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@ -1081,6 +1081,7 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d
 DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
 DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47b24b347ee4758fac8c11e3f627788c03d6568af129acb5b911b08857ab77a619bf571986ee90dd1c6c6aa12fd8e6e26d395a64bb7513a8b SHA512 66a13fedc358399644b869ac4b39a295c6c15d642e074ec66ff042e1b109f9603bc941ff25aaf7d9bc700f6c2fb1f60bf2a637a471e26ae037d822f0f1e2c518
 DIST helm-2.16.1.tar.gz 1283836 BLAKE2B f0a2cfb05adea2b0a98341962753e777e9329b669ca32a84ce0ed9b823df48f7884c6809d1625dd8cdfbf50efea31081c3c0400f0af65a67ab0fbf1afa3deba1 SHA512 eed2da36ba72da61c121d2cc2d4dc4ef2163f926579b2189b8b8113ba70102d0f63e48729e08b260fb3877d0fe1e0d6ed7eb8e9c67605d7d4a3bcdf7b33c2544
+DIST helm-2.16.7.tar.gz 1287743 BLAKE2B fc04e25699489a18703ea1fcf8d63ec4b657098a06f36cc13e5f02696706654203a6a2b075799e3354c7bd7ccb507d538ece14a6a2b7be304a3eed0aa64984ad SHA512 6fc04395e966be8282e576675860f3dddbba812cd23ef30a5bd0997db226887e209a8ffc27c94e4728bfd07a6a0fe4a2a5a24bcd81bd2981c45ddc1adb192087
 DIST helm-3.0.3.tar.gz 499874 BLAKE2B eda691d2b02fb5aaee7e09dd846c19650c3fc0e5d46e703a768b3db5a9966c8bb5548beb1699c5c8771e8e39f8fe35558e601a961d900cd6ebd2e813dec1e6b7 SHA512 9dc776f0638350ba09f7a1af383160a56b0badd3c353f57173ea2540625eb36afe2c0cc1a203b6bcef738d32e4d914028a9b0495d2b652a8cbee4317bca47f0b
 DIST helm-3.1.2.tar.gz 532703 BLAKE2B c3b1ca53d2cb6847342c67514094487e960bcdec0b2a3aafc21d493702a8d48e49a32afb7178f1336e840cdc908e88fffd81c48306771cedb7f0c51f64e606e7 SHA512 5d2392fa1c738f3be0cab1542df850748d237d2cfa978bdab96267e74401f2956ad372e178ff9716ba7ba5cb8f7bce7e3a31448830666b570767a533d559db33
 DIST helm-3.1.3.tar.gz 533593 BLAKE2B d6fce53a4e6cdb9a934552c44c496aae416cf3f7b1220ce0a086b6339afa5c44c5d8202e3cd86489c4726ba9903062e0fcf35702b7462d616d29eb01f93a80ea SHA512 49f924cc79c75328ec4ebc787468198be85412a56224b50d625837445982ecaf990df6aa36e099705ec9bbf4c75c516f4015fc38a5f5f22f9a47568d2f5e2c8f
--- a/app-admin/helm/helm-2.16.7.ebuild
+++ b/app-admin/helm/helm-2.16.7.ebuild
@ -0,0 +1,167 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+MY_PV=${PV/_rc/-rc.}
+
+EGO_VENDOR=(
+"cloud.google.com/go 8c41231e01b2085512d98153bcffb847ff9b4b9f github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
+"github.com/Azure/go-autorest 69b4126ece6b5257e2f9b0017007d2334153655f"
+"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
+"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
+"github.com/cpuguy83/go-md2man 7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19"
+"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
+"github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73"
+"github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
+"github.com/docker/distribution 2461543d988979529609e8cb6fca9ca190dc48da"
+"github.com/docker/docker be7ac8be2ae072032a4005e8f232be3fc57e4127"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
+"github.com/evanphx/json-patch 5858425f75500d40c52783dce87d085a483ce135"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/color 3f9d52f7176a6927daacff70a3e8d1dc2025c53e"
+"github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577"
+"github.com/gofrs/flock 392e7fae8f1b0bdbd67dad7237d23f618feb6dbb"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
+"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
+"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+"github.com/gogo/protobuf 65acae22fc9d1fe290b33faa2bd64cdc20a463a0"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf 6c65a5562fc06764971b7c5d05c76c75e84bdbf7"
+"github.com/google/btree 4030bb1f1f0c35b30ca7009e9ebd06849dd45306"
+"github.com/google/go-cmp 6f77996f0c42f7b84e5a2b252227263f93432e9b"
+"github.com/google/gofuzz f140a6486e521aad38f5917de355cbf147cc0496"
+"github.com/google/uuid 0cd6bf5da1e1c83f8b45653022c74f71af0538a4"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud c2d73b246b48e239d3f03c455905e06fe26e33c3"
+"github.com/gosuri/uitable 2cf933346b8370a3a3d8867ef5cf54b2129d8ecf"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 6af20e3a5340d5e6bde20c8a7a78699efe19ac0a"
+"github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"
+"github.com/huandu/xstrings f02667b379e2fb5916c3cda2cf31e0eb885d79f8"
+"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/jmoiron/sqlx d161d7a76b5661016ad0b085869f77fd410f3e6a"
+"github.com/json-iterator/go 27518f6661eba504be5a7a9a9f6d9460d892ade3"
+"github.com/konsorten/go-windows-terminal-sequences 5c8c8bd35d3832f5d134ae1e1e375b69a4d25242"
+"github.com/lib/pq f91d3411e481ed313eeab65ebfe9076466c39d01"
+"github.com/liggitt/tabwriter 89fcab3d43de07060e4fd4c1547430ed57e87f24"
+"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
+"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+"github.com/Masterminds/goutils 41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"
+"github.com/Masterminds/semver 805c489aa98f412e79eb308a37996bf9d8b1c91e"
+"github.com/Masterminds/sprig e4c0945838d570720d876a6ad9b4568ed32317b4"
+"github.com/Masterminds/vcs f94282d8632a0620f79f0c6ff0e82604e8c5c85b"
+"github.com/mattn/go-colorable 98ec13f34aabf44cc914c65a1cfb7b9bc815aef1"
+"github.com/mattn/go-isatty 0e9ddb7c0c0aef74fa25eaba4141e6b5ab7aca2a"
+"github.com/mattn/go-runewidth 9d4e0701ab53d89eeb2f46b282d1cd71f458f0bf"
+"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
+"github.com/mitchellh/copystructure 9a1b6f44e8da0e0e374624fb0a825a231b00c537"
+"github.com/mitchellh/go-wordwrap 9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c"
+"github.com/mitchellh/reflectwalk 3e2c75dfad4fbf904b58782a80fd595c760ad185"
+"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+"github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
+"github.com/opencontainers/go-digest 279bed98673dd5bef374d3b6e4b09e2af76183bf"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/pkg/errors 27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"
+"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
+"github.com/prometheus/client_model 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"
+"github.com/prometheus/common 4724e9255275ce38f7179b2478abeae4e28c904f"
+"github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/rubenv/sql-migrate 9355dd04f4b3dc9ed604623307307a3491a627bc"
+"github.com/russross/blackfriday 05f3235734ad95d0016f6a23902f06461fcf567a"
+"github.com/sirupsen/logrus 839c75faf7f98a33d445d181f3018b5c3409a45e"
+"github.com/spf13/cobra f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5"
+"github.com/spf13/pflag 2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab"
+"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
+"golang.org/x/crypto e84da0312774c21d64ee2317962ef669b27ffb41 github.com/golang/crypto"
+"golang.org/x/net cdfb69ac37fc6fa907650654115ebebb3aae2087 github.com/golang/net"
+"golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2"
+"golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e github.com/golang/sync"
+"golang.org/x/sys b90733256f2e882e81d52f9126de08df5615afd9 github.com/golang/sys"
+"golang.org/x/text e6919f6577db79269a6443b9dc46d18f2238fb5d github.com/golang/text"
+"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
+"google.golang.org/appengine 54a98f90d1c46b7731eb8fb305d2a321c30ef610 github.com/golang/appengine"
+"google.golang.org/genproto 919d9bdd9fe6f1a5dd95ce5d5e4cdb8fd3c516d0 github.com/google/go-genproto"
+"google.golang.org/grpc a02b0774206b209466313a0b525d2c738fe407eb github.com/grpc/grpc-go"
+"gopkg.in/gorp.v1 6a667da9c028871f98598d85413e3fc4c6daa52e github.com/go-gorp/gorp"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/square/go-jose.v2 e94fb177d3668d35ab39c61cbb2f311550557e83 github.com/square/go-jose"
+"gopkg.in/yaml.v2 f221b8435cfb71e54062f6c6e99e9ade30b124d5 github.com/go-yaml/yaml"
+"k8s.io/api 35e52d86657aba06859dd22099bfa14faf1effb2 github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver 5357c4baaf6562e4d37c9afc9fef99bd16d76a9f github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery a2eda9f80ab8a454a81bdde16d62a1afe5f931c0 github.com/kubernetes/apimachinery"
+"k8s.io/apiserver 5190913f932d82e562d4eb91d0f3d7a063bdbc07 github.com/kubernetes/apiserver"
+"k8s.io/client-go bec269661e48cb1e5fbb0d037f356ffe9e9978a0 github.com/kubernetes/client-go"
+"k8s.io/cli-runtime 74ad18325ed51ea6de9ee19bae59156bad18ecd2 github.com/kubernetes/cli-runtime"
+"k8s.io/component-base 039242c015a9f5eeaccea3ea17c6973b9c27166a github.com/kubernetes/component-base"
+"k8s.io/klog 3ca30a56d8a775276f9cdae009ba326fdc05af7f github.com/kubernetes/klog"
+"k8s.io/kube-openapi 743ec37842bffe49dd4221d9026f30fb1d5adbc4 github.com/kubernetes/kube-openapi"
+"k8s.io/kubectl 2ed914427d51f6fd865e0db43d72b2f22610cf32 github.com/kubernetes/kubectl"
+"k8s.io/kubernetes c97fe5036ef3df2967d086711e6c0c405941e14b github.com/kubernetes/kubernetes"
+"k8s.io/utils 581e00157fb1a0435d4fac54a52d1ca1e481d60e github.com/kubernetes/utils"
+"sigs.k8s.io/kustomize a6f65144121d1955266b0cd836ce954c04122dc8 github.com/kubernetes-sigs/kustomize"
+"sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 github.com/kubernetes-sigs/yaml"
+"vbom.ml/util efcd4e0f97874370259c7d93e12aad57911dea81 github.com/fvbommel/util"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT="bbdfe5e7803a12bbdf97e94cd847859890cf4050"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.12"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+	popd || die
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN} bin/tiller
+	dodoc src/${EGO_PN}/README.md
+}
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/geekbench/geekbench-5.1.1.ebuild
+++ b/app-benchmarks/geekbench/geekbench-5.1.1.ebuild
@ -7,7 +7,7 @@ DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windo
 HOMEPAGE="https://www.geekbench.com/"
 SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"

-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="geekbench"
 SLOT="5"

--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@ -1,7 +1 @@
-DIST gnucash-docs-3.2.tar.gz 92387447 BLAKE2B dac502975f885b777c1e91a7ea574789947e1dddfd3239c05973ce57fec41a6d78e605ef37aaf721db4aa4d2bc8f2dda7ed76cc4dc97dd49e30618414e262f15 SHA512 a58a583a457377f529223ced083fb64460b3b0c75a423db08c7f9542711be98fd59bd776bf77309ff91d1c46f22a5ae882d8c0a8ec3fc834d7a8028a95028aad
-DIST gnucash-docs-3.3.tar.gz 92417386 BLAKE2B 200f9b8d3006589eac5f0d66300d658f69f5c55078371c5b416e34784835350de9bd40fc5d85e59116022874294f74e259a034d6ebcaf315b1ea9942b8350c7b SHA512 5887171cbe95f545eb6e647aee2d04a26ab9102643acd8d3e5754000613a7fb08e4470777f7dfbfd0d1ed7609de7a6241cd82f5c7d62f632b2e3751b005bc01e
-DIST gnucash-docs-3.4.tar.gz 92762652 BLAKE2B 1aad3f1e7fe5b6ec11b38dc778e8994544d50f9549450b4632e5fcbd370332f05c7c68f9f6bf0e274b654dee6304924d17089b61318e0e4356bf01133ad47508 SHA512 0a64c8fcc88988a08d5b2f7c472356c580dff17b1a2a37b66a6bed790fba9d7bb437955050656656a0be399b2ce1635902f4548f44b62233c1fcd1d75fbb38ec
-DIST gnucash-docs-3.5.tar.gz 97187415 BLAKE2B f35a3a25a120d3807771d74ee1c97713e21617f7ac7b4fdc1f58b9d12f7c0cc899a9af6abca21bd4f91a0978ebf5b93604deaae29f39c8ab86bd83ec93e32642 SHA512 aa832a1929ae91b9fe2a6a4ada0c7dbd8c1a4cf76086ec3ab0b82c7396d45aabbb6971f2db788bbdde71a68c8faca5f4621429819ef6c0d1156bcefdc5d289b5
-DIST gnucash-docs-3.6.tar.gz 96986567 BLAKE2B 753ee011cadec37320fafe3c0973bc5772c300dcf641ba34f05d03b9c13ec159c10f8571876adecfd7816956f2dfa9e83ad5879387536c15e7d1b138f7e38a47 SHA512 1fd36c74633ba699116914eaef245d4b84ab85a6e65578c602db8b2e3150f7fb97b549c12068a691e38b90ae0fa5cc22f8026b6d50de1ac967eb52b8296eb135
-DIST gnucash-docs-3.7.tar.gz 70634602 BLAKE2B bee0b328ab36409055ac4f681d4b09ff5e9aa28d17249491869836e8921700b495b46954465161ad06896ef9bc46c7ee8557ef2a3e8c4bbce2d600e6440bc1d9 SHA512 38f5828d3121ed76eb8a43fd91c1e3349c1f31cb95ee8fb8fa1b4c5223c68fc14627c78a5072a632aa0a228790918112a60269e6ee0211c705da6b4d5467a45d
 DIST gnucash-docs-3.8b.tar.gz 71058053 BLAKE2B 0a69db02faf6487f2ecc1b5f9a788fb50cec65ff7db53ca9ec6048510156f094c0ce457d1abb4a9a6694060f68780c0336de41dbd0736ad93055cce81b3a66ab SHA512 3c30e88412e17960006517fb7c341220159c45760ca28c79c27c66551451c8ec14e000757f4d9a78c923e10d437351e38dbedaf0a1f3b11bbf5b87d80cb230fe
--- a/app-doc/gnucash-docs/gnucash-docs-3.2-r2.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-3.2-r2.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-LOCALES=( de it ja pt ru )
-IUSE="${LOCALES[*]/#/l10n_}"
-
-DEPEND="
-	app-text/docbook-xml-dtd
-	app-text/docbook-xsl-stylesheets
-	app-text/rarian
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local doc_type my_lang
-
-	for doc_type in help guide; do
-		for my_lang in C ${L10N}; do
-			case $my_lang in
-				# Both help and guides translated
-				C|de|it|pt) ;;
-				ru|ja) # Only guides translated
-					if [[ ${doc_type} = "help" ]] ; then
-						elog "Help documentation hasn't been translated for $my_lang"
-						elog "Will do English instead."
-						continue
-					fi
-					;;
-				*)
-					die "Invalid locale: $my_lang"
-					;;
-			esac
-
-			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
-		done
-	done
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
-	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
-}
--- a/app-doc/gnucash-docs/gnucash-docs-3.3-r1.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-3.3-r1.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-LOCALES=( de it ja pt ru )
-IUSE="${LOCALES[*]/#/l10n_}"
-
-DEPEND="
-	app-text/docbook-xml-dtd
-	app-text/docbook-xsl-stylesheets
-	app-text/rarian
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local doc_type my_lang
-
-	for doc_type in help guide; do
-		for my_lang in C ${L10N}; do
-			case $my_lang in
-				# Both help and guides translated
-				C|de|it|pt) ;;
-				ru|ja) # Only guides translated
-					if [[ ${doc_type} = "help" ]] ; then
-						elog "Help documentation hasn't been translated for $my_lang"
-						elog "Will do English instead."
-						continue
-					fi
-					;;
-				*)
-					die "Invalid locale: $my_lang"
-					;;
-			esac
-
-			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
-		done
-	done
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
-	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
-}
--- a/app-doc/gnucash-docs/gnucash-docs-3.4-r1.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-3.4-r1.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-LOCALES=( de it ja pt ru )
-IUSE="${LOCALES[*]/#/l10n_}"
-
-DEPEND="
-	app-text/docbook-xml-dtd
-	app-text/docbook-xsl-stylesheets
-	app-text/rarian
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local doc_type my_lang
-
-	for doc_type in help guide; do
-		for my_lang in C ${L10N}; do
-			case $my_lang in
-				# Both help and guides translated
-				C|de|it|pt) ;;
-				ru|ja) # Only guides translated
-					if [[ ${doc_type} = "help" ]] ; then
-						elog "Help documentation hasn't been translated for $my_lang"
-						elog "Will do English instead."
-						continue
-					fi
-					;;
-				*)
-					die "Invalid locale: $my_lang"
-					;;
-			esac
-
-			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
-		done
-	done
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
-	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
-}
--- a/app-doc/gnucash-docs/gnucash-docs-3.5-r1.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-3.5-r1.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-LOCALES=( de it ja pt ru )
-IUSE="${LOCALES[*]/#/l10n_}"
-
-DEPEND="
-	app-text/docbook-xml-dtd
-	app-text/docbook-xsl-stylesheets
-	app-text/rarian
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local doc_type my_lang
-
-	for doc_type in help guide; do
-		for my_lang in C ${L10N}; do
-			case $my_lang in
-				# Both help and guides translated
-				C|de|it|pt) ;;
-				ru|ja) # Only guides translated
-					if [[ ${doc_type} = "help" ]] ; then
-						elog "Help documentation hasn't been translated for $my_lang"
-						elog "Will do English instead."
-						continue
-					fi
-					;;
-				*)
-					die "Invalid locale: $my_lang"
-					;;
-			esac
-
-			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
-		done
-	done
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
-	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
-}
--- a/app-doc/gnucash-docs/gnucash-docs-3.6-r1.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-3.6-r1.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-LOCALES=( de it ja pt ru )
-IUSE="${LOCALES[*]/#/l10n_}"
-
-DEPEND="
-	app-text/docbook-xml-dtd
-	app-text/docbook-xsl-stylesheets
-	app-text/rarian
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local doc_type my_lang
-
-	for doc_type in help guide; do
-		for my_lang in C ${L10N}; do
-			case $my_lang in
-				# Both help and guides translated
-				C|de|it|pt) ;;
-				ru|ja) # Only guides translated
-					if [[ ${doc_type} = "help" ]] ; then
-						elog "Help documentation hasn't been translated for $my_lang"
-						elog "Will do English instead."
-						continue
-					fi
-					;;
-				*)
-					die "Invalid locale: $my_lang"
-					;;
-			esac
-
-			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
-		done
-	done
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
-	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
-}
--- a/app-doc/gnucash-docs/gnucash-docs-3.7.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-3.7.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-LOCALES=( de it ja pt ru )
-IUSE="${LOCALES[*]/#/l10n_}"
-
-DEPEND="
-	app-text/docbook-xml-dtd
-	app-text/docbook-xsl-stylesheets
-	app-text/rarian
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local doc_type my_lang
-
-	for doc_type in help guide; do
-		for my_lang in C ${L10N}; do
-			case $my_lang in
-				# Both help and guides translated
-				C|de|it|pt) ;;
-				ru|ja) # Only guides translated
-					if [[ ${doc_type} = "help" ]] ; then
-						elog "Help documentation hasn't been translated for $my_lang"
-						elog "Will do English instead."
-						continue
-					fi
-					;;
-				*)
-					die "Invalid locale: $my_lang"
-					;;
-			esac
-
-			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
-		done
-	done
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
-	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
-}
--- a/app-doc/zeal/Manifest
+++ b/app-doc/zeal/Manifest
@ -1,3 +1 @@
-DIST zeal-0.4.0.tar.gz 1049326 BLAKE2B b3007dad0ed280954b05464bc107fa51c603d79607acd42ab85bc745d0590bdaed740edac75dac91e0d0da34b5966eb96815e8250a3b68041cb5a8e0389676fc SHA512 fd1e7cd71469e40914b713c10057b3f3d1d2ae9808d296ca01ceb43941b6e7d6754a4f21edf43a594b1c3ebcab20728812db1bdffda6bc78ee49a1d4faaf9627
-DIST zeal-0.6.0.tar.gz 1062223 BLAKE2B 691525380dcefa03a1ed94cf0651f16e4e630aef820beed612a4412d8cdef39de25d2cacb84a76b5f7d03b9c3833fbcd60e463722bd7f9c3e147e5e72037211c SHA512 453841cdbab405a6c3842818b0d18b93d3ee8ad299386c25f63986e04674dbd437665e1913a03f0d94944004a619ea18d218de969c487e68e06a205e0edc1d3a
 DIST zeal-0.6.1.tar.gz 1063963 BLAKE2B 72f38aac8275cea8da214962b568ff3f634c6c8499a73f506a6b63d947f87bb0b13bf6a0821d7803ccf09689744a79ebf8659ebe1d6ae07863662cb6a017c5ee SHA512 5b1a129980000c0fc8516e2c7d6c4a8de4adde7054ff8d9635e3be35441ad3ef0539746bbe1ca8abce7e6fb3d20c825b57661c3f8cd059ef1480db65ff81f3d9
--- a/app-doc/zeal/zeal-0.4.0.ebuild
+++ b/app-doc/zeal/zeal-0.4.0.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils xdg-utils
-
-DESCRIPTION="Offline documentation browser inspired by Dash"
-HOMEPAGE="https://zealdocs.org/"
-SRC_URI="https://github.com/zealdocs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	app-arch/libarchive
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=x11-libs/xcb-util-keysyms-0.3.9
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-themes/hicolor-icon-theme
-"
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" PREFIX="${EPREFIX}/usr" install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
--- a/app-doc/zeal/zeal-0.6.0.ebuild
+++ b/app-doc/zeal/zeal-0.6.0.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils cmake-utils xdg-utils
-
-DESCRIPTION="Offline documentation browser inspired by Dash"
-HOMEPAGE="https://zealdocs.org/"
-SRC_URI="https://github.com/zealdocs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	app-arch/libarchive
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	kde-frameworks/extra-cmake-modules:5
-	>=x11-libs/xcb-util-keysyms-0.3.9
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-themes/hicolor-icon-theme
-"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild
+++ b/app-editors/leafpad/leafpad-0.8.18.1-r1.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
@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="emacs"

 BDEPEND="
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@ -1,3 +1 @@
-DIST qhexedit2-0.8.4.tar.gz 340766 BLAKE2B af24031fdd9f8d677f7e8ab8fd69667852dd971db30f5406b9aaaa08bf7f2dc692c87e99c141f355adc82c8226b5b29f53ce07ba63656d866f8688cb2cbc67f2 SHA512 8ed831d75c8ec1897dfd7ef497423908b26b0f56e6577928ed035654e52b437f64edd61cfcc1de6eaf5d1f29f9dc97da84d2edd7f427e3c09c9d75d7bc6504ff
-DIST qhexedit2-0.8.4_p20170719.tar.gz 342037 BLAKE2B 667a7c3e93ed3422f21da53b6811fca53b210cfaf2603cf2a61e377e68f295b5024a9fa73d444c1e50af274bdbc6faa62bc2ab4aad176a8b3a6d7540117c5a30 SHA512 3c412b9bbe4f84f6f445b6ad530fc51dc5422a0a5bb6184edc7df92595aa5215c345e2b16effae8de758b299c5f7f7d44cf54dd65a180941c30790194679baa8
 DIST qhexedit2-0.8.6_p20190316.tar.gz 355512 BLAKE2B a7edc8d05a7788f3a3f2202762ca3dc436cafbde1b1216ff1bb342055600a2e9d53c27fe324380331b8182904545c698106129238065cd2416d244fdfa176446 SHA512 4ef288c8a220c308d38c41fee83fe962e213cdfa448445ef73c3d2fe1952b68f2096732e78d2aa0a87eddd3cf2f47bed3e77807e12d2b7616c1447b3bf1b0e7d
--- a/app-editors/qhexedit2/files/qhexedit2-0.8.4-fixtest.patch
+++ b/app-editors/qhexedit2/files/qhexedit2-0.8.4-fixtest.patch
@ -1,12 +0,0 @@
--- qhexedit2-0.8.4/test/testchunks.cpp-	2017-01-17 02:32:54.000000000 +0300
-+++ qhexedit2-0.8.4/test/testchunks.cpp	2018-01-03 21:34:24.988555308 +0300
-@@ -1,8 +1,7 @@
- #include "testchunks.h"
- #include <cstdlib>
-
-
-TestChunks::TestChunks(QTextStream &log, QString tName, int size, bool random, int saveFile)
-+TestChunks::TestChunks(QTextStream &log, QString tName, int size, bool random, int saveFile): _chunks(nullptr)
- {
-     char hex[] = "0123456789abcdef";
-     srand(0);
--- a/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild
@ -1,83 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 qmake-utils
-
-DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
-HOMEPAGE="https://github.com/lancos/qhexedit2/"
-SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +gui python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fixtest.patch"
-	"${FILESDIR}/${P}-setup.py.patch"
-)
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	python? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-			dev-python/sip[${PYTHON_USEDEP}]
-			${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e '/^unix:DESTDIR/ d' -e "\$atarget.path = /usr/$(get_libdir)" \
-		-e "\$aINSTALLS += target" src/qhexedit.pro \
-		|| die "src/qhexedit.pro: sed failed"
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	eqmake5 src/qhexedit.pro
-	if use gui; then
-		cd example || die "can't cd example"
-		eqmake5 qhexedit.pro
-	fi
-}
-
-src_compile() {
-	default
-	use python && distutils-r1_src_compile
-	if use gui; then
-		cd example || die "can't cd example"
-		emake
-	fi
-}
-
-python_compile() {
-	use python && distutils-r1_python_compile build_ext --library-dirs="${S}"
-}
-
-src_test() {
-	cd test || die "can't cd test"
-	mkdir logs || die "can't create logs dir"
-	eqmake5 chunks.pro
-	emake
-	./chunks || die "test run failed"
-	grep -q "^NOK" logs/Summary.log && die "test failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	use python && distutils-r1_src_install
-	use gui && dobin example/qhexedit
-	if use doc; then
-		dodoc -r doc/html
-		dodoc doc/release.txt
-	fi
-}
--- a/app-editors/qhexedit2/qhexedit2-0.8.4_p20170719.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.4_p20170719.ebuild
@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 qmake-utils
-
-EGIT_COMMIT="5f3ca79dbe8c765b685636a1751d242a6bfabb7d"
-DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
-HOMEPAGE="https://github.com/lancos/qhexedit2/"
-SRC_URI="https://github.com/lancos/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +gui python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.4-fixtest.patch"
-	"${FILESDIR}/${PN}-0.8.4-setup.py.patch"
-)
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	python? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		dev-python/sip[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-		)
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-src_prepare() {
-	default
-	sed -i -e '/^unix:DESTDIR/ d' -e "\$atarget.path = /usr/$(get_libdir)" \
-		-e "\$aINSTALLS += target" src/qhexedit.pro \
-		|| die "src/qhexedit.pro: sed failed"
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	eqmake5 src/qhexedit.pro
-	if use gui; then
-		cd example || die "can't cd example"
-		eqmake5 qhexedit.pro
-	fi
-}
-
-src_compile() {
-	default
-	use python && distutils-r1_src_compile
-	use gui && emake -C example
-}
-
-python_compile() {
-	use python && distutils-r1_python_compile build_ext --library-dirs="${S}"
-}
-
-src_test() {
-	cd test || die "can't cd test"
-	mkdir logs || die "can't create logs dir"
-	eqmake5 chunks.pro
-	emake
-	./chunks || die "test run failed"
-	grep -q "^NOK" logs/Summary.log && die "test failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	doheader src/*.h
-	use python && distutils-r1_src_install
-	use gui && dobin example/qhexedit
-	if use doc; then
-		dodoc -r doc/html
-		dodoc doc/release.txt
-	fi
-}
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/examiner/examiner-0.5-r2.ebuild
+++ b/app-forensics/examiner/examiner-0.5-r2.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Utilizes the objdump command to disassemble and comment foreign binaries"
-HOMEPAGE="http://www.academicunderground.org/examiner/"
-SRC_URI="http://www.academicunderground.org/examiner/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl"
-
-src_prepare() {
-	# Do not install docs through Makefile wrt bug #241256
-	sed -i -e '/$(DOC)/d' Makefile || die 'sed failed'
-	epatch "${FILESDIR}"/${P}-perl.patch
-}
-
-src_compile() {	:; }
-
-src_install() {
-	dodir /usr/bin /usr/share/${PN} /usr/share/man/man1
-
-	emake \
-		MAN="${D}/usr/share/man/man1" \
-		BIN="${D}/usr/bin" \
-		SHARE="${D}/usr/share/examiner" \
-		install
-
-	dodoc docs/{README*,BUGS,CHANGELOG,TODO,TUTORIAL}
-	dodoc -r utils
-}
--- a/app-forensics/examiner/examiner-0.5-r3.ebuild
+++ b/app-forensics/examiner/examiner-0.5-r3.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
@ -9,7 +9,7 @@ SRC_URI="http://www.academicunderground.org/examiner/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"

 RDEPEND="dev-lang/perl"

--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
--- a/app-laptop/i8kutils/Manifest
+++ b/app-laptop/i8kutils/Manifest
@ -1,2 +1 @@
-DIST i8kutils_1.33.tar.gz 50378 BLAKE2B 648d5dca57a407b1239b5a8d51dbe44214140368eefa71d72ef31b0cac3c0e7af2cb0ce44eb7ee429f555ef6503025ffa7543d9d17d2c42db98b67865fac0a03 SHA512 a7b9277b8c9bc2642a65122dda31cfa7cc0c4fa780ba980364c0a4e0e4599502c6557871464ff256c5911370d98944826d0e29d4d3621605d5e8c1c8a23e5578
 DIST i8kutils_1.42.tar.xz 37544 BLAKE2B ca8ec63252f43b269ba2a5565fce275aaa6542ebe6f4824d12b194cb0ae8b09dbe354c743ad78af8bcb897e411f1739df464e6c5603d470842de4b59be753984 SHA512 148e8788c50cbaa22f1dd3b72867839f5bc2d91cda70aee74f7c9a3d8542386a44652c5eb8dd9eba0e30400fc6bb72855d3cc7f2dc4284c2529b9cba2eac485b
--- a/app-laptop/i8kutils/i8kutils-1.33-r1.ebuild
+++ b/app-laptop/i8kutils/i8kutils-1.33-r1.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Dell Inspiron and Latitude utilities"
-HOMEPAGE="http://packages.debian.org/sid/i8kutils"
-SRC_URI="mirror://debian/pool/main/i/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="examples tk"
-
-DEPEND="tk? ( dev-lang/tk )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.i8kutils )
-
-src_prepare() {
-	sed \
-		-e '/^CC/d' \
-		-e '/^CFLAGS/d' \
-		-e 's: -g : $(LDFLAGS) :g' \
-		-i Makefile || die
-
-	tc-export CC
-}
-
-src_install() {
-	dobin i8kbuttons i8kctl
-	doman i8kbuttons.1 i8kctl.1
-	dosym /usr/bin/i8kctl /usr/bin/i8kfan
-
-	use examples && dodoc -r examples
-
-	newinitd "${FILESDIR}"/i8k.init-r1 i8k
-	newconfd "${FILESDIR}"/i8k.conf i8k
-
-	if use tk; then
-		dobin i8kmon
-		doman i8kmon.1
-		dodoc i8kmon.conf
-		systemd_dounit "${FILESDIR}"/i8kmon.service
-	else
-		cat >> "${ED}"/etc/conf.d/i8k <<- EOF
-		# i8kmon disabled because the package was installed without USE=tk
-		NOMON=1
-		EOF
-	fi
-
-}
--- a/app-laptop/i8kutils/i8kutils-1.42.ebuild
+++ b/app-laptop/i8kutils/i8kutils-1.42.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/i8kutils/trunk/${PV}/+download/${P/-/_}.tar.xz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="tk"

 DEPEND="tk? ( dev-lang/tk:0 )"
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/fhem/fhem-6.0.ebuild
+++ b/app-misc/fhem/fhem-6.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://www.fhem.de/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"

 RDEPEND="
--- a/app-misc/qlcplus/Manifest
+++ b/app-misc/qlcplus/Manifest
@ -1,3 +1,2 @@
 DIST QLC+_4.12.2.tar.gz 10804401 BLAKE2B 95b005985da99d1d1f557b4ac5d6ae7d844ea4f69a7cfa63d79b288ce654b5a70f9e6168f6fd4144496d3cff59a721972acd3ba47fd1477ab4bfd0218f5aeeda SHA512 b274f0559ce15e045d653f4c034dc083922a13c6f9c5e7ba11026b3be9bb85fe447bb489d536dd24bb99bd4b08433f24f1713b73701afff99fa845fcef2547af
 DIST QLC+_5.0.0_alpha3.tar.gz 10016411 BLAKE2B 51c0885f6e2e286f9f63830bcd269db699946c0969cb0f0a0139f82a421a9a4957ab07612db7aa047fe6650a642479282f6cfe0d124a41a935dd853d09b7253f SHA512 e703747aa243bc4c6b2e9fc3cf1a4e67524fa13fa64a59054e66164e879073b1bd69756a42bb423ff05dcb7da946cbcd99bb9edc3fde9a70d75b8a9f164a71d0
-DIST qlcplus-4.11.1.tar.gz 9394093 BLAKE2B 0b91359217b723ed184f6a609ee0ef0a39f5f08aa8933abc7a3c429e4d5a3b2d1dc8ef454c00a172bc0e7b8f7fb0779d7fbba96ed5fafe403853f2a3bb8ce7b8 SHA512 14efdbe5cd53da592a58b48efb1daf7dda2a4e19d7d20792d34674af2aa1b9c287cfd58673db7838885642bb2ebfaf9b462be41d33f8d89497cb61dfab7246df
--- a/app-misc/qlcplus/files/qlcplus-4.11.1-qt-5.11.patch
+++ b/app-misc/qlcplus/files/qlcplus-4.11.1-qt-5.11.patch
@ -1,243 +0,0 @@
-From f8be095c95831ae6ffc8426a94901197c0dacc38 Mon Sep 17 00:00:00 2001
-From: Jano Svitok <jan.svitok@gmail.com>
-Date: Mon, 9 Apr 2018 23:54:50 +0200
-Subject: [PATCH] Fix compilation with QT 5.11.0 beta2
-
---
- fixtureeditor/capabilitywizard.cpp            | 1 +
- fixtureeditor/editchannel.cpp                 | 1 +
- fixtureeditor/edithead.cpp                    | 1 +
- fixtureeditor/editmode.cpp                    | 1 +
- ui/src/aboutbox.cpp                           | 1 +
- ui/src/addfixture.cpp                         | 1 +
- ui/src/chasereditor.cpp                       | 1 +
- ui/src/fixtureselection.cpp                   | 1 +
- ui/src/functionwizard.cpp                     | 1 +
- ui/src/inputchanneleditor.cpp                 | 1 +
- ui/src/selectinputchannel.cpp                 | 1 +
- ui/src/virtualconsole/addvcbuttonmatrix.cpp   | 1 +
- ui/src/virtualconsole/addvcslidermatrix.cpp   | 1 +
- ui/src/virtualconsole/vcbuttonproperties.cpp  | 1 +
- ui/src/virtualconsole/vccuelistproperties.cpp | 2 ++
- ui/src/virtualconsole/vcpropertieseditor.cpp  | 1 +
- ui/src/virtualconsole/vcsliderproperties.cpp  | 1 +
- ui/src/virtualconsole/vcxypadproperties.cpp   | 1 +
- 18 files changed, 19 insertions(+)
-
-diff --git a/fixtureeditor/capabilitywizard.cpp b/fixtureeditor/capabilitywizard.cpp
-index d77c30fe1..ddb4c5b26 100644
--- a/fixtureeditor/capabilitywizard.cpp
-+++ b/fixtureeditor/capabilitywizard.cpp
-@@ -21,6 +21,7 @@
- #include <QTextEdit>
- #include <QSpinBox>
- #include <QDialog>
-+#include <QAction>
- 
- #include "capabilitywizard.h"
- #include "qlccapability.h"
-diff --git a/fixtureeditor/editchannel.cpp b/fixtureeditor/editchannel.cpp
-index c44097783..9278c31b6 100644
--- a/fixtureeditor/editchannel.cpp
-+++ b/fixtureeditor/editchannel.cpp
-@@ -32,6 +32,7 @@
- #include <QPainter>
- #include <QPoint>
- #include <QSize>
-+#include <QAction>
- 
- #include "qlccapability.h"
- #include "qlcconfig.h"
-diff --git a/fixtureeditor/edithead.cpp b/fixtureeditor/edithead.cpp
-index a95ecf726..68025b70d 100644
--- a/fixtureeditor/edithead.cpp
-+++ b/fixtureeditor/edithead.cpp
-@@ -20,6 +20,7 @@
- #include <QTreeWidgetItem>
- #include <QTreeWidget>
- #include <QDebug>
-+#include <QAction>
- 
- #include "qlcfixturehead.h"
- #include "qlcfixturemode.h"
-diff --git a/fixtureeditor/editmode.cpp b/fixtureeditor/editmode.cpp
-index 440ab4956..5b8b1884f 100644
--- a/fixtureeditor/editmode.cpp
-+++ b/fixtureeditor/editmode.cpp
-@@ -30,6 +30,7 @@
- #include <QPoint>
- #include <QDebug>
- #include <QSize>
-+#include <QAction>
- 
- #include "addchannelsdialog.h"
- #include "qlcfixturemode.h"
-diff --git a/ui/src/aboutbox.cpp b/ui/src/aboutbox.cpp
-index 68ece2d54..9296e566b 100644
--- a/ui/src/aboutbox.cpp
-+++ b/ui/src/aboutbox.cpp
-@@ -22,6 +22,7 @@
- #include <QTimer>
- #include <QDesktopServices>
- #include <QUrl>
-+#include <QAction>
- 
- #include "qlcconfig.h"
- #include "aboutbox.h"
-diff --git a/ui/src/addfixture.cpp b/ui/src/addfixture.cpp
-index dad12f4e6..ae6bc0efc 100644
--- a/ui/src/addfixture.cpp
-+++ b/ui/src/addfixture.cpp
-@@ -30,6 +30,7 @@
- #include <QSpinBox>
- #include <QLabel>
- #include <QDebug>
-+#include <QAction>
- 
- #include "qlcfixturedefcache.h"
- #include "qlcfixturemode.h"
-diff --git a/ui/src/chasereditor.cpp b/ui/src/chasereditor.cpp
-index bd949dcf2..246b71606 100644
--- a/ui/src/chasereditor.cpp
-+++ b/ui/src/chasereditor.cpp
-@@ -27,6 +27,7 @@
- #include <QSettings>
- #include <QDebug>
- #include <QUrl>
-+#include <QAction>
- 
- #include "qlcfixturedef.h"
- #include "qlcmacros.h"
-diff --git a/ui/src/fixtureselection.cpp b/ui/src/fixtureselection.cpp
-index 0954a00a1..30851fa21 100644
--- a/ui/src/fixtureselection.cpp
-+++ b/ui/src/fixtureselection.cpp
-@@ -21,6 +21,7 @@
- #include <QTreeWidget>
- #include <QHeaderView>
- #include <QLabel>
-+#include <QAction>
- 
- #include "qlcfixturedef.h"
- 
-diff --git a/ui/src/functionwizard.cpp b/ui/src/functionwizard.cpp
-index 00e7d5a4c..815b20e4c 100644
--- a/ui/src/functionwizard.cpp
-+++ b/ui/src/functionwizard.cpp
-@@ -21,6 +21,7 @@
- #include <QString>
- #include <QDebug>
- #include <QHash>
-+#include <QAction>
- 
- #include "palettegenerator.h"
- #include "fixtureselection.h"
-diff --git a/ui/src/inputchanneleditor.cpp b/ui/src/inputchanneleditor.cpp
-index 6ad638c1f..69b9ca2ae 100644
--- a/ui/src/inputchanneleditor.cpp
-+++ b/ui/src/inputchanneleditor.cpp
-@@ -21,6 +21,7 @@
- #include <QComboBox>
- #include <QSpinBox>
- #include <QIcon>
-+#include <QAction>
- 
- #include "qlcchannel.h"
- #include "qlcinputprofile.h"
-diff --git a/ui/src/selectinputchannel.cpp b/ui/src/selectinputchannel.cpp
-index c07c617fe..72006f2ca 100644
--- a/ui/src/selectinputchannel.cpp
-+++ b/ui/src/selectinputchannel.cpp
-@@ -21,6 +21,7 @@
- #include <QTreeWidgetItem>
- #include <QTreeWidget>
- #include <QDebug>
-+#include <QAction>
- 
- #include "selectinputchannel.h"
- #include "qlcinputchannel.h"
-diff --git a/ui/src/virtualconsole/addvcbuttonmatrix.cpp b/ui/src/virtualconsole/addvcbuttonmatrix.cpp
-index 7ad7160e8..09523bd04 100644
--- a/ui/src/virtualconsole/addvcbuttonmatrix.cpp
-+++ b/ui/src/virtualconsole/addvcbuttonmatrix.cpp
-@@ -19,6 +19,7 @@
- 
- #include <QSettings>
- #include <QDebug>
-+#include <QAction>
- 
- #include "addvcbuttonmatrix.h"
- #include "functionselection.h"
-diff --git a/ui/src/virtualconsole/addvcslidermatrix.cpp b/ui/src/virtualconsole/addvcslidermatrix.cpp
-index 63aa9dcce..cd80b3fe3 100644
--- a/ui/src/virtualconsole/addvcslidermatrix.cpp
-+++ b/ui/src/virtualconsole/addvcslidermatrix.cpp
-@@ -19,6 +19,7 @@
- 
- #include <QSettings>
- #include <QSpinBox>
-+#include <QAction>
- 
- #include "addvcslidermatrix.h"
- #include "vcpropertieseditor.h"
-diff --git a/ui/src/virtualconsole/vcbuttonproperties.cpp b/ui/src/virtualconsole/vcbuttonproperties.cpp
-index ef0bb24ee..8e6dbde72 100644
--- a/ui/src/virtualconsole/vcbuttonproperties.cpp
-+++ b/ui/src/virtualconsole/vcbuttonproperties.cpp
-@@ -26,6 +26,7 @@
- #include <QLineEdit>
- #include <QCheckBox>
- #include <QSpinBox>
-+#include <QAction>
- #include <qmath.h>
- 
- #include "qlcinputchannel.h"
-diff --git a/ui/src/virtualconsole/vccuelistproperties.cpp b/ui/src/virtualconsole/vccuelistproperties.cpp
-index efcb4dae8..d3a1b9118 100644
--- a/ui/src/virtualconsole/vccuelistproperties.cpp
-+++ b/ui/src/virtualconsole/vccuelistproperties.cpp
-@@ -17,6 +17,8 @@
-   limitations under the License.
- */
- 
-+#include <QAction>
-+
- #include "vccuelistproperties.h"
- #include "inputselectionwidget.h"
- #include "functionselection.h"
-diff --git a/ui/src/virtualconsole/vcpropertieseditor.cpp b/ui/src/virtualconsole/vcpropertieseditor.cpp
-index 11ea5cd7b..d1080b06b 100644
--- a/ui/src/virtualconsole/vcpropertieseditor.cpp
-+++ b/ui/src/virtualconsole/vcpropertieseditor.cpp
-@@ -21,6 +21,7 @@
- #include <QSettings>
- #include <QCheckBox>
- #include <QSpinBox>
-+#include <QAction>
- 
- #include "qlcinputprofile.h"
- #include "qlcinputchannel.h"
-diff --git a/ui/src/virtualconsole/vcsliderproperties.cpp b/ui/src/virtualconsole/vcsliderproperties.cpp
-index ff55b71b8..01fd60e9a 100644
--- a/ui/src/virtualconsole/vcsliderproperties.cpp
-+++ b/ui/src/virtualconsole/vcsliderproperties.cpp
-@@ -28,6 +28,7 @@
- #include <QLineEdit>
- #include <QSpinBox>
- #include <QLabel>
-+#include <QAction>
- 
- #include "qlccapability.h"
- #include "qlcchannel.h"
-diff --git a/ui/src/virtualconsole/vcxypadproperties.cpp b/ui/src/virtualconsole/vcxypadproperties.cpp
-index ed7ba7f64..60be83c49 100644
--- a/ui/src/virtualconsole/vcxypadproperties.cpp
-+++ b/ui/src/virtualconsole/vcxypadproperties.cpp
-@@ -23,6 +23,7 @@
- #include <QHeaderView>
- #include <QSettings>
- #include <QDebug>
-+#include <QAction>
- 
- #include "qlcfixturemode.h"
- #include "qlcinputchannel.h"
--- a/app-misc/qlcplus/qlcplus-4.11.1.ebuild
+++ b/app-misc/qlcplus/qlcplus-4.11.1.ebuild
@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils udev vcs-snapshot virtualx xdg
-
-DESCRIPTION="A software to control DMX or analog lighting systems"
-HOMEPAGE="https://www.qlcplus.org/"
-SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 )
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	media-libs/libmad
-	media-libs/libsndfile
-	sci-libs/fftw:3.0
-	virtual/libusb:0
-	virtual/libusb:1
-	virtual/udev
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_prepare() {
-	default
-	sed -e "s:/etc/udev/rules.d:${EROOT}lib/udev/rules.d:" -i \
-		plugins/hid/hid.pro \
-		plugins/udmx/src/src.pro \
-		plugins/dmxusb/src/src.pro \
-		plugins/spi/spi.pro \
-		plugins/peperoni/unix/unix.pro || die
-	sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \
-		-i variables.pri || die
-}
-
-src_configure() {
-	eqmake5
-
-	# sandbox error "mkdir /usr/share/qlcplus"
-	# see https://bugs.gentoo.org/621500#c2
-	export INSTALL_ROOT="${D}"
-}
-
-src_test() {
-	virtx emake check
-}
--- a/app-misc/socnetv/socnetv-2.2.ebuild
+++ b/app-misc/socnetv/socnetv-2.2.ebuild
@ -1,16 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

-inherit eutils qmake-utils toolchain-funcs
-
-MY_PN="SocNetV"
-MY_P="${MY_PN}-${PV}"
+inherit desktop qmake-utils toolchain-funcs

 DESCRIPTION="Qt Social Network Visualizer"
-HOMEPAGE="http://socnetv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/socnetv/${MY_P}.tar.gz"
+HOMEPAGE="https://socnetv.org/"
+SRC_URI="mirror://sourceforge/socnetv/SocNetV-${PV}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
--- a/app-misc/spacenavd/spacenavd-0.7.1.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.7.1.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="https://github.com/FreeSpacenav/spacenavd/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="X"

 RDEPEND="X? (
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@ -1,8 +1 @@
-DIST gnucash-3.2.tar.bz2 13383942 BLAKE2B ce4beb9eab290bbc85c4b3bf68b205a8ebb274056bf10ef1721bce48ec18e4df4b488ce885dc767b4f1e951dabcdc2ba702cb5fe239f249ec50c8d2d1d12a434 SHA512 ef74cbf396096a71316e14500a5b4e57670f9e9c0c5d46f3afe051ccbae2e46a5f14edd8dd805dfb61276b934db286d48ae044160699df82689e2718ed2f7573
-DIST gnucash-3.3.tar.bz2 13440713 BLAKE2B a308af90d8a8e50eb732d29c7eadac1fb75b63006da5bbaa9044039c43c1c17976c6b6fdb1706a08a527b75b1300df3a8ed469151370097b0308a173a170e41b SHA512 4bf0369ca9b3c91c98a0d916f0befc7e5675a246559a6a72dba6592b64f56f3cbd1885b0711e44e8d9cca290be742812763691ae2f639ea31ec534e52e17b3f9
-DIST gnucash-3.4.tar.bz2 13564432 BLAKE2B 478d8e2e4acbd0725ceaf997a1e62ba3875e9d4a003e8a3e69111a9d29118447fb2da8ef3e5dd5274d83a3adef1ee9f4a153cdfd17cabe69864b53bab8c7e813 SHA512 4cebef0ba70e59a82d3b2b7b0b138ddb22e8866dc761e156ff1f15920145d12923719effef21ad4c65ccd62fbd14a1529cf0bfcaab70c5b33d103761d08062e0
-DIST gnucash-3.5.tar.bz2 13766397 BLAKE2B b840fa6af719e1d21daabd8e26f7026a12ca9cefe8c0f644a8382b42c34a6dec2dfc67350645437c2f12792518f289f446824a8c99ea83453e69d976c3cd5c9c SHA512 76230d2fe1ba4cc605d0d58976ed3214b10a2549fc7eaa1e327bbf85c861baa082523c70ed088a59bb56deb6af9a7808752fc719eda0df3e9209cec05c9c8d13
-DIST gnucash-3.6.tar.bz2 13811045 BLAKE2B aa722755e168b6096a8ad0bb05d3c67be9525d5e9e6fcf076c0b6bdc3188815017c2b1bcb308a6f8a7581315f7d9ab67f85b24486214ebbe7ea5a0428e552ea7 SHA512 3d99235a6171e7189dbb15fed11e7f3acb4f49ef8dc6124b26807e74ce4326ac5ae6e23e693a34947604ecb0253ecbcd80f669803a629eb7d236fd3444dbfe82
-DIST gnucash-3.7.tar.bz2 13896595 BLAKE2B d0f0cc9d407677c8b09eab5c1613a0eec80bc54984aebd10915f2f2247ea30c26104cea57c87dd6e46ade9225c9df20c583da21de15f79d50509e63186b682fe SHA512 41275b8d6abba54e95c00d746a2d50305fb7a0490b5486af1472a5d50d2de5973d1ec4de98dd10991325062e61498de020496b59d8548b5a4de9db9d23dee159
 DIST gnucash-3.8b.tar.bz2 14285584 BLAKE2B 304d73b04883b61b8a4e174f458206769483ca0f6d28d284c760397e0bc4061dbdb379ff3cca35e80d6736516549a8733bf36895a11c2202fb9f8f25e591e1d9 SHA512 e0529934e9ccafbef2b724f5fca9a0e300c78cf21596f0dcd4b5c11ff300c06a963b68eff1efe00834dc488ced604b86011075bb22480488ddf31d2d4c94ddca
-DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
--- a/app-office/gnucash/files/gnucash-3.4-test-stress-options.scm
+++ b/app-office/gnucash/files/gnucash-3.4-test-stress-options.scm
@ -1,315 +0,0 @@
-(use-modules (ice-9 textual-ports))
-(use-modules (ice-9 popen))
-(use-modules (gnucash utilities))
-(use-modules (gnucash gnc-module))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report standard-reports))
-(use-modules (gnucash report business-reports))
-(use-modules (gnucash report view-column))
-(use-modules (gnucash report stylesheets))
-(use-modules (gnucash report taxinvoice))
-(use-modules (gnucash report report-system))
-(use-modules (gnucash report report-system test test-extras))
-(use-modules (srfi srfi-64))
-(use-modules (srfi srfi-98))
-(use-modules (gnucash engine test srfi64-extras))
-(use-modules (sxml simple))
-(use-modules (sxml xpath))
-
-;; NOTE
-;; ----
-;; SIMPLE stress tests by default
-;;
-;; PAIRWISE COMBINATORICS are enabled by setting environment variable COMBINATORICS
-;; to the fullpath for the compiled jenny from http://burtleburtle.net/bob/math/jenny.html
-;;
-;; e.g. COMBINATORICS=/home/user/jenny/jenny ninja check
-
-(define optionslist '())
-
-(define (generate-optionslist)
-  (gnc:report-templates-for-each
-   (lambda (report-id template)
-     (let* ((options-generator (gnc:report-template-options-generator template))
-            (name (gnc:report-template-name template))
-            (options (options-generator)))
-       (set! optionslist
-         (cons (list (cons 'report-id report-id)
-                     (cons 'report-name (gnc:report-template-name template))
-                     (cons 'options (let ((report-options-tested '()))
-                                      (gnc:options-for-each
-                                       (lambda (option)
-                                         (when (memq (gnc:option-type option)
-                                                     '(multichoice boolean))
-                                           (set! report-options-tested
-                                             (cons (vector
-                                                    (gnc:option-section option)
-                                                    (gnc:option-name option)
-                                                    (gnc:option-type option)
-                                                    (case (gnc:option-type option)
-                                                      ((multichoice) (map (lambda (d) (vector-ref d 0))
-                                                                          (gnc:option-data option)))
-                                                      ((boolean) (list #t #f))))
-                                                   report-options-tested))))
-                                       options)
-                                      report-options-tested)))
-               optionslist))))))
-
-;; Explicitly set locale to make the report output predictable
-(setlocale LC_ALL "C")
-
-(define (run-test)
-  (test-runner-factory gnc:test-runner)
-  (test-begin "stress options")
-  (generate-optionslist)
-  (tests)
-  (test-end "stress options"))
-
-(define jennypath
-  (get-environment-variable "COMBINATORICS"))
-
-(define jenny-exists?
-  ;; this is a simple test for presence of jenny - will check
-  ;; COMBINATORICS env exists, and running it produces exit-code of
-  ;; zero, and tests the first few letters of its output.
-  (and (string? jennypath)
-       (zero? (system jennypath))
-       (string=? (string-take (get-string-all (open-input-pipe jennypath)) 6)
-                 "jenny:")))
-
-(define (set-option! options section name value)
-  (let ((option (gnc:lookup-option options section name)))
-    (if option
-        (gnc:option-set-value option value))))
-
-(define (mnemonic->commodity sym)
-  (gnc-commodity-table-lookup
-   (gnc-commodity-table-get-table (gnc-get-current-book))
-   (gnc-commodity-get-namespace (gnc-default-report-currency))
-   sym))
-
-(define structure
-  (list "Root" (list (cons 'type ACCT-TYPE-ASSET))
-        (list "Asset"
-              (list "Bank")
-              (list "GBP Bank" (list (cons 'commodity (mnemonic->commodity "GBP"))))
-              (list "Wallet"))
-        (list "Income" (list (cons 'type ACCT-TYPE-INCOME)))
-        (list "Income-GBP" (list (cons 'type ACCT-TYPE-INCOME)
-                                 (cons 'commodity (mnemonic->commodity "GBP"))))
-        (list "Expenses" (list (cons 'type ACCT-TYPE-EXPENSE)))
-        (list "Liabilities" (list (cons 'type ACCT-TYPE-LIABILITY)))
-        (list "Equity" (list (cons 'type ACCT-TYPE-EQUITY)))
-        ))
-
-(define (simple-stress-test report-name uuid report-options)
-  (let ((options (gnc:make-report-options uuid)))
-    (test-assert (format #f "basic test ~a" report-name)
-      (gnc:options->render uuid options (string-append "stress-" report-name) "test"))
-    (format #t "Testing SIMPLE combinations for:\n~a" report-name)
-    (for-each
-     (lambda (option)
-       (format #t ",~a/~a"
-               (vector-ref option 0)
-               (vector-ref option 1)))
-     report-options)
-    (newline)
-    (for-each
-     (lambda (idx)
-       (display report-name)
-       (for-each
-        (lambda (option)
-          (let* ((section (vector-ref option 0))
-                 (name (vector-ref option 1))
-                 (value (list-ref (vector-ref option 3)
-                                  (modulo idx (length (vector-ref option 3))))))
-            (set-option! options section name value)
-            (format #t ",~a"
-                    (cond
-                     ((boolean? value) (if value 't 'f))
-                     (else value)))))
-        report-options)
-       (catch #t
-         (lambda ()
-           (gnc:options->render uuid options "stress-test" "test")
-           (display "[pass]\n"))
-         (lambda (k . args)
-           (format #t "[fail]... error: (~s . ~s) options-list are:\n~a"
-                   k args
-                   (gnc:html-render-options-changed options #t))
-           (test-assert "logging test failure as above..."
-             #f))))
-     (iota
-      (apply max
-             (map (lambda (opt) (length (vector-ref opt 3)))
-                  report-options)))
-     )))
-
-(define (combinatorial-stress-test report-name uuid report-options)
-  (let* ((options (gnc:make-report-options uuid))
-         (render #f))
-    (test-assert (format #f "basic test ~a" report-name)
-      (set! render
-        (gnc:options->render
-         uuid options (string-append "stress-" report-name) "test")))
-    (if render
-        (begin
-          (format #t "Testing n-tuple combinatorics for:\n~a" report-name)
-          (for-each
-           (lambda (option)
-             (format #t ",~a/~a"
-                     (vector-ref option 0)
-                     (vector-ref option 1)))
-           report-options)
-          (newline)
-          ;; generate combinatorics
-          (let* ((option-lengths (map (lambda (report-option)
-                                        (length (vector-ref report-option 3)))
-                                      report-options))
-                 (jennyargs (string-join (map number->string option-lengths) " "))
-                 (n-tuple (min
-                           ;; the following is the n-tuple
-                           2
-                           (length report-options)))
-                 (cmdline (format #f "~a -n~a ~a"
-                                  jennypath n-tuple jennyargs))
-                 (jennyout (get-string-all (open-input-pipe cmdline)))
-                 (test-cases (string-split jennyout #\newline)))
-            (for-each
-             (lambda (case)
-               (unless (string-null? case)
-                 (let* ((choices-str (string-filter char-alphabetic? case))
-                        (choices-alpha (map char->integer (string->list choices-str)))
-                        (choices (map (lambda (n)
-                                        (- n (if (> n 96) 97 39))) ; a-z -> 0-25, and A-Z -> 26-51
-                                      choices-alpha)))
-                   (let loop ((option-idx (1- (length report-options)))
-                              (option-summary '()))
-                     (if (negative? option-idx)
-                         (catch #t
-                           (lambda ()
-                             (gnc:options->render uuid options "stress-test" "test")
-                             (format #t "[pass] ~a:~a \n"
-                                     report-name
-                                     (string-join option-summary ",")))
-                           (lambda (k . args)
-                             (format #t "[fail]... error (~s . ~s) options-list are:\n~a"
-                                     k args
-                                     (gnc:html-render-options-changed options #t))
-                             (test-assert "logging test failure as above..."
-                               #f)))
-                         (let* ((option (list-ref report-options option-idx))
-                                (section (vector-ref option 0))
-                                (name (vector-ref option 1))
-                                (value (list-ref (vector-ref option 3)
-                                                 (list-ref choices option-idx))))
-                           (set-option! options section name value)
-                           (loop (1- option-idx)
-                                 (cons (format #f "~a"
-                                               (cond
-                                                ((boolean? value) (if value 't 'f))
-                                                (else value)))
-                                       option-summary))))))))
-             test-cases)))
-        (display "...aborted due to basic test failure"))))
-
-(define test
-  ;; what strategy are we using here? simple stress test (ie tests as
-  ;; many times as the maximum number of options) or combinatorial
-  ;; tests (using jenny)
-  (if jenny-exists?
-      combinatorial-stress-test
-      simple-stress-test))
-
-(define (create-test-data)
-  (let* ((env (create-test-env))
-         (account-alist (env-create-account-structure-alist env structure))
-         (bank (cdr (assoc "Bank" account-alist)))
-         (gbp-bank (cdr (assoc "GBP Bank" account-alist)))
-         (wallet (cdr (assoc "Wallet" account-alist)))
-         (income (cdr (assoc "Income" account-alist)))
-         (gbp-income (cdr (assoc "Income-GBP" account-alist)))
-         (expense (cdr (assoc "Expenses" account-alist)))
-         (liability (cdr (assoc "Liabilities" account-alist)))
-         (equity (cdr (assoc "Equity" account-alist))))
-    ;; populate datafile with old transactions
-    (env-transfer env 01 01 1970 bank expense       5   #:description "desc-1" #:num "trn1" #:memo "memo-3")
-    (env-transfer env 31 12 1969 income bank       10   #:description "desc-2" #:num "trn2" #:void-reason "void" #:notes "notes3")
-    (env-transfer env 31 12 1969 income bank       29   #:description "desc-3" #:num "trn3"
-                  #:reconcile (cons #\c (gnc-dmy2time64 01 03 1970)))
-    (env-transfer env 01 02 1970 bank expense      15   #:description "desc-4" #:num "trn4" #:notes "notes2" #:memo "memo-1")
-    (env-transfer env 10 01 1970 liability expense 10   #:description "desc-5" #:num "trn5" #:void-reason "any")
-    (env-transfer env 10 01 1970 liability expense 11   #:description "desc-6" #:num "trn6" #:notes "notes1")
-    (env-transfer env 10 02 1970 bank liability     8   #:description "desc-7" #:num "trn7" #:notes "notes1" #:memo "memo-2"
-                  #:reconcile (cons #\y (gnc-dmy2time64 01 03 1970)))
-    (let ((txn (xaccMallocTransaction (gnc-get-current-book)))
-          (split-1 (xaccMallocSplit  (gnc-get-current-book)))
-          (split-2 (xaccMallocSplit  (gnc-get-current-book)))
-          (split-3 (xaccMallocSplit  (gnc-get-current-book))))
-      (xaccTransBeginEdit txn)
-      (xaccTransSetDescription txn "$100bank -> $80expenses + $20wallet")
-      (xaccTransSetCurrency txn (xaccAccountGetCommodity bank))
-      (xaccTransSetDate txn 14 02 1971)
-      (xaccSplitSetParent split-1 txn)
-      (xaccSplitSetParent split-2 txn)
-      (xaccSplitSetParent split-3 txn)
-      (xaccSplitSetAccount split-1 bank)
-      (xaccSplitSetAccount split-2 expense)
-      (xaccSplitSetAccount split-3 wallet)
-      (xaccSplitSetValue split-1 -100)
-      (xaccSplitSetValue split-2 80)
-      (xaccSplitSetValue split-3 20)
-      (xaccSplitSetAmount split-1 -100)
-      (xaccSplitSetAmount split-2 80)
-      (xaccSplitSetAmount split-3 20)
-      (xaccTransSetNotes txn "multisplit")
-      (xaccTransCommitEdit txn))
-    (let ((closing-txn (env-transfer env 31 12 1977 expense equity 111 #:description "Closing")))
-      (xaccTransSetIsClosingTxn closing-txn #t))
-    (env-transfer-foreign env 15 01 2000 gbp-bank bank 10 14 #:description "GBP 10 to USD 14")
-    (env-transfer-foreign env 15 02 2000 bank gbp-bank  9  6 #:description "USD 9 to GBP 6")
-    (for-each (lambda (m)
-                (env-transfer env 08 (1+ m) 1978 gbp-income gbp-bank 51 #:description "#51 income")
-                (env-transfer env 03 (1+ m) 1978 income bank  103 #:description "$103 income")
-                (env-transfer env 15 (1+ m) 1978 bank expense  22 #:description "$22 expense")
-                (env-transfer env 09 (1+ m) 1978 income bank  109 #:description "$109 income"))
-              (iota 12))
-    (let ((mid (floor (/ (+ (gnc-accounting-period-fiscal-start)
-                            (gnc-accounting-period-fiscal-end)) 2))))
-      (env-create-transaction env mid bank income 200))))
-
-(define (run-tests prefix)
-  (for-each
-   (lambda (option-set)
-     (let ((report-name (assq-ref option-set 'report-name))
-           (report-guid (assq-ref option-set 'report-id))
-           (report-options (assq-ref option-set 'options)))
-       (if (member report-name
-                   ;; these reports seem to cause problems when running...
-                   '(
-                     ;; eguile-based reports
-                     "Tax Invoice"
-                     "Receipt"
-                     "Australian Tax Invoice"
-                     "Balance Sheet (eguile)"
-
-                     ;; tax-schedule - locale-dependent?
-                     "Tax Schedule Report/TXF Export"
-
-                     ;; unusual reports
-                     "Welcome to GnuCash"
-                     "Hello, World"
-                     "Multicolumn View"
-                     "General Journal"
-                     ))
-           (format #t "\nSkipping ~a ~a...\n" report-name prefix)
-           (begin
-             (format #t "\nTesting ~a ~a...\n" report-name prefix)
-             (test report-name report-guid report-options)))))
-   optionslist))
-
-(define (tests)
-  (run-tests "with empty book")
-  (create-test-data)
-  (run-tests "on a populated book"))
--- a/app-office/gnucash/files/gnucash-3.4-test-transaction.patch
+++ b/app-office/gnucash/files/gnucash-3.4-test-transaction.patch
@ -1,25 +0,0 @@
-From 95bee405cf5568f5899287ba62058cf894361676 Mon Sep 17 00:00:00 2001
-From: Christopher Lam <christopher.lck@gmail.com>
-Date: Wed, 2 Jan 2019 00:00:56 +0800
-Subject: [PATCH] [test-transaction] fix a test which was hardcoded to 2018.
-
-This test was hard-coded to pass in 2018. Fix.
---
- gnucash/report/standard-reports/test/test-transaction.scm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gnucash/report/standard-reports/test/test-transaction.scm b/gnucash/report/standard-reports/test/test-transaction.scm
-index 755aba2983..2f428e24e9 100644
--- a/gnucash/report/standard-reports/test/test-transaction.scm
-+++ b/gnucash/report/standard-reports/test/test-transaction.scm
-@@ -652,8 +652,8 @@
-           (list "Grand Total" "$2,280.00" "$2,280.00")
-           (get-row-col sxml -1 #f))
-         (test-equal "dual amount column, first transaction correct"
-          (list "01/03/18" "$103 income" "Root.Asset.Bank" "$103.00" "$103.00")
-          (get-row-col sxml 1 #f)))
-+          (list "$103 income" "Root.Asset.Bank" "$103.00" "$103.00")
-+          (cdr (get-row-col sxml 1 #f))))
-       )
- 
-     (test-end "display options")
--- a/app-office/gnucash/files/gnucash-3.7-include-checksymbolexists.patch
+++ b/app-office/gnucash/files/gnucash-3.7-include-checksymbolexists.patch
@ -1,12 +0,0 @@
-Bug: https://bugs.gentoo.org/690270
-
--- a/gnucash/register/register-gnome/CMakeLists.txt
-+++ b/gnucash/register/register-gnome/CMakeLists.txt
-@@ -1,5 +1,7 @@
- add_subdirectory(test)
- 
-+include(CheckSymbolExists)
-+
- #GTK before 3.14 didn't have GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK
- check_symbol_exists(GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK gdk/gdktypes.h have_mod_mask)
- if (NOT have_mod_mask)
--- a/app-office/gnucash/gnucash-3.2-r2.ebuild
+++ b/app-office/gnucash/gnucash-3.2-r2.ebuild
@ -1,169 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# google{test,mock} version
-GV="1.8.0"
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
-		 https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-IUSE="aqbanking chipcard debug doc examples gnome-keyring mysql nls ofx postgres
-	  python quotes -register2 sqlite +gui"
-REQUIRED_USE="
-	chipcard? ( aqbanking )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# libdbi version requirement for sqlite taken from bug #455134
-#
-# dev-libs/boost must always be built with nls enabled.
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libxml2-2.7.0:2
-	>=sys-libs/zlib-1.1.4
-	>=dev-scheme/guile-2.0.0:12=[regex]
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	dev-libs/libxslt
-	aqbanking? (
-		>=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gui? (
-	  gnome-base/dconf
-	  net-libs/webkit-gtk:4=
-	  >=x11-libs/gtk+-3.14.0:3
-	)
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		>=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	~dev-cpp/gtest-${GV}
-	>=sys-devel/gettext-0.19.6
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-PDEPEND="doc? (
-	~app-doc/gnucash-docs-${PV}
-	gnome-extra/yelp
-)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-no-gui.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
-		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
-
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-		-DWITH_GNUCASH=$(usex gui)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if use python ; then
-		cp common/test-core/unittest_support.py \
-		   "${BUILD_DIR}"/common/test-core/ || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-
-	if use gui ; then
-	  rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
-	fi
-
-	if use examples ; then
-		mv "${ED%/}"/usr/share/doc/gnucash \
-		   "${ED%/}"/usr/share/doc/${PF}/examples || die
-		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
-		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
-		   *win32-bin.txt || die
-		popd > /dev/null || die
-		docompress -x /usr/share/doc/${PF}/examples/
-	else
-		rm -r "${ED%/}"/usr/share/doc/gnucash || die
-	fi
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	if use gui ; then
-		gnome2_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
-	ewarn
-	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
-	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-}
-
-pkg_postrm() {
-	if use gui ; then
-		gnome2_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
--- a/app-office/gnucash/gnucash-3.3-r1.ebuild
+++ b/app-office/gnucash/gnucash-3.3-r1.ebuild
@ -1,169 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# google{test,mock} version
-GV="1.8.0"
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
-	https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="aqbanking chipcard debug doc examples gnome-keyring mysql nls ofx postgres python quotes -register2 sqlite +gui"
-REQUIRED_USE="
-	chipcard? ( aqbanking )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# libdbi version requirement for sqlite taken from bug #455134
-#
-# dev-libs/boost must always be built with nls enabled.
-# guile[deprecated] because of SCM_LIST*() use
-RDEPEND="
-	>=dev-libs/glib-2.46.0:2
-	>=dev-libs/libxml2-2.7.0:2
-	>=sys-libs/zlib-1.1.4
-	>=dev-scheme/guile-2.2.0:12=[deprecated,regex]
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	dev-libs/libxslt
-	aqbanking? (
-		>=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gui? (
-		gnome-base/dconf
-		net-libs/webkit-gtk:4=
-		>=x11-libs/gtk+-3.14.0:3
-	)
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		>=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	~dev-cpp/gtest-${GV}
-	>=sys-devel/gettext-0.19.6
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-PDEPEND="doc? (
-	~app-doc/gnucash-docs-${PV}
-	gnome-extra/yelp
-)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-no-gui.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
-		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
-		# Disable fallback to guile-2.0
-		-DCMAKE_DISABLE_FIND_PACKAGE_GUILE2=ON
-		-DCOMPILE_GSCHEMAS=OFF
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-		-DWITH_GNUCASH=$(usex gui)
-	)
-
-	append-cflags -Wno-error
-	append-cxxflags -Wno-error
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if use python ; then
-		cp common/test-core/unittest_support.py \
-		   "${BUILD_DIR}"/common/test-core/ || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-
-	if use examples ; then
-		mv "${ED%/}"/usr/share/doc/gnucash \
-		   "${ED%/}"/usr/share/doc/${PF}/examples || die
-		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
-		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
-		   *win32-bin.txt || die
-		popd > /dev/null || die
-		docompress -x /usr/share/doc/${PF}/examples/
-	else
-		rm -r "${ED%/}"/usr/share/doc/gnucash || die
-	fi
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	if use gui ; then
-		gnome2_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
-	ewarn
-	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
-	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-}
-
-pkg_postrm() {
-	if use gui ; then
-		gnome2_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
--- a/app-office/gnucash/gnucash-3.3.ebuild
+++ b/app-office/gnucash/gnucash-3.3.ebuild
@ -1,171 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# google{test,mock} version
-GV="1.8.0"
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
-		 https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="aqbanking chipcard debug doc examples gnome-keyring mysql nls ofx postgres
-	  python quotes -register2 sqlite +gui"
-REQUIRED_USE="
-	chipcard? ( aqbanking )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# libdbi version requirement for sqlite taken from bug #455134
-#
-# dev-libs/boost must always be built with nls enabled.
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libxml2-2.7.0:2
-	>=sys-libs/zlib-1.1.4
-	>=dev-scheme/guile-2.0.0:12=[regex]
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	dev-libs/libxslt
-	aqbanking? (
-		>=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gui? (
-	  gnome-base/dconf
-	  net-libs/webkit-gtk:4=
-	  >=x11-libs/gtk+-3.14.0:3
-	)
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		>=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	~dev-cpp/gtest-${GV}
-	>=sys-devel/gettext-0.19.6
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-PDEPEND="doc? (
-	~app-doc/gnucash-docs-${PV}
-	gnome-extra/yelp
-)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-no-gui.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
-		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
-
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-		-DWITH_GNUCASH=$(usex gui)
-	)
-
-	append-cflags -Wno-error
-	append-cxxflags -Wno-error
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if use python ; then
-		cp common/test-core/unittest_support.py \
-		   "${BUILD_DIR}"/common/test-core/ || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-
-	if use gui ; then
-	  rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
-	fi
-
-	if use examples ; then
-		mv "${ED%/}"/usr/share/doc/gnucash \
-		   "${ED%/}"/usr/share/doc/${PF}/examples || die
-		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
-		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
-		   *win32-bin.txt || die
-		popd > /dev/null || die
-		docompress -x /usr/share/doc/${PF}/examples/
-	else
-		rm -r "${ED%/}"/usr/share/doc/gnucash || die
-	fi
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	if use gui ; then
-		gnome2_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
-	ewarn
-	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
-	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-}
-
-pkg_postrm() {
-	if use gui ; then
-		gnome2_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
--- a/app-office/gnucash/gnucash-3.4.ebuild
+++ b/app-office/gnucash/gnucash-3.4.ebuild
@ -1,180 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# google{test,mock} version
-GV="1.8.0"
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
-	https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx
-	  postgres python quotes -register2 sqlite"
-
-REQUIRED_USE="
-	chipcard? ( aqbanking )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# libdbi version requirement for sqlite taken from bug #455134
-#
-# dev-libs/boost must always be built with nls enabled.
-# guile[deprecated] because of SCM_LIST*() use
-RDEPEND="
-	>=dev-libs/glib-2.46.0:2
-	>=dev-libs/libxml2-2.7.0:2
-	>=sys-libs/zlib-1.1.4
-	>=dev-scheme/guile-2.2.0:12=[deprecated,regex]
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	dev-libs/libxslt
-	aqbanking? (
-		>=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gui? (
-		gnome-base/dconf
-		net-libs/webkit-gtk:4=
-		>=x11-libs/gtk+-3.14.0:3
-	)
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		>=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	~dev-cpp/gtest-${GV}
-	>=sys-devel/gettext-0.19.6
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-PDEPEND="doc? (
-	~app-doc/gnucash-docs-${PV}
-	gnome-extra/yelp
-)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-no-gui.patch
-		  # Fixed in 3.5
-		  "${FILESDIR}"/${PN}-3.4-test-transaction.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/gnucash-3.4-test-stress-options.scm \
-	   ${PN}-${PV}/${PN}/report/standard-reports/test/test-stress-options.scm \
-		|| die "Failed copying scm"
-}
-
-src_configure() {
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
-		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
-		# Disable fallback to guile-2.0
-		-DCMAKE_DISABLE_FIND_PACKAGE_GUILE2=ON
-		-DCOMPILE_GSCHEMAS=OFF
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-		-DWITH_GNUCASH=$(usex gui)
-	)
-
-	append-cflags -Wno-error
-	append-cxxflags -Wno-error
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if use python ; then
-		cp common/test-core/unittest_support.py \
-		   "${BUILD_DIR}"/common/test-core/ || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-
-	if use examples ; then
-		mv "${ED%/}"/usr/share/doc/gnucash \
-		   "${ED%/}"/usr/share/doc/${PF}/examples || die
-		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
-		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
-		   *win32-bin.txt || die
-		popd > /dev/null || die
-		docompress -x /usr/share/doc/${PF}/examples/
-	else
-		rm -r "${ED%/}"/usr/share/doc/gnucash || die
-	fi
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	if use gui ; then
-		gnome2_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
-	ewarn
-	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
-	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-}
-
-pkg_postrm() {
-	if use gui ; then
-		gnome2_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
--- a/app-office/gnucash/gnucash-3.5.ebuild
+++ b/app-office/gnucash/gnucash-3.5.ebuild
@ -1,176 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# google{test,mock} version
-GV="1.8.0"
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
-	https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-IUSE="aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx
-	  postgres python quotes -register2 sqlite"
-
-REQUIRED_USE="
-	chipcard? ( aqbanking )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# libdbi version requirement for sqlite taken from bug #455134
-#
-# dev-libs/boost must always be built with nls enabled.
-# guile[deprecated] because of SCM_LIST*() use
-RDEPEND="
-	>=dev-libs/glib-2.46.0:2
-	>=dev-libs/libxml2-2.7.0:2
-	>=sys-libs/zlib-1.1.4
-	>=dev-scheme/guile-2.2.0:12=[deprecated,regex]
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	dev-libs/libxslt
-	aqbanking? (
-		>=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gui? (
-		gnome-base/dconf
-		net-libs/webkit-gtk:4=
-		>=x11-libs/gtk+-3.14.0:3
-	)
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		>=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	~dev-cpp/gtest-${GV}
-	>=sys-devel/gettext-0.19.6
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-PDEPEND="doc? (
-	~app-doc/gnucash-docs-${PV}
-	gnome-extra/yelp
-)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-no-gui.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/gnucash-3.4-test-stress-options.scm \
-	   ${PN}-${PV}/${PN}/report/standard-reports/test/test-stress-options.scm \
-		|| die "Failed copying scm"
-}
-
-src_configure() {
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
-		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
-		# Disable fallback to guile-2.0
-		-DCMAKE_DISABLE_FIND_PACKAGE_GUILE2=ON
-		-DCOMPILE_GSCHEMAS=OFF
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-		-DWITH_GNUCASH=$(usex gui)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if use python ; then
-		cp common/test-core/unittest_support.py \
-		   "${BUILD_DIR}"/common/test-core/ || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-
-	if use examples ; then
-		mv "${ED%/}"/usr/share/doc/gnucash \
-		   "${ED%/}"/usr/share/doc/${PF}/examples || die
-		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
-		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
-		   *win32-bin.txt || die
-		popd > /dev/null || die
-		docompress -x /usr/share/doc/${PF}/examples/
-	else
-		rm -r "${ED%/}"/usr/share/doc/gnucash || die
-	fi
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	if use gui ; then
-		gnome2_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
-	ewarn
-	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
-	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-}
-
-pkg_postrm() {
-	if use gui ; then
-		gnome2_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
--- a/app-office/gnucash/gnucash-3.6.ebuild
+++ b/app-office/gnucash/gnucash-3.6.ebuild
@ -1,192 +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 cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx
-	  postgres python quotes -register2 sqlite test"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	chipcard? ( aqbanking )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# libdbi version requirement for sqlite taken from bug #455134
-#
-# dev-libs/boost must always be built with nls enabled.
-# guile[deprecated] because of SCM_LIST*() use
-RDEPEND="
-	>=dev-libs/glib-2.46.0:2
-	>=dev-libs/libxml2-2.7.0:2
-	>=sys-libs/zlib-1.1.4
-	>=dev-scheme/guile-2.2.0:12=[deprecated,regex]
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	dev-libs/libxslt
-	aqbanking? (
-		>=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gui? (
-		gnome-base/dconf
-		net-libs/webkit-gtk:4=
-		>=x11-libs/gtk+-3.14.0:3
-	)
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		>=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.6
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/libtool
-	virtual/pkgconfig
-	test? ( >=dev-cpp/gtest-1.8.0 )
-"
-
-PDEPEND="doc? (
-	~app-doc/gnucash-docs-${PV}
-	gnome-extra/yelp
-)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-no-gui.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/gnucash-3.4-test-stress-options.scm \
-	   ${PN}-${PV}/${PN}/report/standard-reports/test/test-stress-options.scm \
-		|| die "Failed copying scm"
-}
-
-src_configure() {
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		# Disable fallback to guile-2.0
-		-DCMAKE_DISABLE_FIND_PACKAGE_GUILE2=ON
-		-DCOMPILE_GSCHEMAS=OFF
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-		-DWITH_GNUCASH=$(usex gui)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if use python ; then
-		cp common/test-core/unittest_support.py \
-		   "${BUILD_DIR}"/common/test-core/ || die
-	fi
-
-	LOCALE_TESTS=
-	if type locale >/dev/null 2>&1; then
-		MY_LOCALES="$(locale -a)"
-		if [[ "${MY_LOCALES}" != *en_US* ||
-				"${MY_LOCALES}" != *en_GB* ||
-				"${MY_LOCALES}" != *fr_FR* ]] ; then
-			ewarn "Missing one or more of en_US, en_GB, or fr_FR locales."
-		else
-			LOCALE_TESTS=true
-		fi
-	else
-		ewarn "'locale' not found."
-	fi
-
-	if [[ ! ${LOCALE_TESTS} ]]; then
-		ewarn "Disabling test-qof and test-gnc-numeric."
-		echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
-			> "${BUILD_DIR}"/CTestCustom.cmake || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-
-	if use examples ; then
-		mv "${ED%/}"/usr/share/doc/gnucash \
-		   "${ED%/}"/usr/share/doc/${PF}/examples || die
-		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
-		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
-		   *win32-bin.txt || die
-		popd > /dev/null || die
-		docompress -x /usr/share/doc/${PF}/examples/
-	else
-		rm -r "${ED%/}"/usr/share/doc/gnucash || die
-	fi
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	if use gui ; then
-		gnome2_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
-	ewarn
-	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
-	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-}
-
-pkg_postrm() {
-	if use gui ; then
-		gnome2_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
--- a/app-office/gnucash/gnucash-3.7.ebuild
+++ b/app-office/gnucash/gnucash-3.7.ebuild
@ -1,213 +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 cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres
-	  python quotes -register2 smartcard sqlite test"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	smartcard? ( aqbanking )"
-
-# libdbi version requirement for sqlite taken from bug #455134
-#
-# dev-libs/boost must always be built with nls enabled.
-# guile[deprecated] because of SCM_LIST*() use
-RDEPEND="
-	>=dev-libs/glib-2.46.0:2
-	>=dev-libs/libxml2-2.7.0:2
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	dev-libs/libxslt
-	>=dev-scheme/guile-2.2.0:12=[deprecated,regex]
-	>=sys-libs/zlib-1.1.4
-	aqbanking? (
-		>=net-libs/aqbanking-5[ofx?]
-		sys-libs/gwenhywfar
-		smartcard? ( sys-libs/libchipcard )
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gui? (
-		gnome-base/dconf
-		net-libs/webkit-gtk:4=
-		>=x11-libs/gtk+-3.14.0:3
-		aqbanking? ( >=sys-libs/gwenhywfar-4.20.2[gtk] )
-	)
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		>=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.6
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/libtool
-	virtual/pkgconfig
-	test? ( >=dev-cpp/gtest-1.8.0 )
-"
-
-PDEPEND="doc? (
-	~app-doc/gnucash-docs-${PV}
-	gnome-extra/yelp
-)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-no-gui.patch
-	"${FILESDIR}"/${PN}-3.7-include-checksymbolexists.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/gnucash-3.4-test-stress-options.scm \
-	   ${PN}-${PV}/${PN}/report/standard-reports/test/test-stress-options.scm \
-		|| die "Failed copying scm"
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	xdg_environment_reset
-
-	# Fix tests writing to /tmp
-	local fixtestfiles=(
-		"${S}"/gnucash/report/report-system/test/test-commodity-utils.scm
-		"${S}"/gnucash/report/report-system/test/test-extras.scm
-		"${S}"/gnucash/report/report-system/test/test-report-html.scm
-		"${S}"/gnucash/report/report-system/test/test-report-system.scm
-		"${S}"/libgnucash/backend/xml/test/test-xml-pricedb.cpp
-		"${S}"/libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
-	)
-	for x in "${fixtestfiles[@]}"; do
-		sed -i -e "s|\"/tmp/|\"${T}/|g" "${x}" || die "sed of "${x}" failed"
-	done
-}
-
-src_configure() {
-	export GUILE_AUTO_COMPILE=0
-
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILE_GSCHEMAS=OFF
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-		-DWITH_GNUCASH=$(usex gui)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if use python ; then
-		cp common/test-core/unittest_support.py \
-		   "${BUILD_DIR}"/common/test-core/ || die
-	fi
-
-	LOCALE_TESTS=
-	if type locale >/dev/null 2>&1; then
-		MY_LOCALES="$(locale -a)"
-		if [[ "${MY_LOCALES}" != *en_US* ||
-				"${MY_LOCALES}" != *en_GB* ||
-				"${MY_LOCALES}" != *fr_FR* ]] ; then
-			ewarn "Missing one or more of en_US, en_GB, or fr_FR locales."
-		else
-			LOCALE_TESTS=true
-		fi
-	else
-		ewarn "'locale' not found."
-	fi
-
-	if [[ ! ${LOCALE_TESTS} ]]; then
-		ewarn "Disabling test-qof and test-gnc-numeric."
-		echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
-			> "${BUILD_DIR}"/CTestCustom.cmake || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-
-	if use examples ; then
-		mv "${ED%/}"/usr/share/doc/gnucash \
-		   "${ED%/}"/usr/share/doc/${PF}/examples || die
-		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
-		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
-		   *win32-bin.txt || die
-		popd > /dev/null || die
-		docompress -x /usr/share/doc/${PF}/examples/
-	else
-		rm -r "${ED%/}"/usr/share/doc/gnucash || die
-	fi
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
-	ewarn
-	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
-	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-}
-
-pkg_postrm() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
--- a/app-office/gnucash/metadata.xml
+++ b/app-office/gnucash/metadata.xml
@ -9,9 +9,6 @@
 		<flag name="aqbanking">
 			Connect to some internet banks via AqBanking
 		</flag>
-		<flag name="chipcard">
-			Enable support for chipcard reading and processing.
-		</flag>
 		<flag name="quotes">Enable Online Stock Quote retrieval</flag>
 		<flag name="register2">Use the new register (Experimental)</flag>
 	</use>
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@ -1,3 +1,4 @@
 DIST eix-0.33.11.tar.xz 623256 BLAKE2B 756feed85cb4f40ef9228a03d2a8b8470eb6017b00d93b364d67e3d11ecaacce2bb9c6afed388d9f70dfcb7a0b9ece13ca6ee523f5839b7d9bf80cf3b2721524 SHA512 2829d1482abfe479ae71e8b00da07abe74ba3090ba2a3f9d9a93437cb2d4d64213968bcd6c082a6703ec1d9c36dfcfaa0850172f3ffd4d256f553b98eeaf29e6
 DIST eix-0.33.9.tar.xz 627944 BLAKE2B cb4add12301a4f08b6ca052df92be34c8a448b386aa700e8ac7e1fbe8563cd76047994007ac94d8989747d843f70a5e1731b401510f58badd9811b30c2ce3be8 SHA512 7539a91d5b5343532ceab1f4aeb82a95413c39b1a57b9e7922032acc937cc8b839494fc40f3510218349561c6d50e89e1861d2fce5e60eabed2465316b28a756
 DIST eix-0.34.1.tar.xz 626484 BLAKE2B 3f33df9d3f45abc073d7b80a7a6b3574ef6c1372042cb1ec4f0b0213842bc48d8d5a76c005ece2c060a39b1c8778764eb1f6808e75bc10af6e366e33e10aa6c7 SHA512 86289d8dcb0cf87ad48c739aae637626f9e63200a48d019fc96e74f2851b2791a61741d5db72ceaf3e5a375fb0dbf9302b04f766c3def69bcaabb393545dc767
+DIST eix-0.34.2.tar.xz 626492 BLAKE2B 984411e459b18f0ade77569b1e972a8c59588a31ce6af4b998a5fa27f9d5a2cc75fe647641f0651f17b5e9b4dc5706444dc49bd09e9e070e666beb989403e303 SHA512 422123108c841dd7e02296fa38276e72c61c8cab5e9ebba1fd2cd23d2a4b2c68e1dc530e47428f0bc41e89983196c7b8319ee548789199e4673c04687bbc5aec
--- a/app-portage/eix/eix-0.34.1.ebuild
+++ b/app-portage/eix/eix-0.34.1.ebuild
@ -40,6 +40,11 @@ src_prepare() {
 		-i src/eix-functions.sh.in || die
 	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
 		-i src/Makefile.am || die
+
+	# workaround unconditional protobuf use
+	# https://bugs.gentoo.org/724366
+	sed -e '/eix-proto\.cc/d' -i src/Makefile.am || die
+
 	eautoreconf
 }

--- a/app-portage/eix/eix-0.34.2.ebuild
+++ b/app-portage/eix/eix-0.34.2.ebuild
@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 flag-o-matic tmpfiles
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+BOTHDEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${BOTHDEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
+		-i src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+		--without-protobuf
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	# https://github.com/vaeth/eix/issues/35
+	append-cxxflags -std=c++14
+
+	# work around https://github.com/vaeth/eix/issues/64, bug#687988
+	local -x mv_fCXXFLAGS_cache='-mindirect-branch=thunk'
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+}
+
+pkg_postinst() {
+	tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT}/var/cache/${PN}" || die
+	fi
+}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/djview/djview-4.10.6-r1.ebuild
+++ b/app-text/djview/djview-4.10.6-r1.ebuild
@ -38,7 +38,7 @@ src_prepare() {
 	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
 	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
 	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
-	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
+	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4} || die
 	AT_M4DIR="config" eautoreconf
 }

@ -64,15 +64,15 @@ src_install() {

 	einstalldocs

-	cd desktopfiles
 	insinto /usr/share/icons/hicolor/32x32/apps
-	newins prebuilt-hi32-djview4.png djvulibre-djview4.png
+	newins desktopfiles/prebuilt-hi32-djview4.png djvulibre-djview4.png
 	insinto /usr/share/icons/hicolor/64x64/apps
-	newins prebuilt-hi64-djview4.png djvulibre-djview4.png
+	newins desktopfiles/prebuilt-hi64-djview4.png djvulibre-djview4.png
 	insinto /usr/share/icons/hicolor/scalable/apps
-	newins djview.svg djvulibre-djview4.svg
-	sed -i -e 's/Exec=djview4/Exec=djview/' djvulibre-djview4.desktop
-	domenu djvulibre-djview4.desktop
+	newins desktopfiles/djview.svg djvulibre-djview4.svg
+	sed -e 's/Exec=djview4/Exec=djview/' \
+		-i desktopfiles/djvulibre-djview4.desktop || die
+	domenu desktopfiles/djvulibre-djview4.desktop
 }

 pkg_postinst() {
--- a/app-text/pdfsandwich/Manifest
+++ b/app-text/pdfsandwich/Manifest
@ -1 +1,2 @@
 DIST pdfsandwich-0.1.4.tar.bz2 16401 BLAKE2B cb431f35b199e3e6290c60a3f6c7b2621dd3652a29346092869d8e5f86f5664079de1ef431f9b5e8b9f7cc044d64006295a8176d6a28b2ea5fb820db8c952000 SHA512 ee03aea13c72cc5a02136b5d16d2425f685f0b7a9d6fa6cff6c792bd24e6316720dff321b5e8237b949c98c713f39cb8b08b855b76e2a77350927b1ee7943171
+DIST pdfsandwich-0.1.7.tar.bz2 17461 BLAKE2B edeb08ab55df89ef2d1f3e43446e831c66e57273b36ecd56a4cc5f910ca5b59a03e2a66b13e7150f06f8f3eb26ed14cd1c80d02cd38d6bd6cfe923c30c801577 SHA512 ac315aeba2cc753fddc380e2522d0c41d65ea80372a23c2cd5371ebc239ac104ab5a5a1386378b9e026b2935a767128224f7617a5eb8f5ef9d6874cc18ef83ff
--- a/app-text/pdfsandwich/files/pdfsandwich-0.1.7-gentoo.patch
+++ b/app-text/pdfsandwich/files/pdfsandwich-0.1.7-gentoo.patch
@ -0,0 +1,43 @@
+--- a/Makefile	2020-05-21 20:46:14.961927486 +0200
+++ b/Makefile	2020-05-21 20:49:16.203121793 +0200
+@@ -6,7 +6,7 @@
+ 
+ SOURCE = pdfsandwich.ml
+ TARGET = pdfsandwich
+-MANUAL =	$(TARGET).1.gz
+MANUAL =	$(TARGET).1
+ 
+ VERSION :=	$(shell cat pdfsandwich_version)
+ 
+@@ -24,7 +24,7 @@
+ 
+ $(MANUAL):	manual.txt
+ 	# you need gawk for this:
+-	./txt2man -t PDFSANDWICH manual.txt | gzip -9 > $(MANUAL)
+	./txt2man -t PDFSANDWICH manual.txt > $(MANUAL)
+ 
+ # Canceling pathological implicit rule:
+ %: %.o
+@@ -40,7 +40,7 @@
+ include makefile.installprefix
+ 
+ PREF = $(DESTDIR)$(PREFIX)
+-INSTALL = 	install -s
+INSTALL = 	install
+ CP = 		cp
+ INSTALLBINDIR =	$(PREF)/bin
+ INSTALLMANDIR = $(PREF)/share/man/man1
+@@ -47,12 +47,8 @@
+ INSTALLDOCDIR = $(PREF)/share/doc/$(TARGET)
+ 
+ install: $(DOCFILES) $(ADDITIONAL)
+-	(umask 0022; mkdir -p $(INSTALLBINDIR) $(INSTALLDOCDIR) $(INSTALLMANDIR))
+	(umask 0022; mkdir -p $(INSTALLBINDIR))
+ 	$(INSTALL) $(TARGET) $(INSTALLBINDIR)
+-	$(CP) $(DOCFILES) $(INSTALLDOCDIR)
+-	gzip -9 $(INSTALLDOCDIR)/changelog
+-	$(CP) $(MANUAL) $(INSTALLMANDIR)
+-	chmod 644 $(INSTALLDOCDIR)/* $(INSTALLMANDIR)/*
+ 
+ uninstall:
+ 	rm -rf $(INSTALLBINDIR)/$(TARGET) $(INSTALLDOCDIR) $(INSTALLMANDIR)/$(MANUAL)
--- a/app-text/pdfsandwich/metadata.xml
+++ b/app-text/pdfsandwich/metadata.xml
@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
 	<longdescription>
 pdfsandwich generates "sandwich" OCR pdf files, i.e. pdf files which
 contain only images (no text) will be processed by optical character
--- a/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild
+++ b/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="generator of sandwich OCR pdf files"
+HOMEPAGE="http://www.tobias-elze.de/pdfsandwich"
+SRC_URI="mirror://sourceforge/pdfsandwich/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="png"
+
+RDEPEND=">=app-text/tesseract-3.00
+	media-gfx/exact-image
+	app-text/unpaper
+	app-text/ghostscript-gpl
+	virtual/imagemagick-tools[png?]"
+DEPEND="sys-apps/gawk
+	>=dev-lang/ocaml-3.10[ocamlopt]"
+
+DOCS=( changelog )
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+QA_FLAGS_IGNORED="/usr/bin/${PN}"
+
+src_prepare() {
+	sed -i \
+		-e "/^OCAMLOPTFLAGS/s/$/ -ccopt \"\$(CFLAGS) \$(LDFLAGS)\"/" \
+		Makefile || die
+	default
+}
+
+src_install() {
+	default
+	doman ${PN}.1
+}
+
+pkg_postinst() {
+	elog "pdfsandwich relies on the tesseract library for OCR."
+	elog "Consequently language support is determined by tesseract's"
+	elog "language support which in turn is controlled via the LINGUAS"
+	elog "variable in make.conf."
+}
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@ -1 +1,2 @@
 DIST aunit-2019-20190429-18B77-src.tar.gz 624683 BLAKE2B 455c3566ed46138116f258b175e883a59102dc334b41040cd6a332175fc4138d7ccdab1357c5b8886f14e551e3a6f4f4aa73eb755ade4a7a1663ac2d999973ca SHA512 9b1834ebacb9dbaa7a01f702455a44921a26a8d8d00f55ecc2fc8ddf2d884ef2ef2bba0f62551421f5a47d558d0fba88cbd57671459bba0c9f90c6310d714b19
+DIST aunit-2020-20200429-19B6C-src.tar.gz 615443 BLAKE2B b7d31dc8e198b3ceb94d043d701dceadbc1e20596a71a4f25a140bdd3f9ad54f7d7e4d4bfb587fbc31b9a6a046407c2d0dbd77dd2d045878e9aa2da3954d2964 SHA512 2d61db882cd7eaf66be101ffabafafdab1834578df162f0ef1947b517265033285cef3d84a76a3b0f1cb05d0adf12a1910b652bfbaeb56fc022157f44b34de86
--- a/dev-ada/aunit/aunit-2020.ebuild
+++ b/dev-ada/aunit/aunit-2020.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_201{6,7,8,9} )
+inherit ada multiprocessing
+
+MYP=${P}-20200429-19B6C-src
+
+DESCRIPTION="Ada unit testing framework"
+HOMEPAGE="http://libre.adacore.com/tools/aunit/"
+SRC_URI="https://community.download.adacore.com/v1/6c8702d4a3c4a39f5da077716e44bef980377ba8?filename=$MYP}.tar.gz
+	-> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
+
+src_compile() {
+	emake GPRBUILD="gprbuild -j$(makeopts_jobs) -v"
+}
+
+src_install() {
+	emake INSTALL="${D}"/usr install
+	einstalldocs
+	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/ || die
+	rmdir "${D}"/usr/share/doc/${PN} || die
+	mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples || die
+	rmdir "${D}"/usr/share/examples || die
+	rm -r "${D}"/usr/share/gpr/manifests || die
+}
+
+src_test() {
+	emake PROJECT_PATH_ARG="ADA_PROJECT_PATH=$(pwd)/lib/gnat" -C test
+}
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@ -4,6 +4,7 @@ DIST postgresql-11.7.tar.bz2 19890063 BLAKE2B 461c372567ff0b4ff4da52889be5d2822b
 DIST postgresql-11.8.tar.bz2 19922770 BLAKE2B a646b585bbafc95957fa60c7d119c02b69b727759d2189588508f8a690dc97a0ed1429a3379bc6fd48fb22ee92f3d811dedbf8aa43271361f9b7ac2c8d42a31b SHA512 fc3d0ebd224de60bda3fa71b6832958698238e9088cf46a80c376b8996cc3b2d017fde5dce1c1da1e5e6e23b78054aafad7ee1caa744bfb12c52317ccc8a1922
 DIST postgresql-12.2.tar.bz2 20363545 BLAKE2B 7b0cfe841d46b117ff5dd793be5537e916f92255eb0d000681ed62c497eef34c5d1261126be408f2b7f95274485e2787869cd4063461ab248b650c168b62548d SHA512 0e0ce8e21856e8f43e58b840c10c4e3ffae6d5207e0d778e9176e36f8e20e34633cbb06f0030a7c963c3491bb7e941456d91b55444c561cfc6f283fba76f33ee
 DIST postgresql-12.3.tar.bz2 20439892 BLAKE2B f7a44725f235c55a2849acd444de3a9c932314e2ae8c68d7f8e827439263b052bdf0fd5b6cdaa8197c4ce9ad1d4fbb02b5ec1af030365363993a36d8d95a4231 SHA512 68e2d244ae2a9f2138d7569bcadc1cf6f62a410fa56ad1d4ac53206f2adefabb5ae136110b41ca9246df0f8b8cb039918997e0f8a81fc7e6efb7ad10b3a59ba1
+DIST postgresql-13beta1.tar.bz2 21361108 BLAKE2B be5e41d49159ec5932ce958aab3b015b33ce02ef56abf47930754219e220672770785f6eed7966cd57fa9f3fd0d4527f5cb2813a4221443b56d70b7db7178b31 SHA512 8d8c13d7abf2127b0b0c04f080303906e8b0829d390530b308cbfa26e07cd2443a32281ef218a147499de5abe1fde8ab8818f581c68bf550cae1fbd235f46b80
 DIST postgresql-9.4.26.tar.bz2 16871195 BLAKE2B f26fd335293669a815a51ceb994b66e154c66f96f91e4c68d7df3490ad25f4b0366ebf7bfe2b209ff34965ea27a08562ace050f40d49cec94eb576d7a1becd1c SHA512 7d379d139c7b2bdac1df38743cbb46a1790a8d5174e8cf1141b7b4febcbc8f612e347bf4d355684eef24dfc73bb2796f85fc532908f26ba7195c685f198cbb72
 DIST postgresql-9.5.21.tar.bz2 17640928 BLAKE2B 8ffcf0befc331317a32d63d3cdfe44f7743f72f18b4bc46bee5ee80f8c489b4b1ef26abc8219f277acc922657fc21e3dc31f3fc9838621f44d95cc9405fca43b SHA512 8527356ee3b4f151c832aef50a8b96e923e0a6c77e5fe6ad597f50527f9d084a8feab7bede8fdbe29aab44383577d3f86e5286fb34e2d2b696cde34bd922e69d
 DIST postgresql-9.5.22.tar.bz2 17667386 BLAKE2B 6fe8ccf638af466e57f239c9d7f1a19bb6c33f6019955824f54f2fe63870675d841811318fb28707cc85ab8a9db550e6655773db0d89d801e26459c9d0d01a43 SHA512 489321fa49e17308d3a78353edf73a16295c1377ad429a94636df069d2bf55f538ba6570e3d2991dd28bcca45fee77c6c41fa9bade35ea7f9e581abff4c9a401
--- a/dev-db/postgresql/postgresql-13_beta1.ebuild
+++ b/dev-db/postgresql/postgresql-13_beta1.ebuild
@ -0,0 +1,458 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
+
+KEYWORDS=""
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+llvm? (
+	sys-devel/llvm:=
+	sys-devel/clang:=
+)
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
--- a/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r1.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r1.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_P="u-boot-${PV/_/-}"
+DESCRIPTION="utilities for working with Das U-Boot"
+HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome"
+SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \
+		scripts/kconfig/lxdialog/check-lxdialog.sh \
+		scripts/kconfig/Makefile \
+		tools/Makefile || die
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	# Unset a few KBUILD variables. Bug #540476
+	unset KBUILD_OUTPUT KBUILD_SRC
+
+	emake \
+		V=1 \
+		CC="${CC}" \
+		HOSTCC="${CC}" \
+		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
+		HOSTLDFLAGS="${LDFLAGS}" \
+		tools-only_defconfig
+
+	emake \
+		V=1 \
+		NO_SDL=1 \
+		HOSTSTRIP=: \
+		STRIP=: \
+		CC="${CC}" \
+		HOSTCC="${CC}" \
+		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
+		HOSTLDFLAGS="${LDFLAGS}" \
+		CONFIG_ENV_OVERWRITE=y \
+		tools-all
+}
+
+src_test() { :; }
+
+src_install() {
+	cd tools || die
+	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
+	dobin env/fw_printenv
+	dosym fw_printenv /usr/bin/fw_setenv
+	insinto /etc
+	doins env/fw_env.config
+	doman "${S}"/doc/mkimage.1
+}
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
--- a/dev-go/get-ego-vendor/get-ego-vendor-0.2.0.ebuild
+++ b/dev-go/get-ego-vendor/get-ego-vendor-0.2.0.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://github.com/williamh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"

 src_compile() {
 	go build ||  die
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.104.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.104.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""

 DEPEND=">=virtual/jdk-1.6"
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.55.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.55.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""

 DEPEND=">=virtual/jdk-1.8"
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/bglibs/bglibs-2.04-r2.ebuild
+++ b/dev-libs/bglibs/bglibs-2.04-r2.ebuild
@ -45,7 +45,9 @@ src_configure() {
 }

 src_compile() {
-	default
+	# Parallel build fails, bug #343617
+	MAKEOPTS+=" -j1" default
+
 	if use doc; then
 		emake -C doc/latex pdf
 	fi
--- a/dev-libs/elfutils/files/elfutils-0.173-reorder.patch
+++ b/dev-libs/elfutils/files/elfutils-0.173-reorder.patch
@ -1,37 +0,0 @@
-https://bugs.gentoo.org/666954
-https://github.com/rpm-software-management/rpm/issues/423
-https://sourceware.org/ml/elfutils-devel/2019-q2/msg00077.html
-
-From: Mark Wielaard <mark at klomp dot org>
-Subject: [PATCH] libelf: Mark shdr_flags dirty if offset or size changes during update.
-Date: Mon, 13 May 2019 00:13:42 +0200
-Message-Id: <20190512221342.23383-1-mark@klomp.org>
-
-We forgot to mark the shdr_flags dirty when only the sh_size or
-sh_offset changed during elf_update (). This meant that if there were
-no other shdr changes we only wrote out the section data, but didn't
-write out the shdr table to the file.
-
-Signed-off-by: Mark Wielaard <mark@klomp.org>
---
- libelf/elf32_updatenull.c          |   5 +-
-
--- a/libelf/elf32_updatenull.c
-+++ b/libelf/elf32_updatenull.c
-@@ -366,12 +366,15 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum)
- 		    }
- 
- 		  /* See whether the section size is correct.  */
-+		  int size_changed = 0;
- 		  update_if_changed (shdr->sh_size, (GElf_Word) offset,
-				     changed);
-+				     size_changed);
-+		  changed |= size_changed;
- 
- 		  if (shdr->sh_type != SHT_NOBITS)
- 		    size += offset;
- 
-+		  scn->shdr_flags |= (offset_changed | size_changed);
- 		  scn->flags |= changed;
- 		}
- 
--- a/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch
+++ b/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch
@ -1,20 +0,0 @@
-fixed executable stack
-
-http://bugs.gentoo.org/115038
-
--- gmp-4.1.4/configure
-+++ gmp-4.1.4/configure
-@@ -21689,6 +21689,13 @@
- fi
- echo "')" >> $gmp_configm4
- echo "define(\`__CONFIG_M4_INCLUDED__')" >> $gmp_configm4
-+# Gentoo hack
-+case $host_os in
-+	*linux*)
-+		echo '.section .note.GNU-stack,"",%progbits' >> $gmp_configm4
-+		echo '.previous' >> $gmp_configm4
-+		;;
-+esac
- 
- # Create Makefiles
- # FIXME: Upcoming version of autoconf/automake may not like broken lines.
--- a/dev-libs/gmp/files/gmp-4.2.1-s390.diff
+++ b/dev-libs/gmp/files/gmp-4.2.1-s390.diff
@ -1,68 +0,0 @@
-stolen from SuSE
-
--- configure.in
-+++ configure.in
-@@ -1050,6 +1050,9 @@
-     ;;
- 
- 
-+  s390x-*-*)
-+       path="s390x" ;;
-+
-   # IBM s/370 and similar
-   [s3[6-9]0*-*-*])
-     gcc_cflags="-O2 $fomit_frame_pointer"
--- configure
-+++ configure
-@@ -1050,6 +1050,9 @@
-     ;;
- 
- 
-+  s390x-*-*)
-+       path="s390x" ;;
-+
-   # IBM s/370 and similar
-   s3[6-9]0*-*-*)
-     gcc_cflags="-O2 $fomit_frame_pointer"
--- mpn/s390/gmp-mparam.h
-+++ mpn/s390/gmp-mparam.h
-@@ -20,7 +20,8 @@
- MA 02110-1301, USA. */
- 
- 
-/* BITS_PER_MP_LIMB etc generated by configure */
-+#define BITS_PER_MP_LIMB 32
-+#define BYTES_PER_MP_LIMB 4
- 
- 
- /* Generated by tuneup.c, 2001-12-03, gcc 2.95 */
--- mpn/s390x/gmp-mparam.h
-+++ mpn/s390x/gmp-mparam.h
-@@ -0,0 +1,27 @@
-+/* gmp-mparam.h -- Compiler/machine parameter header file.
-+
-+Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation, Inc.
-+
-+This file is part of the GNU MP Library.
-+
-+The GNU MP Library is free software; you can redistribute it and/or modify
-+it under the terms of the GNU Library General Public License as published by
-+the Free Software Foundation; either version 2 of the License, or (at your
-+option) any later version.
-+
-+The GNU MP Library is distributed in the hope that it will be useful, but
-+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-+License for more details.
-+
-+You should have received a copy of the GNU Library General Public License
-+along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-+MA 02111-1307, USA. */
-+
-+#define BITS_PER_MP_LIMB 64
-+#define BYTES_PER_MP_LIMB 8
-+#define BITS_PER_LONGINT 64
-+#define BITS_PER_INT 32
-+#define BITS_PER_SHORTINT 16
-+#define BITS_PER_CHAR 8
--- a/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
+++ b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 inherit autotools multilib-minimal

@ -22,8 +22,8 @@ RDEPEND="
 	media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
 "

-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "

@ -33,5 +33,9 @@ src_prepare() {
 }

 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
+	ECONF_SOURCE="${S}" econf --disable-static
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
 }
--- a/dev-libs/isl/files/isl-0.22-bmap-nullderef.patch
+++ b/dev-libs/isl/files/isl-0.22-bmap-nullderef.patch
@ -1,34 +0,0 @@
-https://groups.google.com/forum/#!original/isl-development/Otz1QKZDpzA/71GkTvqkCAAJ
-https://bugs.gentoo.org/702968
-
-Subject: [MAINT PATCH] isl_basic_map_underlying_set: fix error handling
-Date: Tue,  7 Jan 2020 23:02:42 +0100
-Message-Id: <20200107220242...@kotnet.org>
-X-Mailer: git-send-email 2.24.1.591.g12029dc57d
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-From: Sven Verdoolaege <sven.ve...@gmail.com>
-
-The check for a valid bmap before accessing its n_div field
-was inadvertently removed in isl-0.21-230-g6a4c4bbf31 (isl_map.c:
-extract out shared isl_basic_map_{take,restore}_space,
-Thu Aug 11 10:27:49 2016 +0200).
-
-Reported-by: Richard Biener <rgue...@suse.de>
-Signed-off-by: Sven Verdoolaege <sven.ve...@gmail.com>
---
- isl_map.c | 2 ++
- 1 file changed, 2 insertions(+)
--- a/isl_map.c
-+++ b/isl_map.c
-@@ -5511,6 +5511,8 @@ __isl_give isl_basic_set *isl_basic_map_underlying_set(
- 	    !isl_space_is_named_or_nested(bmap->dim, isl_dim_out))
- 		return bset_from_bmap(bmap);
- 	bmap = isl_basic_map_cow(bmap);
-+	if (!bmap)
-+		return NULL;
- 	space = isl_basic_map_take_space(bmap);
- 	space = isl_space_underlying(space, bmap->n_div);
- 	bmap = isl_basic_map_restore_space(bmap, space);
-- 
-2.24.1.591.g12029dc57d
--- a/dev-libs/kqoauth/kqoauth-0.98-r2.ebuild
+++ b/dev-libs/kqoauth/kqoauth-0.98-r2.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 inherit qmake-utils

@ -30,10 +30,10 @@ src_prepare() {
 	# prevent tests from beeing built at src_compile
 	sed -i -e '/SUBDIRS/s/ tests//' ${PN}.pro || die "sed on ${PN}.pro failed"
 	# respect libdir
-	sed -e 's:{INSTALL_PREFIX}/lib:[QT_INSTALL_LIBS]:g' -i src/src.pro || die "sed on src.pro failed"
+	sed -e 's:{INSTALL_PREFIX}/lib:[QT_INSTALL_LIBS]:g'\
+		-i src/src.pro || die "sed on src.pro failed"

-	sed \
-		-e "s/TARGET = kqoauth/TARGET = kqoauth-qt5/g" \
+	sed -e "s/TARGET = kqoauth/TARGET = kqoauth-qt5/g" \
 		-i src/src.pro || die
 }

--- a/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild
+++ b/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild
@ -13,7 +13,7 @@ DESCRIPTION="Framework to collect user feedback for applications via telemetry a

 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi

 LICENSE="MIT"
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@ -1,3 +1,2 @@
-DIST libbytesize-1.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
-DIST libbytesize-2.1.tar.gz 440209 BLAKE2B 7c689f269eae7b408b7f85fb9c877c9eb519d2a2eb143ef0ddb1657fbb4d79fab7cdaa56b35b4bbbb964e47361e37d7c70a0a135bacb8f817bd6cf8d2e22b68e SHA512 6b93d877e921820c19ed6874a36d9f8b6958112f6230f24980e8e6e30570b39ce74594f0ef126f70dc81b5434899c1f0f3ad0925f3ff7b6a596a9329c8f106c8
 DIST libbytesize-2.2.tar.gz 443040 BLAKE2B 04035f99f1da4d2d426106e1f292d71089dae89923d41425fa815a72e375639a7d8b6fc5552a3f08462597ce9c19797c7fce5b79fdad504b9062168093a70a4f SHA512 4538ac3499a24023c21fe07f527e400f99509921e377248970ac2da0eaf1655ddb261f432eed46a59ef69a1275ba7d1e5b0cc488d64eeea936b6cfa54c552ac1
+DIST libbytesize-2.3.tar.gz 438198 BLAKE2B 583450b66781bbb16298507292ffe60012ccc296f0822784ead13bcf1ce3f9a9cf7c2341d5f64d3356fb78aefb3e6b0770bce64ebf85aa92d168277d35f9629c SHA512 23720b90f4dbf7880a640ec04e910c4c1f34637dd3621900772187cb2e1d04ec34d4900ce3c9b4083ac462b411d5a409a644f62ed76b2c57ef1f11432c58be8a
--- a/dev-libs/libbytesize/libbytesize-1.4.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.4.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
-HOMEPAGE="https://github.com/storaged-project/libbytesize"
-SRC_URI="https://github.com/storaged-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="doc test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/gmp:0=
-	dev-libs/mpfr:=
-	>=dev-libs/libpcre-8.32
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )
-	test? (
-		dev-python/pocketlint
-		dev-python/polib
-	)
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-python3 #634840
-		$(use_with doc gtk-doc)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	python_install() {
-		emake -C src/python install DESTDIR="${D}"
-		python_optimize
-	}
-	python_foreach_impl python_install
-
-	find "${ED}" -name "*.la*" -delete || die
-}
--- a/dev-libs/libbytesize/libbytesize-2.3.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.3.ebuild
--- a/dev-libs/libevent/libevent-2.1.11.ebuild
+++ b/dev-libs/libevent/libevent-2.1.11.ebuild
@ -15,7 +15,7 @@ SRC_URI="
 LICENSE="BSD"

 SLOT="0/2.1-7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug libressl +ssl static-libs test +threads"
 RESTRICT="!test? ( test )"

--- a/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch
+++ b/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch
@ -1,22 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=513428
-https://bugs.gentoo.org/show_bug.cgi?id=536764
-https://trac.macports.org/ticket/44170
-
--- libffi-3.2.1/src/x86/win32.S
-+++ libffi-3.2.1/src/x86/win32.S
-@@ -1184,7 +1184,6 @@
- 
- #if defined(X86_WIN32) && !defined(__OS2__)
-         .section	.eh_frame,"w"
-#endif
- .Lframe1:
- .LSCIE1:
-         .long	.LECIE1-.LASCIE1  /* Length of Common Information Entry */
-@@ -1343,6 +1342,7 @@
-         /* End of DW_CFA_xxx CFI instructions.  */
-         .align 4
- .LEFDE5:
-+#endif /* defined(X86_WIN32) && !defined(__OS2__), for the eh_frame */
- 
- #endif /* !_MSC_VER */
- 
--- a/dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch
+++ b/dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch
@ -1,41 +0,0 @@
-ia64: fix small struct handling (missing complex type entry)
-
-commit 6e8a4460833594d5af1b4539178025da0077df19
-added FFI_TYPE_COMPLEX value type (comes after FFI_TYPE_POINTER)
-
-ia64 ffi_closure_unix reiles on the ordering of
-types as ia64 has ia64-specific FFI types:
-small struct and others.
-
-As a result all tests handling small structs broke.
-
-The change fixes dispatch table by ignoring FFI_TYPE_COMPLEX.
-This has positive effect of unbreaking most tests:
-
-                 === libffi Summary ===
- 
-# of expected passes            1595
-# of unexpected failures        295
-+# of expected passes            1930
-+# of unexpected failures        10
- # of unsupported tests          30
-
-Bug: https://bugs.gentoo.org/634190
--- a/src/ia64/unix.S
-+++ b/src/ia64/unix.S
-@@ -529,6 +529,7 @@ ffi_closure_unix:
- 	data8	@pcrel(.Lst_int64)		// FFI_TYPE_SINT64
- 	data8	@pcrel(.Lst_void)		// FFI_TYPE_STRUCT
- 	data8	@pcrel(.Lst_int64)		// FFI_TYPE_POINTER
-+	data8	@pcrel(.Lst_void)		// FFI_TYPE_COMPLEX (not implemented)
- 	data8 	@pcrel(.Lst_small_struct)	// FFI_IA64_TYPE_SMALL_STRUCT
- 	data8	@pcrel(.Lst_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
- 	data8	@pcrel(.Lst_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
-@@ -550,6 +551,7 @@ ffi_closure_unix:
- 	data8	@pcrel(.Lld_int)		// FFI_TYPE_SINT64
- 	data8	@pcrel(.Lld_void)		// FFI_TYPE_STRUCT
- 	data8	@pcrel(.Lld_int)		// FFI_TYPE_POINTER
-+	data8	@pcrel(.Lld_void)		// FFI_TYPE_COMPLEX (not implemented)
- 	data8 	@pcrel(.Lld_small_struct)	// FFI_IA64_TYPE_SMALL_STRUCT
- 	data8	@pcrel(.Lld_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
- 	data8	@pcrel(.Lld_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
--- a/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch
+++ b/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch
@ -1,20 +0,0 @@
--- a/src/alpha/osf.S.orig	2015-01-16 10:46:15.000000000 +0100
-+++ b/src/alpha/osf.S	2015-01-16 10:46:24.000000000 +0100
-@@ -279,6 +279,7 @@
- 	.gprel32 $load_64	# FFI_TYPE_SINT64
- 	.gprel32 $load_none	# FFI_TYPE_STRUCT
- 	.gprel32 $load_64	# FFI_TYPE_POINTER
-+	.gprel32 $load_none	# FFI_TYPE_COMPLEX
- 
- /* Assert that the table above is in sync with ffi.h.  */
- 
-@@ -294,7 +295,8 @@
- 	|| FFI_TYPE_SINT64 != 12	\
- 	|| FFI_TYPE_STRUCT != 13	\
- 	|| FFI_TYPE_POINTER != 14	\
-	|| FFI_TYPE_LAST != 14
-+	|| FFI_TYPE_COMPLEX != 15       \
-+	|| FFI_TYPE_LAST != 15
- #error "osf.S out of sync with ffi.h"
- #endif
- 
--- a/dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch
+++ b/dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch
@ -1,74 +0,0 @@
-From b58caef7fd620408be9239ac24ea89d5bc84f30b Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 17 Feb 2018 19:00:40 +0000
-Subject: [PATCH 2/2] ia64: fix small struct return
-
-This change fixes libffi.call/struct10.c failure on ia64:
-FAIL: libffi.call/struct10.c -W -Wall -Wno-psabi -O0 execution test
-
-.Lst_small_struct handles returns for structs less than 32 bytes
-(following ia64 return value ABI [1]). Subroutine does roughly the
-following:
-
-```
-    mov [sp+0]  = r8
-    mov [sp+8]  = r9
-    mov [sp+16] = r10
-    mov [sp+24] = r11
-    memcpy(destination, source=sp, 12);
-```
-
-The problem: ia64 ABI guarantees that top 16 bytes of stack are
-scratch space for callee function. Thus it can clobber it. [1]
-says (7.1 Procedure Frames):
-"""
-* Scratch area. This 16-byte region is provided as scratch storage
-  for procedures that are called by the current procedure. Leaf
-  procedures do not need to allocate this region. A procedure may
-  use the 16 bytes at the top of its own frame as scratch memory,
-  but the contents of this area are not preserved by a procedure call.
-"""
-
-In our case 16 top bytes are clobbered by a PLT resolver when memcpy()
-is called for the first time. As a result memcpy implementation reads
-already clobbered data frop top of stack.
-
-The fix is simple: allocate 16 bytes of scrats space prior to memcpy()
-call.
-
-[1]: https://www.intel.com/content/dam/www/public/us/en/documents/guides/itanium-software-runtime-architecture-guide.pdf
-
-Bug: https://bugs.gentoo.org/634190
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
- src/ia64/unix.S | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/ia64/unix.S b/src/ia64/unix.S
-index 4733377..e2547e0 100644
--- a/src/ia64/unix.S
-+++ b/src/ia64/unix.S
-@@ -175,7 +175,6 @@ ffi_call_unix:
- 	;;
- 
- .Lst_small_struct:
-	add	sp = -16, sp
- 	cmp.lt	p6, p0 = 8, in3
- 	cmp.lt	p7, p0 = 16, in3
- 	cmp.lt	p8, p0 = 24, in3
-@@ -191,6 +190,12 @@ ffi_call_unix:
- (p8)	st8	[r18] = r11
- 	mov	out1 = sp
- 	mov	out2 = in3
-+	;;
-+	// ia64 software calling convention requires
-+	// top 16 bytes of stack to be scratch space
-+	// PLT resolver uses that scratch space at
-+	// 'memcpy' symbol reolution time
-+	add	sp = -16, sp
- 	br.call.sptk.many b0 = memcpy#
- 	;;
- 	mov	ar.pfs = loc0
-- 
-2.16.1
-
--- a/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch
+++ b/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch
@ -1,56 +0,0 @@
-Autogenerated part of libffi-3.2.1-include-path.patch
-
-https://bugs.gentoo.org/643582
-diff --git a/include/Makefile.in b/include/Makefile.in
-index 9d747e8..99ecfd7 100644
--- a/include/Makefile.in
-+++ b/include/Makefile.in
-@@ -152,2 +152,2 @@ am__uninstall_files_from_dir = { \
-am__installdirs = "$(DESTDIR)$(includesdir)"
-HEADERS = $(nodist_includes_HEADERS)
-+am__installdirs = "$(DESTDIR)$(includedir)"
-+HEADERS = $(nodist_include_HEADERS)
-@@ -317,2 +317 @@ EXTRA_DIST = ffi.h.in ffi_common.h
-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-nodist_includes_HEADERS = ffi.h ffitarget.h
-+nodist_include_HEADERS = ffi.h ffitarget.h
-@@ -360 +359 @@ clean-libtool:
-install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
-+install-nodist_includeHEADERS: $(nodist_include_HEADERS)
-@@ -362 +361 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
-	@list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-+	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
-@@ -364,2 +363,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \
-+	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
-+	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
-@@ -372,2 +371,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
-@@ -376 +375 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
-uninstall-nodist_includesHEADERS:
-+uninstall-nodist_includeHEADERS:
-@@ -378 +377 @@ uninstall-nodist_includesHEADERS:
-	@list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-+	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
-@@ -380 +379 @@ uninstall-nodist_includesHEADERS:
-	dir='$(DESTDIR)$(includesdir)'; $(am__uninstall_files_from_dir)
-+	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
-@@ -468 +467 @@ installdirs:
-	for dir in "$(DESTDIR)$(includesdir)"; do \
-+	for dir in "$(DESTDIR)$(includedir)"; do \
-@@ -522 +521 @@ info-am:
-install-data-am: install-nodist_includesHEADERS
-+install-data-am: install-nodist_includeHEADERS
-@@ -566 +565 @@ ps-am:
-uninstall-am: uninstall-nodist_includesHEADERS
-+uninstall-am: uninstall-nodist_includeHEADERS
-@@ -577 +576 @@ uninstall-am: uninstall-nodist_includesHEADERS
-	install-nodist_includesHEADERS install-pdf install-pdf-am \
-+	install-nodist_includeHEADERS install-pdf install-pdf-am \
-@@ -582 +581 @@ uninstall-am: uninstall-nodist_includesHEADERS
-	uninstall-am uninstall-nodist_includesHEADERS
-+	uninstall-am uninstall-nodist_includeHEADERS
--- a/dev-libs/libffi/files/libffi-3.2.1-include-path.patch
+++ b/dev-libs/libffi/files/libffi-3.2.1-include-path.patch
@ -1,39 +0,0 @@
-https://bugs.gentoo.org/643582
-
-From 982b89c01aca99c7bc229914fc1521f96930919b Mon Sep 17 00:00:00 2001
-From: Yen Chi Hsuan <yan12125@gmail.com>
-Date: Sun, 13 Nov 2016 19:17:19 +0800
-Subject: [PATCH] Install public headers in the standard path
-
---
- include/Makefile.am | 3 +--
- libffi.pc.in        | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/include/Makefile.am b/include/Makefile.am
-index bb241e8..c59df9f 100644
--- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -6,5 +6,4 @@ DISTCLEANFILES=ffitarget.h
- noinst_HEADERS=ffi_common.h ffi_cfi.h
- EXTRA_DIST=ffi.h.in
- 
-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-nodist_includes_HEADERS = ffi.h ffitarget.h
-+nodist_include_HEADERS = ffi.h ffitarget.h
-diff --git a/libffi.pc.in b/libffi.pc.in
-index edf6fde..6fad83b 100644
--- a/libffi.pc.in
-+++ b/libffi.pc.in
-@@ -2,7 +2,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- toolexeclibdir=@toolexeclibdir@
-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includedir=@includedir@
- 
- Name: @PACKAGE_NAME@
- Description: Library supporting Foreign Function Interfaces
-- 
-2.15.1
-
--- a/dev-libs/libffi/files/libffi-3.2.1-musl-emutramp.patch
+++ b/dev-libs/libffi/files/libffi-3.2.1-musl-emutramp.patch
@ -1,31 +0,0 @@
-https://github.com/libffi/libffi/commit/e169ba2b83c780058fe626856cfdb5903a85cb97.patch
-https://bugs.gentoo.org/694916
-
-From e169ba2b83c780058fe626856cfdb5903a85cb97 Mon Sep 17 00:00:00 2001
-From: Kylie McClain <somasis@exherbo.org>
-Date: Fri, 29 Apr 2016 21:04:07 -0400
-Subject: [PATCH] Fix usage on musl libc
-
-A gcc compiled on musl does not define __gnu_linux__, it defines __linux__.
-Only on glibc does __gnu_linux__ get defined, but both define __linux__, so
-we should check for that instead.
-
-With this patch, libffi works perfectly, and passes its testsuite entirely
-on musl libc systems.
---
- src/closures.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/closures.c b/src/closures.c
-index 3dec0e31..05849e06 100644
--- a/src/closures.c
-+++ b/src/closures.c
-@@ -35,7 +35,7 @@
- #include <ffi_common.h>
- 
- #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
-# if __gnu_linux__ && !defined(__ANDROID__)
-+# if __linux__ && !defined(__ANDROID__)
- /* This macro indicates it may be forbidden to map anonymous memory
-    with both write and execute permission.  Code compiled when this
-    option is defined will attempt to map such pages once, but if it
--- a/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch
+++ b/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch
@ -1,93 +0,0 @@
-From 955e3c56459556284cf4a7fb23c51f9d310be80c Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 19 May 2018 10:49:07 +0100
-Subject: [PATCH] hppa: avoid TEXTREL in .eh_frame section
-
-Before the change hand-crafted .eh_frame section contained
-ABS relocation and caused TEXTREL tag to be emitted:
-
-```
-$ ./configure --host=hppa2.0-unknown-linux-gnu LDFLAGS=-Wl,-z,text
-$ make
-...
-/usr/libexec/gcc/hppa2.0-unknown-linux-gnu/ld:
-    read-only segment has dynamic relocations.
-```
-
-Link failure is caused by absolute address of FDEs
-encoded into .eh_frame entries.
-
-Fixed TEXTREL by using pcrel (instead of ABS) encoding
-for absolute addresses (__PIC__ code) by adding augmentation
-information ("zR" CIE type).
-
-All tests still pass on hppa2.0. The specific tests that still pass
-and exercise this code path:
-    testsuite/libffi.call/unwindtest.cc
-    testsuite/libffi.call/unwindtest_ffi_call.cc
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
- src/pa/linux.S | 25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/src/pa/linux.S b/src/pa/linux.S
-index f11ae76..ab04c75 100644
--- a/src/pa/linux.S
-+++ b/src/pa/linux.S
-@@ -297,10 +297,18 @@ ffi_closure_pa32:
- .LSCIE1:
- 	.word   0x0     ;# CIE Identifier Tag
- 	.byte   0x1     ;# CIE Version
-+#ifdef __PIC__
-+	.ascii  "zR\0"  ;# CIE Augmentation: 'z' - data, 'R' - DW_EH_PE_... data
-+#else
- 	.ascii "\0"     ;# CIE Augmentation
-+#endif
- 	.uleb128 0x1    ;# CIE Code Alignment Factor
- 	.sleb128 4      ;# CIE Data Alignment Factor
- 	.byte   0x2     ;# CIE RA Column
-+#ifdef __PIC__
-+	.uleb128 0x1    ;# Augmentation size
-+	.byte	0x1b    ;# FDE Encoding (DW_EH_PE_pcrel|DW_EH_PE_sdata4)
-+#endif
- 	.byte   0xc     ;# DW_CFA_def_cfa
- 	.uleb128 0x1e
- 	.uleb128 0x0
-@@ -310,9 +318,15 @@ ffi_closure_pa32:
- 	.word   .LEFDE1-.LASFDE1        ;# FDE Length
- .LASFDE1:
- 	.word   .LASFDE1-.Lframe1       ;# FDE CIE offset
-	.word   .LFB1   ;# FDE initial location
-+#ifdef __PIC__
-+	.word	.LFB1-. ;# FDE initial location
-+#else
-+	.word	.LFB1   ;# FDE initial location
-+#endif
- 	.word   .LFE1-.LFB1     ;# FDE address range
-
-+#ifdef __PIC__
-+	.uleb128 0x0	;# Augmentation size: no data
-+#endif
- 	.byte   0x4     ;# DW_CFA_advance_loc4
- 	.word   .LCFI11-.LFB1
- 	.byte	0x83	;# DW_CFA_offset, column 0x3
-@@ -338,8 +352,15 @@ ffi_closure_pa32:
- 	.word   .LEFDE2-.LASFDE2        ;# FDE Length
- .LASFDE2:
- 	.word   .LASFDE2-.Lframe1       ;# FDE CIE offset
-+#ifdef __PIC__
-+	.word   .LFB2-. ;# FDE initial location
-+#else
- 	.word   .LFB2   ;# FDE initial location
-+#endif
- 	.word   .LFE2-.LFB2     ;# FDE address range
-+#ifdef __PIC__
-+	.uleb128 0x0	;# Augmentation size: no data
-+#endif
- 	.byte   0x4     ;# DW_CFA_advance_loc4
- 	.word   .LCFI21-.LFB2
- 	.byte   0x83    ;# DW_CFA_offset, column 0x3
-- 
-2.19.0
-
--- a/dev-libs/libnfc/Manifest
+++ b/dev-libs/libnfc/Manifest
@ -1 +1,2 @@
 DIST libnfc-1.7.1.tar.bz2 484309 BLAKE2B 7a86394e8902421410d54de2b2710cee7ea34a6f950f6d76ec59d24d6e46798cd10a9725f405c729df44da84b810b5853a5eef0ec5f2a10ccbcf7585d33f34ef SHA512 6a03d197c450c0ab8f2d16ae8c1f80e206fa909ece84a32dbb962acd0f7ef693a419608cdaa4c2207a1d2593599e44479520d7413eace7fca19d3230442e506c
+DIST libnfc-1.7.2.tar.bz2 534821 BLAKE2B 015634a696aeda77abdb53ab658504d0183b8d8d5899f368b122660d6527cf4d3ec988147082620d87d007ea33320acfde6cc013c9257b9c62fa4fb99528eeeb SHA512 c93ab10667998b6c6bf948082253715762ae91699d3e035f1149cebf6d3881cbc2ab570976c70cd12f886f76a18a82ac048fad0664512d1cd553c0fd1fdf7674
--- a/dev-libs/libnfc/libnfc-1.7.2.ebuild
+++ b/dev-libs/libnfc/libnfc-1.7.2.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Near Field Communications (NFC) library"
+HOMEPAGE="http://www.libnfc.org/"
+SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc pcsc-lite readline static-libs usb"
+
+RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite )
+	readline? ( sys-libs/readline:0 )
+	usb? ( virtual/libusb:0 )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s"
+	use pcsc-lite && drivers+=",acr122_pcsc"
+	use usb && drivers+=",pn53x_usb,acr122_usb"
+	econf \
+		--with-drivers="${drivers}" \
+		$(use_enable doc) \
+		$(use_with readline) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	use doc && doxygen
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name 'lib*.la' -delete
+	use doc && dohtml "${S}"/doc/html/*
+}
--- a/dev-libs/qoauth/qoauth-2.0.1_pre20160315-r3.ebuild
+++ b/dev-libs/qoauth/qoauth-2.0.1_pre20160315-r3.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 inherit qmake-utils

@ -13,14 +13,17 @@ LICENSE="LGPL-2.1"
 SLOT="5"
 KEYWORDS="amd64 ~ppc64 x86"
 IUSE="debug doc test"
+
 RESTRICT="!test? ( test )"

+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
 COMMON_DEPEND="
 	app-crypt/qca:2[debug?,qt5(+)]
 	dev-qt/qtnetwork:5
 "
 DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
 	test? ( dev-qt/qttest:5 )
 "
 RDEPEND="${COMMON_DEPEND}
@ -57,7 +60,7 @@ src_configure() {
 src_install() {
 	if use doc; then
 		doxygen "${S}"/Doxyfile || die "failed to generate documentation"
-		HTML_DOCS=( "${S}"/doc/html/. )
+		local HTML_DOCS=( "${S}"/doc/html/. )
 	fi

 	INSTALL_ROOT="${D}" default
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
--- a/dev-ml/num/files/num-1.3-cflags.patch
+++ b/dev-ml/num/files/num-1.3-cflags.patch
@ -0,0 +1,11 @@
+--- a/src/Makefile	2020-05-21 18:54:31.176399032 +0200
+++ b/src/Makefile	2020-05-21 18:55:27.881498310 +0200
+@@ -65,7 +65,7 @@
+ %.cmx: %.ml
+ 	$(OCAMLOPT) $(CAMLOPTFLAGS) -c $*.ml
+ %.$(O): %.c
+-	$(OCAMLC) -ccopt -DBNG_ARCH_$(BNG_ARCH) -c $*.c
+	$(OCAMLC) -ccopt "-DBNG_ARCH_$(BNG_ARCH) $(CFLAGS)" -c $*.c
+ 
+ # Legacy installation: files go into OCaml's stdlib directory; only META
+ # is installed via findlib
--- a/dev-ml/num/num-1.3.ebuild
+++ b/dev-ml/num/num-1.3.ebuild
@ -19,6 +19,14 @@ DEPEND=">=dev-lang/ocaml-4.09.0[ocamlopt]
 RDEPEND="${DEPEND}"
 BDEPEND="${DEPEND}"

+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+)
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
 src_install() {
 	findlib_src_preinst
 	OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install DESTDIR="${D}"
--- a/Show More
+++ b/Show More