Sync with portage [Mon Mar 5 12:52:40 MSK 2018].

2018-03-05 12:52:40 +03:00 · 2018-03-05 12:52:40 +03:00 · 4beb529425
commit 4beb529425
parent 6aabfa7f30
664 changed files with 3351 additions and 3414 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/eselect/eselect-1.4.11.ebuild
+++ b/app-admin/eselect/eselect-1.4.11.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"

 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"

 RDEPEND="sys-apps/sed
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@ -1,2 +1,3 @@
 DIST fam-2.7.0.tar.gz 301974 BLAKE2B 9a915e61b2898717cac1b7bbe9b2049aee0701314710906c5c8323aafe0847a9f017d09c4d9345e1fba386ac3c1001ec013325f9841d716e8c91e35bcf1e3962 SHA512 62b6222ee925eb2af1e258097c9bb676191690f38f8504ae16b1883a1019e0ac6dc7116ac2c4c596a956b3b3cfc3ce3ee7b613c319654681afb13e3ad3f284e2
+DIST fam_2.7.0-17.2.diff.gz 28826 BLAKE2B 880f8614304b048a24be03231ec26a02901befd75c8c5d51abf07d5afb42f370f4d3702d0db790f2f651f040372791024d9cbfbea15a1932629fb13a7b6a5ec8 SHA512 295c954fcecb7357a72ecf3c7469bb37c29e8969fc7be3a0e92e40e79911c9578f44c42a0a6f900610c8a9886f1addc62e50f258105aaadb61c718f526608697
 DIST fam_2.7.0-17.diff.gz 28056 BLAKE2B 4db010fdf7a2548f5651e9da876df63d3bd0d1a5f184b26df99f7d4204bbcbadf4c7672d248d9d1af2e7297b0ec17a5ec80e6b57016774877465a957ae3c6ae8 SHA512 76b14e1d17713eb86d52cb804d34012e5369b5f4e8bcbdc73a063d2ad9219e0c4a261cef9e144ee07744a953a2e893bdf2ceeefcf21edc7a2ac5e70a51a8e209
--- a/app-admin/fam/fam-2.7.0_p17_p2.ebuild
+++ b/app-admin/fam/fam-2.7.0_p17_p2.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic ltprune multilib-minimal
+
+FAM_PV="${PV/_p*/}"
+DEBIAN_PATCH="${PV#*_p}"
+DEBIAN_PATCH="${DEBIAN_PATCH/_p/.}"
+DESCRIPTION="FAM, the File Alteration Monitor"
+HOMEPAGE="http://oss.sgi.com/projects/fam/"
+SRC_URI="
+	ftp://oss.sgi.com/projects/fam/download/stable/${PN}-${FAM_PV}.tar.gz
+	mirror://debian/pool/main/f/${PN}/${PN}_${FAM_PV}-${DEBIAN_PATCH}.diff.gz
+"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="
+	!app-admin/gamin
+	net-libs/libtirpc
+	net-nds/rpcbind
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO README )
+S=${WORKDIR}/${PN}-${FAM_PV}
+
+src_prepare() {
+	eapply "${WORKDIR}"/${PN}_${FAM_PV}-${DEBIAN_PATCH}.diff
+	edos2unix debian/patches/10_debianbug375967.patch
+	eapply "${FILESDIR}"/${PN}-${FAM_PV}-patch-header.patch
+
+	eapply debian/patches/*patch
+
+	eapply "${FILESDIR}"/${PN}-${FAM_PV}-AM_CONFIG_HEADER.patch
+	eapply "${FILESDIR}"/${PN}-${FAM_PV}-out-of-tree.patch
+	eapply "${FILESDIR}"/${PN}-${FAM_PV}-sysmacros.patch #580702
+
+	eapply_user
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	tc-export PKG_CONFIG
+	append-cppflags $(${PKG_CONFIG} --cflags libtirpc)
+	append-libs $(${PKG_CONFIG} --libs libtirpc)
+	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
+
+	# These are thrown away later
+	if ! multilib_is_native_abi ; then
+		sed -i -e 's/src conf man//' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+	einstalldocs
+
+	sed -i "${D}"/etc/fam.conf \
+		-e "s:local_only = false:local_only = true:g" \
+		|| die "sed fam.conf"
+
+	doinitd "${FILESDIR}/famd"
+}
--- a/app-admin/fam/files/fam-2.7.0-AM_CONFIG_HEADER.patch
+++ b/app-admin/fam/files/fam-2.7.0-AM_CONFIG_HEADER.patch
@ -0,0 +1,11 @@
+--- a/configure.ac
+++ b/configure.ac
+@@ -7,7 +7,7 @@
+ AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
+ dnl AC_CONFIG_SRCDIR([acconfig.h])
+-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
+ AC_LANG(C++)
+ 
+ # Variables used by the FAM source.
--- a/app-admin/fam/files/fam-2.7.0-patch-header.patch
+++ b/app-admin/fam/files/fam-2.7.0-patch-header.patch
@ -0,0 +1,66 @@
+--- a/debian/patches/15-partial_send.patch
+++ b/debian/patches/15-partial_send.patch
+@@ -1,6 +1,6 @@
+ diff -Naur fam-2.7.0/fam-2.7.0/src/NetConnection.c++ fam-2.7.0-mod/fam-2.7.0/src/NetConnection.c++
+---- fam-2.7.0/fam-2.7.0/src/NetConnection.c++	2003-01-18 09:18:12.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/src/NetConnection.c++	2007-07-30 12:57:19.812380334 -0400
+--- a/src/NetConnection.c++	2003-01-18 09:18:12.000000000 -0500
++++ b/src/NetConnection.c++	2007-07-30 12:57:19.812380334 -0400
+ @@ -213,6 +213,7 @@
+  
+      msgList_t * msg = new msgList_t;
+@@ -31,8 +31,8 @@
+              {
+                  /* Since the client library can close it's fd before
+ diff -Naur fam-2.7.0/fam-2.7.0/src/NetConnection.h fam-2.7.0-mod/fam-2.7.0/src/NetConnection.h
+---- fam-2.7.0/fam-2.7.0/src/NetConnection.h	2003-01-18 09:18:12.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/src/NetConnection.h	2007-07-30 12:53:46.746803625 -0400
+--- a/src/NetConnection.h	2003-01-18 09:18:12.000000000 -0500
++++ b/src/NetConnection.h	2007-07-30 12:53:46.746803625 -0400
+ @@ -80,6 +80,7 @@
+      typedef struct msgList_s {
+          char msg[MAXMSGSIZE+5];  //  + 4 for 32-bit length, + 1 for overflow
+--- a/debian/patches/16-port_number.patch
+++ b/debian/patches/16-port_number.patch
+@@ -1,6 +1,6 @@
+ diff -Naur fam-2.7.0/fam-2.7.0/man/famd.8 fam-2.7.0-mod/fam-2.7.0/man/famd.8
+---- fam-2.7.0/fam-2.7.0/man/famd.8	2003-01-19 19:58:11.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/man/famd.8	2007-07-30 12:23:15.292527117 -0400
+--- a/man/famd.8	2003-01-19 19:58:11.000000000 -0500
++++ b/man/famd.8	2007-07-30 12:23:15.292527117 -0400
+ @@ -51,6 +51,9 @@
+  Register with the portmapper using the specifed RPC program
+  and version numbers.
+@@ -12,8 +12,8 @@
+  Poll a remove NFS server every \fIperiod\fR seconds
+  to obtain file updates if the remove server is not running \fBfamd\fR.
+ diff -Naur fam-2.7.0/fam-2.7.0/src/Listener.c++ fam-2.7.0-mod/fam-2.7.0/src/Listener.c++
+---- fam-2.7.0/fam-2.7.0/src/Listener.c++	2003-01-19 19:37:29.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/src/Listener.c++	2007-07-26 16:32:03.863758810 -0400
+--- a/src/Listener.c++	2003-01-19 19:37:29.000000000 -0500
++++ b/src/Listener.c++	2007-07-26 16:32:03.863758810 -0400
+ @@ -60,13 +60,14 @@
+  
+  static void cleanup_negotiation(void *closure);
+@@ -57,8 +57,8 @@
+  	if (listen(sock, 1) < 0)
+  	{
+ diff -Naur fam-2.7.0/fam-2.7.0/src/Listener.h fam-2.7.0-mod/fam-2.7.0/src/Listener.h
+---- fam-2.7.0/fam-2.7.0/src/Listener.h	2003-01-18 09:18:12.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/src/Listener.h	2007-07-26 16:32:50.682255289 -0400
+--- a/src/Listener.h	2003-01-18 09:18:12.000000000 -0500
++++ b/src/Listener.h	2007-07-26 16:32:50.682255289 -0400
+ @@ -51,7 +51,9 @@
+  
+      Listener(bool started_by_inetd,
+@@ -79,8 +79,8 @@
+      //  Private Instance Methods
+  
+ diff -Naur fam-2.7.0/fam-2.7.0/src/main.c++ fam-2.7.0-mod/fam-2.7.0/src/main.c++
+---- fam-2.7.0/fam-2.7.0/src/main.c++	2003-01-19 01:15:51.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/src/main.c++	2007-05-08 16:42:35.618954322 -0400
+--- a/src/main.c++	2003-01-19 01:15:51.000000000 -0500
++++ b/src/main.c++	2007-05-08 16:42:35.618954322 -0400
+ @@ -89,6 +89,7 @@
+      fprintf(stderr, "\t-d\t\tdebug\n");
+      fprintf(stderr, "\t-v\t\tverbose\n");
--- a/app-admin/keepassxc/keepassxc-2.2.4.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.2.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -13,7 +13,7 @@ HOMEPAGE="https://keepassxc.org"

 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 else
 	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
 fi
--- a/app-admin/packagekit-qt/Manifest
+++ b/app-admin/packagekit-qt/Manifest
@ -1,3 +1,2 @@
-DIST PackageKit-Qt-0.9.6.tar.xz 43288 BLAKE2B 7f00595ae91163346b1bd5b80da0f243388cb9a5ff64520a2574b96b3e6f240bc270b1083d24d4075960474d55720736c47cb84033d26f2ae5fce3ab6f062a23 SHA512 67d025e4e5b9860ec188518c11b3941b9a26cf9dce65665ea56307731721dac57dbb4e8726eb253f9fb39022aa3d0b0c7b9765532fa12b014fe9357028ece8aa
 DIST packagekit-qt-1.0.0.tar.gz 53495 BLAKE2B a19ff095ec42bc16e498455323a4046365f6ae144fdfc998dee799df9f4ea022696ab30682316b6417c8a96e80e75db31704e36e43c1a5eddd0a7d86309adada SHA512 4109117a94c47180cff0f073c03820ac39a139b6b3ac88dec82758fffe01271f7a3dae85d94e86a4a1167f4660326adc1d58dc6eb0fd164bd0aefee2e412dad4
 DIST packagekit-qt-1.0.1.tar.gz 53503 BLAKE2B af96899e520f4139d6025746c2a2e7a65c67c2900cdf4fbdb410c12e33f494343d078ec24e7dcdb33749b1d5206b0bf622809827ed64beae162888e48d0aaec0 SHA512 e1291545b496571c00a6a24586c45b7173e85e3704d419af6a0ec47ea5ce256c8ec7e887721b1bf8038cb967ceb82726925800ab06aa784b2bdd560e49be724a
--- a/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild
+++ b/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PN="PackageKit-Qt"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Qt PackageKit backend library"
-HOMEPAGE="http://www.packagekit.org/"
-SRC_URI="https://www.freedesktop.org/software/PackageKit/releases/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=app-admin/packagekit-base-0.9
-	>=dev-qt/qtcore-5.6:5
-	>=dev-qt/qtdbus-5.6:5
-	>=dev-qt/qtsql-5.6:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
--- a/app-admin/tenshi/tenshi-0.17.ebuild
+++ b/app-admin/tenshi/tenshi-0.17.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/inversepath/${PN}/archive/${PV}.tar.gz

 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""

 RDEPEND="dev-lang/perl
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
--- a/app-antivirus/clamav/clamav-0.99.3-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.3-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc"

 CDEPEND="bzip2? ( app-arch/bzip2 )
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/dpkg/dpkg-1.19.0.5.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"

 RDEPEND="
--- a/app-arch/p7zip/p7zip-16.02-r2.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r2.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"

 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"

 REQUIRED_USE="kde? ( wxwidgets )"
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/burncdda/Manifest
+++ b/app-cdr/burncdda/Manifest
@ -1,2 +1 @@
-DIST burncdda-1.8.0.tar.gz 23795 BLAKE2B c0c2e00f1cbaa343458429504e024bbfb2830e174cfc0e964d5ab5b90587dbe501a869727c04dc01e6023feb07de27b22febb70f020019ea6eaa50f5e39c2e5e SHA512 798d2f6c51005dc87d1214e82cc5b2227bdf34b93b0457382cb0eb86a1426be9e61df5029460b42842cb730b806934447f6adb9ed7e6674e69d4910799b3ee92
 DIST burncdda-1.8.3.tar.gz 23710 BLAKE2B 60e70eaa31d2c2eee2a3e3a874f28dde1fc1c4d221b9eb14119666f505f94275c78f4aa87b823ee7c926bb657492a0cbc9830635d2a3d781b9853ec8866c5caa SHA512 b0ddf9457ca9a1b8ad07b43aba4b5c6532ef09aae85b363802084bcf7bbb4d4bfadf980af98862dfbdd72e257d287f1e517323ebec7432be3514880e393e9f1d
--- a/app-cdr/burncdda/burncdda-1.8.0.ebuild
+++ b/app-cdr/burncdda/burncdda-1.8.0.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Console app for copying burning audio cds"
-HOMEPAGE="http://burncdda.sourceforge.net/"
-SRC_URI="http://www.thenktor.homepage.t-online.de/burncdda/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86"
-IUSE="flac mp3 vorbis"
-
-RDEPEND="
-	app-cdr/cdrdao
-	dev-util/dialog
-	media-sound/normalize
-	media-sound/sox
-	virtual/cdrtools
-	flac? ( media-libs/flac )
-	mp3? (
-		media-sound/mpg123
-		media-sound/mp3_check
-	)
-	vorbis? ( media-sound/vorbis-tools )
-"
-
-src_install() {
-	dobin ${PN}
-
-	insinto /usr/lib/${PN}
-	doins *.func
-
-	insinto /etc
-	doins ${PN}.conf
-
-	dodoc CHANGELOG
-	doman burncdda.1.gz
-}
--- a/app-cdr/isomaster/isomaster-1.3.13.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.13.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=4
@ -10,7 +10,7 @@ SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"

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

 RDEPEND=">=dev-libs/iniparser-3.0.0:0
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/gpgme/gpgme-1.10.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.10.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"

 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs cxx python qt5"

 COMMON_DEPEND=">=app-crypt/gnupg-2
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/leo/leo-5.6.ebuild
+++ b/app-editors/leo/leo-5.6.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/leo-editor/leo-editor/archive/${PV}.tar.gz -> ${P}.t

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

 RDEPEND="
--- a/app-editors/mg/mg-20171014.ebuild
+++ b/app-editors/mg/mg-20171014.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://homepage.boetes.org/software/mg/${P}.tar.gz"

 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="livecd"

 RDEPEND="sys-libs/ncurses:0
--- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild
+++ b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz"

 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 x86 ~x86-fbsd"

 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc ~x86"
 IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"

 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
--- a/app-editors/zile/zile-2.4.13.ebuild
+++ b/app-editors/zile/zile-2.4.13.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="acl test"

 RDEPEND=">=dev-libs/boehm-gc-7.2:=
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"

 DEPEND="sys-apps/texinfo"

--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@ -1 +1,2 @@
 DIST slime-2.15.tar.gz 1072190 BLAKE2B 7623d2d109486e35cb94a3bd8a6b72008c28fbc0bac5bdbcde5fcde19b2ebc74d488a6ff67f026922ea716e67ac732cc72f7b984cc4c2574f57323db93de300c SHA512 15f943981e35995b225b168a3d1c2099f7205c2ff359fa209f164464caf05f9fab4d24906442d94ddeb4222f7116d09a832c7377baf95fbe02d6a98a721fd611
+DIST slime-2.20.tar.gz 803127 BLAKE2B 9a6e50d50da4c9f8f2226ec919cf7f2068ae93a0bac0301233c2d75f12e94e3345998093880d7836fab07d8541da86de928308cfe571ee5811da6de9bfa11b31 SHA512 994dbffb54ee1ab4ca529771451724c83ff83992a6d495e06cdca5cd94f0c098e48d7914489278e3015f18ea094d58c469e57301492087a33087562f69506b46
--- a/app-emacs/slime/slime-2.20.ebuild
+++ b/app-emacs/slime/slime-2.20.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp eutils
+
+DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
+HOMEPAGE="http://common-lisp.net/project/slime/"
+SRC_URI="https://github.com/slime/slime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 xref? ( xref.lisp )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc xref"
+RESTRICT=test # tests fail to contact sbcl
+
+RDEPEND="virtual/commonlisp
+	dev-lisp/asdf"
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-5.1
+	doc? ( virtual/texi2dvi )"
+
+CLPACKAGE=swank
+CLSYSTEMS=swank
+SITEFILE=70${PN}-gentoo.el
+
+src_prepare() {
+	# Remove xref.lisp (which is non-free) unless USE flag is set
+	use xref || rm -f xref.lisp
+	eapply_user
+}
+
+src_compile() {
+	elisp-compile *.el || die
+	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
+		elisp-compile contrib/*.el lib/*.el || die
+	emake -j1 -C doc slime.info || die "Cannot build info docs"
+
+	#if use doc; then
+	#	VARTEXFONTS="${T}"/fonts \
+	#		emake -j1 -C doc slime.pdf || die "emake doc failed"
+	#fi
+}
+
+src_install() {
+	## install core
+	elisp-install ${PN} *.{el,elc,lisp} || die "Cannot install SLIME core"
+
+	## install contribs
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo} \
+		|| die "Cannot install contribs"
+
+	## install lib
+	elisp-install ${PN}/lib/ lib/*.{el,elc} || die "Cannot install libs"
+
+	## install swank
+	elisp-install ${PN}/swank/ swank/*.lisp || die "Cannot install swank"
+
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	## install docs
+	dodoc README.md CONTRIBUTING.md NEWS PROBLEMS
+	newdoc contrib/README.md README-contrib.md
+	doinfo doc/slime.info
+	use doc && dodoc doc/*.pdf
+}
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
@ -47,7 +47,6 @@ RDEPEND="!app-emulation/virtualbox-bin
 			x11-libs/libXinerama
 		)
 	)
-	java? ( >=virtual/jre-1.6:= )
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:0= )
 	lvm? ( sys-fs/lvm2 )
@ -71,13 +70,15 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-fontsextra
 	)
 	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jre-1.6:= )
+	java? ( >=virtual/jdk-1.6 )
 	pam? ( sys-libs/pam )
 	pax_kernel? ( sys-apps/elfix )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
 	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"

 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
 	usr/lib/virtualbox/VBoxSDL.so
--- a/app-emulation/virtualbox/virtualbox-5.1.34.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.34.ebuild
@ -47,7 +47,6 @@ RDEPEND="!app-emulation/virtualbox-bin
 			x11-libs/libXinerama
 		)
 	)
-	java? ( >=virtual/jre-1.6:= )
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:0= )
 	lvm? ( sys-fs/lvm2 )
@ -71,13 +70,15 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-fontsextra
 	)
 	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jre-1.6:= )
+	java? ( >=virtual/jdk-1.6 )
 	pam? ( sys-libs/pam )
 	pax_kernel? ( sys-apps/elfix )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
 	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"

 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
 	usr/lib/virtualbox/VBoxSDL.so
--- a/app-emulation/virtualbox/virtualbox-5.2.6.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.6.ebuild
@ -47,7 +47,6 @@ RDEPEND="!app-emulation/virtualbox-bin
 			x11-libs/libXinerama
 		)
 	)
-	java? ( >=virtual/jre-1.6:= )
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:0= )
 	lvm? ( sys-fs/lvm2 )
@ -71,13 +70,15 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-fontsextra
 	)
 	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jre-1.6:= )
+	java? ( >=virtual/jdk-1.6 )
 	pam? ( sys-libs/pam )
 	pax_kernel? ( sys-apps/elfix )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
 	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"

 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
 	usr/lib/virtualbox/VBoxSDL.so
--- a/app-emulation/virtualbox/virtualbox-5.2.8.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.8.ebuild
@ -47,7 +47,6 @@ RDEPEND="!app-emulation/virtualbox-bin
 			x11-libs/libXinerama
 		)
 	)
-	java? ( >=virtual/jre-1.6:= )
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:0= )
 	lvm? ( sys-fs/lvm2 )
@ -71,13 +70,15 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-fontsextra
 	)
 	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jre-1.6:= )
+	java? ( >=virtual/jdk-1.6 )
 	pam? ( sys-libs/pam )
 	pax_kernel? ( sys-apps/elfix )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
 	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"

 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
 	usr/lib/virtualbox/VBoxSDL.so
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-java/Manifest
+++ b/app-eselect/eselect-java/Manifest
@ -1,3 +1 @@
-DIST eselect-java-0.2.0.tar.bz2 13353 BLAKE2B 9fbc647329194ce61970ed7315ddbb22311ca3a58a370c2e4e5a693f8d085d01251b54ba586ea0cd9c5cbd5d0fa93db1054b955a4be53ab59ffce767aa878c9b SHA512 376c72317461c743dd91f8576cff7b1279b8f1672aa878c492ec3ed0da5f3c8d25cbb5fd4d9120109a01466dadbd049fb75d642187c850676d939925bcb55fdd
-DIST eselect-java-0.3.0.tar.bz2 13434 BLAKE2B 0a9f69f3ad75174bc49f2ada6aafac9c7135c151cb06e8a37cf60095a1bd323c5e7bd99752269c7674af9c1b67cc061778fdf8e49c8a02f2e90ec9bb623058b9 SHA512 d874d1d20d3920d16d5812b2aa28455f9166c6590b711e2bd49b1632e164be18f177eec5f5f2814391966ca3b710aab21b44d29afead2148cc7d0ed90841f9d8
 DIST eselect-java-0.4.0.tar.xz 13412 BLAKE2B da3df5c342b1632d1cc597909283cfcb7cb71d4bff04c2aa3253110f06b8addc5121efe1a50409f2b297c70c4f816a385a0199e68821acb6c48e3065d3097b37 SHA512 a1bdb2554e4dc78d980cab80591f6e0c537f983ae78d2ca98bda8f5292cf749fa5a9983dc51c6576176566f2fcc255ca40b04c26bd1b5d7f1db2d12b76048567
--- a/app-eselect/eselect-java/eselect-java-0.2.0-r1.ebuild
+++ b/app-eselect/eselect-java/eselect-java-0.2.0-r1.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="A set of eselect modules for Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	!app-eselect/eselect-ecj
-	!app-eselect/eselect-maven
-	!<dev-java/java-config-2.2
-	app-admin/eselect"
-
-src_prepare() {
-	eautoreconf
-
-	# Bug 549498: "eselect XXX show" should never send output to stderr.
-	sed -i \
-		-e '/^do_show.. {$/,/^}$/{ /echo/s,>&2$,, }' \
-		"${S}"/src/modules/maven.eselect.in \
-		"${S}"/src/modules/ecj.eselect.in
-}
-
-pkg_postinst() {
-	local REMOVED=0
-
-	rm -v "${EROOT}"usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1
-	rm -v "${EROOT}"etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1
-
-	if [[ "${REMOVED}" = 1 ]]; then
-		elog "The eselect java-nsplugin module has been removed and your configuration"
-		elog "has been cleaned up. From now on, you may only install either Oracle or"
-		elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an"
-		elog "Oracle VM. See the README installed with icedtea-web for more details."
-	fi
-}
--- a/app-eselect/eselect-java/eselect-java-0.2.0.ebuild
+++ b/app-eselect/eselect-java/eselect-java-0.2.0.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="A set of eselect modules for Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	!app-eselect/eselect-ecj
-	!app-eselect/eselect-maven
-	!<dev-java/java-config-2.2
-	app-admin/eselect"
-
-src_prepare() {
-	eautoreconf
-}
-
-pkg_postinst() {
-	local REMOVED=0
-
-	rm -v "${EROOT}"usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1
-	rm -v "${EROOT}"etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1
-
-	if [[ "${REMOVED}" = 1 ]]; then
-		elog "The eselect java-nsplugin module has been removed and your configuration"
-		elog "has been cleaned up. From now on, you may only install either Oracle or"
-		elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an"
-		elog "Oracle VM. See the README installed with icedtea-web for more details."
-	fi
-}
--- a/app-eselect/eselect-java/eselect-java-0.3.0.ebuild
+++ b/app-eselect/eselect-java/eselect-java-0.3.0.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A set of eselect modules for Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	!app-eselect/eselect-ecj
-	!app-eselect/eselect-maven
-	!<dev-java/java-config-2.2
-	app-admin/eselect"
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# Bug 549498: "eselect XXX show" should never send output to stderr.
-	sed -i \
-		-e '/^do_show.. {$/,/^}$/{ /echo/s,>&2$,, }' \
-		"${S}"/src/modules/maven.eselect.in \
-		"${S}"/src/modules/ecj.eselect.in
-}
-
-pkg_postinst() {
-	local REMOVED=0
-
-	rm -v "${EROOT}"usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1
-	rm -v "${EROOT}"etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1
-
-	if [[ "${REMOVED}" = 1 ]]; then
-		elog "The eselect java-nsplugin module has been removed and your configuration"
-		elog "has been cleaned up. From now on, you may only install either Oracle or"
-		elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an"
-		elog "Oracle VM. See the README installed with icedtea-web for more details."
-	fi
-}
--- a/app-eselect/eselect-java/eselect-java-0.4.0.ebuild
+++ b/app-eselect/eselect-java/eselect-java-0.4.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

 RDEPEND="
 	!app-eselect/eselect-ecj
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/sleuthkit/sleuthkit-4.5.0.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.5.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz

 LICENSE="BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )"
 SLOT="0/13" # subslot = major soname version
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE="aff doc ewf java static-libs test +threads zlib"

 DEPEND="
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="hyperestraier mysql python ruby ${USE_RUBY//ruby/ruby_targets_ruby} static-libs subversion"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"

 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
--- a/app-misc/tmux/tmux-2.6.ebuild
+++ b/app-misc/tmux/tmux-2.6.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.

 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"

 CDEPEND="
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/lyx/lyx-2.2.3-r1.ebuild
+++ b/app-office/lyx/lyx-2.2.3-r1.ebuild
@ -1,187 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils eutils fdo-mime flag-o-matic font python-single-r1 qmake-utils toolchain-funcs
-
-MY_P="${P/_}"
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="https://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
-	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/${MY_P}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos"
-IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-texlive/texlive-fontsextra
-	sys-apps/file
-	sys-libs/zlib
-	virtual/imagemagick-tools[png,svg?]
-	aspell? ( app-text/aspell )
-	cups? ( net-print/cups )
-	dia? ( app-office/dia )
-	docbook? ( app-text/sgmltools-lite )
-	dot? ( media-gfx/graphviz )
-	enchant? ( app-text/enchant )
-	gnumeric? ( app-office/gnumeric )
-	html? ( dev-tex/html2latex )
-	hunspell? ( app-text/hunspell )
-	latex? (
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/noweb
-		app-text/ps2eps
-		app-text/texlive
-		dev-tex/chktex
-		dev-tex/dvipost
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-pictures
-		|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-science )
-		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra )
-		|| (
-			dev-tex/hevea
-			dev-tex/latex2html
-			dev-tex/tex4ht[java]
-			dev-tex/tth
-		)
-	)
-	l10n_he? ( dev-tex/culmus-latex )
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-	rcs? ( dev-vcs/rcs )
-	rtf? (
-		app-text/unrtf
-		dev-tex/html2latex
-		dev-tex/latex2rtf
-	)
-	subversion? ( dev-vcs/subversion )
-	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	!qt5? ( dev-qt/qtsvg:4 )
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtx11extras:5
-	)
-"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-PATCHES=( "${FILESDIR}"/2.1-python.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	font_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
-}
-
-src_configure() {
-	tc-export CXX
-	#bug 221921
-	export VARTEXFONTS=${T}/fonts
-
-	econf \
-		$(use_with aspell) \
-		$(use_enable debug) \
-		$(use_with enchant) \
-		$(use_with hunspell) \
-		$(use_enable monolithic-build) \
-		$(use_enable nls) \
-		$(use_enable qt5) \
-		--with-qt-dir=$(usex qt5 $(qt5_get_libdir)/qt5 $(qt4_get_libdir)) \
-		--disable-stdlib-debug \
-		--without-included-boost \
-		--with-packaging=posix
-}
-
-src_install() {
-	default
-
-	if use l10n_he ; then
-		echo "\bind_file cua" > "${T}"/hebrew.bind
-		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
-
-		insinto /usr/share/lyx/bind
-		doins "${T}"/hebrew.bind || die
-	fi
-
-	newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
-	doicon -s 48 "${S}/lib/images/lyx.png"
-	doicon -s scalable "${S}/lib/images/lyx.svg"
-
-	# fix for bug 91108
-	if use latex ; then
-		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx || die
-	fi
-
-	# fonts needed for proper math display, see also bug #15629
-	font_src_install
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-
-	if use hunspell ; then
-		dosym ../myspell /usr/share/lyx/dicts
-		dosym ../myspell /usr/share/lyx/thes
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	font_pkg_postinst
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	# fix for bug 91108
-	if use latex ; then
-		texhash
-	fi
-
-	# instructions for RTL support. See also bug 168331.
-	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
-		elog
-		elog "Enabling RTL support in LyX:"
-		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
-		elog "You must enable RTL support in LyX. To do so start LyX and go to"
-		elog "Tools->Preferences->Language settings->Language"
-		elog "and make sure the \"Right-to-left language support\" is checked"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	if use latex ; then
-		texhash
-	fi
-}
--- a/app-office/lyx/lyx-2.2.3-r4.ebuild
+++ b/app-office/lyx/lyx-2.2.3-r4.ebuild
@ -40,7 +40,6 @@ RDEPEND="${PYTHON_DEPS}
 	latex? (
 		app-text/dvipng
 		app-text/ghostscript-gpl
-		app-text/noweb
 		app-text/ps2eps
 		app-text/texlive
 		dev-tex/chktex
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@ -14,7 +14,6 @@
  <use>
    <flag name="debug">Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.</flag>
    <flag name="doc">Create description of the eix cache file additionally in html format</flag>
-    <flag name="jumbo-build">Compile faster and produce better binary. Recommended unless compiling on a quite memory-restricted system.</flag>
    <flag name="sqlite">Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix</flag>
  </use>
  <upstream>
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/bash/bash-4.4_p12.ebuild
+++ b/app-shells/bash/bash-4.4_p12.ebuild
@ -46,7 +46,7 @@ fi

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"

 DEPEND=">=sys-libs/ncurses-5.2-r2:0=
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/highlight/files/highlight-3.42-qmake-fix.patch
+++ b/app-text/highlight/files/highlight-3.42-qmake-fix.patch
@ -0,0 +1,32 @@
+From 8464afed560fa1096d37aa82aef99c00819fec87 Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Fri, 2 Mar 2018 19:15:35 +0000
+Subject: [PATCH] fix directories passed to qmake being ignored
+
+contains() matches the whole value, add regular expressions for the path
+components.
+---
+ src/gui-qt/highlight.pro | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/gui-qt/highlight.pro b/src/gui-qt/highlight.pro
+index bae8d7c..0380a90 100644
+--- a/src/gui-qt/highlight.pro
+++ b/src/gui-qt/highlight.pro
+@@ -43,13 +43,13 @@ unix {
+     PKGCONFIG += lua
+ 
+     # to make it run within Qt Creator
+-    !contains(DEFINES, DATA_DIR) {
+    !contains(DEFINES, DATA_DIR.*) {
+         DEFINES+=DATA_DIR=\\\"/usr/share/highlight/\\\"
+     }
+-    !contains(DEFINES, CONFIG_DIR) {
+    !contains(DEFINES, CONFIG_DIR.*) {
+         DEFINES+=CONFIG_DIR=\\\"/etc/highlight/\\\"
+     }
+-    !contains(DEFINES, DOC_DIR) {
+    !contains(DEFINES, DOC_DIR.*) {
+         DEFINES+=DOC_DIR=\\\"/usr/share/doc/highlight/\\\"
+     }
+ }
--- a/app-text/highlight/highlight-3.42-r1.ebuild
+++ b/app-text/highlight/highlight-3.42-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"

 RDEPEND="
@ -42,6 +42,8 @@ myhlopts=(
 	"conf_dir=${EPREFIX}/etc/highlight/"
 )

+PATCHES=( "${FILESDIR}"/${P}-qmake-fix.patch ) # bug 649398
+
 src_prepare() {
 	default

@ -78,7 +80,10 @@ src_compile() {

 src_install() {
 	emake -f makefile "${myhlopts[@]}" install
-	use qt5 && emake -f makefile "${myhlopts[@]}" install-gui
+	if use qt5; then
+		emake -f makefile "${myhlopts[@]}" install-gui
+		docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
+	fi

 	if ! use examples ; then
 		rm -r "${ED}"/usr/share/doc/${PF}/extras || die
--- a/app-text/poppler/poppler-0.62.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.62.0-r1.ebuild
@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/73"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi

--- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0.ebuild
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-DTD_FILE="scrollkeeper-omf.dtd"
-
-DESCRIPTION="DTD from the Scrollkeeper package"
-HOMEPAGE="http://scrollkeeper.sourceforge.net/"
-SRC_URI="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FILE}"
-
-LICENSE="FDL-1.1"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.4.19"
-DEPEND="${RDEPEND}
-	!<app-text/scrollkeeper-9999-r1"
-
-src_unpack() { :; }
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/xml/scrollkeeper/dtds
-	doins "${DISTDIR}/${DTD_FILE}"
-}
-
-pkg_postinst() {
-	einfo "Installing catalog..."
-
-	# Install regular DOCTYPE catalog entry
-	"${EROOT}"usr/bin/xmlcatalog --noout --add "public" \
-		"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
-		"${EROOT}"usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
-		"${EROOT}"etc/xml/catalog
-
-	# Install catalog entry for calls like: xmllint --dtdvalid URL ...
-	"${EROOT}"usr/bin/xmlcatalog --noout --add "system" \
-		"${SRC_URI}" \
-		"${EROOT}"usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
-		"${EROOT}"etc/xml/catalog
-}
-
-pkg_postrm() {
-	# Remove all sk-dtd from the cache
-	einfo "Cleaning catalog..."
-
-	"${EROOT}"usr/bin/xmlcatalog --noout --del \
-		"${EROOT}"usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
-		"${EROOT}"etc/xml/catalog
-}
--- a/app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild
+++ b/app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild
@ -9,6 +9,6 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

-DEPEND="=app-text/scrollkeeper-dtd-1.0"
+DEPEND="~app-text/scrollkeeper-dtd-1.0"
 RDEPEND=""
 PDEPEND="app-text/rarian"
--- a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
+++ b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,7 +11,7 @@ SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"

 RDEPEND="!app-text/htmltidy"

--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.42.ebuild
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.42.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"

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

 RDEPEND=">=app-editors/xemacs-21.4.20-r5
 	app-xemacs/sh-script"
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/aerospike-server-community/Manifest
+++ b/dev-db/aerospike-server-community/Manifest
@ -1,5 +1,4 @@
-DIST aerospike-server-community-3.13.0.8-debian7.tgz 10659161 BLAKE2B 845b752a2071b6a9a0502a3bc63f15db836fc0615103ce27b0a81c11a808f1b7423dcd84bf8d3584738c273e3756a6cf155b0a9bea73a79511ec5ea5a5243f0a SHA512 70ec34a1832659918c21f08de4968c4e237aa5dc43f07135dd4cfc49d4107de08418f6dadbf07a375b39e1f5e8dc5e156e56428818a4327001e03b75a7bc0038
-DIST aerospike-server-community-3.14.1.5-debian7.tgz 10451650 BLAKE2B 1b043893094fd843f459e31af7be2818e54697e32dea7338842876bc88deb6a649d8275892b5eb54c1613e52a8bad153e676fbf258afeb5f4e76aed881d16494 SHA512 3b7bb44ba8ce9b9b643067c0c33e1d154dd760096df3d2629ffb7dc6b1c04002b54d771d9cf0303c78e102c6a12a882edd0a689395a8bf55518e23dbf36aea8e
-DIST aerospike-server-community-3.15.0.2-debian7.tgz 10299075 BLAKE2B 86b755fef6b0fe9e1736584d38e3e9b9ec46f661698ec9643c507605a0252725fea971a46ba2f25a302961c2916b4e21a8d76c8ae8a1a76b3e9a06f30d4fdc74 SHA512 6aae04d81ff9a56e2283186b8a38947b9a30cd2ed97ea4613a9eecd89912ec31695a959f25fc0b06b2cac13c1aaf1c46366cf3967f776a515196e2a2e5dbe431
+DIST aerospike-server-community-3.13.0.9-debian7.tgz 10657823 BLAKE2B a4f88eb24e91e54abb70358e027ff68de48dd4e0c6f919ce0b8d31b27aaaf3cf5894fe876d092247a5adedec39461426195a220cbcb93fe2bbcb648a5d16d332 SHA512 e7a25377970121bbf453b79d5d6504b054c82b9c3e0dbd43dc665aebfe32a8f5319a9654f98d8c89443b493c0ba44babf38e55138ea356c14619fa5b138d19d9
+DIST aerospike-server-community-3.14.1.8-debian7.tgz 14017262 BLAKE2B a02e516e690c84cd5df973bfc08ba019511f685fc20b303a9ff1548a92bf2dbf4b5be9f5bdd0bb94a5586e49eb368b02457dbf4ac40901fb2b601114f5e9b636 SHA512 867b3c90bd56b1eca0ed17ed97004130310ee74cf24d48e52d47fdd926aea536fad8781c43fe0ae37ea2e2dc1864ca64335fefa6b67d3d89b78393f4035b528b
 DIST aerospike-server-community-3.15.1.4-debian7.tgz 9775381 BLAKE2B 4f7fe86d99cb0cdc74d0bacdcdaea8112e105b6daa870fee12a0137447118ba73adc580b4e4a47f9e1338bc393aeb32787b067a75415bf5c1c6d76cf4ee94d7c SHA512 2b77622ea4eb35de9eb26b33f0cf47fc8d29a70fe75848b81245842b2f3c728d6b2d3ebe72369b91ef0d53be168cea04086ae469ad69124ab2010f48f3005fd5
-DIST aerospike-server-community-3.16.0.1-debian7.tgz 13480540 BLAKE2B 4137670c9ee0bba6cb836e9e60a200b8e71896461b96dc594e51cdf075cf0d89031079160d30896ae890f3e72a8ee4bba1bb4133d1054f5ddf5928fad792d2c5 SHA512 17f6ab38ec8e81cc81197eaa858f61eb15555ae66ba3c6e01153805dd0b3fe9d48b9436e327a3395c9de3db92920a351354359fcb49214820a5945fcef757e6b
+DIST aerospike-server-community-3.16.0.6-debian7.tgz 11106496 BLAKE2B b4d9e4856e7d30f537685ed6f924bae8ba953e8aab363f0fa0ba1e5522719f4a521f757944693c46af2933f9ce4e7f10d60808ef76cb78523347cac38cd0608b SHA512 0e32c73881f29d634b67f1c46cdd608ad306fb164753ae3a113761adc806dba72fbd8d8022f7c5fb1b84171f145113b6659092a23e283e147d292931c5befde7
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.13.0.9.ebuild
+++ b/dev-db/aerospike-server-community/aerospike-server-community-3.13.0.9.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.14.1.8.ebuild
+++ b/dev-db/aerospike-server-community/aerospike-server-community-3.14.1.8.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.15.0.2.ebuild
+++ b/dev-db/aerospike-server-community/aerospike-server-community-3.15.0.2.ebuild
@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-libs/readline:0
-	sys-libs/zlib
-	dev-libs/openssl:0
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-debian7"
-
-pkg_setup() {
-	enewgroup aerospike
-	enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
-	local server_deb="${P}.debian7.x86_64.deb"
-	local tools_deb="aerospike-tools-3.15.0.3.debian7.x86_64.deb"
-
-	ar x "${server_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	ar x "${tools_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
-	rm usr/bin/{asfixownership,asmigrate2to3}
-}
-
-src_install() {
-	insinto /opt/
-	doins -r opt/aerospike
-
-	fperms +x -R /opt/aerospike/bin/
-	fperms +x -R /opt/aerospike/lib/python/
-
-	for dir in '/etc' '/var/log'; do
-		keepdir "${dir}/aerospike"
-	done
-
-	insinto /etc/aerospike
-	for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
-		doins "${FILESDIR}/${conf}"
-	done
-
-	insinto /usr/bin
-	doins usr/bin/*
-	fperms +x -R /usr/bin/asd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/aerospike.logrotate aerospike
-
-	newinitd "${FILESDIR}"/aerospike.init aerospike
-
-	fowners -R aerospike:aerospike /opt/aerospike/
-	fowners aerospike:aerospike /usr/bin/asd
-	fowners -R aerospike:aerospike /var/log/aerospike
-}
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.16.0.6.ebuild
+++ b/dev-db/aerospike-server-community/aerospike-server-community-3.16.0.6.ebuild
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild
@ -7,13 +7,13 @@ VCS_INHERIT=""
 if [[ "${PV}" == 9999 ]] ; then
 	VCS_INHERIT="git-r3"
 	EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git"
-	KEYWORDS="~hppa ~ia64 ~ppc64"
+	KEYWORDS="~hppa ~ia64 ~ppc64 ~sparc"
 else
 	MY_PN=${PN#mariadb-}
 	MY_PV=${PV/_b/-b}
 	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
 	S="${WORKDIR}/${PN}-${MY_PV}-src"
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
 fi

 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
--- a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
@ -44,7 +44,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	static? ( yassl !pam )"

 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"

 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.11.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11.ebuild
@ -18,7 +18,7 @@ LICENSE="GPL-2"

 SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
 S="${WORKDIR}/${P}-src"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86"

 SUBSLOT="18"
 SLOT="0/${SUBSLOT}"
--- a/dev-db/mysql/mysql-5.6.39.ebuild
+++ b/dev-db/mysql/mysql-5.6.39.ebuild
@ -16,7 +16,7 @@ inherit mysql-multilib-r1
 IUSE="$IUSE numa"

 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 COMMON_DEPEND="numa? ( sys-process/numactl:= )"

--- a/dev-db/postgresql/postgresql-10.3.ebuild
+++ b/dev-db/postgresql/postgresql-10.3.ebuild
@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT=$(get_major_version)

--- a/dev-db/postgresql/postgresql-9.3.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.22.ebuild
@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.4.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.17.ebuild
@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.5.12.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.12.ebuild
@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.6.8.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.8.ebuild
@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/redis/redis-3.2.8-r5.ebuild
+++ b/dev-db/redis/redis-3.2.8-r5.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="http://redis.io/"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"

 LICENSE="BSD"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 SLOT="0"

--- a/dev-db/redis/redis-4.0.2-r1.ebuild
+++ b/dev-db/redis/redis-4.0.2-r1.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="http://redis.io/"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"

 LICENSE="BSD"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 SLOT="0"

--- a/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"

 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"

 RDEPEND="
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-ant-2
+
+MY_PV="$(replace_all_version_separators -)"
+
+DESCRIPTION="A XSLT and XQuery Processor"
+HOMEPAGE="http://saxon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}he${MY_PV}source.zip"
+
+LICENSE="MPL-1.0"
+SLOT="9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CDEPEND="
+	dev-java/xom:0
+	dev-java/jdom:0
+	dev-java/dom4j:1
+	dev-java/ant-core"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}"
+
+# prepare eclass variables
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+
+src_prepare() {
+	default
+
+	# Fedora-inspired removal.
+
+	# deadNET.
+	rm -rv net/sf/saxon/dotnet || die
+
+	# Depends on XQJ (javax.xml.xquery).
+	rm -rv net/sf/saxon/xqj || die
+
+	# This requires a EE edition feature (com.saxonica.xsltextn).
+	rm -v net/sf/saxon/option/sql/SQLElementFactory.java || die
+
+	# <major>.<minor> version
+	local version="$(get_version_component_range 1-2)"
+
+	# generate build.xml with external javadoc links
+	sed -e "s:@JDK@:1.6:" \
+		-e "s:@JDOM@:1:" \
+		< "${FILESDIR}/${version}-build.xml" \
+		> "${S}/build.xml" \
+		|| die "build.xml generation failed!"
+
+	# prepare creates the dir for properties
+	eant prepare
+
+	# properties
+	cp -v \
+		"${FILESDIR}/${version}-edition.properties" \
+		"${S}/build/classes/edition.properties" || die
+}
+
+src_compile() {
+	local gcp="$(java-pkg_getjars dom4j-1,jdom,xom)"
+	gcp="${gcp}:$(java-pkg_getjars --build-only ant-core)"
+	eant -Dgentoo.classpath="${gcp}" jar $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform
+	java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query
+
+	java-pkg_register-ant-task
+
+	use doc && java-pkg_dojavadoc build/api
+
+	use source && java-pkg_dosrc src
+}
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/nim/nim-0.18.0.ebuild
+++ b/dev-lang/nim/nim-0.18.0.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-inherit bash-completion-r1
+inherit bash-completion-r1 multiprocessing

 DESCRIPTION="compiled, garbage-collected systems programming language"
 HOMEPAGE="https://nim-lang.org/"
@ -14,10 +14,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc +readline test"

-DEPEND="
+RDEPEND="
 	readline? ( sys-libs/readline:0= )
 "
-RDEPEND="${DEPEND}"
+DEPEND="
+	${DEPEND}
+	test? ( net-libs/nodejs )
+"
+
+_run() {
+	echo "$@"
+	"$@" || die "'$*' failed"
+}

 nim_use_enable() {
 	[[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
@ -25,24 +33,24 @@ nim_use_enable() {
 }

 src_compile() {
-	./build.sh || die "build.sh failed"
+	_run ./build.sh

-	./bin/nim c koch || die "csources nim failed"
-	./koch boot -d:release $(nim_use_enable readline useGnuReadline) || die "koch boot failed"
+	_run ./bin/nim --parallelBuild:$(makeopts_jobs) c koch
+	_run ./koch boot --parallelBuild:$(makeopts_jobs) -d:release $(nim_use_enable readline useGnuReadline)
 	# build nimble and friends
-	PATH="./bin:$PATH" ./koch tools || die "koch tools failed"
+	PATH="./bin:$PATH" _run ./koch tools

 	if use doc; then
-		PATH="./bin:$PATH" ./koch web || die "koch web failed"
+		PATH="./bin:$PATH" _run ./koch web
 	fi
 }

 src_test() {
-	PATH="./bin:$PATH" ./koch test || die "test suite failed"
+	PATH="./bin:$PATH" _run ./koch test
 }

 src_install() {
-	PATH="./bin:$PATH" ./koch install "${ED}/usr" || die "koch install failed"
+	PATH="./bin:$PATH" _run ./koch install "${ED}/usr"
 	rm -r "${ED}/usr/nim/doc" || die "failed to remove 'doc'"

 	dodir /usr/bin
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/check/check-0.12.0.ebuild
+++ b/dev-libs/check/check-0.12.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}-github.t

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs subunit"

 RDEPEND="
--- a/dev-libs/dotconf/dotconf-1.3-r1.ebuild
+++ b/dev-libs/dotconf/dotconf-1.3-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""

 DEPEND=">=sys-devel/autoconf-2.58"
--- a/dev-libs/elfutils/elfutils-0.170-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.170-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"

 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils"

 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc static-libs utils"

 DEPEND=""
--- a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"

 DEPEND="virtual/pkgconfig
--- a/dev-libs/libsodium/libsodium-1.0.16-r1.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.16-r1.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
+HOMEPAGE="https://github.com/jedisct1/libsodium"
+SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local ECONF_SOURCE="${S}"
+	local myconf
+
+	# --disable-pie is needed on x86, see bug #512734
+	if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then
+		myconf="${myconf} --disable-pie"
+	fi
+
+	econf \
+		$(use_enable asm) \
+		$(use_enable minimal) \
+		$(use_enable !urandom blocking-random) \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
+		$(use_enable cpu_flags_x86_aes aesni) \
+		${myconf}
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name "*.la" -delete || die
+}
--- a/dev-libs/libtar/libtar-1.2.20-r4.ebuild
+++ b/dev-libs/libtar/libtar-1.2.20-r4.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs zlib"

 RDEPEND="
--- a/dev-libs/libusb/libusb-1.0.21.ebuild
+++ b/dev-libs/libusb/libusb-1.0.21.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"

 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"

 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
--- a/dev-libs/libxml2/libxml2-2.9.7.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.7.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"

 LICENSE="MIT"
 SLOT="2"
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
--- a/dev-lisp/asdf/Manifest
+++ b/dev-lisp/asdf/Manifest
@ -1,4 +1,3 @@
-DIST asdf-3.0.3.tar.gz 427575 BLAKE2B e237a60982beff858a6aaf90736a54be0f7fec7d4d26c8bb370cab50e743df291e88372579318501cd199734119cfbdea6cde51ac3b5ca5af9e22e8b2b032052 SHA512 d9d8d466c7b6aa6beb1c22da4fd10499fa784c39ab138bea7ecb8cdccf769766572ebe91c89db2d5c53e493096248f82a224be95c1fcac8b7beebe1b57f34883
 DIST asdf-3.1.5.tar.gz 400359 BLAKE2B 586a66799a37259694baa673f2849e183fac5fedfe5ff5c92529d47fc0954d40b48bbc095db926b9ea2214b551729c269d0925e4396a52310b72fd5f21842f49 SHA512 937d45eabea0853cd1b2e78e84cf33e7b55065857ffcf49fd87ccd60e21ae09c6dc7ab3649d48b37aeb1beaeeaf6c816e5ce035f0283707105296fb976044516
 DIST asdf-3.1.6.tar.gz 396066 BLAKE2B 4cf18e83eb62448f4eb29a38a44d9cd5a0d5393ecaba4d1eacdc2a41e02989bea632a7ae4f583a4b6a7fcd6f24351a1d65179a6c06f2c22ed9d1bc8cc24c9b0b SHA512 3203bef1ce4c2d28306ca1ee214d3d5fd04b3d2caa61f606d0334f100358bfbd9b03d69c95e83734175639a91e76aeac509e949768fc694817631078671a9bc1
 DIST asdf-3.1.7.tgz 402257 BLAKE2B f6bafb3843fef8ca566c89aa64f8987656fcf7cb262cdb97d3f797e296e32c9d9fe7115b4019bf93eea4b891b36d3d81a589be6e5506035c004a0552d81756d7 SHA512 ebe2ddf702f6200bf98408fb262e9929565c9d29bcd874dd2657a6f84e123b0153a78e457fb425d48a05c427f7c090ab5fd0e6201223eb4b296b3b4cd5b57c26
@ -6,5 +5,3 @@ DIST asdf-3.2.0.tar.gz 438536 BLAKE2B aed96ab33e33a1aa996dd0be6cc0d230cde0d11510
 DIST asdf-3.2.1.tar.gz 460536 BLAKE2B 080398a9a2bdd48b2ce08dad939b997dea8e7f23ee0012fbfccbe7ae0f72d24b832730e5c6bf5383a6e4753cd1226f08c5450a6636266b70e7590c9970cbc751 SHA512 686881536126eb6ffb7e9db763aec02e1ad7ab4df60cc96d094bc4cebb95453e3d57273cb925471c7ee13e4378ca3c0d697c416b7374ad07148e11d89aee85b0
 DIST asdf-3.3.0.tar.gz 498451 BLAKE2B dea8e659eab482604067f5989c766b52b9bc4f0bafeb7a12508520abf686dde730225dbc3063291dd334b1a97a41d04b4207be4680ae0cae9a4207222eda7b43 SHA512 4e8b3434d9eb504af253fa39ac759cceb7ea0c3e2c364875d7259b32a9818b051fb2a3c94c188c7f38e43825e2a18107f1732211534a8b1fbbaa77b6c7f90486
 DIST asdf-3.3.1.tar.gz 479255 BLAKE2B 5161b79741a52721eaa4da80a61bbe51e924967ecb744a087fdcbd99407abcc42faf39eafe6d30af7dd8af751a80caaf23e93ce42aa5f584123a1e8b528cc613 SHA512 bf5efec4518eb5312ce743c0fbe60c587bebfe26c36c833c163d67bf8631e18eeb293f2185e547f6be10da061a17f024d9f4a3a0808727d7b9b3a7d7a0faf133
-DIST cl-asdf_1.89-1.diff.gz 395 BLAKE2B bded3192ece58409af6fd8d05d0da347c32e3c2ffaf155b93f93b0d5bb89cbf0c14ec06df48a9c53badbe808cc322d47859e3d4b46be73868625b39315fd01de SHA512 0d5ac51e69914b58497815971f1736712bd65988944fff5966f854c2dd22d1969d9237c996bfd44a6195d2765db9af07c3055c9bf126ba25059eccdbf8da20b4
-DIST cl-asdf_1.89.orig.tar.gz 60134 BLAKE2B b0115406f09fcae108c2fa5e68d88f4936cd9b7a86d7cad34a007c6d2adc2164f23de4f55e0844ce3d217e7439b291856c43f038e520da5d27a8c0574d417398 SHA512 eb20877bb6acb6cab5874229290605aaef19d2501d8011473b66d0c9609d0b4d12f2951c39e4a3d2d07a3f0a7862c7e6beb6073514bb8b36189049bb96ba0e9a
--- a/Show more
+++ b/Show more