Sync with portage [Tue Oct 1 23:26:32 MSK 2019].

2019-10-01 23:26:32 +03:00 · 2019-10-01 23:26:32 +03:00 · 629ccf6924
commit 629ccf6924
parent 7737e5c44b
576 changed files with 4057 additions and 2663 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/emacs-updater/metadata.xml
+++ b/app-admin/emacs-updater/metadata.xml
@ -5,4 +5,5 @@
  <email>gnu-emacs@gentoo.org</email>
  <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<stabilize-allarches/>
 </pkgmetadata>
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/restic/restic-0.9.5.ebuild
+++ b/app-backup/restic/restic-0.9.5.ebuild
@ -32,12 +32,12 @@ src_compile() {
 		-o restic ${EGO_PN}/cmd/restic
 	)

-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+	GO111MODULE=off GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
 		go build "${mygoargs[@]}" || die
 }

 src_test() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+	GO111MODULE=off GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
 		go test -timeout 30m -v -work -x ${EGO_PN}/cmd/... ${EGO_PN}/internal/... || die
 }

--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@ -2,4 +2,4 @@ DIST Geekbench-2.4.2-LinuxARM.tar.gz 1921401 BLAKE2B 34d86178e35d586b79182b33203
 DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a148449a36845fe63320788432493581ec6bd5958bf178d83d68b532ffbe5c7ee13e92b0bb00c0aca968bb2e499453f1b7a7 SHA512 d84e13eb5fd28fb232a5f93aa76f4855adcb9ccffbcd90dacc3e2b45231afd82e78d40c63f729391e5d00e95c14653e83757faca4e543c6306dd913c4e0edb87
 DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
 DIST Geekbench-4.4.1-Linux.tar.gz 71076124 BLAKE2B 14c2b80c971798e7d2bb256e76c7ab9c48e8c1c389e2f7547a436f706ac4f21c1e52e564cd584893071ee2f9f0a4747cd03ea72cc728ff8e4f369d5cc794d77a SHA512 fa687d33a7d7a2d09c544e3d17de93f41cfa77915c708cd1ef0743f84f7f83df9d3f8df2872a8f85ed2c4c872e3cd41932685ffeb19cdb0ea047ab5116713420
-DIST Geekbench-5.0.1-Linux.tar.gz 92098694 BLAKE2B 007439570830816d573897eb3fb666656e0521e885fd241ad8606b6a6ca533a5ed490ac86465993ba4532d9278d09d03c78ca01bcf6cd932eb00eac00eb3a242 SHA512 82bd126c533764bdf6d25588d59b929be59deb4d0548ca0d414910fcea6a473918f4e62e9fed5fe644683b57819c868285ecaf92a6d123954ad92a93f989ed69
+DIST Geekbench-5.0.2-Linux.tar.gz 92814509 BLAKE2B 4cb490f161cc00f19ef29f9722fb065bdfcadf1904600b22b33042bd9f42a9f4f13000ec09685f38ce5bfb1c509423044a2ed3913e575c81c2ed54f3ba28b5a4 SHA512 90b9b8bf2833b25a20f3eaee0b9be8f4be67d56f6d5a43adc0ae8a61d84ea785e9aa0629948dd1e4a4d3762c2f1800db3b886085735b466927be1ad9ead1f33a
--- a/app-benchmarks/geekbench/geekbench-5.0.2.ebuild
+++ b/app-benchmarks/geekbench/geekbench-5.0.2.ebuild
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/auto-complete/auto-complete-1.5.1-r1.ebuild
+++ b/app-emacs/auto-complete/auto-complete-1.5.1-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -13,6 +13,7 @@ LICENSE="GPL-3+ FDL-1.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
+RESTRICT="test"

 RDEPEND="app-emacs/popup"
 BDEPEND="${RDEPEND}
--- a/app-emacs/edb/Manifest
+++ b/app-emacs/edb/Manifest
@ -1,2 +1 @@
-DIST edb-1.31.tar.gz 585728 BLAKE2B ffe1ef3171724b1c608d347393955615a48737230f7493e22c48504134682d1c73397e1e559708f16ab2284a17b4b6baff7dbb15e255511b6ed5d07d6a22e249 SHA512 99af00f1e876b490205e9c3b1807d0af0efcd9a5bff018629f00e36d1572f7d05e979d6bfb50f9c15edfe3ad5382fa6f6171f13c638f3143ece53790bdaa31c3
 DIST edb-1.32.tar.gz 692581 BLAKE2B 3f77d6f9d6550ce1c064dc0820fdc9a24293964900d4f390ad1456e79f42444d7c9512585cf230d742e66360011e2e314446748e23395bee1e7f8086c38853b7 SHA512 ee8bd642c019d30401202f540b37f28c914c17083123ca61b741de72d168ecb855d0508f922af208bb717b02b4819cf6f3c5137d589f2e858410a3e9ab4034e0
--- a/app-emacs/edb/edb-1.31.ebuild
+++ b/app-emacs/edb/edb-1.31.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="EDB, The Emacs Database"
-HOMEPAGE="http://www.gnuvola.org/software/edb/
-	https://www.emacswiki.org/emacs/EmacsDataBase"
-SRC_URI="http://www.gnuvola.org/software/edb/${P}.tar.gz"
-
-LICENSE="GPL-3+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-ELISP_PATCHES="${P}-skram-path.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	default
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake -j1 \
-		sitelisp="${ED}${SITELISP}" \
-		infodir="${ED}/usr/share/info" \
-		install
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc AUTHORS BUGS ChangeLog HACKING NEWS README THANKS TODO doc/refcard.ps
-	dodoc -r examples
-}
--- a/app-emacs/edb/files/edb-1.31-skram-path.patch
+++ b/app-emacs/edb/files/edb-1.31-skram-path.patch
@ -1,11 +0,0 @@
--- edb-1.31-orig/skram/GNUmakefile.in
-+++ edb-1.31/skram/GNUmakefile.in
-@@ -48,7 +48,7 @@
- #
- # Until that change is distributed, here is a workaround:
- wily-emacs = $(ebatch) \
-  --eval '(add-to-list (quote load-path) (expand-file-name "$(topdir)"))' \
-+  --eval '(add-to-list (quote load-path) (expand-file-name "$(topdir)/lisp"))' \
-   --eval '(require (quote database))'
- 
- sk2: skram.data
--- a/app-emacs/evil/Manifest
+++ b/app-emacs/evil/Manifest
@ -1,3 +1,2 @@
-DIST evil-1.0.8.tar.xz 427884 BLAKE2B 9a2327d268c7d64c2b439788a3d6fc8104ad2554bce150431efeecd9c6db8dd41acb2e5886328ccfd21a3a94d56962cc9167ec53b3abb785565783beb213acdb SHA512 d827ff8856c0240c334088f4c61226c93994a4c5afdd775a7170233add884af134b22cdc8bfa6432d3f44d3e6cf3cea89501a4ebfdc37ed5c70b3c712ad2ea86
 DIST evil-1.2.13.tar.gz 540559 BLAKE2B 064d746415775653a6152557645324d6900edff39ecab409105bb2ea8f810a3ff8e706acc776e4749c6d9675c2e5e4798bc9744056130a24b3c6382a2eafdbb8 SHA512 30d6f65db234c8c23cd31d1fbd9347e71b7d47ed7a9b50161c3e5820243dca2d9ce661469a1f141be08f89aeaaa5d2d04fce5a6bc8f38285e6a5229c6a05dcf7
 DIST evil-1.2.14.tar.gz 544497 BLAKE2B 1230632dbcfc065a65aca673e87662c8c77c5ce93e2aeaefcd416e9c41971c08fa692c976a1635f504080de20d08357b7beb4efb65db8198dbdbb766459f7987 SHA512 300de4b4bc6924bef7ec4f58cb9c24b38e694e7c1c215bfc5e816523fc5887dee6ce333b322d7fe5c47497491d194ee7c7269fe36c692f8c4413a8e286b796b3
--- a/app-emacs/evil/evil-1.0.8.ebuild
+++ b/app-emacs/evil/evil-1.0.8.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Extensible vi layer for Emacs"
-HOMEPAGE="https://github.com/emacs-evil/evil"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="test"
-
-RDEPEND=">=app-emacs/undo-tree-0.6.3"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-
-S="${WORKDIR}/${PN}"
-ELISP_REMOVE="evil-pkg.el evil-tests.el"
-ELISP_TEXINFO="doc/evil.texi"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="CHANGES.org"
--- a/app-emacs/mmm-mode/files/mmm-mode-0.5.7-texinfo-encoding.patch
+++ b/app-emacs/mmm-mode/files/mmm-mode-0.5.7-texinfo-encoding.patch
@ -0,0 +1,11 @@
+https://bugs.gentoo.org/695954
+
+--- a/mmm.texinfo
+++ b/mmm.texinfo
+@@ -1,5 +1,6 @@
+ \input texinfo
+ @c %**start of header
+@documentencoding ISO-8859-1
+ @setfilename mmm.info
+ @settitle MMM Mode Manual
+ @c %**end of header
--- a/app-emacs/mmm-mode/mmm-mode-0.5.7.ebuild
+++ b/app-emacs/mmm-mode/mmm-mode-0.5.7.ebuild
@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"

 BDEPEND="sys-apps/texinfo"

+PATCHES=("${FILESDIR}"/${P}-texinfo-encoding.patch)
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="mmm.texinfo"
 DOCS="AUTHORS FAQ NEWS README README.Mason TODO"
--- a/app-emacs/pov-mode/pov-mode-3.3-r1.ebuild
+++ b/app-emacs/pov-mode/pov-mode-3.3-r1.ebuild
@ -6,7 +6,7 @@ EAPI=7
 inherit elisp

 DESCRIPTION="Major mode for Povray scene files"
-HOMEPAGE="https://github.com/emacsmirror/pov-mode"
+HOMEPAGE="https://github.com/melmothx/pov-mode"
 SRC_URI="https://github.com/emacsmirror/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-3+ FDL-1.2+"
--- a/app-emacs/python-mode/Manifest
+++ b/app-emacs/python-mode/Manifest
@ -1,3 +1,2 @@
 DIST python-mode.el-6.1.2.tar.gz 330107 BLAKE2B f04df366ee3e47921f5635472ac22412066d3d97e0f4d2627993b1b6173321687a575abc8700907a9c63829704792505681196e0786e7dc39b9ecbab7562ef9e SHA512 967ad7fdb3503c2dc37df79ba9f45ed7627a5b8e287cae9e8963a259a6568282c16d509e873c7d8b97e4acaafbd71dcec00e5ac71ed695b20ecddca5da20ba96
-DIST python-mode.el-6.2.0.tar.gz 393046 BLAKE2B bc1327324a0b4d2e35cdb4ee593ca6ae5ef203dcea3312e3f24690ce90780c50f4a60e17d9ff32730e5a0dcef9cb04af2150211fc23fe620a4e265d335115616 SHA512 0280649fa646e071a756a657be91dc3b4ab0a227105eeba7601b98fbac1916af0607add20c58c74434eb2fa139a996736e963783b1500ca6f3656a90deaa427e
 DIST python-mode.el-6.2.3.tar.gz 314461 BLAKE2B 3bd71b47de1284d59db61f829e3419f2fb10e226900392d903256f31ad90f47317b7bde4cde1cf7d86518f9c706d9c844b208a9e2469a41037252a63f7bc1ba6 SHA512 4aeb33d4054d582cd2a3f4834472c7d0cb3fe5e12e10f5117dcbcd90ec2ca490964c774918c83697f283c68e57766c3c67d3853ddbaa3408777fdafc7f2674f2
--- a/app-emacs/python-mode/python-mode-6.2.0.ebuild
+++ b/app-emacs/python-mode/python-mode-6.2.0.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-MY_P="${PN}.el-${PV}"
-DESCRIPTION="An Emacs major mode for editing Python source"
-HOMEPAGE="https://launchpad.net/python-mode"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="NEWS README"
-DOC_CONTENTS="Note that doctest and pymacs are in their own packages,
-	app-emacs/doctest-mode and app-emacs/pymacs, respectively."
--- a/app-emacs/teco/files/teco-7-backquotes.patch
+++ b/app-emacs/teco/files/teco-7-backquotes.patch
@ -0,0 +1,34 @@
+https://bugs.gentoo.org/684180
+
+--- a/teco.el
+++ b/teco.el
+@@ -451,10 +451,10 @@
+ and does
+ 	(aset teco:exec-1 ?x 'teco:type-1-x)"
+   (let ((s (intern (concat "teco:type-1-" (char-to-string char)))))
+-    (` (progn
+-	 (defun (, s) ()
+-	   (,@ body))
+-	 (aset teco:exec-1 (, char) '(, s))))))
+    `(progn
+       (defun ,s ()
+	 ,@body)
+       (aset teco:exec-1 ,char ',s))))
+ 
+ (defmacro teco:define-type-2 (char &rest body)
+   "Define the code to process a type 2 character.
+@@ -467,10 +467,10 @@
+ and does
+ 	(aset teco:exec-2 ?x 'teco:type-2-x)"
+   (let ((s (intern (concat "teco:type-2-" (char-to-string char)))))
+-    (` (progn
+-	 (defun (, s) ()
+-	   (,@ body))
+-	 (aset teco:exec-2 (, char) '(, s))))))
+    `(progn
+       (defun ,s ()
+	 ,@body)
+       (aset teco:exec-2 ,char ',s))))
+ 
+ (defconst teco:char-types (make-vector 256 0)
+   "Define the characteristics of characters, as tested by \":
--- a/app-emacs/teco/files/teco-7-emacs-24.patch
+++ b/app-emacs/teco/files/teco-7-emacs-24.patch
@ -1,5 +1,5 @@
--- teco.el
-+++ teco.el
+--- a/teco.el
+++ b/teco.el
@@ -312,7 +312,7 @@
   "Return string describing the version of Teco.  When called interactively,
 displays the version."
--- a/app-emacs/teco/files/teco-7-minibuffer-prompt.patch
+++ b/app-emacs/teco/files/teco-7-minibuffer-prompt.patch
@ -1,5 +1,5 @@
--- teco.el
-+++ teco.el
+--- a/teco.el
+++ b/teco.el
@@ -2213,9 +2213,11 @@
 (define-key teco:command-keymap "/" 'teco:command-slash)
 (define-key teco:command-keymap "*" 'teco:command-star)
--- a/app-emacs/teco/teco-7-r2.ebuild
+++ b/app-emacs/teco/teco-7-r2.ebuild
@ -1,21 +1,22 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7

-inherit readme.gentoo elisp
+inherit elisp readme.gentoo-r1

 DESCRIPTION="TECO interpreter for GNU Emacs"
 HOMEPAGE="https://www.emacswiki.org/emacs/TECO"
-# taken from: http://www.emacswiki.org/emacs/teco.el
+# taken from: https://www.emacswiki.org/emacs/teco.el
 SRC_URI="mirror://gentoo/${P}.el.bz2"

 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"

-ELISP_PATCHES="${P}-minibuffer-prompt.patch
-	${P}-emacs-24.patch"
+PATCHES=("${FILESDIR}"/${P}-minibuffer-prompt.patch
+	"${FILESDIR}"/${P}-emacs-24.patch
+	"${FILESDIR}"/${P}-backquotes.patch)
 SITEFILE="50${PN}-gentoo.el"
 DOC_CONTENTS="To be able to invoke Teco directly, define a keybinding
 	for teco:command in your ~/.emacs file, e.g.:
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
@ -63,7 +63,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
@ -63,7 +63,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
@ -63,7 +63,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
@ -63,7 +63,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
@ -65,7 +65,7 @@ RDEPEND="${DEPEND}
 	media-libs/mesa[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
@ -65,7 +65,7 @@ RDEPEND="${DEPEND}
 	media-libs/mesa[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
@ -77,7 +77,7 @@ RDEPEND="${DEPEND}
 	media-libs/mesa[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
@ -77,7 +77,7 @@ RDEPEND="${DEPEND}
 	media-libs/mesa[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
@ -77,7 +77,7 @@ RDEPEND="${DEPEND}
 	media-libs/mesa[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@ -1 +1,2 @@
 DIST FAudio-19.06.tar.gz 899089 BLAKE2B a59ad9613bcfa71e1fc8be1f2d389f56b8f96430c354b7c7148d1e1e084102b6d8559cd258f3ab6969a4ac93e55ea2397b18dc417857e9ee0f022ea0dae65c0e SHA512 ba3ee18b47d8d85dc39e777c420522349f9873cf1528dd6c266f7254fe27cdb5bb6ab5bcbeab870938b509bfd006590d2380908b7d1e3fd679d2a434ce82eca6
+DIST FAudio-19.09.tar.gz 901659 BLAKE2B 8bb99c67b6da2660e71c7a8a70f83130738a07e7f4ddd2001fb857c81a593935506a8c1fe6d24bfd064537ea4a5a603973c32d839228d7b3f45c9c300ba15147 SHA512 127f975c68e2b449fa7cadae0723925f35ca7a2841ea3fd85037febe964331de4b2e3031ab09c292ee5f40d90902dcf78c75cc3fe7fbe4d6f37a822b4d9eb966
--- a/app-emulation/faudio/faudio-19.09.ebuild
+++ b/app-emulation/faudio/faudio-19.09.ebuild
@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# shellcheck disable=SC2034
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-multilib virtualx
+
+FAUDIO_PN="FAudio"
+FAUDIO_PV="${PV}"
+FAUDIO_P="${FAUDIO_PN}-${FAUDIO_PV}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git"
+else
+	SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S="${WORKDIR}/${FAUDIO_P}"
+fi
+
+DESCRIPTION="FAudio - Accuracy-focused XAudio reimplementation for open platforms"
+HOMEPAGE="https://fna-xna.github.io/"
+LICENSE="ZLIB"
+SLOT="0"
+
+IUSE="+abi_x86_32 +abi_x86_64 debug ffmpeg xnasong test utils"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
+
+COMMON_DEPEND="
+	>=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}]
+	ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+"
+DEPEND="${COMMON_DEPEND}
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_INSTALL_BINDIR=bin"
+		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
+		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
+		"-DCMAKE_INSTALL_PREFIX=${EPREFIX%/}/usr"
+		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
+		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
+		"-DBUILD_TESTS=$(usex test ON OFF)"
+		"-DBUILD_UTILS=$(usex utils ON OFF)"
+		"-DFFMPEG=$(usex ffmpeg ON OFF)"
+		"-DXNASONG=$(usex xnasong ON OFF)"
+	)
+	if use ffmpeg; then
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)"  )
+	fi
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	cmake-multilib_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_make
+	emake -C "${BUILD_DIR}" all
+}
+
+multilib_src_install() {
+	# FIXME: do we want to install the FAudio tools?
+	cmake-utils_src_install
+
+	sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \
+		"${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \
+		|| die "sed failed"
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins "${T}/faudio.pc"
+
+	if use test; then
+		mkdir -p "${T}/$(get_libdir)"
+		cp "${BUILD_DIR}/faudio_tests" "${T}/$(get_libdir)/" || die "cp failed"
+	fi
+}
+
+faudio_test() {
+	XDG_RUNTIME_DIR="/run/user/0" virtx "${T}/$(get_libdir)/faudio_tests"
+}
+
+pkg_postinst() {
+	use test || return
+
+	# FIXME: FAudio tests are broken and also don't appear to work
+	# in the Portage sandbox.
+	multilib_foreach_abi faudio_test
+}
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@ -1,2 +1 @@
-DIST gallium-nine-standalone-0.3.tar.gz 63887 BLAKE2B bd198617a5d3d3830bd5127b63eed2c82bff037141ae72ff9237ad5062fdbe9b6797e233eaf86e06d92153487c53389eb094b0be3b0cbdbf3fe565292a15cbb0 SHA512 80fedca58523fbf318109d2d3d5420e97d26ebf5b89b9f1965165c7a33c9dab9c62a65f14b75569b5126c549f5df91beef372d54e94dc90c608932eeb6a59829
-DIST gallium-nine-standalone-0.4.tar.gz 66820 BLAKE2B 7e7b0028f0c7e7c26fa1ee164e7e867fee39a5f315b750bfc3537e8720e9fbc625ca27fb28a58e8e521af455f8ab347d6fd6ca82786fe5ac9d76e368cd43466e SHA512 6af31e828400c6f711c76d91fb65215f4ba79c31b8d98f3e953b319593d96d1e5e78e07aca96529de37bbb89f3479a4d4db5f58e32ce7b98667284be10a9e532
+DIST gallium-nine-standalone-0.5.tar.gz 69056 BLAKE2B 6acfd500a31e480e2e09e751097beaa2bc94c574edd2b313adb707dc65447be1868ed190bf13549cc38eae945d421242a5d3b2c068486ad35347903e27e0bf80 SHA512 6223a851536c67d32e3a834d7a3c7b93fb59c226b127e1ee1b5a72a7cc93172173f5004ca4944a842015650ef80e8427a684109ae5a4a9e9ef838961e0767c78
--- a/app-emulation/gallium-nine-standalone/files/0.5-flags.patch
+++ b/app-emulation/gallium-nine-standalone/files/0.5-flags.patch
@ -1,27 +1,27 @@
 diff -Naur a/tools/cross-wine32.in b/tools/cross-wine32.in
--- a/tools/cross-wine32.in	2019-01-12 16:45:09.190471883 +0000
-+++ b/tools/cross-wine32.in	2019-01-12 16:48:22.569404982 +0000
+--- a/tools/cross-wine32.in	2019-09-25 13:25:24.000000000 +0100
+++ b/tools/cross-wine32.in	2019-09-30 23:05:00.121344967 +0100
@@ -5,8 +5,8 @@
 pkgconfig = '@PKG_CONFIG@'
 
 [properties]
-c_args = ['-m32', '--no-gnu-unique']
+-c_args = ['-m32']
 -c_link_args = ['-m32', '-mwindows']
-+c_args = @CFLAGS@ + ['-m32', '--no-gnu-unique']
+c_args = @CFLAGS@ + ['-m32']
 +c_link_args = @LDFLAGS@ + ['-m32', '-mwindows']
 needs_exe_wrapper = true
 
 [host_machine]
 diff -Naur a/tools/cross-wine64.in b/tools/cross-wine64.in
--- a/tools/cross-wine64.in	2019-01-12 16:45:09.190471883 +0000
-+++ b/tools/cross-wine64.in	2019-01-12 16:48:19.865349306 +0000
+--- a/tools/cross-wine64.in	2019-09-25 13:25:24.000000000 +0100
+++ b/tools/cross-wine64.in	2019-09-30 23:04:57.340283350 +0100
@@ -5,8 +5,8 @@
 pkgconfig = '@PKG_CONFIG@'
 
 [properties]
-c_args = ['-m64', '--no-gnu-unique']
+-c_args = ['-m64']
 -c_link_args = ['-m64', '-mwindows']
-+c_args = @CFLAGS@ + ['-m64', '--no-gnu-unique']
+c_args = @CFLAGS@ + ['-m64']
 +c_link_args = @LDFLAGS@ + ['-m64', '-mwindows']
 needs_exe_wrapper = true
 
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild
@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson multilib-minimal toolchain-funcs
-
-MY_PN="wine-nine-standalone"
-DESCRIPTION="A standalone version of the WINE parts of Gallium Nine"
-HOMEPAGE="https://github.com/iXit/wine-nine-standalone"
-
-if [[ $PV = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git"
-else
-	SRC_URI="https://github.com/iXit/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-# We don't put Wine in RDEPEND because you can also use this with
-# Steam's Proton.
-
-RDEPEND="
-	media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	virtual/wine[${MULTILIB_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/flags.patch
-	"${FILESDIR}"/0.3-nine-dll-path.patch
-)
-
-bits() {
-	if [[ ${ABI} = amd64 ]]; then
-		echo 64
-	else
-		echo 32
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Upstream includes a bootstrap.sh script with hardcoded CHOSTs to
-	# create the Meson cross files. We improve on that here but also
-	# inject CFLAGS and LDFLAGS, partly to simply respect these, and
-	# partly to allow d3d9-nine.dll to be loaded from a location outside
-	# WINEPREFIX. This avoids the need for the nine-install.sh script,
-	# which doesn't play well with our multi-Wine environment.
-	bootstrap_nine() {
-		local file=tools/cross-wine$(bits)
-		local g9dll=Z:${EPREFIX//\//\\}\\usr\\$(get_libdir)\\d3d9-nine.dll.so
-
-		# Yes, these ridiculous backslashes are needed!
-		g9dll=\\\\\\\\\\\"${g9dll//\\/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\}\\\\\\\\\\\"
-
-		sed \
-			-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
-			-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} -DG9DLL=${g9dll}")!" \
-			-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
-			${file}.in > ${file} || die
-	}
-
-	multilib_foreach_abi bootstrap_nine
-}
-
-multilib_src_configure() {
-	# We override bindir because otherwise the 32-bit exe is overwritten
-	# by the 64-bit exe and we need both of them.
-	local emesonargs=(
-		--cross-file "${S}/tools/cross-wine$(bits)"
-		--bindir "$(get_libdir)"
-		-Ddistro-independent=false
-		-Ddri2=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-pkg_postinst() {
-	local bits=$(bits)
-
-	einfo "Don't remove the Z: drive from your WINEPREFIX as this relies on it."
-	einfo
-	einfo "To set up the ${bits}-bit library, launch your preferred Wine as follows:"
-	einfo "  wine${bits/32} ${EPREFIX}/usr/$(get_libdir)/ninewinecfg.exe.so"
-
-	if use abi_x86_64 && use abi_x86_32; then
-		einfo
-		einfo "To set up the 32-bit library, launch your preferred Wine as follows:"
-		einfo "  wine ${EPREFIX}/usr/$(ABI=x86 get_libdir)/ninewinecfg.exe.so"
-	fi
-}
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild
@ -38,7 +38,7 @@ DEPEND="
 "

 PATCHES=(
-	"${FILESDIR}"/flags.patch
+	"${FILESDIR}"/0.5-flags.patch
 	"${FILESDIR}"/0.3-nine-dll-path.patch
 )

--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@ -38,7 +38,7 @@ DEPEND="
 "

 PATCHES=(
-	"${FILESDIR}"/flags.patch
+	"${FILESDIR}"/0.5-flags.patch
 	"${FILESDIR}"/0.3-nine-dll-path.patch
 )

--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-ctags/metadata.xml
+++ b/app-eselect/eselect-ctags/metadata.xml
@ -5,4 +5,5 @@
  <email>emacs@gentoo.org</email>
  <name>Gentoo Emacs project</name>
 </maintainer>
+<stabilize-allarches/>
 </pkgmetadata>
--- a/app-eselect/eselect-emacs/metadata.xml
+++ b/app-eselect/eselect-emacs/metadata.xml
@ -5,4 +5,5 @@
  <email>emacs@gentoo.org</email>
  <name>Gentoo Emacs project</name>
 </maintainer>
+<stabilize-allarches/>
 </pkgmetadata>
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/pet/Manifest
+++ b/app-misc/pet/Manifest
@ -1,43 +1,22 @@
-DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
 DIST github.com-BurntSushi-toml-v0.3.0.tar.gz 41554 BLAKE2B 2af83c65e70addb9d95a242c3ad7748d6d273578564009bd29fecf8537194e965f29d5087975792e60c39f250e3bafe313ce313305ef481ca6f05b81b4f33aa6 SHA512 3f3cc441787c41029c4b4944e6437919abbd31d3d53b361ce22f6237d76655357936bab90ee8f3340ea9550cbe90f3a369b3209321e8bb6bbeca0892babca6fe
 DIST github.com-briandowns-spinner-48dbb65d7bd5c74ab50d53d04c949f20e3d14944.tar.gz 11663 BLAKE2B 17e4c4d8403663b27c85074f456c60f7da3d43c875816b6f4da32ccc4c422b59cb28c11a894705430b6001766ba3a63ddaade95ab1510f87ce19cfe0b1391d04 SHA512 9ba6de3249259ddbc81faef63e0c801822687f875acb5965dcdfd52c85bca887dd5248be731e0731f1dcf274de64a87630cb902fc2e15718ffb327922f023bea
 DIST github.com-chzyer-readline-2972be24d48e78746da79ba8e24e8b488c9880de.tar.gz 36832 BLAKE2B a66fdb5126e9a9f7dfd52360d0a26916764a96df95b1d995ea1a83aac26227e16d3a2c3a419746c8ad03ba5bef4724a6abadf0ee3fdd84f347d595b9db88b6e1 SHA512 fb84020d5519cd0c5c2c06df598122e1bad3a31ed6b545aae66547e43d48d3da04a75799db9ca8957af1bd47ce2c1542440287c6722e0ab2c27b23ea9631e09a
-DIST github.com-chzyer-readline-f6d7a1f6fbf35bbf9beb80dc63c56a29dcfb759f.tar.gz 36845 BLAKE2B 2c99997fcbc05cf6eee1d8f5829b331d14d9981598a913832a71c58a19fa889a4b270df7f4612a0dff3eddc03dcf6d4be42c05f762010a9ed4f53817b0b61d86 SHA512 f8d2c9c40c594a3ac2724c7109eaf22b212b644c39846f6c86ee4199c61f7197b0e276dfefdd037accdbfdb24ddf850a2b3608fbaaeeca2048269c219dbf93cd
-DIST github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz 588432 BLAKE2B 0ea1b91d459a9708896d8e6fda386924d0dd8aeb44cf58de4a1c7d51185e9ad106333029fc807f6221db0decf7e8da883d98ba390250dc5fa47474fa951836f7 SHA512 a24eb00104b7763d7b711a4e555f00464fd19d117fe7d5c6bf0c007167dcad1b893a7130abc46619f29136fef4ee080662d4622d5f15019d41c24ae55a804a3d
-DIST github.com-fatih-color-5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz 818356 BLAKE2B 8b9fb3b45ad4af90c26a0f197d9cb07ee22484006a396218d617e7992cc0e65dc3d3c8dab894e692eecad75d8aeaf6e5c8a34849e4d7892a10fecae3a8ecbf2f SHA512 4966b347777fb41f23c26a35511083886d67bf79ce74944a888ab29bacf6e33a753ade90df37321751167df054301fb4276452c3722dd0120cce9f4757ebec2d
 DIST github.com-fatih-color-v1.7.0.tar.gz 816449 BLAKE2B f006f51cbd1a0288380b339d7d2b493e447aa1e6bd783f11de5670d4db6ff8c1463cbe957a04127c1f24186a9362be8c40ecdf4394cbbc0e2c6c2cb598c012ac SHA512 ee5668ce828ad3e5461c54d971aee4b10a578f697717010d60fdda641948430816e74580563dfea6a4c66a9840175ff5b63c2ca9cf1af213cfac5be7b8ddac36
-DIST github.com-golang-appengine-150dc57a1b433e64154302bdc40b6bb8aefa313a.tar.gz 230977 BLAKE2B a551b24b20e846e81305181130bdf47af11ab0ce93d9b2c7a626df507c5eb8a88f416e919dfe7a9f73d47c606d34182a90a64e08b4279928a300bac664250368 SHA512 a1d337d50378604f28c275dc3192565a7b058ace04cfefa5b5cce7141873e88925b63750a9ba62e87e4b3e65f4c94875435674653836d8785c02b26f82a1ceb6
 DIST github.com-golang-appengine-v1.0.0.tar.gz 230886 BLAKE2B 1edb9998d1e7add28dd7f900874d1f2de83c9ae6bde94556dbe221e0077d665bd77f07bf7461eb5baaf5ce5bdbb765de41cb2412dbc618a4b475ff73c481c50f SHA512 0948582b3cf0520f0f2052aa04bda2409ee5f2f6d4781b95d208f2c6121bfe3383099ccf99f6c78ac90c6c35ae9e7dd7d0c317917daaa0e8bc7fe99f0b7d09b9
 DIST github.com-golang-crypto-8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9.tar.gz 1613170 BLAKE2B e151da61e2070a138d449767c1151be43b53b301daeba95935af2b871cf1216d76f764ccc43263947091c70120323dc50e34645013454f6cfc3bf8123497025b SHA512 c36a53920a68eb0157ca36aec22f32cb5a3fd43d777268dd834787ce941335472ad97f173db7ace7fd60a9a53235b684431d245d03d2de63b0a403e6b136f6d6
 DIST github.com-golang-net-1e491301e022f8f977054da4c2d852decd59571f.tar.gz 950358 BLAKE2B 7b5a47d00de2d3261d3031f8b1bcc15ca037dc320c0ecdd43b53d03202a8b4ff30b03906e322466177bb489e446c25b4dea6696bfea636fe68bad3ef85fed6c3 SHA512 adf4db073e376178fe180c98908c071be49919a87d9d5476407c4371ef397fcd469c20363f0133a856a8dbb2b1a54c9590029386079c88df72fc09effccd95d7
 DIST github.com-golang-oauth2-1e0a3fa8ba9a5c9eb35c271780101fdaf1b205d7.tar.gz 42533 BLAKE2B 7eb92ec84a084767aa43c89882c13bfdb4db437fe8354e430fb110f673816de9bfc219cb81c7d55d15fd7c3a08a1cccae8f539e115177e50598a0560170c8fe8 SHA512 9321bd14f949990ea9befcc9f5c0db5e5f7139eae7b498c36694bff1797e675d621f344992b472e021c06062363b47fcc61aa6492014af594bc9590e4db5f6ea
 DIST github.com-golang-sys-9527bec2660bd847c050fda93a0f0c6dee0800bb.tar.gz 972371 BLAKE2B a4814d48cf7356deef16c543150f8ba291ccd50c39542f8d218fca3c3569645c9dda938caa609b8daf8fe330f5758b9137ec5961b16eabf31d7a1c0d4753d4f7 SHA512 dc3279b4b85b90f3d1eed61cdc0c80b42d6306999bada8d68fdb4fbd6a4c30a9c9aa965b55429130d75d489f220a3bad06fa62ea716f461a0162b0400ca0ea62
-DIST github.com-google-go-github-e48060a28fac52d0f1cb758bc8b87c07bac4a87d.tar.gz 195878 BLAKE2B 46e186bc1a3096dd043780a35a989959b2cbcabd063bd4bd671fb3b4536ecff731037c57479228badb438fb53bb0c21e8fbb1db881f1438be9bd2398a75c9455 SHA512 da15b3ff93cc1b26439b9e7acf3ae5a12e7d23c0d6e11c691c4013133d37b41d35275f8040a74fcd4f90a9ad93c0b95b48687de43e94831b699df60fbf0c5159
 DIST github.com-google-go-github-v15.0.0.tar.gz 195725 BLAKE2B c8a04c0bdf2f19874ee681d02ebe8fe69b02236f605a76aa639addf9f1d662515ced5e363896d388c01670a9117166a65ea91e04b4b1c9dab2e7ab7ca34e3731 SHA512 c05867feb415826713b0ba90b3a904f2429771f1ca769cd2b21ba616798177c42a35f72c69752d3f12562eb36243b25ef20794911735cbc74ad206abe548fb67
 DIST github.com-google-go-querystring-53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz 7489 BLAKE2B 93ae5c6fc79a511852fa71da41cc9a53d4c93f9e7da43b4b105481f6d77efcbbf30379e7a90ba8e4330553956fa435e3d2e93d8865e7dfda293bbebe9b0ddfa1 SHA512 18830dbf6e14eb7757f7bdee1405e278b6c966fc7632be3decf34ea947705d66f8c0def8060371aa1e3c90cee7ca4324e67d9926627243f987281db52ffa2bca
-DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
 DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
-DIST github.com-jroimartin-gocui-4f518eddb04b8f73870836b6d1941e8aa3c06637.tar.gz 28059 BLAKE2B e760c6976b7cf6bf4df46bc355eb1ecbd62795d65ddc8172f4ee727579a5848f1e202afe9fa1fd649ab52c417af8f0c8aa09a139904a57114214859206404028 SHA512 27931ff511b9ddca3ad0f21d648ac4652736907366136d8e0282a89acf4afb589821aee0362166a8df2de2cbd6b20edf13c13d2686e6e5f9ea2d773e6e507b36
-DIST github.com-jroimartin-gocui-c055c87ae801372cd74a0839b972db4f7697ae5f.tar.gz 28382 BLAKE2B c54e8fae44035a4da89823265c34315940597682c2fff9ecef0ea0f6c00a8b9b885e189277b897205425df9546d2ab6883f209a52ed792def417aff87975a24c SHA512 4edeb6e7103ca7bcb79de26f3c09aa8b92b7d5190719eaea2e0929a40d70ff97953fe405d300eacde70493301439025f5bfae5850257cd9e95619cc90dd4bf76
 DIST github.com-jroimartin-gocui-v0.4.0.tar.gz 28376 BLAKE2B 00775b321258c59d031adadb3f56a553c194e113138490b6ca75320c8b5fe685b89ffee046cc87f5e73c5c6826bfa7f4c22e208066e87e755a421f9939b88b41 SHA512 47cd84a3383bb18e22532c022d1730dfafc69d978f57e1402bd8057be91e810a13783675efb7fd29fc7e68a91284554d643f0efe923f9ff32c63582371454db0
-DIST github.com-mattn-go-colorable-167de6bfdfba052fa6b2d3664c8f5272e23c9072.tar.gz 7598 BLAKE2B 21a5b6e25859f38416a185646e3d63cb7fc2d175f816ba71b924a80a939fdd47af5be8eec35146703822e1eaa91a3a2f41123eba475f678cd0206b597b879189 SHA512 47f401a01ecc8d08504bb8da3164b95c814ff567d9d44dcdd8aed7dcc2768e4aae0b65504f15931a20c3ec6bd9873383e2b1150660a7ae5016dc1d389305a0f9
 DIST github.com-mattn-go-colorable-v0.0.9.tar.gz 7593 BLAKE2B ce0e8b4ea658b41da2f1bf38eb5eef108393e672792adef98baa56a5885508766ed0cec4041f2cbcd8baf20d03a967c3d62d539a9bb07a0b90651123a3f3a647 SHA512 59be33ee1ff5f2410f57421f4af21dbd85d0b48e3070a4179c016eee1fd9017ff83058eca2b0e31a5af725ae48b794b49ade37a5cf5ab0a1954606eb52bd06b6
-DIST github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz 3366 BLAKE2B a98547ec2761d17b7afa7e69408292c3450c0661f442fe8aa0ae918c19c54c2fad4243f91a374f12029f0da0d2dd8145ba9d50ee91f052b69c99755f3701504d SHA512 e75aa6d17ee5fb1222b9505ebd015d9a5392b9627487adc7ebf83bdc66c337520ec819a41e4a92e231c6ca9ffbb145eb1bd3140852083c4c69df9b2ca886e172
 DIST github.com-mattn-go-isatty-v0.0.3.tar.gz 3364 BLAKE2B 1df33a5e546b1e9be70dc6eba5f91b31ded363602b9cce856773e7db5d8fbe16c39a44bc4240f2c82ccfa173ec56544f2b5f408404d5fd4beb70ad2cfb174286 SHA512 60afa46beefe482bb13ab9dd0b94c45719a91d7f5d98f87452154636b520648fd900961b0df2bb3170bf42cdb62635073cfc48f923639aa2391ddccd6382fb1d
-DIST github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz 22390 BLAKE2B 20b6793a424d2620e5ce57fad619e86e7bf251ad612322132939c3c53eeaa17c1a100aa75888209975c05e4c7f1ec099ac4c51b61f4fdd62a42d2e506c4f5b75 SHA512 85430512b8c199e7e2ae4bfa77aef58958211bf85148ea439cf26ffc30704d3bbbe21e1525df579a65e0262c7f8780ff0ec345fb76907f4c66bf715f10ff6e12
 DIST github.com-mattn-go-runewidth-v0.0.2.tar.gz 22367 BLAKE2B 9e98e1c6b042e6e11023be3a3d64c24f56d47ceb70670e6d9a3df967496fe5c964674598c07987b90e58485f0c4722a6dc13c06449b51bfac32fc7349c20eb5b SHA512 fc76cafb03e6dbf28c8208070293ed64173a85b62dbb768d288e050cc1e41db63263f1f5322bbddc233d545143bda8f00ca3ae1668810e8ce2919ed5ee6aae2f
 DIST github.com-nsf-termbox-go-21a4d435a86280a2927985fd6296de56cbce453e.tar.gz 31588 BLAKE2B f29b919f24be6b3e7abb733c7bb97270ade14fc7b6c500b84bafc8c289aed835a2d37181e1ea0381d5aa7659bfa2a407f4baf90f9d635162bb4319eeba758955 SHA512 c2370a310eacbf50a11263b10a005bc9ee95e25c2bd3f17f87d8e407562ceec4b6bb6fbba039f89afd32d5538a96b72570c6e93719d4878fd66e95addedcaf27
-DIST github.com-nsf-termbox-go-88b7b944be8bc8d8ec6195fca97c5869ba20f99d.tar.gz 31339 BLAKE2B 38224fa7af5e8e56500fc01f3e861aeae2e81b4cc38859d9598b0883ccde7504f1f717a73db4a76c4ea4baa5f052fb5b7f39413aa8be9e5cde5b70d8693f2044 SHA512 f53f34059016336cdf2d061594b50ce5a3bad9a9a97158218342e245c277ae68571647fe00bf207274a8714ce103a536ff80b820feaefb44cbd12abc5debdd47
-DIST github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz 11345 BLAKE2B 9f25872e040b5e0602e658fa728e93a300c00ed1064966370e1b676eea6a94d6bca491b2f6c33a9f2c4d1c522a3ceee540aede2dc638eed238de8485500821e9 SHA512 fa82643f622150b44b198451c1e41e042fd7ceefad9d68e32238d48c9a29c6fb14780fca9d9a7dec660365062d4089c638196960fac056b685e7543410774228
 DIST github.com-pkg-errors-v0.8.0.tar.gz 11344 BLAKE2B 50fd44e65872bc2c365f649b79784f1f88adf5101c9654f632fc0f96cde67ce0a839dd799b7f195f056f8cb12bbdcfa3167a54b6ffc107575d32f97e6705eb5b SHA512 82055b10c02f13a8ce497388729568ddde7ae61e9fb2592b9acb11c61dfe94d5554432aee168e7c7adbd8345511c3e4ce0ba4c1b23cf253480e199a95316c443
-DIST github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz 101642 BLAKE2B 9d0ea2e12e915d79a3c8351357cc0ec564910dc145be7d0b8eced6422e4e841e66f28f211e369d5639fcacc201af553e70a740dab76354f9b3b256bf08c3d100 SHA512 5618be996d70382efa9a84d0d06fe866b0fc955ea79240f37132588d0f793988ed4ed1584e716d2644a774d5b4e0e80b77a04d8740cab313107929eb413e25c2
-DIST github.com-spf13-cobra-ef82de70bb3f60c65fb8eebacbb2d122ef517385.tar.gz 101660 BLAKE2B c55d90b35107df52b9a5e8376f096267a0d96253dcdf01cfad27fa3e67d58e352472dc871ed0cae411f09600d7c2a1f244e03d8d62a1db609368a95f836aa933 SHA512 2897e8e2e837606e42daf0d3319669ed1c3ea03d3c9c07b784bfca38fe0b5fca6ac07e074608036af33f5127bb3f0a2a6606df79437c90363c11fc32185a068d
 DIST github.com-spf13-cobra-v0.0.3.tar.gz 101526 BLAKE2B 8613eccdd5bbd31429b7aa8260ee9367e34a5cc78075b394b09db91a97445ed1dadfb53a86105b55cb6ea3b4c2f9d50553e9198d64dfb6033dd1db2805984a2c SHA512 c38db9432a168f913b41a1e1b11d84bedfade82ff70791be9d343a6cc86b8a05b18bae344d67ebd8bae4c98662db7ac664a9dc86fa9b9ad4aa5c96cbf0178efb
-DIST github.com-spf13-pflag-583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz 43327 BLAKE2B cc00d2852d895265eb0b60454877da841fe123535009025c761761c61b4d937d6293f3bef765d2a8919d63d8324dcb6addf774837df26fb864cb72d88add2d03 SHA512 061b9895e3936e356f707385ed7d7e5172f94167a1fabc84e9a0a69df4f03e0eaf435a4ac0cb00f5077855987ab1d2c3b051846c0466485a7bc329a547dc3d3a
-DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 39045 BLAKE2B a933e0ae64f3bb344a7dffdf8f7ed73e4fba329a81794442ac3a8fa8904f29958bcc6b0f2af9848bc6c715b27abc5908d5ff16d23ea790899f71d2f5ff0ce6cb SHA512 c05ef1bc05cba471a55a11a2209fe4bdaaba491434a28b7f08d23528f4074b82a656b62972efdd49384dd49bde429d2d2c0e6ba311cae0d23f55b229b768dae8
 DIST github.com-spf13-pflag-v1.0.1.tar.gz 43244 BLAKE2B 7391fc9b28285d28fec041634ece2cad5ee54a2b46979772fb3d1b42888fbdea1624444c3618938083539b0af05eb5985b74881f37ff81baca99881ba3ca0226 SHA512 e09066442bd7c98b3a3c2de815d89ce27d97ccec242e1e47ff38e4f8ece442657573bddab5bd560f644f62304ca6bdca3b4e002ebc330b78e69a96eccd8e778b
-DIST github.com-xanzy-go-gitlab-26ea551e8c159cea42a9f206bc18ae5884d44d0c.tar.gz 80968 BLAKE2B c6673c8c0cb4b5ed5c2d85c934ec3095d11d14d73e84acdbd3e3f1a5ebab36ca49d472b1040297e248c55e2843c01ed05aabc21b8b94758a799c48bd8558af01 SHA512 1b8c48a35ae0a3d64f2fc04b1705afbaa9fb45ff00e6a755afe3dbb915dcb2e3e60f4cd9168a82ab03a3615833f94d311a1910429a7b91b7e67f8115334b3192
 DIST github.com-xanzy-go-gitlab-v0.10.5.tar.gz 80919 BLAKE2B c1aba2dfa8d22e508f361f1a91a2062c23e95d0e24201da12188ec226ca2bb831df996c25fd8ab8a11c66c9bfecfc6d5246eafd9f1933da342483a51938d0ced SHA512 31baafbb9d9e34619b0f050661fcb770e1503569f48bcad15de474992737a6071bd64c6de8f776d7a62fed8bd3fd6f2d759cb6e2094b498df49946f6a69df518
-DIST pet-0.3.0.tar.gz 2735876 BLAKE2B c2b629db202c263b7419e79e15e07b808ea2a395030ef79214c541ac0d17a9fbe9cf3db9bc7e1a886da38ff8becd06d18abc24a69131cf6e3009ee2d72b1e6db SHA512 deb0323fbcd0195df9638bd82077a55be6554d80c44ddbb08cbb63c2a055659f5aa42fd87bc498d5cb0c93d57047f48462ec428ebff3d89a80dcd4b3661447fc
-DIST pet-0.3.2.tar.gz 2737547 BLAKE2B dff3c20539e910a06840fda95cae9214f4e846d503454c3d98a46dd0756dc709d7055f52b58dce057b4513470a19ce4542c3b2af35f4492dc544366a44e6f311 SHA512 b8abef80a7dd52b0143638dc12686f519b76b326c0cfb487423011e54fe536a83f9994c238854e42652138ea4b0ed1dfb37c59af37e329424c01186da74ed910
 DIST pet-0.3.6.tar.gz 2739396 BLAKE2B 16fd9cd2e80d742b7f56819318f709ebe40902e9096c4b5f11b4dfb5341c78b491e70b1d5e6ff81d758413b9b2276e9bd87e99eb320592a70f93a2c75c805892 SHA512 366eabd93865ac72f9d251d51393ba9ad5904195d40f26da80a371d6d2183b5e81156930b137b1551ef2bd372cbf235847dd8a7ac8c7d4584c9d326325d30f79
--- a/app-misc/pet/pet-0.3.0.ebuild
+++ b/app-misc/pet/pet-0.3.0.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=( "github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
-	"github.com/briandowns/spinner 48dbb65d7bd5c74ab50d53d04c949f20e3d14944"
-	"github.com/chzyer/readline f6d7a1f6fbf35bbf9beb80dc63c56a29dcfb759f"
-	"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
-	"github.com/google/go-github e48060a28fac52d0f1cb758bc8b87c07bac4a87d"
-	"github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
-	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-	"github.com/jroimartin/gocui 4f518eddb04b8f73870836b6d1941e8aa3c06637"
-	"github.com/mattn/go-colorable 167de6bfdfba052fa6b2d3664c8f5272e23c9072"
-	"github.com/mattn/go-isatty 0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
-	"github.com/mattn/go-runewidth 9e777a8366cce605130a531d2cd6363d07ad7317"
-	"github.com/nsf/termbox-go 88b7b944be8bc8d8ec6195fca97c5869ba20f99d"
-	"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
-	"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
-	"github.com/spf13/pflag e57e3eeb33f795204c1ca35f56c44f83227c6e66"
-	"golang.org/x/crypto 8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9 github.com/golang/crypto"
-	"golang.org/x/net 1e491301e022f8f977054da4c2d852decd59571f github.com/golang/net"
-	"golang.org/x/oauth2 1e0a3fa8ba9a5c9eb35c271780101fdaf1b205d7 github.com/golang/oauth2"
-	"golang.org/x/sys 9527bec2660bd847c050fda93a0f0c6dee0800bb github.com/golang/sys"
-	"google.golang.org/appengine 150dc57a1b433e64154302bdc40b6bb8aefa313a github.com/golang/appengine" )
-
-EGO_PN="github.com/knqyf263/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Simple command-line snippet manager"
-HOMEPAGE="https://github.com/knqyf263/pet"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="zsh-completion"
-
-# dev-go/toml doesn't provide sources
-RDEPEND="zsh-completion? ( app-shells/zsh-completions )"
-
-src_install() {
-	dobin pet
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins src/github.com/knqyf263/pet/misc/completions/zsh/_pet
-	fi
-}
-
-pkg_postinst() {
-	if ! has_version app-shells/peco ; then
-		einfo "You should consider to install app-shells/peco"
-		einfo "to be able to use selector command"
-	fi
-}
--- a/app-misc/pet/pet-0.3.2.ebuild
+++ b/app-misc/pet/pet-0.3.2.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-	"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
-	"github.com/briandowns/spinner 48dbb65d7bd5c74ab50d53d04c949f20e3d14944"
-	"github.com/chzyer/readline 2972be24d48e78746da79ba8e24e8b488c9880de"
-	"github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
-	"github.com/google/go-github e48060a28fac52d0f1cb758bc8b87c07bac4a87d"
-	"github.com/xanzy/go-gitlab 26ea551e8c159cea42a9f206bc18ae5884d44d0c"
-	"github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
-	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-	"github.com/jroimartin/gocui c055c87ae801372cd74a0839b972db4f7697ae5f"
-	"github.com/mattn/go-colorable 167de6bfdfba052fa6b2d3664c8f5272e23c9072"
-	"github.com/mattn/go-isatty 0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
-	"github.com/mattn/go-runewidth 9e777a8366cce605130a531d2cd6363d07ad7317"
-	"github.com/nsf/termbox-go 21a4d435a86280a2927985fd6296de56cbce453e"
-	"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
-	"github.com/spf13/cobra ef82de70bb3f60c65fb8eebacbb2d122ef517385"
-	"github.com/spf13/pflag 583c0c0531f06d5278b7d917446061adc344b5cd"
-	"golang.org/x/crypto 8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9 github.com/golang/crypto"
-	"golang.org/x/net 1e491301e022f8f977054da4c2d852decd59571f github.com/golang/net"
-	"golang.org/x/oauth2 1e0a3fa8ba9a5c9eb35c271780101fdaf1b205d7 github.com/golang/oauth2"
-	"golang.org/x/sys 9527bec2660bd847c050fda93a0f0c6dee0800bb github.com/golang/sys"
-	"google.golang.org/appengine 150dc57a1b433e64154302bdc40b6bb8aefa313a github.com/golang/appengine"
-)
-
-EGO_PN="github.com/knqyf263/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Simple command-line snippet manager"
-HOMEPAGE="https://github.com/knqyf263/pet"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="zsh-completion"
-
-# dev-go/toml doesn't provide sources
-RDEPEND="
-	zsh-completion? ( app-shells/zsh-completions )"
-
-src_install() {
-	dobin pet
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins src/github.com/knqyf263/pet/misc/completions/zsh/_pet
-	fi
-}
-
-pkg_postinst() {
-	if ! has_version app-shells/peco ; then
-		einfo "You should consider to install app-shells/peco"
-		einfo "to be able to use selector command"
-	fi
-}
--- a/app-misc/pet/pet-0.3.6.ebuild
+++ b/app-misc/pet/pet-0.3.6.ebuild
@ -3,8 +3,7 @@

 EAPI=7

-EGO_VENDOR=(
-	"github.com/BurntSushi/toml v0.3.0"
+EGO_VENDOR=( "github.com/BurntSushi/toml v0.3.0"
 	"github.com/briandowns/spinner 48dbb65d7bd5c74ab50d53d04c949f20e3d14944"
 	"github.com/chzyer/readline 2972be24d48e78746da79ba8e24e8b488c9880de"
 	"github.com/fatih/color v1.7.0"
@ -24,8 +23,7 @@ EGO_VENDOR=(
 	"golang.org/x/oauth2 1e0a3fa8ba9a5c9eb35c271780101fdaf1b205d7 github.com/golang/oauth2"
 	"golang.org/x/sys 9527bec2660bd847c050fda93a0f0c6dee0800bb github.com/golang/sys"
 	"github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
-	"google.golang.org/appengine v1.0.0 github.com/golang/appengine"
-)
+	"google.golang.org/appengine v1.0.0 github.com/golang/appengine" )

 EGO_PN="github.com/knqyf263/${PN}"

@ -36,24 +34,25 @@ HOMEPAGE="https://github.com/knqyf263/pet"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"

-LICENSE="MIT"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="zsh-completion"

 RDEPEND="zsh-completion? ( app-shells/zsh-completions )"
-S=${WORKDIR}/${P}/src/${EGO_PN}
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"

 src_compile() {
 	export -n GOCACHE XDG_CACHE_HOME
 	GOPATH="${WORKDIR}/${P}" GO111MODULE=on \
-		go build -mod=vendor -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+		go build -mod=vendor -v -work -x "${EGO_BUILD_FLAGS}" "${EGO_PN}" || die
 }

 src_install() {
 	dobin pet

-	if use zsh-completion; then
+	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
 		doins misc/completions/zsh/_pet
 	fi
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild
@ -54,7 +54,7 @@ RDEPEND="
 	>=dev-lang/perl-5.0
 	${PYTHON_DEPS}
 	>=media-libs/freetype-2.1.10-r2
-	sys-libs/ncurses:5/5
+	sys-libs/ncurses-compat:5
 	x11-libs/libXaw
 	x11-libs/libXinerama"

--- a/app-office/unoconv/Manifest
+++ b/app-office/unoconv/Manifest
@ -1 +1,2 @@
 DIST unoconv-0.8.2.tar.gz 104072 BLAKE2B 1ac16159f939a06cc75f3ff23f5aa7f1c4d49a41d4cce5e9c5866714ef1b3b969f94c074d36fff19d6af22375d5598033fb69761a09d3e60b81d794841c0e0d8 SHA512 cd6a4d06559895c0aebb5fda51ca86928474dd0ca0aa908e81762643186c29cf8436c889eedbb18bc74ed6016414d1aa831cd034614244d5aae677a6b4cdd4c9
+DIST unoconv-0.9.tar.gz 108547 BLAKE2B 6620a7adb32c25182fbb5d0b141ec15d461ee7a73d8644e92337fd7748607d0d33a5978add4c72abf2b35f769f8bbfa35d411f77c4750606e22d6cbc7d7b3454 SHA512 1d6448154ec41776ed4d2ffd87b1caa15e231676a1161072676b1f5a466ea6dbae904de3eafb9ab2718fe4ed0ab7a2c9a91b1d19d79ea382c1e7576ea21e7f04
--- a/app-office/unoconv/unoconv-0.9.ebuild
+++ b/app-office/unoconv/unoconv-0.9.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit eutils python-single-r1
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DESCRIPTION="Convert between document formats supported by Libreoffice"
+HOMEPAGE="http://dag.wiee.rs/home-made/unoconv/"
+SRC_URI="https://github.com/dagwieers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	!app-text/odt2txt
+	virtual/ooo
+"
+
+src_prepare() {
+	eapply "${FILESDIR}/timeout.patch"
+	eapply_user
+	python_fix_shebang .
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake -j1 doc-install install install-links DESTDIR="${D}" || die
+
+	dodoc ChangeLog CHANGELOG.md README.adoc || die
+}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/calibre/calibre-3.47.1.ebuild
+++ b/app-text/calibre/calibre-3.47.1.ebuild
@ -31,7 +31,7 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 SLOT="0"
 IUSE="ios +udisks"

--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/pgrouting/pgrouting-2.6.2-r1.ebuild
+++ b/dev-db/pgrouting/pgrouting-2.6.2-r1.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="http://pgrouting.org/"
 LICENSE="GPL-2 MIT Boost-1.0"

 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SRC_URI="https://github.com/pgRouting/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 IUSE="pdf html"

--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
--- a/dev-haskell/network-data/network-data-0.5.3.ebuild
+++ b/dev-haskell/network-data/network-data-0.5.3.ebuild
@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 "

 src_prepare() {
+	default
+
 	if has_version "<dev-lang/ghc-7.10.1"; then
 		cabal_chdeps \
 			'pretty >= 1.1.2' 'pretty >= 1.0, prettyclass >= 1.0'
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@ -1,9 +1,6 @@
-DIST crystal-0.30.0-1-linux-i686.tar.gz 31962470 BLAKE2B e913122b8e6fa472b7766c865916a8d6d588fccf1ad85f2c5a7b31334cb5631773e7672eb8fdd1c9bfbefa720b7bef6ea8884e225a29be2a8d8203fa1e2e3455 SHA512 84fd9d66355d069e02805d2f8cc3544ecc90bf6bbbf27b0e5df133264507396cef378f4238e28aff8fc9c8c21cd938d687d11b1924d2530cf5c95b1078eb772b
-DIST crystal-0.30.0-1-linux-x86_64.tar.gz 30157495 BLAKE2B b7e684242f90b7dc0bc93bb2c90e255c65554bfc514616cff645578f1d0956cb9f61262294d3399618bf50c4828e6e83fabd09515d3b7268cbcd96952cba58a4 SHA512 34e5a70ce2305b492bad57cdbcf77603e46052d89cb3b92012cb546ec22af9dbc80c91963b1725e6e1095548e43da766d39fefc2bee827e194d889ccd20c044f
-DIST crystal-0.30.0.tar.gz 2151397 BLAKE2B 8b32d12e6f45d18c5ef23dce0520d7669076295324bcb100e0120779c986ecf9081a23207eaa3696b661dd566c37aada1644d2b5acf2e5ddf447be11b8dabe8a SHA512 9c3da09b8ed57d1fd6942350cefe3be7cf6f1ab32a86329c0eda24138e30f44b822161b8eb3bca057bd8e7b0a47fefbe566af1284f486643080a967c1cb79483
 DIST crystal-0.30.1-1-linux-i686.tar.gz 31972575 BLAKE2B 75350799d836110448f56a7b0f49ad27fdeef0f1da169cc15b411482649538e48c3895b169a1deb4c5691f97329ad70a126396425fd096f0dbd83db7e989e4b2 SHA512 9ede9ed7522a82270d91c316b9b98d8ab2d497def2432b99e2d2f21175e978b5b984df92c9637b4600ef27b6e84bd7bc7a5a1b227b17538804a1bc52dabdf84a
 DIST crystal-0.30.1-1-linux-x86_64.tar.gz 30166159 BLAKE2B b58e69f9f00e15c3b6e7e259179903f6f210f463c89b8d50a99b1a7d413092585afddf94cac3a461c041c3d91301aac8e61dbab37282a29f781a34367a1d9ddb SHA512 31f06163951fb6ede70eb41f6047c96a74293754bba360b428bf162b1661eed47f8b426327f074f3523ae16b073e8ae5f5e0e6b36ebf83031fa5a0b414b41648
 DIST crystal-0.30.1.tar.gz 2153037 BLAKE2B e5cb2d49688aba75f684ea9fea7e6b0e85eb124f55bf00472595ba83bedd50a8042c5b3c40358254c3fdec3bce2f351ca5e6d385a7841d33f44b934844fd89b1 SHA512 62ddb0dc45385d52d7fdd593f85ec4bef2451aa9a48aabe0115ffe8cfe820e6665b2d51d097339fe931d8599bb6c62c7ddfcaae36a199db0726df4e246af6eab
-DIST crystal-0.31.0-1-linux-i686.tar.gz 28656362 BLAKE2B 032e276ee12978fdf1e4d59c1cab680ba6c67b23479820edf16d0957e4ec5f054c49775a719f601766477808898bebb4eb64a2e77c413fba28f4f9f50d25f73c SHA512 bafd566c000f190c9fc7cf327411e1683cda5ea7bd4f2e09660749c99ec661997d1e7b1076ea3624bfa8f2a6432bd283a170efaa17a4988c8bb7195eaa41f872
-DIST crystal-0.31.0-1-linux-x86_64.tar.gz 26985093 BLAKE2B f9d663cab6ee81abd941dbf528b25efd0a2d2a5d7cc21fa56456b7f9720e85d297d13c254c9a5b392dc3f054535ea4131d6ec7f43f6ac6621fd19ed2453e475b SHA512 f2d0ee26d01432fe0f2d2e5c847f88d4f58d2498d4f7769fa29817a172012628d5c63702c09451de54a154e8e2bb78709379f4d695773d999ca8e32bd559b65a
-DIST crystal-0.31.0.tar.gz 2190452 BLAKE2B 126da5d787feea3c4d12f496321f9b16257f96cbdc9f3290b1bca8d8a5902d3a0a65e9b9d5e28c4ccd791f0fcc0139321251dcc775a926a6271be480111d251d SHA512 c5a276c7b098bc863087449328326a54186ddc1c269b90a8d94d9133feaa001398d0272c6ff48e1376d3d8a276a074f50ef67ca4e2bc27cbfd0dfd0f952efd8f
+DIST crystal-0.31.1-1-linux-i686.tar.gz 28667084 BLAKE2B 50964072d9335f96effce812cd261760dd308ee50628a47e2694f0a34b6dce210d5a00b978b0537bcd24cc2fc6dd82637c05dc0596ba0322e1297b97ea14bc78 SHA512 2353d10bce6983459afae526b516290eba44e2d6b5943911b8da657a36a0bbd422bd4efe61f2205e178355a2898e90ac9927c64ffba1e8edae4615a01ea9ad40
+DIST crystal-0.31.1-1-linux-x86_64.tar.gz 26998394 BLAKE2B 37ecfe9f130b1e9e52686c52474fcef599a348a7d9f1885c3fe41302a1d6d760ada5a153978397c7ec43b2bb4442bb3fc1c2f8d5eed9b4141858455673170544 SHA512 433ac13f9f541dd5b58c1db5e063e23058a87ed325cabc0a4165c42edf18a5f9f126ea4e1d9627357d47c5e3f392131e1f7aab22c34dce3b02e3fdca49658b5b
+DIST crystal-0.31.1.tar.gz 2191156 BLAKE2B 072e14fed34cc411cd6d9a57b8c5184e5974257869ef41f9bd12401ab473186f699bfbac438af97dd8e4e8cf749ebdbf35050882e9dc14be75392d50763902a8 SHA512 d44ce5653aa2877d85685bd897888cd7675eb02897363f71627ac19589447889af8e73a1d8acb2108e0356939cd515022fd2b92d019014714428d92666ad0f37
--- a/dev-lang/crystal/crystal-0.30.0.ebuild
+++ b/dev-lang/crystal/crystal-0.30.0.ebuild
@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
-
-BV=0.30.0-1
-BV_AMD64=${BV}-linux-x86_64
-BV_X86=${BV}-linux-i686
-
-DESCRIPTION="The Crystal Programming Language"
-HOMEPAGE="https://crystal-lang.org"
-SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz )
-	x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc debug examples blocking-stdio-hack +xml +yaml"
-
-RESTRICT=test # not stable for day-to-day runs
-
-LLVM_MAX_SLOT=8
-
-# dev-libs/boehm-gc[static-libs] dependency problem,  check the issue: https://github.com/manastech/crystal/issues/1382
-DEPEND="
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	dev-libs/boehm-gc[static-libs,threads]
-	dev-libs/libatomic_ops
-	dev-libs/libevent
-	dev-libs/libpcre
-	sys-libs/libunwind
-	dev-libs/pcl
-	dev-libs/gmp:0
-"
-RDEPEND="${DEPEND}
-	xml? ( dev-libs/libxml2 )
-	yaml? ( dev-libs/libyaml )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.27.1-verbose.patch
-	"${FILESDIR}"/${PN}-0.26.1-gentoo-tests-sandbox.patch
-	"${FILESDIR}"/${PN}-0.26.1-gentoo-tests-network-sandbox-3.patch
-	"${FILESDIR}"/${PN}-0.27.0-extra-spec-flags.patch
-	#"${FILESDIR}"/${PN}-0.27.0-max-age-0-test.patch
-	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch
-	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch
-	"${FILESDIR}"/${PN}-0.27.0-tcp-server-test.patch
-	"${FILESDIR}"/${PN}-0.29.0-no-usr-lib.patch
-)
-
-src_prepare() {
-	default
-
-	use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch
-}
-
-src_compile() {
-	local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin
-	if [[ ! -d ${bootstrap_path} ]]; then
-		eerror "Binary tarball does not contain expected directory:"
-		die "'${bootstrap_path}' path does not exist."
-	fi
-
-	emake \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		\
-		PATH="${bootstrap_path}:${PATH}" \
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV} \
-		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
-	use doc && emake docs
-}
-
-src_test() {
-	# EXTRA_SPEC_FLAGS is useful to debug individual tests
-	# as part of full build:
-	#    USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal
-	emake spec \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		\
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV} \
-		\
-		"EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/crystal
-	doins -r src/.
-	dobin .build/crystal
-
-	insinto /usr/share/zsh/site-functions
-	newins etc/completion.zsh _crystal
-
-	use examples && dodoc -r samples
-
-	if use doc ; then
-		docinto api
-		dodoc -r docs/.
-	fi
-
-	newbashcomp etc/completion.bash ${PN}
-}
--- a/dev-lang/crystal/crystal-0.31.1.ebuild
+++ b/dev-lang/crystal/crystal-0.31.1.ebuild
--- a/dev-lang/ghc/ghc-7.10.3.ebuild
+++ b/dev-lang/ghc/ghc-7.10.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -95,7 +95,7 @@ PREBUILT_BINARY_DEPENDS="
 # ghc[binary] in system. terminfo package is linked
 # against ncurses.
 PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
-	sys-libs/ncurses:5/5
+	sys-libs/ncurses-compat:5
 "

 RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
--- a/dev-lang/ghc/ghc-7.8.4.ebuild
+++ b/dev-lang/ghc/ghc-7.8.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -79,7 +79,7 @@ RDEPEND="

 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
-	sys-libs/ncurses:5/5
+	sys-libs/ncurses-compat:5
 "

 RDEPEND+="binary? ( ${PREBUILT_BINARY_DEPENDS} )"
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@ -1,7 +1,7 @@
-DIST ruby-2.4.6.tar.xz 10005544 BLAKE2B 2af984d96dad4d7ef4d467b317bd4bb54b0614d96619377bc46f7588cd1c72bee47202b61d6ec54f00113fd25672d2831221dbf0a4491aa271541a34c634ee84 SHA512 eafb2257747f99e2ed262af142e71175b70f7cceaa4d1253b92c8337f075a9a58a2d93b029d75e11a9b124f112a8f0983273b2b30afc147b5cf71a8dbb5fa0ba
 DIST ruby-2.4.7.tar.xz 10118948 BLAKE2B e85e051e9dbac8e7f87bd6187dc105b89a6bc7197c811bd51bf25b109781b8ec79c02e48887cbac841d38922d278da4ee32d8cf14e180083f4a902d77c4ec2dc SHA512 df637c5803ddd83f759e9c24b0e7ca1f6cae7c7b353409583d92dbffece0d9d02b48905d6552327a1522a4a37d4e2d22c6c11bd991383835be35e2f31739d649
-DIST ruby-2.5.5.tar.xz 11459832 BLAKE2B ced1105a87e7df8f82a65ca8d1d329d5a9d110d2f3f88b27a79262c4ac1484dda16d8646c0c03f18c1bb25f8b154075eb03a0614355ec62f677c2fa56ab3c956 SHA512 06b1d58536ebfacb7b56c1e6ed4b8ab816fadc4f48c845a452554cd262e7908199a30e5793f3cbaec2db56a8803aa5c6089abf7bf06c8fc47867e97870b7dfec
+DIST ruby-2.4.8.tar.xz 9813812 BLAKE2B 94f651ecb013f13425d8e53ae23070c23568b079c4554273c36b61d4ccf17269ac4bccff8676cf26d6c2a2e678e4d644432aa1d36e5bafbbe65457a4988a5532 SHA512 5f51a8312c23c1c2bfbb9c59efbd789492a4a7e4b1d4e7764db6eaaa542008e814b40817f10825e22c7fa8715fb9187be5d09b06128da211559b3601785937ea
 DIST ruby-2.5.6.tar.xz 11323612 BLAKE2B 5db6d573089a9fba95a1027891a0116c14d495b342ca8f055bd1ad55942f2a15a65a61cc1a0f6f249cd10fe2f6161f3ab0066a6dbce8e480e55b76ca5bdb5cd9 SHA512 4fe5f8bad5d320f8f17b02ce15afee341e7b0074efcfd98d8944e0cb7c448e0660c4553dd5c0328ee3b49fea3247642f85c60bdce431ed57f58b6326dfd48ee1
-DIST ruby-2.6.2.tar.xz 11889840 BLAKE2B 817919c078869c2ad8d5c9d8c8b7ee77e8b0e3339c2ef662a94a666a859f762fa63c6f8534027abd368e91fe4e3e1fe68fa984cbf12f76cff8c0c66f0114914f SHA512 13f7d7b483a037378eac4bf4bebddc21d69f4e19e6bbb397dd53e7518037ae9a3aa5b41fc20bf1fe410803c6efc3a6a65a65af47648d3a93713f75cfe885326a
+DIST ruby-2.5.7.tar.xz 11296440 BLAKE2B 6f3590f30c7b196145a83490abed24b0059521374a03086646186b20670bfed548ea744c910c8eda0d11607d8673644d7fb23ff9091dd2f6dfcbc43080fe0f97 SHA512 63b7c75fab44cd1bd22f22ddec00c740cf379ac7240da0dfafcec54347766695faef47428ce1c433fd77fa96992e976c984697067fa526236d383b12adc9ce75
 DIST ruby-2.6.3.tar.xz 11904360 BLAKE2B 8113e5a19b967cdf995a3c8d3c83aeab3bf89e975d3b039c64259e97f20dbe9ebd96ada093f9d330516d16ef78bb0ecbbac8f3facd467aa13f1f70b23b992f82 SHA512 959a613f5cf5b3185a1d7a7ba0e1921166b3930f30461b391b1c9fcfe396f56dc3c736123dfc7b4e72c32a97dc5a1eb1fd7f09bcc3793a3c5526f6644ba421c8
 DIST ruby-2.6.4.tar.xz 11727940 BLAKE2B abeff89d50612d6426e1dc5fd7c15c83ef9714ddb38c64ed14bff6331c619b0a55d4a64bff49177576c3fae8cfcee30127e808f49d11b3e64a2230a043e16bd3 SHA512 930a4162fdb008d2446247908c14269fd13db4dc80bd2bb201a65a69c03f5933f97b4c5079ccd2a12db4934ff97b2debaa10a6c6f5c3060e55873f4397747eaa
+DIST ruby-2.6.5.tar.xz 11553580 BLAKE2B 07739a92ff17467fe6d31bb4dce56ae35fd9c67bb697ebc00b4845474c75d8377c77916e6e129512cfffcf76bd60e6327e818e899b6160f3222912654d5eb118 SHA512 e8ae3b5d4d23a93d0ef6057235ad0e573665a8b4b6544e1c70b4cce9c4d2fb9094e5c8fe8a9ab7b9996efe3ada603f9b4ef1fd08fb5a83253c1ae2b5e3f202db
--- a/dev-lang/ruby/ruby-2.4.8.ebuild
+++ b/dev-lang/ruby/ruby-2.4.8.ebuild
@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"

 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"

 RDEPEND="
@ -57,7 +57,7 @@ PDEPEND="
 	${BUNDLED_GEMS}
 	virtual/rubygems[ruby_targets_ruby24]
 	>=dev-ruby/json-2.0.2[ruby_targets_ruby24]
-	rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] )
+	rdoc? ( >=dev-ruby/rdoc-5.1.0-r1[ruby_targets_ruby24] )
 	xemacs? ( app-xemacs/ruby-modes )"

 src_prepare() {
--- a/dev-lang/ruby/ruby-2.5.7.ebuild
+++ b/dev-lang/ruby/ruby-2.5.7.ebuild
@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"

 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"

 RDEPEND="
@ -56,7 +56,7 @@ PDEPEND="
 	${BUNDLED_GEMS}
 	virtual/rubygems[ruby_targets_ruby25]
 	>=dev-ruby/json-2.0.2[ruby_targets_ruby25]
-	rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby25] )
+	rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby25] )
 	xemacs? ( app-xemacs/ruby-modes )"

 src_prepare() {
--- a/dev-lang/ruby/ruby-2.6.5.ebuild
+++ b/dev-lang/ruby/ruby-2.6.5.ebuild
@ -58,7 +58,7 @@ PDEPEND="
 	virtual/rubygems[ruby_targets_ruby26]
 	>=dev-ruby/bundler-1.17.2[ruby_targets_ruby26]
 	>=dev-ruby/json-2.0.2[ruby_targets_ruby26]
-	rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby26] )
+	rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby26] )
 	xemacs? ( app-xemacs/ruby-modes )"

 src_prepare() {
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@ -1 +1,2 @@
 DIST zig-0.4.0.tar.gz 8924757 BLAKE2B 5ca3377f205694ff02360900b49eee7347cdf1cdaef90f1be071eff2610425ed453dfb35928fbe65b25f151b7153ab838c887d362ed3cd746f07833ae42510fd SHA512 423915730bc4ae9a67db3731a96471467826d16e59b87b3541f3e8ed2436f941939f22ccbebdb9a958a195b05360eb65f5be1658b32a01cc8db55c6e581eb039
+DIST zig-0.5.0.tar.gz 15743912 BLAKE2B 1a28dffebc24200cf51e1d94ff7203c8de5641e1a299eff58e808a5a8f3257fc8ff771699a0f90733702b90e5536990adc5bf41b973b4ea642081ef788f7a83d SHA512 9fc2ef827421e54e8db98ce3474ba3bbe9119b0b9aa30b4edd78d73277d2384067b5c78f4ebbca350a97ac230131e7f71e6d54c1e75fc74e1833ce6c51c402df
--- a/dev-lang/zig/zig-0.5.0.ebuild
+++ b/dev-lang/zig/zig-0.5.0.ebuild
@ -0,0 +1,61 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils llvm
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+LICENSE="MIT"
+SLOT="0"
+IUSE="+experimental"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX
+	PowerPC Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+# According to zig's author, zig builds that do not support all targets are not
+# supported by the upstream project.
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]}
+
+RDEPEND="
+	sys-devel/llvm:9
+	!experimental? ( sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}] )
+	sys-devel/clang:9
+"
+
+DEPEND="${RDEPEND}"
+
+LLVM_MAX_SLOT=9
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_prepare() {
+	if use experimental; then
+		sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake"
+	fi
+
+	sed -i 's/--prefix "${CMAKE_INSTALL_PREFIX}"/--prefix ".\/${CMAKE_INSTALL_PREFIX}"/' CMakeLists.txt || \
+	    die "unable to fix install path"
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCLANG_INCLUDE_DIRS="$(llvm-config --includedir)"
+		-DCLANG_LIBDIRS="$(llvm-config --libdir)"
+	)
+
+	cmake-utils_src_configure
+}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@ -1 +1 @@
-DIST angelscript_2.33.0.zip 1954948 BLAKE2B 61fa597cb36142230dd07103d6782bb2e195268b664643314d4bae3908ceb530ce5661376a163cc91bb13ecd386d540554e5cce74c289983536cf7f70dc881a1 SHA512 eaf972ecf965fe4f72e55755f5e796499018e918f93cfd835b1ca20f9338e299e8dbd707240341eef81ae920f07d2280646151f515f5990a62550689445c86f0
+DIST angelscript_2.34.0.zip 2020026 BLAKE2B f002c67d812cc6453d1e93ffba4aaa4c300926996b74f8d596642625e251ccd14b97473f8f0ff595e3233a3ebc7654c94420ae761eaa0b67439e18472f8df977 SHA512 c26dba452ab52c300da9c95fde8398acf4840cbc0e653ededf978d4a3e942cfe5b77292c74c49dc0279250a27cfd324c696c49d139a97c844b2a1eead9aae2f4
--- a/dev-libs/angelscript/angelscript-2.34.0.ebuild
+++ b/dev-libs/angelscript/angelscript-2.34.0.ebuild
--- a/dev-libs/libffi-compat/Manifest
+++ b/dev-libs/libffi-compat/Manifest
@ -0,0 +1 @@
+DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
--- a/dev-libs/libffi-compat/files/libffi-3.1-darwin-x32.patch
+++ b/dev-libs/libffi-compat/files/libffi-3.1-darwin-x32.patch
@ -0,0 +1,22 @@
+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-compat/files/libffi-3.2.1-complex-ia64.patch
+++ b/dev-libs/libffi-compat/files/libffi-3.2.1-complex-ia64.patch
@ -0,0 +1,41 @@
+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-compat/files/libffi-3.2.1-complex_alpha.patch
+++ b/dev-libs/libffi-compat/files/libffi-3.2.1-complex_alpha.patch
@ -0,0 +1,20 @@
+--- 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-compat/files/libffi-3.2.1-ia64-small-struct.patch
+++ b/dev-libs/libffi-compat/files/libffi-3.2.1-ia64-small-struct.patch
@ -0,0 +1,74 @@
+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-compat/files/libffi-3.2.1-include-path-autogen.patch
+++ b/dev-libs/libffi-compat/files/libffi-3.2.1-include-path-autogen.patch
@ -0,0 +1,56 @@
+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-compat/files/libffi-3.2.1-include-path.patch
+++ b/dev-libs/libffi-compat/files/libffi-3.2.1-include-path.patch
@ -0,0 +1,39 @@
+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-compat/files/libffi-3.2.1-musl-emutramp.patch
+++ b/dev-libs/libffi-compat/files/libffi-3.2.1-musl-emutramp.patch
@ -0,0 +1,31 @@
+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-compat/files/libffi-3.2.1-o-tmpfile-eacces.patch
+++ b/dev-libs/libffi-compat/files/libffi-3.2.1-o-tmpfile-eacces.patch
@ -0,0 +1,17 @@
+https://bugs.gentoo.org/529044
+
+deploy this workaround until newer versions of the kernel/C library/libsandbox
+are rolled out into general circulation
+
+--- a/src/closures.c
+++ b/src/closures.c
+@@ -301,7 +301,8 @@ open_temp_exec_file_dir (const char *dir)
+ #ifdef O_TMPFILE
+   fd = open (dir, flags | O_RDWR | O_EXCL | O_TMPFILE, 0700);
+   /* If the running system does not support the O_TMPFILE flag then retry without it. */
+-  if (fd != -1 || (errno != EINVAL && errno != EISDIR && errno != EOPNOTSUPP)) {
+  if (fd != -1 || (errno != EINVAL && errno != EISDIR && errno != EOPNOTSUPP &&
+		   errno != EACCES)) {
+     return fd;
+   } else {
+     errno = 0;
--- a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
+++ b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils libtool multilib multilib-minimal toolchain-funcs
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions"
+HOMEPAGE="https://sourceware.org/libffi/"
+SRC_URI="ftp://sourceware.org/pub/libffi/libffi-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="6" # libffi.so.6
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug pax_kernel test"
+
+RDEPEND="!dev-libs/libffi:0/0" # conflicts on libffi.so.6
+DEPEND="test? ( dev-util/dejagnu )"
+
+DOCS="ChangeLog* README"
+
+PATCHES=(
+	"${FILESDIR}"/libffi-3.2.1-o-tmpfile-eacces.patch #529044
+	"${FILESDIR}"/libffi-3.2.1-complex_alpha.patch
+	"${FILESDIR}"/libffi-3.1-darwin-x32.patch
+	"${FILESDIR}"/libffi-3.2.1-complex-ia64.patch
+	"${FILESDIR}"/libffi-3.2.1-include-path.patch
+	"${FILESDIR}"/libffi-3.2.1-include-path-autogen.patch
+	"${FILESDIR}"/libffi-3.2.1-ia64-small-struct.patch #634190
+	"${FILESDIR}"/libffi-3.2.1-musl-emutramp.patch #694916
+)
+
+S=${WORKDIR}/libffi-${PV}
+ECONF_SOURCE=${S}
+
+src_prepare() {
+	default
+
+	sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814
+	elibtoolize
+}
+
+multilib_src_configure() {
+	use userland_BSD && export HOST="${CHOST}"
+	econf \
+		--disable-static \
+		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable debug)
+}
+
+multilib_src_install() {
+	dolib.so .libs/libffi.so.${SLOT}*
+}
--- a/dev-libs/libffi-compat/metadata.xml
+++ b/dev-libs/libffi-compat/metadata.xml
@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Compilers for high level languages generate code that follow certain
+		conventions. These conventions are necessary, in part, for separate
+		compilation to work. One such convention is the "calling
+		convention". The "calling convention" is essentially a set of
+		assumptions made by the compiler about where function arguments will
+		be found on entry to a function. A "calling convention" also specifies
+		where the return value for a function is found.
+
+		Some programs may not know at the time of compilation what arguments
+		are to be passed to a function. For instance, an interpreter may be
+		told at run-time about the number and types of arguments used to call
+		a given function. Libffi can be used in such programs to provide a
+		bridge from the interpreter program to compiled code.
+
+		The libffi library provides a portable, high level programming
+		interface to various calling conventions. This allows a programmer to
+		call any function specified by a call interface description at run
+		time.
+
+		Ffi stands for Foreign Function Interface. A foreign function
+		interface is the popular name for the interface that allows code
+		written in one language to call code written in another language. The
+		libffi library really only provides the lowest, machine dependent
+		layer of a fully featured foreign function interface. A layer must
+		exist above libffi that handles type conversions for values passed
+		between the two languages.
+	</longdescription>
+	<use>
+		<flag name="pax_kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483`