Sync with portage [Sat Jul 8 12:40:21 MSK 2017].

7 years ago · 34f6d2a046
parent 9d8542c155
commit 34f6d2a046
1448 changed files with 2779 additions and 35860 deletions
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@ -1,2 +1 @@
-DIST at-spi2-atk-2.20.1.tar.xz 309112 SHA256 2358a794e918e8f47ce0c7370eee8fc8a6207ff1afe976ec9ff547a03277bf8e SHA512 17ec2c4e7b532b92d7a53da77ec87516f3cab41464b828661cb75bc93e3dcf7e2c8eaa288ae43f60cfbfe9dafd89a74255ab69dffdf90953943733058292c33f WHIRLPOOL 151aa9ef1a27462c7bac470d8c9a203f840d8f365815325b408d337863d24b1747bfe61dbf18ada4d3632349c55b265d4b44c9744445a9622a1d1d4a32c71501
 DIST at-spi2-atk-2.22.0.tar.xz 306148 SHA256 e8bdedbeb873eb229eb08c88e11d07713ec25ae175251648ad1a9da6c21113c1 SHA512 9b815eecbe01164df8a3341a3b0e1fe57a4f333964a0836f89f54712512a32d69c333c0c099eb194716d081f5460bb6e6d2c852f7218df51549e88e75880f284 WHIRLPOOL 830b19dda735aa1cd03296a852d22117e957b69de20f798f4728993594e7b578558f413f38ddfcf81a8a9ad544480722db7d088f2b38827ca4293b141eb18370
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.20.1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.20.1.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-core-2.17.90[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.15.4[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/at-spi-1.32.0-r1
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( >=dev-libs/libxml2-2.9.1 )
-"
-
-src_prepare() {
-	# Upstream forgot to put this in tarball, upstream #770615
-	cp -n "${FILESDIR}"/${PN}-2.20.0-tests-data/*.xml "${S}"/tests/data/ || die
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure --enable-p2p $(use_with test tests)
-}
-
-multilib_src_test() {
-	emake check TESTS_ENVIRONMENT="dbus-run-session"
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.22.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.22.0.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"

 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"

 COMMON_DEPEND="
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@ -1,2 +1 @@
-DIST at-spi2-core-2.20.2.tar.xz 454124 SHA256 88a4de9d43139f13cca531b47b901bc1b56e0ab06ba899126644abd4ac16a143 SHA512 b92eb876ecc1fbd14c042a37d0d781c2b3697ad3e988d3fa2c8894f5ffc269b38a703fee702a1a03d8b37b7c2140a7862cd818c9c7f66bc85bfa776355172d79 WHIRLPOOL 07f99b4b4167875f26952747a8e9fb8ec2cf92898d57a0d4b41420e25d09b8ea7145cea994860959af8ffe78d2ba8fee6900932145ebba9d5047bf832d79617c
 DIST at-spi2-core-2.22.1.tar.xz 454048 SHA256 6f8f39f091bfe2c57870cb8bfbb02edac4fc85cda69665e6967937daf7201c42 SHA512 2376b57ce744351ed09a13cd02f0c02264c0998860710cfcdac59f0efb78061512986f5d7305a2f6c594d70213722f81795620e8cd2c6587c6d3f1335477171f WHIRLPOOL a3bd869b286e7fd974242c5846d219c9be3b5fb4322f7bd82f9c039cd032bbfc0917e2e54dc900283eb13a1bba14906eec3f2ef9d9b3caae1aef6bdce24fe3be
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.20.2.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.20.2.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 multilib-minimal
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="X +introspection"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-
-# x11-libs/libSM is needed until upstream #719808 is solved either
-# making the dep unneeded or fixing their configure
-# Only libX11 is optional right now
-RDEPEND="
-	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
-	x11-libs/libSM[${MULTILIB_USEDEP}]
-	x11-libs/libXi[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-PATCHES=(
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-)
-
-multilib_src_configure() {
-	# xevie is deprecated/broken since xorg-1.6/1.7
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-xevie \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable X x11)
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
-	fi
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.22.1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.22.1.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="X +introspection"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"

 # x11-libs/libSM is needed until upstream #719808 is solved either
 # making the dep unneeded or fixing their configure
--- a/app-admin/webapp-config/webapp-config-1.55.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55.ebuild
@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1 prefix

 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"

 DESCRIPTION="Gentoo's installer for web-based applications"
 HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
--- a/app-arch/unrar/unrar-5.5.5-r1.ebuild
+++ b/app-arch/unrar/unrar-5.5.5-r1.ebuild
@ -14,7 +14,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/5"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
--- a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
@ -0,0 +1,197 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit depend.apache eutils user systemd
+
+MY_P="BackupPC-${PV}"
+
+DESCRIPTION="High-performance backups to a server's disk"
+HOMEPAGE="http://backuppc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="rss samba"
+
+# The CGI modules are handled in $RDEPEND.
+APACHE_MODULES="apache2_modules_alias," # RedirectMatch
+APACHE_MODULES+="apache2_modules_authn_core," # AuthType
+APACHE_MODULES+="apache2_modules_authz_core," # Require
+APACHE_MODULES+="apache2_modules_authz_host," # Require host
+APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
+
+DEPEND="dev-lang/perl
+	app-admin/apache-tools
+	app-admin/makepasswd"
+
+# Older versions of mod_perl think they're compatibile with apache-2.4,
+# so we require the new one explicitly.
+RDEPEND="${DEPEND}
+	virtual/perl-IO-Compress
+	dev-perl/Archive-Zip
+	dev-perl/CGI
+	dev-perl/libwww-perl
+	app-arch/tar
+	app-arch/par2cmdline
+	app-arch/gzip
+	app-arch/bzip2
+	virtual/mta
+	>=www-apache/mod_perl-2.0.9
+	www-apache/mpm_itk
+	|| ( >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
+		 >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
+		 >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] )
+	net-misc/rsync
+	dev-perl/File-RsyncP
+	rss? ( dev-perl/XML-RSS )
+	samba? ( net-fs/samba )"
+
+need_apache2_4
+
+SLOT="0"
+
+S="${WORKDIR}/${MY_P}"
+
+CGIDIR="/usr/lib/backuppc/htdocs"
+CONFDIR="/etc/BackupPC"
+DATADIR="/var/lib/backuppc"
+DOCDIR="/usr/share/doc/${PF}"
+LOGDIR="/var/log/BackupPC"
+
+pkg_setup() {
+	enewgroup backuppc
+	enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
+	epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
+	epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
+
+	epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
+	epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
+
+	epatch "${FILESDIR}"/${P}-perl522.patch #580254
+	epatch "${FILESDIR}"/${P}-perl526.patch #594128
+
+	# Fix docs location using the marker that we've patched in.
+	sed -i "s+__DOCDIR__+${DOCDIR}+" "lib/BackupPC/CGI/View.pm" \
+		|| die "failed to sed the documentation location"
+}
+
+src_install() {
+	local myconf
+	myconf=""
+	if use samba ; then
+		myconf="--bin-path smbclient=$(type -p smbclient)"
+		myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
+	fi
+
+	/usr/bin/env perl ./configure.pl \
+		--batch \
+		--bin-path perl=$(type -p perl) \
+		--bin-path tar=$(type -p tar) \
+		--bin-path rsync=$(type -p rsync) \
+		--bin-path ping=$(type -p ping) \
+		--bin-path df=$(type -p df) \
+		--bin-path ssh=$(type -p ssh) \
+		--bin-path sendmail=$(type -p sendmail) \
+		--bin-path hostname=$(type -p hostname) \
+		--bin-path gzip=$(type -p gzip) \
+		--bin-path bzip2=$(type -p bzip2) \
+		--config-dir "${CONFDIR}" \
+		--install-dir /usr \
+		--data-dir "${DATADIR}" \
+		--hostname 127.0.0.1 \
+		--uid-ignore \
+		--dest-dir "${D%/}" \
+		--html-dir "${CGIDIR}"/image \
+		--html-dir-url /image \
+		--cgi-dir "${CGIDIR}" \
+		--fhs \
+		${myconf} || die "failed the configure.pl script"
+
+	ebegin "Installing documentation"
+
+	pod2man \
+		-errors=none \
+		--section=8 \
+		--center="BackupPC manual" \
+		"${S}"/doc/BackupPC.pod backuppc.8 \
+		|| die "failed to generate man page"
+
+	doman backuppc.8
+
+	# Place the documentation in the correct location
+	dodoc "${D}/usr/doc/BackupPC.html"
+	dodoc "${D}/usr/doc/BackupPC.pod"
+	rm -rf "${D}/usr/doc" || die
+
+	eend 0
+
+	# Setup directories
+	dodir "${CONFDIR}/pc"
+
+	keepdir "${CONFDIR}"
+	keepdir "${CONFDIR}/pc"
+	keepdir "${DATADIR}"/{trash,pool,pc,cpool}
+	keepdir "${LOGDIR}"
+
+	ebegin "Setting up init.d/conf.d/systemd scripts"
+	newinitd "${S}"/init.d/gentoo-backuppc backuppc
+	newconfd "${S}"/init.d/gentoo-backuppc.conf backuppc
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto "${APACHE_MODULES_CONFDIR}"
+	doins "${FILESDIR}"/99_backuppc.conf
+
+	# Make sure that the ownership is correct
+	chown -R backuppc:backuppc "${D}${CONFDIR}" || die
+	chown -R backuppc:backuppc "${D}${DATADIR}" || die
+	chown -R backuppc:backuppc "${D}${LOGDIR}"  || die
+}
+
+pkg_postinst() {
+	elog "Installation finished, you may now start using BackupPC."
+	elog
+	elog "- Read the documentation in /usr/share/doc/${PF}/BackupPC.html"
+	elog "  Please pay special attention to the security section."
+	elog
+	elog "- You can launch backuppc by running:"
+	elog
+	elog "    # /etc/init.d/backuppc start"
+	elog
+	elog "- To enable the GUI, first edit ${ROOT}etc/conf.d/apache2 and add,"
+	elog
+	elog "    \"-D BACKUPPC -D PERL -D MPM_ITK\""
+	elog
+	elog "  to the APACHE2_OPTS line."
+	elog
+	elog "  Then you must edit ${ROOT}etc/apache2/modules.d/00_mpm_itk.conf"
+	elog "  and adjust the values of LimitUIDRange/LimitGIDRange to include"
+	elog "  the UID and GID of the backuppc user."
+	elog
+	elog "  Finally, start apache:"
+	elog
+	elog "    # /etc/init.d/apache2 start"
+	elog
+	elog "  The web interface should now be running on,"
+	elog
+	elog "    http://127.0.0.1:8080/"
+	elog
+
+	# Generate a new password if there's no auth file
+	if [[ ! -f "${CONFDIR}/users.htpasswd" ]]; then
+		adminuser="backuppc"
+		adminpass=$( makepasswd --chars=12 )
+		htpasswd -bc "${CONFDIR}/users.htpasswd" $adminuser $adminpass
+
+		elog ""
+		elog "- Created admin user $adminuser with password $adminpass"
+		elog "  To add new users, run: "
+		elog ""
+		elog "  # htpasswd ${CONFDIR}/users.htpasswd newUser"
+	fi
+}
--- a/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch
+++ b/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch
@ -0,0 +1,21 @@
+diff -ruN BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm BackupPC-3.3.1/lib/BackupPC/Lib.pm
+--- BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm	2015-01-12 01:19:53.000000000 +0100
+++ BackupPC-3.3.1/lib/BackupPC/Lib.pm	2017-07-08 00:31:52.100003197 +0200
+@@ -1261,7 +1261,7 @@
+         #
+         # Replace scalar variables first
+         #
+-        $arg =~ s[\${(\w+)}(\+?)]{
+        $arg =~ s[\$\{(\w+)}(\+?)]{
+             exists($vars->{$1}) && ref($vars->{$1}) ne "ARRAY"
+                 ? ($2 eq "+" ? $bpc->shellEscape($vars->{$1}) : $vars->{$1})
+                 : "\${$1}$2"
+@@ -1270,7 +1270,7 @@
+         # Now replicate any array arguments; this just works for just one
+         # array var in each argument.
+         #
+-        if ( $arg =~ m[(.*)\${(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) {
+        if ( $arg =~ m[(.*)\$\{(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) {
+             my $pre  = $1;
+             my $var  = $2;
+             my $esc  = $3;
--- a/app-crypt/jetring/jetring-0.25.ebuild
+++ b/app-crypt/jetring/jetring-0.25.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="5"
@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.xz"

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

 DEPEND="app-crypt/gnupg"
--- a/app-crypt/yubikey-manager/yubikey-manager-0.3.2-r1.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-0.3.2-r1.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1

 DESCRIPTION="Python library and command line tool for configuring a YubiKey"
--- a/app-crypt/yubikey-manager/yubikey-manager-0.3.3.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-0.3.3.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1

 DESCRIPTION="Python library and command line tool for configuring a YubiKey"
--- a/app-crypt/yubikey-manager/yubikey-manager-0.4.0.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-0.4.0.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1

 DESCRIPTION="Python library and command line tool for configuring a YubiKey"
--- a/app-editors/atom/atom-1.18.0.ebuild
+++ b/app-editors/atom/atom-1.18.0.ebuild
@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$

 EAPI=6

--- a/app-emacs/pymacs/pymacs-0.25-r2.ebuild
+++ b/app-emacs/pymacs/pymacs-0.25-r2.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/pinard/Pymacs/tarball/v${PV} -> ${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc"

 DEPEND="doc? (
--- a/app-emulation/libvirt/libvirt-3.4.0.ebuild
+++ b/app-emulation/libvirt/libvirt-3.4.0.ebuild
@ -18,7 +18,7 @@ else
 	else
 		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	SLOT="0/${PV}"
 fi

--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@ -18,7 +18,7 @@ else
 	else
 		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	SLOT="0/${PV}"
 fi

--- a/app-emulation/xtrs/xtrs-4.9d-r3.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r3.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs readme.gentoo
-
-DESCRIPTION="Radio Shack TRS-80 emulator"
-HOMEPAGE="http://www.tim-mann.org/xtrs.html"
-SRC_URI="http://www.tim-mann.org/trs80/${P}.tar.gz
-	ls-dos? (
-		http://www.tim-mann.org/trs80/ld4-631.zip
-		https://dev.gentoo.org/~ulm/distfiles/ld4-631l.xd3
-	)"
-
-LICENSE="xtrs ls-dos? ( freedist )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="ls-dos"
-RESTRICT="ls-dos? ( bindist )"
-
-RDEPEND="sys-libs/ncurses:0
-	sys-libs/readline:0
-	>=x11-libs/libX11-1.0.0"
-DEPEND="${RDEPEND}
-	ls-dos? ( app-arch/unzip dev-util/xdelta:3 )"
-
-src_prepare() {
-	sed -i -e 's/$(CC) -o/$(CC) $(LDFLAGS) -o/' Makefile || die
-	if use ls-dos; then
-		cd "${WORKDIR}" || die
-		xdelta3 -d -s ld4-631.dsk "${DISTDIR}"/ld4-631l.xd3 out.dsk || die
-		mv out.dsk ld4-631.dsk || die
-	fi
-}
-
-src_compile() {
-	use ppc && append-flags -Dbig_endian
-	emake CC="$(tc-getCC)" DEBUG="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/xtrs/disks /usr/share/man/man1
-	emake PREFIX="${D}"/usr install
-
-	insopts -m0444
-	insinto /usr/share/xtrs/disks
-	doins cpmutil.dsk utility.dsk
-
-	if use ls-dos; then
-		doins "${WORKDIR}"/ld4-631.dsk
-		dosym disks/ld4-631.dsk /usr/share/xtrs/disk4p-0
-		dosym disks/utility.dsk /usr/share/xtrs/disk4p-1
-	fi
-
-	dodoc ChangeLog README xtrsrom4p.README cpmutil.html dskspec.html
-
-	DOC_CONTENTS="For copyright reasons, xtrs does not include actual ROM
-		images. Because of this, unless you supply your own ROM, xtrs will
-		not function in any mode except 'Model 4p' mode (a minimal free ROM
-		is included for this), which can be run like this:
-		\n\nxtrs -model 4p -diskdir /usr/share/xtrs
-		\n\nIf you already own a copy of the ROM software (e.g., if you have
-		a TRS-80 with this ROM), then you can make yourself a copy of this
-		for use with xtrs, using utilities available on the web. To load
-		your own ROM, specify the '-romfile' option, or the 'Xtrs.romfile'
-		X resource. ROM files can be in Intel hex or binary format."
-	readme.gentoo_create_doc
-}
--- a/app-emulation/xtrs/xtrs-4.9d-r4.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r4.ebuild
@ -15,7 +15,7 @@ SRC_URI="http://www.tim-mann.org/trs80/${P}.tar.gz

 LICENSE="xtrs ls-dos? ( freedist )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE="ls-dos"
 RESTRICT="ls-dos? ( bindist )"

--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@ -1,13 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-inherit cannadic eutils multilib
+EAPI="6"

-MY_P="Canna${PV//./}"
-MY_P="${MY_P/_/}"
+inherit cannadic toolchain-funcs
+
+MY_P="Canna${PV//[._]/}"

 DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.sourceforge.jp/"
+HOMEPAGE="http://canna.osdn.jp/"
 SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"

 LICENSE="MIT GPL-2"
@ -15,129 +16,80 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""

-DEPEND=">=sys-apps/sed-4
-	x11-misc/gccmakedep
+DEPEND="x11-misc/gccmakedep
 	x11-misc/imake"
 RDEPEND=""
-
 S="${WORKDIR}/${MY_P}"

-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-kpdef.patch
+	"${FILESDIR}"/${PN}-posix-sort.patch
+)
+DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"

-	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
-	sed -e "s%@cannapkgver@%${PF}%" \
-		"${FILESDIR}"/${PN}-3.7-gentoo.diff.in > "${T}"/${PF}-gentoo.diff || die
-	epatch "${T}"/${PF}-gentoo.diff
+src_prepare() {
+	default

-	# bug #248723
-	epatch "${FILESDIR}"/${P}-strip.patch
+	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die

 	# Multilib-strict fix for amd64
-	sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* || die
-	# fix deprecated sort syntax
-	sed -e 's:^\(sortcmd=\".* -s\).*$:\1 -k 1,1\":' \
-		-i cmd/mkbindic/mkbindic.cpp || die
-
-	cd "${S}"/dic/phono
-	epatch "${FILESDIR}"/${PN}-kpdef-gentoo.diff
+	sed -i "/DefLibCannaDir/s:/lib$:/$(get_libdir):" Canna.conf
+}

+src_configure() {
+	xmkmf -a || die
 }

 src_compile() {
-	xmkmf || die
-
-	#make libCannaDir=../lib/canna canna || die
 	# bug #279706
-	emake -j1 CDEBUGFLAGS="${CFLAGS}" canna || die
-
-	#if use doc ; then
-	#	einfo "Compiling DVI, PS (and PDF) document"
-	#	cd doc/man/guide/tex
-	#	xmkmf || die
-	#	emake -j1 JLATEXCMD=platex \
-	#		DVI2PSCMD="dvips -f" \
-	#		canna.dvi canna.ps || die
-	#	if has_version 'app-text/dvipdfmx' && \
-	#		( has_version 'app-text/acroread' \
-	#		|| has_version 'app-text/xpdf-japanese' ); then
-	#		emake -j1 JLATEXCMD=platex \
-	#			DVI2PSCMD="dvips -f" \
-	#			canna.pdf || die
-	#	fi
-	#fi
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		SHLIBGLOBALSFLAGS="${LDFLAGS}" \
+		${PN}
 }

 src_install() {
-	emake DESTDIR="${D}" install || die
-	emake DESTDIR="${D}" install.man || die
-
-	# install default.canna (removed from Canna36p4)
-	insinto /usr/share/canna
-	newins misc/initfiles/verbose.canna default.canna
-
-	# cannakill should link to /usr/bin/catdic
-	dosym ../bin/catdic /usr/sbin/cannakill
+	emake DESTDIR="${D}" install install.man
+	einstalldocs

-	dodir /usr/share/man/man8 /usr/share/man/ja/man8
+	dodir /usr/share/man{,/ja}/man8
+	local man mandir
 	for man in cannaserver cannakill ; do
 		for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do
 			mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
 		done
 	done

-	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
+	# for backward compatibility
+	dosbin "${FILESDIR}"/update-canna-dics_dir

-	#if use doc ; then
-	#	insinto /usr/share/doc/${PF}
-	#	doins doc/man/guide/tex/canna.{dvi,ps,pdf}
-	#fi
+	keepdir /var/lib/${PN}/dic/{user,group}
+	fowners bin:bin /var/lib/${PN}/dic/{user,group}
+	fperms 0775 /var/lib/${PN}/dic/{user,group}

-	newinitd "${FILESDIR}"/${P}.initd canna || die
-	newconfd "${FILESDIR}"/${P}.confd canna || die
-	insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die
-	keepdir /var/log/canna/ || die
+	insinto /var/lib/${PN}/dic/dics.d
+	newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir

-	# for backward compatibility
-	dosbin "${FILESDIR}"/update-canna-dics_dir
+	keepdir /var/log/${PN}

-	insinto /var/lib/canna/dic/dics.d/
-	newins "${D}"/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}

-	# fix permission for user dictionary
-	keepdir /var/lib/canna/dic/{user,group}
-	fowners root:bin /var/lib/canna/dic/{user,group}
-	fperms 775 /var/lib/canna/dic/{user,group}
+	insinto /etc
+	newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
 }

 pkg_postinst() {
 	update-cannadic-dir
-	elog
-	elog "Canna dictionary format has been changed."
-	elog "You should rebuild app-dict/canna-* after emerge."
-	elog
-}
-
-pkg_prerm() {
-	if [ -S /tmp/.iroha_unix/IROHA ] ; then
-		# make sure cannaserver get stopped because otherwise
-		# we cannot stop it with /etc/init.d after emerge -C canna
-		einfo
-		einfo "Stopping Canna for safe unmerge"
-		einfo
-		/etc/init.d/canna stop
-		touch "${T}"/canna.cookie
-	fi
-}

-pkg_postrm() {
-	if [ -f /usr/sbin/cannaserver -a -e "${T}"/canna.cookie ] ; then
-		#update-cannadic-dir
-		einfo
-		einfo "Restarting Canna"
-		einfo
-		/etc/init.d/canna start
-		rm -f "${T}"/canna.cookie
+	if ! locale -a | grep -iq "ja_JP.eucjp"; then
+		elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
+		elog
+		elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
+		elog "# locale-gen"
+		elog
 	fi
 }
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@ -1,166 +1,125 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-inherit cannadic eutils multilib
+EAPI="6"

-MY_P="Canna${PV//./}"
-MY_P="${MY_P/_/}"
+inherit cannadic toolchain-funcs
+
+MY_P="Canna${PV//[._]/}"

 DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.sourceforge.jp/"
+HOMEPAGE="http://canna.osdn.jp/"
 SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"

 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ipv6"

-DEPEND=">=sys-apps/sed-4
-	x11-misc/gccmakedep
+DEPEND="x11-misc/gccmakedep
 	x11-misc/imake
 	doc? (
 		app-text/ghostscript-gpl
-		>=dev-texlive/texlive-langcjk-2010
-		dev-texlive/texlive-fontsextra
-		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
+		dev-texlive/texlive-langjapanese
 		dev-texlive/texlive-latexrecommended
 	)"
 RDEPEND=""
-
 S="${WORKDIR}/${MY_P}"

-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-kpdef.patch
+	"${FILESDIR}"/${PN}-posix-sort.patch
+)
+DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"

-	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
-	sed -e "s%@cannapkgver@%${PF}%" \
-		"${FILESDIR}"/${PN}-3.7-gentoo.diff.in > "${T}"/${PF}-gentoo.diff || die
-	epatch "${T}"/${PF}-gentoo.diff
+src_prepare() {
+	default

-	# bug #248723
-	epatch "${FILESDIR}"/${P}-strip.patch
+	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die

-	# Multilib-strict fix for amd64
-	sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* || die
-	# fix deprecated sort syntax
-	sed -e 's:^\(sortcmd=\".* -s\).*$:\1 -k 1,1\":' \
-		-i cmd/mkbindic/mkbindic.cpp || die
+	sed -i \
+		-e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
+		-e "/UseInet6/s:0:$(usex ipv6 1 0):" \
+		Canna.conf
+}

-	cd "${S}"/dic/phono
-	epatch "${FILESDIR}"/${PN}-kpdef-gentoo.diff
+src_configure() {
+	xmkmf -a || die

+	if use doc; then
+		cd doc/man/guide/tex
+		xmkmf -a || die
+		cd - > /dev/null
+	fi
 }

 src_compile() {
-	xmkmf || die
-
-	#make libCannaDir=../lib/canna canna || die
 	# bug #279706
-	emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-		LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" canna || die
-
-	if use doc ; then
-		einfo "Compiling DVI, PS (and PDF) document"
-		cd doc/man/guide/tex
-		xmkmf || die
-		emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-			LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" \
-			JLATEXCMD=platex \
-			DVI2PSCMD="dvips -f" VARTEXFONTS="${T}"/fonts \
-			canna.dvi canna.ps || die
-		if has_version 'app-text/dvipdfmx' && \
-			( has_version 'app-text/acroread' \
-			|| has_version 'app-text/xpdf-japanese' ); then
-			emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-				LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" \
-				JLATEXCMD=platex \
-				DVI2PSCMD="dvips -f" VARTEXFONTS="${T}"/fonts \
-				canna.pdf || die
-		fi
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		SHLIBGLOBALSFLAGS="${LDFLAGS}" \
+		${PN}
+
+	if use doc; then
+		# NOTE: build fails if infinality enabled in fontconfig
+		einfo "Compiling DVI, PS, and PDF documents"
+		# bug #223077
+		emake -C doc/man/guide/tex -j1 \
+			JLATEXCMD="platex -kanji=euc" \
+			DVI2PSCMD="dvips" \
+			VARTEXFONTS="${T}"/fonts \
+			${PN}.ps \
+			${PN}.pdf
 	fi
 }

 src_install() {
-	emake DESTDIR="${D}" install || die
-	emake DESTDIR="${D}" install.man || die
-
-	# install default.canna (removed from Canna36p4)
-	insinto /usr/share/canna
-	newins misc/initfiles/verbose.canna default.canna
-
-	# cannakill should link to /usr/bin/catdic
-	dosym ../bin/catdic /usr/sbin/cannakill
+	emake DESTDIR="${D}" install install.man
+	einstalldocs

-	dodir /usr/share/man/man8 /usr/share/man/ja/man8
+	dodir /usr/share/man{,/ja}/man8
+	local man mandir
 	for man in cannaserver cannakill ; do
 		for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do
 			mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
 		done
 	done

-	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
-
-	if use doc ; then
+	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins doc/man/guide/tex/canna.{dvi,ps,pdf}
+		doins doc/man/guide/tex/${PN}.{dvi,ps,pdf}
 	fi

-	newinitd "${FILESDIR}"/${P}.initd canna || die
-	newconfd "${FILESDIR}"/${P}.confd canna || die
-	insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die
-	keepdir /var/log/canna/ || die
-
 	# for backward compatibility
 	dosbin "${FILESDIR}"/update-canna-dics_dir

-	insinto /var/lib/canna/dic/dics.d/
-	newins "${D}"/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir
+	keepdir /var/lib/${PN}/dic/{user,group}
+	fowners bin:bin /var/lib/${PN}/dic/{user,group}
+	fperms 0775 /var/lib/${PN}/dic/{user,group}
+
+	insinto /var/lib/${PN}/dic/dics.d
+	newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir

-	# fix permission for user dictionary
-	keepdir /var/lib/canna/dic/{user,group}
-	fowners root:bin /var/lib/canna/dic/{user,group}
-	fperms 775 /var/lib/canna/dic/{user,group}
+	keepdir /var/log/${PN}
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+	insinto /etc
+	newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
 }

 pkg_postinst() {
 	update-cannadic-dir
-	elog
-	elog "Canna dictionary format has been changed."
-	elog "You should rebuild app-dict/canna-* after emerge."
-	elog
-
-	local localearchive="${ROOT}usr/$(get_libdir)/locale/locale-archive"
-	if [ -f "${localearchive}" -a -x /usr/bin/localedef ] && \
-		! /usr/bin/localedef --list-archive "${localearchive}" | grep -i 'ja_JP.eucjp' >/dev/null 2>&1 ; then
-		elog "Some dictionary tools in this package require ja_JP.eucJP locale."
-		elog "Please add ja_JP.eucJP locale to /etc/locale.gen:"
+
+	if ! locale -a | grep -iq "ja_JP.eucjp"; then
+		elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
 		elog
 		elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
 		elog "# locale-gen"
 		elog
 	fi
 }
-
-pkg_prerm() {
-	if [ -S /tmp/.iroha_unix/IROHA ] ; then
-		# make sure cannaserver get stopped because otherwise
-		# we cannot stop it with /etc/init.d after emerge -C canna
-		einfo
-		einfo "Stopping Canna for safe unmerge"
-		einfo
-		/etc/init.d/canna stop
-		touch "${T}"/canna.cookie
-	fi
-}
-
-pkg_postrm() {
-	if [ -f /usr/sbin/cannaserver -a -e "${T}"/canna.cookie ] ; then
-		#update-cannadic-dir
-		einfo
-		einfo "Restarting Canna"
-		einfo
-		/etc/init.d/canna start
-		rm -f "${T}"/canna.cookie
-	fi
-}
--- a/app-i18n/canna/files/canna-3.7-gentoo.diff.in
+++ b/app-i18n/canna/files/canna-3.7-gentoo.diff.in
@ -1,144 +0,0 @@
-diff -urN Canna37b1.ORIG/Canna.conf Canna37b1/Canna.conf
--- Canna37b1.ORIG/Canna.conf	2003-09-27 15:23:08.000000000 +0900
-+++ Canna37b1/Canna.conf	2003-09-27 19:09:13.000000000 +0900
-@@ -114,7 +114,7 @@
- #  define DefErrDir /usr/spool/canna
- #  define DefLibCannaDir /usr/lib
- # else
-#  define DefErrDir /var/log
-+#  define DefErrDir /var/log/canna
- #  define DefLibCannaDir $(cannaExecPrefix)/lib
- # endif
- #endif
-@@ -140,16 +140,18 @@
- # define ModernElfLinkAvailable NO
- #endif
- 
-cannaPrefix = DefCannaPrefix
-+cannaPrefix = /usr
- cannaExecPrefix = $(cannaPrefix)
- cannaBinDir = $(cannaExecPrefix)/bin
- cannaSrvDir = DefCannaSrvDir
- XCOMM cannaLibDir = /var/lib/canna
- XCOMM cannaLibDir = /var/db/canna
- cannaLibDir = DefCannaLibDir
-XCOMM cannaManDir = $(cannaPrefix)/share/man
-cannaManDir = $(cannaPrefix)/man
-+cannaManDir = $(cannaPrefix)/share/man
-+XCOMM cannaManDir = $(cannaPrefix)/man
- cannaIncDir = $(cannaPrefix)/include/canna
-+cannaDocDir = $(cannaPrefix)/share/doc/@cannapkgver@
-+cannaShareDir = $(cannaPrefix)/share/canna
- 
- libCannaDir = DefLibCannaDir
- ErrDir  = DefErrDir
-@@ -158,7 +160,7 @@
- #define SupportOldWchar 1
- 
- /* IPv6を用いる場合は1と定義してください */
-#define UseInet6 0 /* requires newer IPv6 implementation */
-+/* #define UseInet6 0 /* requires newer IPv6 implementation */
- 
- /* 3.2系から3.6系までの形式の辞書を作る場合はこれを定義してください */
- /* #define DIC_3_6_COMPAT */
-@@ -237,7 +239,7 @@
- /* #define UseInstalledLibCanna YES */
- #define UseInstalledLibCanna NO
- 
-DicDir   = $(cannaLibDir)/dic
-+DicDir   = /var/lib/canna/dic
- 
- /* ここから下は変更不要です */
- 
-diff -urN Canna37b1.ORIG/Imakefile Canna37b1/Imakefile
--- Canna37b1.ORIG/Imakefile	2003-09-25 15:30:20.000000000 +0900
-+++ Canna37b1/Imakefile	2003-09-27 19:09:00.000000000 +0900
-@@ -55,6 +55,7 @@
- 	@echo "#define CANNAHOSTFILE '$(cannaLibDir)/cannahost'" >> junkjunk
- 	@echo "/* for lib/canna */" >> junkjunk
- 	@echo "#define CANNALIBDIR '$(cannaLibDir)'" >> junkjunk
-+	@echo "#define CANNASHAREDIR '$(cannaShareDir)'" >> junkjunk
- 	@echo "#define SUPPORT_OLD_WCHAR '$(supportOldWchar)'" >> junkjunk
- 	@echo "/* for scripts */" >> junkjunk
- 	@echo "#define CANNABINDIR $(cannaBinDir)" >> junkjunk
-@@ -83,6 +84,7 @@
- 	 echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\
- 	 echo "/* for lib/canna */";\
- 	 echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \
-+	 echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \
- 	 echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \
- 	 echo "/* for scripts */";\
- 	 echo "#define CANNABINDIR $(cannaBinDir)"; \
-diff -urN Canna37b1.ORIG/dic/phono/Imakefile Canna37b1/dic/phono/Imakefile
--- Canna37b1.ORIG/dic/phono/Imakefile	2002-10-19 17:27:40.000000000 +0900
-+++ Canna37b1/dic/phono/Imakefile	2003-09-27 19:09:00.000000000 +0900
-@@ -27,9 +27,10 @@
- 
-        ROMAJI_DIC_DEF = -DSHIFT
- 
-               DICDIR = $(cannaLibDir)/dic
-            SAMPLEDIR = $(cannaLibDir)/sample
-         SAMPLESRCDIR = $(cannaLibDir)/sample/src
-+               DICDIR = $(DicDir)
-+        CANNASHAREDIR = $(cannaShareDir)
-+            SAMPLEDIR = $(cannaDocDir)/sample
-+         SAMPLESRCDIR = $(cannaDocDir)/sample/src
- 
-     KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \
-             lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \
-@@ -69,7 +70,7 @@
- MakeDirectories(install,$(DICDIR))
- MakeDirectories(install,$(SAMPLESRCDIR))
- 
-InstallMultiple($(ROMKANA_TABLES),$(DICDIR))
-+InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR))
- 
- #ifdef USE_OBSOLETE_STYLE_FILENAME
- InstallNonExec(default.kpdef,$(SAMPLESRCDIR))
-diff -urN Canna37b1.ORIG/lib/canna/romaji.c Canna37b1/lib/canna/romaji.c
--- Canna37b1.ORIG/lib/canna/romaji.c	2003-09-17 17:50:53.000000000 +0900
-+++ Canna37b1/lib/canna/romaji.c	2003-09-27 19:09:00.000000000 +0900
-@@ -427,7 +427,7 @@
- 	}
-       }
-       
-#if 0 /* currently CANNASHAREDDIR is not defined */
-+#if 1 /* currently CANNASHAREDDIR is defined */
-       if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa@linux.or.jp> */
-         extern jrUserInfoStruct *uinfo;
- 	
-diff -urN Canna37b1.ORIG/misc/Imakefile Canna37b1/misc/Imakefile
--- Canna37b1.ORIG/misc/Imakefile	2003-03-05 04:23:53.000000000 +0900
-+++ Canna37b1/misc/Imakefile	2003-09-27 19:09:00.000000000 +0900
-@@ -48,7 +48,7 @@
- MakeLintLibSubdirs($(SUBDIRS))
- MakeLintSubdirs($(SUBDIRS),install.ln,install.ln)
- 
-MakeDirectories(install,$(cannaLibDir)/sample/src)
-+MakeDirectories(install,$(cannaDocDir)/sample/src)
- 
- #ifdef USE_OBSOLETE_STYLE_FILENAME
- default.canna: default.ca
-@@ -58,8 +58,8 @@
- 	$(CP) default.ca default.canna
- #endif
- 
-InstallNonExec(default.canna,$(cannaLibDir))
-InstallNonExec(is.c,$(cannaLibDir)/sample/src)
-+InstallNonExec(default.canna,$(cannaDocDir))
-+InstallNonExec(is.c,$(cannaDocDir)/sample/src)
- 
- clean::
- 	$(RM) $(PROGRAMS)
-diff -urN Canna37b1.ORIG/misc/initfiles/Imakefile Canna37b1/misc/initfiles/Imakefile
--- Canna37b1.ORIG/misc/initfiles/Imakefile	2003-02-04 05:13:01.000000000 +0900
-+++ Canna37b1/misc/initfiles/Imakefile	2003-09-27 19:09:00.000000000 +0900
-@@ -6,7 +6,7 @@
- #endif
- 
-             CANNAROOT = ../..
-            SAMPLEDIR = $(cannaLibDir)/sample
-+            SAMPLEDIR = $(cannaShareDir)
- 
- all::
- 
--- a/app-i18n/canna/files/canna-3.7_p3-strip.patch
+++ b/app-i18n/canna/files/canna-3.7_p3-strip.patch
@ -1,142 +0,0 @@
-diff -Naur Canna37p3.orig/config.log Canna37p3/config.log
--- Canna37p3.orig/config.log	1970-01-01 09:00:00.000000000 +0900
-+++ Canna37p3/config.log	2009-09-21 10:25:33.000000000 +0900
-@@ -0,0 +1,126 @@
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+
-+It was created by canna configure 3.7p3, which was
-+generated by GNU Autoconf 2.59.  Invocation command line was
-+
-+  $ ./configure 
-+
-+## --------- ##
-+## Platform. ##
-+## --------- ##
-+
-+hostname = lets
-+uname -m = x86_64
-+uname -r = 2.6.31-gentoo
-+uname -s = Linux
-+uname -v = #1 SMP PREEMPT Fri Sep 11 17:39:06 JST 2009
-+
-+/usr/bin/uname -p = Intel(R) Core(TM)2 Duo CPU L7300 @ 1.40GHz
-+/bin/uname -X     = unknown
-+
-+/bin/arch              = unknown
-+/usr/bin/arch -k       = unknown
-+/usr/convex/getsysinfo = unknown
-+hostinfo               = unknown
-+/bin/machine           = unknown
-+/usr/bin/oslevel       = unknown
-+/bin/universe          = unknown
-+
-+PATH: /usr/local/bin
-+PATH: /usr/bin
-+PATH: /bin
-+PATH: /opt/bin
-+PATH: /usr/x86_64-pc-linux-gnu/i686-pc-linux-gnu/gcc-bin/4.3.3
-+PATH: /usr/x86_64-pc-linux-gnu/gcc-bin/4.4.1
-+PATH: /usr/kde/3.5/bin
-+PATH: /usr/qt/3/bin
-+PATH: /opt/android-sdk-1.5/tools
-+PATH: /opt/android-sdk-1.5/platforms/android-1.5/tools
-+PATH: /usr/games/bin
-+
-+
-+## ----------- ##
-+## Core tests. ##
-+## ----------- ##
-+
-+configure:1307: error: You cannot invloke configure directly.
-+
-+## ---------------- ##
-+## Cache variables. ##
-+## ---------------- ##
-+
-+ac_cv_env_CC_set=
-+ac_cv_env_CC_value=
-+ac_cv_env_CFLAGS_set=
-+ac_cv_env_CFLAGS_value=
-+ac_cv_env_CPPFLAGS_set=
-+ac_cv_env_CPPFLAGS_value=
-+ac_cv_env_CPP_set=
-+ac_cv_env_CPP_value=
-+ac_cv_env_LDFLAGS_set=
-+ac_cv_env_LDFLAGS_value=
-+ac_cv_env_build_alias_set=
-+ac_cv_env_build_alias_value=
-+ac_cv_env_host_alias_set=
-+ac_cv_env_host_alias_value=
-+ac_cv_env_target_alias_set=
-+ac_cv_env_target_alias_value=
-+
-+## ----------------- ##
-+## Output variables. ##
-+## ----------------- ##
-+
-+CC=''
-+CFLAGS=''
-+CPP=''
-+CPPFLAGS=''
-+DEFS=''
-+ECHO_C=''
-+ECHO_N='-n'
-+ECHO_T=''
-+EGREP=''
-+EXEEXT=''
-+LDFLAGS=''
-+LIBOBJS=''
-+LIBS=''
-+LTLIBOBJS=''
-+OBJEXT=''
-+PACKAGE_BUGREPORT='canna-dev@lists.sourceforge.jp'
-+PACKAGE_NAME='canna'
-+PACKAGE_STRING='canna 3.7p3'
-+PACKAGE_TARNAME='canna'
-+PACKAGE_VERSION='3.7p3'
-+PATH_SEPARATOR=':'
-+SHELL='/bin/sh'
-+ac_ct_CC=''
-+bindir='${exec_prefix}/bin'
-+build_alias=''
-+datadir='${prefix}/share'
-+exec_prefix='NONE'
-+host_alias=''
-+includedir='${prefix}/include'
-+infodir='${prefix}/info'
-+libdir='${exec_prefix}/lib'
-+libexecdir='${exec_prefix}/libexec'
-+localstatedir='${prefix}/var'
-+mandir='${prefix}/man'
-+oldincludedir='/usr/include'
-+prefix='NONE'
-+program_transform_name='s,x,x,'
-+sbindir='${exec_prefix}/sbin'
-+sharedstatedir='${prefix}/com'
-+sysconfdir='${prefix}/etc'
-+target_alias=''
-+
-+## ----------- ##
-+## confdefs.h. ##
-+## ----------- ##
-+
-+#define PACKAGE_BUGREPORT "canna-dev@lists.sourceforge.jp"
-+#define PACKAGE_NAME "canna"
-+#define PACKAGE_STRING "canna 3.7p3"
-+#define PACKAGE_TARNAME "canna"
-+#define PACKAGE_VERSION "3.7p3"
-+
-+configure: exit 1
-diff -Naur Canna37p3.orig/server/Imakefile Canna37p3/server/Imakefile
--- Canna37p3.orig/server/Imakefile	2004-04-27 06:48:37.000000000 +0900
-+++ Canna37p3/server/Imakefile	2009-09-21 10:28:48.000000000 +0900
-@@ -6,7 +6,7 @@
- #ifdef __EMX__
-          INSTFLAGS = $(INSTUGIDFLAGS)
- #else
-         INSTFLAGS = -s $(INSTUGIDFLAGS)
-+         INSTFLAGS = $(INSTUGIDFLAGS)
- #endif
-            DEFINES = $(CANNASERVER_DEFINES) $(SIGNAL_DEFINES) ConnectionFlags
-           INCLUDES = -I$(CANNAROOT)/include
--- a/app-i18n/canna/files/canna-3.7_p3.initd
+++ b/app-i18n/canna/files/canna-3.7_p3.initd
@ -1,41 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# CANNASERVER_OPTS and CANNASERVER_OWNER is defined in /etc/conf.d/canna
-CANNASERVER_LOGFILE="/var/log/canna/CANNA0msgs"
-
-depend() {
-	after logger
-}
-
-start() {
-	if [ -S /tmp/.iroha_unix/IROHA ] ; then
-		/usr/sbin/cannakill >/dev/null 2>&1
-	fi
-	rm -f /tmp/.iroha_unix/IROHA
-
-	if [ "${CANNASERVER_ENABLE_SYSLOG}" = "yes" ] ; then
-		CANNASERVER_OPTS="${CANNASERVER_OPTS} -syslog"
-	else
-		touch "${CANNASERVER_LOGFILE}"
-		chmod u+w "${CANNASERVER_LOGFILEj}"
-	fi
-
-	if [ ! -z "${CANNASERVER_OWNER}" ] ; then
-		if [ -f "${CANNASERVER_LOGFILE}" ] ; then
-			chown "${CANNASERVER_OWNER}" "${CANNASERVER_LOGFILE}"
-		fi
-		CANNASERVER_OPTS="${CANNASERVER_OPTS} -u ${CANNASERVER_OWNER}"
-	fi
-
-	ebegin "Starting canna"
-	/usr/sbin/cannaserver ${CANNASERVER_OPTS}
-	eend $? "Failed to start canna"
-}
-
-stop() {
-	ebegin "Stopping canna"
-	/usr/sbin/cannakill
-	eend $? "Failed to stop canna"
-}
--- a/app-i18n/canna/files/canna-gentoo.patch
+++ b/app-i18n/canna/files/canna-gentoo.patch
@ -0,0 +1,146 @@
+--- a/Canna.conf
+++ b/Canna.conf
+@@ -109,12 +109,12 @@
+ # define DefErrDir $(cannaPrefix)/log
+ # define DefLibCannaDir $(cannaExecPrefix)/lib
+ #else 
+-# define DefCannaPrefix /usr/local/canna
+# define DefCannaPrefix $(EPREFIX)/usr
+ # ifdef ObsoleteInstallDir
+ #  define DefErrDir /usr/spool/canna
+ #  define DefLibCannaDir /usr/lib
+ # else
+-#  define DefErrDir /var/log
+#  define DefErrDir $(EPREFIX)/var/log/$(PN)
+ #  define DefLibCannaDir $(cannaExecPrefix)/lib
+ # endif
+ #endif
+@@ -123,7 +123,7 @@
+ # define DefCannaLibDir $(cannaPrefix)/lib
+ #else
+ # define DefCannaSrvDir $(cannaExecPrefix)/sbin
+-# define DefCannaLibDir $(cannaPrefix)/share/canna
+# define DefCannaLibDir $(cannaPrefix)/share/$(PN)
+ #endif
+ 
+ #if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) \
+@@ -147,9 +147,11 @@
+ XCOMM cannaLibDir = /var/lib/canna
+ XCOMM cannaLibDir = /var/db/canna
+ cannaLibDir = DefCannaLibDir
+-XCOMM cannaManDir = $(cannaPrefix)/share/man
+-cannaManDir = $(cannaPrefix)/man
+-cannaIncDir = $(cannaPrefix)/include/canna
+cannaManDir = $(cannaPrefix)/share/man
+XCOMM cannaManDir = $(cannaPrefix)/man
+cannaIncDir = $(cannaPrefix)/include/$(PN)
+cannaShareDir = $(cannaPrefix)/share/$(PN)
+cannaDocDir = $(cannaPrefix)/share/doc/$(PF)
+ 
+ libCannaDir = DefLibCannaDir
+ ErrDir  = DefErrDir
+@@ -237,7 +239,7 @@
+ /* #define UseInstalledLibCanna YES */
+ #define UseInstalledLibCanna NO
+ 
+-DicDir   = $(cannaLibDir)/dic
+DicDir   = $(EPREFIX)/var/lib/$(PN)/dic
+ 
+ /* ここから下は変更不要です */
+ 
+--- a/Imakefile
+++ b/Imakefile
+@@ -87,6 +87,7 @@
+ 	 echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\
+ 	 echo "/* for lib/canna */";\
+ 	 echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \
+	 echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \
+ 	 echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \
+ 	 echo "/* for scripts */";\
+ 	 echo "#define CANNABINDIR $(cannaBinDir)"; \
+--- a/dic/phono/Imakefile
+++ b/dic/phono/Imakefile
+@@ -27,9 +27,10 @@
+ 
+        ROMAJI_DIC_DEF = -DSHIFT
+ 
+-               DICDIR = $(cannaLibDir)/dic
+-            SAMPLEDIR = $(cannaLibDir)/sample
+-         SAMPLESRCDIR = $(cannaLibDir)/sample/src
+               DICDIR = $(DicDir)
+        CANNASHAREDIR = $(cannaShareDir)
+            SAMPLEDIR = $(cannaDocDir)/sample
+         SAMPLESRCDIR = $(cannaDocDir)/sample/src
+ 
+     KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \
+             lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \
+@@ -69,7 +70,7 @@
+ MakeDirectories(install,$(DICDIR))
+ MakeDirectories(install,$(SAMPLESRCDIR))
+ 
+-InstallMultiple($(ROMKANA_TABLES),$(DICDIR))
+InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR))
+ 
+ #ifdef USE_OBSOLETE_STYLE_FILENAME
+ InstallNonExec(default.kpdef,$(SAMPLESRCDIR))
+--- a/lib/canna/romaji.c
+++ b/lib/canna/romaji.c
+@@ -427,7 +427,6 @@
+ 	}
+       }
+       
+-#if 0 /* currently CANNASHAREDDIR is not defined */
+       if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa@linux.or.jp> */
+         extern jrUserInfoStruct *uinfo;
+ 	
+@@ -450,7 +449,6 @@
+ 	  }
+ 	}
+       }
+-#endif
+       
+       if (retval == (struct RkRxDic *)NULL) { /* 全部オープンできない */
+ 	sprintf(rdic, 
+--- a/misc/Imakefile
+++ b/misc/Imakefile
+@@ -48,7 +48,7 @@
+ MakeLintLibSubdirs($(SUBDIRS))
+ MakeLintSubdirs($(SUBDIRS),install.ln,install.ln)
+ 
+-MakeDirectories(install,$(cannaLibDir)/sample/src)
+MakeDirectories(install,$(cannaDocDir)/sample/src)
+ 
+ #ifdef USE_OBSOLETE_STYLE_FILENAME
+ default.canna: default.ca
+@@ -58,8 +58,8 @@
+ 	$(CP) default.ca default.canna
+ #endif
+ 
+ InstallNonExec(default.canna,$(cannaLibDir))
+-InstallNonExec(is.c,$(cannaLibDir)/sample/src)
+InstallNonExec(is.c,$(cannaDocDir)/sample/src)
+ 
+ clean::
+ 	$(RM) $(PROGRAMS)
+--- a/misc/initfiles/Imakefile
+++ b/misc/initfiles/Imakefile
+@@ -6,7 +6,7 @@
+ #endif
+ 
+             CANNAROOT = ../..
+-            SAMPLEDIR = $(cannaLibDir)/sample
+            SAMPLEDIR = $(cannaDocDir)/sample
+ 
+ all::
+ 
+--- a/server/Imakefile
+++ b/server/Imakefile
+@@ -6,7 +6,7 @@
+ #ifdef __EMX__
+          INSTFLAGS = $(INSTUGIDFLAGS)
+ #else
+-         INSTFLAGS = -s $(INSTUGIDFLAGS)
+         INSTFLAGS = $(INSTUGIDFLAGS)
+ #endif
+            DEFINES = $(CANNASERVER_DEFINES) $(SIGNAL_DEFINES) ConnectionFlags
+           INCLUDES = -I$(CANNAROOT)/include
--- a/app-i18n/canna/files/canna-kpdef-gentoo.diff
+++ b/app-i18n/canna/files/canna-kpdef-gentoo.diff
@ -1,5 +1,5 @@
--- default.kpdef.orig	2002-10-19 17:27:40.000000000 +0900
-+++ default.kpdef	2003-12-13 00:54:51.000000000 +0900
+--- a/dic/phono/default.kpdef
+++ b/dic/phono/default.kpdef
@@ -350,3 +350,15 @@
 _	｡ｲ
 /	｡ｿ
--- a/app-i18n/canna/files/canna-posix-sort.patch
+++ b/app-i18n/canna/files/canna-posix-sort.patch
@ -0,0 +1,11 @@
+--- a/cmd/mkbindic/mkbindic.cpp
+++ b/cmd/mkbindic/mkbindic.cpp
+@@ -40,7 +40,7 @@
+ bck_text=;
+ flag=;
+ compat_flag=;
+-sortcmd="sort -d -s +0 -1"
+sortcmd="sort -d -s -k 1,1"
+ usage="usage: mkbindic [-m|-s] [-name dicname] [-c version] textfile [cpp-args ...]";
+ : ${TMPDIR:=/tmp}
+ 
--- a/app-i18n/canna/files/canna-3.7_p3.confd
+++ b/app-i18n/canna/files/canna-3.7_p3.confd
--- a/app-i18n/canna/files/canna.initd
+++ b/app-i18n/canna/files/canna.initd
@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/${RC_SVCNAME}server"
+command_args="${CANNASERVER_OPTS}"
+
+# CANNASERVER_OPTS and CANNASERVER_OWNER is defined in /etc/conf.d/canna
+CANNASERVER_LOGFILE="/var/log/${RC_SVCNAME}/CANNA0msgs"
+
+depend() {
+	use logger
+	need net
+}
+
+start_pre() {
+	if [ "${CANNASERVER_ENABLE_SYSLOG}" = "yes" ]; then
+		command_args="${command_args} -syslog"
+	elif [ -z "${CANNASERVER_OWNER}" ]; then
+		checkpath "${CANNASERVER_LOGFILE}"
+	else
+		checkpath -o "${CANNASERVER_OWNER}" "${CANNASERVER_LOGFILE}"
+		command_args="${command_args} -u ${CANNASERVER_OWNER}"
+	fi
+}
+
+stop() {
+	ebegin "Stopping ${name:-${RC_SVCNAME}}"
+	/usr/sbin/${RC_SVCNAME}kill
+	eend ${?}
+}
--- a/app-i18n/canna/metadata.xml
+++ b/app-i18n/canna/metadata.xml
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge-jp">canna</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge-jp">canna</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge.jp/freewnn/59257/${MY_P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="X ipv6"

 DEPEND="X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )"
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -10,7 +10,7 @@ SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"

 src_prepare() {
 	local ver="$(best_version sys-kernel/linux-headers)"
--- a/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0.ebuild
+++ b/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs perl-functions latex-package
-
-DESCRIPTION="Create and manage multiple choice questionnaries, including automated marking"
-HOMEPAGE="http://home.gna.org/auto-qcm/"
-SRC_URI="http://download.gna.org/auto-qcm/${PN}_${PV}_sources.tar.gz"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-CDEPEND="
-	app-text/texlive[doc,dvi2tty,dvipdfm,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,omega,publishers,l10n_fr]
-	app-text/poppler:=
-	dev-perl/XML-LibXML
-	media-libs/netpbm
-	media-libs/opencv
-"
-DEPEND="${CDEPEND}
-	app-text/dblatex
-	app-text/docbook-xml-simple-dtd:*
-	app-text/docbook-xsl-stylesheets
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl:=
-	dev-perl/Glib-Object-Introspection
-	dev-perl/Gtk2
-	dev-perl/Gtk2-Notify
-	media-gfx/imagemagick
-	dev-perl/XML-Writer
-	dev-perl/Archive-Zip
-	dev-perl/DBI
-	dev-perl/Text-CSV
-	dev-perl/DBD-SQLite
-	dev-perl/Net-CUPS
-	dev-perl/Email-Address
-	dev-perl/Email-MIME
-	dev-perl/Email-Sender
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.0-desktop.patch"
-	"${FILESDIR}/${PN}-1.3.0-conf.patch"
-)
-
-src_compile() {
-	perl_set_version
-	export VENDOR_LIB PVR
-	export TEXINPUTS="/usr/share/dblatex/latex/style:/usr/share/dblatex/latex/misc:/usr/share/dblatex/latex/graphics:"
-
-	export MAKEOPTS="-j1"
-	# when doing a parallel build, the package is acting decidedly odd
-	# e.g., the build seems to succeed while actually stuff fails
-	# and subsequent error messages do not have any relation to the real problem
-	# So let's keep this also for easier debugging
-
-	emake \
-			GCC_NETPBM="-I/usr/include/netpbm/ -lnetpbm" \
-			GCC="$(tc-getCC)" \
-			GCC_PP="$(tc-getCXX)"
-}
-
-src_install() {
-	default
-}
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@ -1,2 +1 @@
-DIST skrooge-2.5.0.tar.xz 17603860 SHA256 97bebb1b3f1cd791160292bd4689e584c4054db14f0f88039541e67c72ce5e0d SHA512 00fb32f7705c5125803436a21648545154043b6333267ae722c9beac04baf766e1860ce84b4e56d80d81ade1ab3ef8e3ac60a98d0616cae6ec5212d7ad2ef528 WHIRLPOOL 0eef97d2eebcc00155d1505a457e8443df676c93124edbf352b89fa796781ae9e0630294256932e065d2a35eb2d1916ccf733e05bf4f16a237302d0db713073c
 DIST skrooge-2.8.1.tar.xz 19299556 SHA256 8f166db74a27db0ce0ea197f89dfd021224afc3e4875e36438a4496f10746460 SHA512 864de0c9e8876b87ab4100b0d48ea8e573655ebad5175333230ff715faa46077b96e25b91e767da864196960de14df9b9fee5b561e4d51b03a80fb58a070755f WHIRLPOOL 12d1455493fd32dd61cb0543a2365444f0fd1fa5b08214760f7c3b58836c3ac55a480f322cbea61eb13675b9698531fa860f8a2b4c9a915a789fc95bedc8b269
--- a/app-office/skrooge/metadata.xml
+++ b/app-office/skrooge/metadata.xml
@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
-		<flag name="crypt">Enable encryption using <pkg>dev-db/sqlcipher</pkg></flag>
 		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
 	</use>
 </pkgmetadata>
--- a/app-office/skrooge/skrooge-2.5.0.ebuild
+++ b/app-office/skrooge/skrooge-2.5.0.ebuild
@ -1,104 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_GCC_MINIMAL="4.9"
-KDE_HANDBOOK="forceoptional" # not optional until kdelibs4support is gone
-KDE_TEST="forceoptional"
-# TODO: Drop kdelibs4support when QT_MINIMAL=5.7.0
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="http://www.skrooge.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="activities crypt designer kde ofx"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5]
-	dev-libs/grantlee:5
-	activities? ( $(add_frameworks_dep kactivities) )
-	crypt? ( dev-db/sqlcipher )
-	!crypt? ( dev-db/sqlite:3 )
-	kde? ( $(add_frameworks_dep krunner) )
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwindowsystem)
-	dev-libs/libxslt
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	designer? (
-		$(add_frameworks_dep kdesignerplugin)
-		$(add_qt_dep designer)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/skrooge:4
-"
-
-REQUIRED_USE="test? ( designer )"
-
-# hangs + installs files
-RESTRICT+=" test"
-
-DOCS=( AUTHORS CHANGELOG README TODO )
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_CIPHER=$(usex crypt)
-		-DSKG_DESIGNER=$(usex designer)
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package kde KF5Runner)
-		$(cmake-utils_use_find_package ofx LibOfx)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	kde5_src_test
-}
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@ -1,2 +1 @@
-DIST libplist-1.12.tar.bz2 384321 SHA256 0effdedcb3de128c4930d8c03a3854c74c426c16728b8ab5f0a5b6bdc0b644be SHA512 8af40d8f457ca9a8a9061e9429698c696200714cc05dcbe981e900106c52cd5222edb9dd8d8976bccd0c8997508ed14fb2e10f0ed29383f2ad4f7c5eb7eec0b3 WHIRLPOOL 7d3c4f7822683018b5b0e794d509b9cf5a703605ed772df849ad9ebba6e8191f2eb629444c07d2dcb265520d24c94f13287f200fec34779c9e6fe029536183a7
 DIST libplist-2.0.0.tar.bz2 421405 SHA256 3a7e9694c2d9a85174ba1fa92417cfabaea7f6d19631e544948dc7e17e82f602 SHA512 81508bf6773483528816725c3b5b868563b84fd7810999404072e5ea9efa7fc9f11ef997f32208e4421aa26b15edd0c65f87c67c1472e8c4e356f1e9fe7740ee WHIRLPOOL cfea767321dda602722281f189dae708969c7471bc4b9388638b671257f3808358e1227cdf29cba7751cb715a8ec92fccb1c0dd5c8d150ebac19fdf8633c6339
--- a/app-pda/libplist/libplist-1.12.ebuild
+++ b/app-pda/libplist/libplist-1.12.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit autotools eutils python-r1
-
-DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
-HOMEPAGE="http://www.libimobiledevice.org/"
-SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/3" # based on SONAME of libplist.so
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-fbsd"
-IUSE="python static-libs"
-
-RDEPEND=">=dev-libs/libxml2-2.7.8
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS NEWS README )
-
-RESTRICT="test" # TODO: src_test() was dropped from 1.10 (cmake) -> 1.11 (autotools)
-
-BUILD_DIR="${S}_build"
-
-src_configure() {
-	local ECONF_SOURCE=${S}
-	local myeconfargs=( $(use_enable static-libs static) )
-
-	do_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		pushd "${BUILD_DIR}" >/dev/null || die
-		econf "${myeconfargs[@]}" "${@}"
-		popd >/dev/null || die
-	}
-
-	do_configure_python() {
-		PYTHON_LDFLAGS="$(python_get_LIBS)" do_configure "$@"
-	}
-
-	do_configure --without-cython
-	use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
-	python_compile() {
-		emake -C "${BUILD_DIR}"/cython -j1 \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			plist_la_LIBADD="${native_builddir}/src/libplist.la"
-	}
-
-	local native_builddir=${BUILD_DIR}
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake -j1
-	use python && python_foreach_impl python_compile
-	popd >/dev/null || die
-}
-
-src_install() {
-	python_install() {
-		emake -C "${BUILD_DIR}/cython" -j1 \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			DESTDIR="${D}" install
-	}
-
-	local native_builddir=${BUILD_DIR}
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake -j1 DESTDIR="${D}" install
-	use python && python_foreach_impl python_install
-	popd >/dev/null || die
-
-	if use python ; then
-		insinto /usr/include/plist/cython
-		doins cython/plist.pxd
-	fi
-	prune_libtool_files --all
-}
--- a/app-pda/libplist/libplist-2.0.0.ebuild
+++ b/app-pda/libplist/libplist-2.0.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"

 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/3.1.0" # based on SONAME of libplist.so
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-fbsd"
 IUSE="python static-libs"

 RDEPEND="python? ( ${PYTHON_DEPS} )"
--- a/app-text/blahtexml/blahtexml-0.9.ebuild
+++ b/app-text/blahtexml/blahtexml-0.9.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://gva.noekeon.org/${PN}/${P}-src.tar.gz"

 LICENSE="BSD CC-BY-3.0 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="doc"

 RDEPEND="dev-libs/xerces-c"
--- a/app-text/dvipsk/dvipsk-5.996_p20160523.ebuild
+++ b/app-text/dvipsk/dvipsk-5.996_p20160523.ebuild
@ -28,7 +28,7 @@ SRC_URI="${SRC_URI} ) "

 LICENSE="GPL-2"
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc source"

 DEPEND=">=dev-libs/kpathsea-6.2.1"
--- a/app-text/htmldoc/htmldoc-1.8.30.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.30.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-so
 IUSE="fltk"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"

 DEPEND=">=media-libs/libpng-1.4:0=
 	virtual/jpeg:0
--- a/app-text/libgxps/Manifest
+++ b/app-text/libgxps/Manifest
@ -1,2 +1 @@
-DIST libgxps-0.2.4.tar.xz 335256 SHA256 e9d6aa02836d9d4823a51705d3e1dee6fc4bce11d72566024042cfaac56ec7a4 SHA512 3e2821931a63483281952d9818dc77295caa8a514d0a25deffd922d98a9db8ced4141cc8489781715a021af361a2e41210aad1fb773f94dff0f864f8e45d2681 WHIRLPOOL 57a7f460e5cfc449b5ca95cd2e8d658d8857b4618cf79896a5da05fbd24e5c38092392f39ef5c96e20b30e1267317ef6e9c3bfd9eada105117bd29a53dd86ebf
 DIST libgxps-0.2.5.tar.xz 346532 SHA256 3e7594c5c9b077171ec9ccd3ff2b4f4c4b29884d26d4f35e740c8887b40199a0 SHA512 f449c4cb989910797c84614ce9f141d4e9adcda0c18f309f656de397ba5deabfa9b4c558c81be7f52bc44c048c401616775989cd1ff9408eeea44f46ef56635b WHIRLPOOL db7514e785f46a3fbf32db9962c2644837855116acbbf37373388c3cfed3b88645c4a574fe8e2ae41913b68250d9448dd3566d9b15b258c74810262f4411f9b8
--- a/app-text/libgxps/libgxps-0.2.4.ebuild
+++ b/app-text/libgxps/libgxps-0.2.4.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Library for handling and rendering XPS documents"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="debug +introspection jpeg lcms static-libs tiff"
-
-RDEPEND="
-	>=app-arch/libarchive-2.8
-	>=dev-libs/glib-2.24:2
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=x11-libs/cairo-1.10[svg]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.1:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	tiff? ( media-libs/tiff:0[zlib] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-# There is no automatic test suite, only an interactive test application
-RESTRICT="test"
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-man \
-		--disable-test \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_with jpeg libjpeg) \
-		$(use_with lcms liblcms2) \
-		$(use_enable static-libs static) \
-		$(use_with tiff libtiff)
-}
--- a/app-text/libgxps/libgxps-0.2.5.ebuild
+++ b/app-text/libgxps/libgxps-0.2.5.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
 IUSE="debug +introspection jpeg lcms static-libs tiff"

 RDEPEND="
--- a/app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild
@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"

 LICENSE="MIT"
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""

 DEPEND=">=dev-libs/kpathsea-6.2.1"
--- a/app-text/psutils/psutils-1.17-r3.ebuild
+++ b/app-text/psutils/psutils-1.17-r3.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"

 LICENSE="psutils"
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND=""
--- a/app-text/ronn/ronn-0.7.3-r3.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rtomayko/ronn/"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris"

 IUSE=""

--- a/app-text/texlive-core/texlive-core-2016-r5.ebuild
+++ b/app-text/texlive-core/texlive-core-2016-r5.ebuild
@ -74,7 +74,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"

-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"

 TEXMF_PATH=/usr/share/texmf-dist
--- a/app-text/texlive/metadata.xml
+++ b/app-text/texlive/metadata.xml
@ -12,8 +12,6 @@
 	  that removes the LaTeX (or TeX) control sequences</flag>
  <flag name="dvi2tty">Add support for <pkg>dev-tex/dvi2tty</pkg> to preview
 	  dvi-files on text-only devices</flag>
-  <flag name="dvipdfm">Add support for <pkg>app-text/dvipdfm</pkg> to convert
-	  DVI files to PDF</flag>
  <flag name="epspdf">Add support for <pkg>app-text/epspdf</pkg>, a tool for converting [e]ps files to pdf.</flag>
  <flag name="extra">Add support for extra TeXLive packages</flag>
  <flag name="games">Add typesetting support for games (chess, etc.)
--- a/app-text/texlive/texlive-2012.ebuild
+++ b/app-text/texlive/texlive-2012.ebuild
@ -1,197 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk context detex doc dvi2tty dvipdfm extra epspdf games graphics
-humanities jadetex luatex metapost music omega pdfannotextractor png pstricks publishers
-science tex4ht texi2html truetype xetex xindy xml X"
-
-LANGS="af ar as bg bn bo ca cs cy da de el en en-GB eo es et eu fa fi fr ga gl
-	gu he hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no
-	or pa pl pt ro ru sa sk sl sr sv ta te th tk tr uk vi zh"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-TEXLIVE_CAT="dev-texlive"
-
-DEPEND=">=app-text/texlive-core-${PV}"
-RDEPEND="${DEPEND}
-	app-text/psutils
-	>=${TEXLIVE_CAT}/texlive-fontutils-${PV}
-	media-gfx/sam2p
-	texi2html? ( app-text/texi2html )
-	sys-apps/texinfo
-	>=${TEXLIVE_CAT}/texlive-texinfo-${PV}
-	app-text/t1utils
-	>=app-text/lcdf-typetools-2.92[kpathsea]
-	truetype? ( app-text/ttf2pk2 )
-	detex? ( dev-tex/detex )
-	app-text/ps2eps
-	dvipdfm? ( >=app-text/dvipdfm-0.13.2d )
-	dvi2tty? ( dev-tex/dvi2tty )
-	png? ( app-text/dvipng )
-	X? ( >=app-text/xdvik-22.85 )
-	>=${TEXLIVE_CAT}/texlive-basic-${PV}
-	>=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
-	>=${TEXLIVE_CAT}/texlive-latex-${PV}
-	luatex? (
-		>=${TEXLIVE_CAT}/texlive-luatex-${PV}
-		>=dev-tex/luatex-0.70
-	)
-	>=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
-	>=dev-tex/xcolor-2.11
-	>=dev-tex/latex-beamer-3.20
-	metapost? (
-		>=${TEXLIVE_CAT}/texlive-metapost-${PV}
-			dev-tex/feynmf
-	)
-	>=${TEXLIVE_CAT}/texlive-genericrecommended-${PV}
-	pdfannotextractor? ( dev-tex/pdfannotextractor )
-	extra? (
-		dev-tex/chktex
-		app-text/dvisvgm
-		dev-tex/latexdiff
-		>=dev-tex/latexmk-418
-		>=app-text/pdfjam-2.02
-		>=${TEXLIVE_CAT}/texlive-bibtexextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-fontsextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-genericextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-latexextra-${PV}
-			>=dev-tex/glossaries-2.07
-			>=dev-tex/leaflet-20041222
-			>=dev-tex/currvita-0.9i-r1
-			>=dev-tex/g-brief-4.0.2
-			>=dev-tex/envlab-1.2-r1
-			>=dev-tex/europecv-20060424-r1
-			>=dev-tex/svninfo-0.7.3-r1
-		>=${TEXLIVE_CAT}/texlive-mathextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-plainextra-${PV}
-	)
-	xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
-	graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV}
-		dev-tex/dot2texi )
-	epspdf? ( app-text/epspdf )
-	science? ( >=${TEXLIVE_CAT}/texlive-science-${PV} )
-	publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
-	music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} )
-	pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} )
-	omega? ( >=${TEXLIVE_CAT}/texlive-omega-${PV} )
-	context? ( >=${TEXLIVE_CAT}/texlive-context-${PV} )
-	games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} )
-	humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
-	tex4ht? ( >=dev-tex/tex4ht-20080829 )
-	xml? (
-		>=${TEXLIVE_CAT}/texlive-htmlxml-${PV}
-		>=dev-tex/xmltex-1.9-r2
-		app-text/passivetex
-	)
-	jadetex? ( >=app-text/jadetex-3.13-r2 )
-	doc? (
-		>=${TEXLIVE_CAT}/texlive-documentation-base-${PV}
-		l10n_ar? ( >=${TEXLIVE_CAT}/texlive-documentation-arabic-${PV} )
-		l10n_bg? ( >=${TEXLIVE_CAT}/texlive-documentation-bulgarian-${PV} )
-		l10n_zh? ( >=${TEXLIVE_CAT}/texlive-documentation-chinese-${PV} )
-		l10n_cs? ( >=${TEXLIVE_CAT}/texlive-documentation-czechslovak-${PV} )
-		l10n_sk? ( >=${TEXLIVE_CAT}/texlive-documentation-czechslovak-${PV} )
-		l10n_nl? ( >=${TEXLIVE_CAT}/texlive-documentation-dutch-${PV} )
-		l10n_en? ( >=${TEXLIVE_CAT}/texlive-documentation-english-${PV} )
-		l10n_fi? ( >=${TEXLIVE_CAT}/texlive-documentation-finnish-${PV} )
-		l10n_fr? ( >=${TEXLIVE_CAT}/texlive-documentation-french-${PV} )
-		l10n_de? ( >=${TEXLIVE_CAT}/texlive-documentation-german-${PV} )
-		l10n_it? ( >=${TEXLIVE_CAT}/texlive-documentation-italian-${PV} )
-		l10n_ja? ( >=${TEXLIVE_CAT}/texlive-documentation-japanese-${PV} )
-		l10n_ko? ( >=${TEXLIVE_CAT}/texlive-documentation-korean-${PV} )
-		l10n_mn? ( >=${TEXLIVE_CAT}/texlive-documentation-mongolian-${PV} )
-		l10n_pl? ( >=${TEXLIVE_CAT}/texlive-documentation-polish-${PV} )
-		l10n_pt? ( >=${TEXLIVE_CAT}/texlive-documentation-portuguese-${PV} )
-		l10n_ru? ( >=${TEXLIVE_CAT}/texlive-documentation-russian-${PV} )
-		l10n_sr? ( >=${TEXLIVE_CAT}/texlive-documentation-serbian-${PV} )
-		l10n_sl? ( >=${TEXLIVE_CAT}/texlive-documentation-slovenian-${PV} )
-		l10n_es? ( >=${TEXLIVE_CAT}/texlive-documentation-spanish-${PV} )
-		l10n_th? ( >=${TEXLIVE_CAT}/texlive-documentation-thai-${PV} )
-		l10n_tr? ( >=${TEXLIVE_CAT}/texlive-documentation-turkish-${PV} )
-		l10n_uk? ( >=${TEXLIVE_CAT}/texlive-documentation-ukrainian-${PV} )
-		l10n_vi? ( >=${TEXLIVE_CAT}/texlive-documentation-vietnamese-${PV} )
-	)
-	l10n_af?    ( >=${TEXLIVE_CAT}/texlive-langafrican-${PV}
-	              >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ar?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	l10n_fa?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	l10n_hy?    ( >=${TEXLIVE_CAT}/texlive-langarmenian-${PV}
-	              >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
-		   >=dev-tex/cjk-latex-4.8.2 )
-	l10n_hr?    ( >=${TEXLIVE_CAT}/texlive-langcroatian-${PV} )
-	l10n_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
-	              >=app-text/vlna-1.3 )
-	l10n_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
-	l10n_da?    ( >=${TEXLIVE_CAT}/texlive-langdanish-${PV} )
-	l10n_nl?    ( >=${TEXLIVE_CAT}/texlive-langdutch-${PV} )
-	l10n_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
-	l10n_en-GB? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
-	l10n_fi?    ( >=${TEXLIVE_CAT}/texlive-langfinnish-${PV} )
-	l10n_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	l10n_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	l10n_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
-	l10n_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
-	l10n_he?    ( >=${TEXLIVE_CAT}/texlive-langhebrew-${PV} )
-	l10n_hu?    ( >=${TEXLIVE_CAT}/texlive-langhungarian-${PV} )
-	l10n_as?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
-	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
-	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langlatin-${PV} )
-	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langlithuanian-${PV} )
-	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langlatvian-${PV} )
-	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langmongolian-${PV} )
-	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langnorwegian-${PV} )
-	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langnorwegian-${PV} )
-	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langnorwegian-${PV} )
-	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV}
-	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
-	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
-	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langswedish-${PV} )
-	l10n_bo?    ( >=${TEXLIVE_CAT}/texlive-langtibetan-${PV} )
-	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langturkmen-${PV} )
-	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langvietnamese-${PV} )
-	xindy? ( app-text/xindy )
-"
--- a/app-text/texlive/texlive-2016.ebuild
+++ b/app-text/texlive/texlive-2016.ebuild
@ -9,7 +9,7 @@ SRC_URI=""

 LICENSE="metapackage"
 SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex dvi2tty extra epspdf games graphics
 humanities jadetex luatex metapost music omega pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild
@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~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 ~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=""

 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@ -1,2 +1 @@
-DIST glibmm-2.48.1.tar.xz 6235724 SHA256 dc225f7d2f466479766332483ea78f82dc349d59399d30c00de50e5073157cdf SHA512 280949315e592ff8f3f7cfa6376d129211ffb6832146578d6533c4792aafef8b4ea5354943d5623ebf34ce31b8c71b6055a51de2b8ae8cfb419e6e033d9f98fa WHIRLPOOL 81c369bf7bf7ebc1f88e47943ed4b352644cad05566ec2fa04f0974a9e48dbc56b3cbd2f3bde9f55412da886e9b99fde096a1936834c65c77ede3781be30e0fd
 DIST glibmm-2.50.1.tar.xz 6444576 SHA256 1fd85051da9cb402cc8348cec72dfe4d79f9345df4a1dbf68703a4ded45846a4 SHA512 4f25c75c1628ca2f4db1c29cebc63187d372603066b06aa6a66c6da792f9e02cb4a413e41f058a81e2d5a2b38d625de13df76115b278f010ce2fc493fe6e6bbb WHIRLPOOL 54b656e04550a050994061db1498a3ac066b1e37643faa218ec1ef04604c0d37c799572b546e79c29f1b35586b1a5b0c354eca72151756eb99f4434a27fa7ae2
--- a/dev-cpp/glibmm/glibmm-2.48.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.48.1.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug examples test"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.8.0:2[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 1 failed"
-	fi
-
-	# don't build examples - we want to install example sources, not binaries
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die "sed 2 failed"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(use_enable debug debug-refcounting) \
-		$(multilib_native_use_enable doc documentation) \
-		--enable-deprecated-api
-}
-
-multilib_src_test() {
-	cd tests
-	default
-
-	for i in */test; do
-		${i} || die "Running tests failed at ${i}"
-	done
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use doc && ! use examples; then
-		rm -fr "${ED}usr/share/doc/glibmm*"
-	fi
-
-	if use examples; then
-		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-		dodoc -r examples
-	fi
-}
--- a/dev-cpp/glibmm/glibmm-2.50.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.50.1.ebuild
@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"

 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"

 RDEPEND="
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@ -1,3 +1,2 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 SHA256 0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e WHIRLPOOL b1bd5d27f53fece724c3389eb938a9ba746fb168637cacd437f152e6753f0150e5227acaed8d9b93b8e2e497352d03d77bec3fe4a5029c144ef2270c28c31c46
-DIST gtkmm-3.20.1.tar.xz 12178004 SHA256 051de1b8756ca6ec61f26264338cfc3060af936fd70bf4558bfe1e115418c612 SHA512 fad034db02ee3f4658bb3c065d78998f5da090ecba8903016fa1412eff845fdd46f44b2b6bd1be54d1d177bca0840815a1f492391045fbe43fa173e40b7b0fd5 WHIRLPOOL 5368bf79026c7888304b3329a28269ce17a3656b121805c4649241c622512ad2890a0c7fe0c74edd3f156388da77195fe62733c3609c245041ad2ea93090513f
 DIST gtkmm-3.22.0.tar.xz 12320816 SHA256 05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5 SHA512 0bc141ff09bc78697e89c6f071a1411cbc06e015ee664f3a6f9143bdb31793982e09533c8cff6d8c19cc53c4d32a1e5ad016db48141f5cfc21edfb333bf37988 WHIRLPOOL 8ec9f50c3f960dbe907d584c96adc0b4859b0d319c9c299f476cad8065390abb3f0b1c48cdf01303ce6f72a267b72d750d8dd5e4a011ce2d245e9acd649ee4b9
--- a/dev-cpp/gtkmm/gtkmm-3.20.1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.20.1.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2 multilib-minimal virtualx
-
-DESCRIPTION="C++ interface for GTK+"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE="aqua doc examples test wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.48.0:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.20.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.28:2[${MULTILIB_USEDEP}]
-	>=dev-cpp/atkmm-2.24.2[${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.12.0[${MULTILIB_USEDEP}]
-	>=dev-cpp/pangomm-2.38.2:1.4[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	examples? ( >=media-libs/libepoxy-1.2[${MULTILIB_USEDEP}] )
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )
-"
-#	dev-cpp/mm-common"
-# eautoreconf needs mm-common
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 1 failed"
-	fi
-
-	if ! use examples; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 2 failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		--enable-api-atkmm \
-		$(multilib_native_use_enable doc documentation) \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend)
-}
-
-multilib_src_test() {
-	virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
--- a/dev-cpp/gtkmm/gtkmm-3.22.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.22.0.ebuild
@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"

 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"

 IUSE="aqua doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils multilib toolchain-funcs

-KEYWORDS="alpha amd64 arm 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"

 DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
 HOMEPAGE="http://cr.yp.to/cdb.html"
--- a/dev-db/m17n-db/m17n-db-1.7.0.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.7.0.ebuild
@ -13,7 +13,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""

 DEPEND="sys-devel/gettext"
-RDEPEND="virtual/libintl"
+RDEPEND="!dev-db/m17n-contrib
+	virtual/libintl"

 src_install() {
 	default
--- a/dev-db/m17n-db/metadata.xml
+++ b/dev-db/m17n-db/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
--- a/dev-db/mariadb/mariadb-10.1.24.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.24.ebuild
@ -21,7 +21,7 @@ RESTRICT="!bindist? ( bindist )"
 REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"

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

 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"

--- a/dev-db/tinycdb/tinycdb-0.77-r2.ebuild
+++ b/dev-db/tinycdb/tinycdb-0.77-r2.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.corpit.ru/mjt/${PN}/${P/-/_}.tar.gz"

 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc x86"
+KEYWORDS="amd64 ~arm64 hppa ia64 ppc x86"
 IUSE="static-libs"
 RESTRICT="test"

--- a/dev-java/jibx/Manifest
+++ b/dev-java/jibx/Manifest
@ -1,4 +1,4 @@
+DIST jibx-1.1.5.zip 6788994 SHA256 121dbe5b7338081ffbf09cd1175afe5e1862a63673f467d560e0ab4c27fb3f17 SHA512 13c3a43a53746e9146d1240d73d1948b3c03ead55aa0e79158c2700a385b0dfba0e31122efd11446c1a46c2b3f85235035dc198c6b3acf2fcefa88b2a0683cc7 WHIRLPOOL 427b9970850f5497796e65e43200262e567965bd5ae07f59893f00eba4cf6942a70cf15fb0985d99e26c649e56f175b8dd0b1451b77c27a9859b196bc5cd9d91
 DIST jibx-bind-1.2.6-sources.jar 450003 SHA256 fa0a5b86677e2158c553bed1b10ff03666d3d9c293c584b6b3fc0a2220f73829 SHA512 8a93aed76d00c465f4fa1d4929bbecc37497b05d7e094b68745bd740bf06cfe87919f3c02b83311766852845e763a2ed51f9ed1d543d03921dea1b67526e7668 WHIRLPOOL 3a31eb554bf37bc7a5b6f4e5ed619dc24bdcca3f7e567df9550740b5c31ab4a15d785ecfa9322a385d0a0e49a645777bf4639add32689b0997e0f4421bdfc69d
 DIST jibx-extras-1.2.6-sources.jar 61737 SHA256 ef92732594b865f91de6a652eb4c7a990b486274ed7286ee21252c8168ca3f7f SHA512 355e387f92766e2cdd8686e9ed26e80584c668ca6c670532f8f24ae758bc4713cfd505890f0ea634b3380f41429725e2ca719652700b0dc3562d5966b108b3ed WHIRLPOOL b8b6fe03da804c32dfca3c82d8e7d7049d39147f78646f9f017f71bc5164d0b376c2df716daa7b0b5b311ec2cc56048d63745fdeaa3c565000fe5d907194016b
 DIST jibx-run-1.2.6-sources.jar 194660 SHA256 64efecf8e948b3e76c701a342164463adbb6a378000ab0b80d3ddf5e27676407 SHA512 623ef57cc411464fe1b936d9795ba982fb221334ad8ea8448afa73d9c229a2b3dacde1ee424864d1c12830d59ca2e9431d54b5cb0d1e8273b4fd6fbc47a3cf5a WHIRLPOOL 8ae9f1b2bbd504283b7e1a5399c8da396907077fae74a8cf8f6e8f552776536f9e82038803c3f9e0870571fd906af85347104716aa3ef9bfaaf585e8b478a2c1
-DIST jibx_1_1_5.zip 6788994 SHA256 121dbe5b7338081ffbf09cd1175afe5e1862a63673f467d560e0ab4c27fb3f17 SHA512 13c3a43a53746e9146d1240d73d1948b3c03ead55aa0e79158c2700a385b0dfba0e31122efd11446c1a46c2b3f85235035dc198c6b3acf2fcefa88b2a0683cc7 WHIRLPOOL 427b9970850f5497796e65e43200262e567965bd5ae07f59893f00eba4cf6942a70cf15fb0985d99e26c649e56f175b8dd0b1451b77c27a9859b196bc5cd9d91
--- a/dev-java/jibx/jibx-1.1.5-r1.ebuild
+++ b/dev-java/jibx/jibx-1.1.5-r1.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators '_')
-
-DESCRIPTION="JiBX: Binding XML to Java Code"
-HOMEPAGE="http://jibx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE=""
-
-COMMON_DEP="dev-java/dom4j:1
-	dev-java/ant-core:0
-	dev-java/bcel:0
-	java-virtuals/stax-api
-	dev-java/xpp3:0"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
-	cd lib || die
-	rm -v *.jar || die
-	java-pkg_jar-from ant-core,bcel,dom4j-1,stax-api,xpp3
-}
-
-EANT_BUILD_XML="build/build.xml"
-EANT_BUILD_TARGET="small-jars"
-
-src_install() {
-	java-pkg_dojar "${S}"/lib/${PN}*.jar
-
-	dodoc changes.txt docs/binding.dtd docs/binding.xsd
-	dohtml readme.html
-
-	use doc && {
-		java-pkg_dohtml -r docs/*
-		cp -R starter "${ED}/usr/share/doc/${PF}"
-		cp -R tutorial "${ED}/usr/share/doc/${PF}"
-	}
-
-	use source && java-pkg_dosrc build/src/* build/extras/*
-}
--- a/dev-java/jibx/jibx-1.1.5-r2.ebuild
+++ b/dev-java/jibx/jibx-1.1.5-r2.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators '_')
-
-DESCRIPTION="JiBX: Binding XML to Java Code"
-HOMEPAGE="http://jibx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE=""
-
-CDEPEND="dev-java/dom4j:1
-	dev-java/ant-core:0
-	dev-java/bcel:0
-	dev-java/xpp3:0"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
-	cd lib || die
-	rm -v *.jar || die
-	java-pkg_jar-from ant-core,bcel,dom4j-1,xpp3
-}
-
-EANT_BUILD_TARGET="small-jars"
-EANT_BUILD_XML="build/build.xml"
-
-src_install() {
-	java-pkg_dojar "${S}"/lib/${PN}*.jar
-
-	dodoc changes.txt docs/binding.dtd docs/binding.xsd
-	dohtml readme.html
-
-	use doc && {
-		java-pkg_dohtml -r docs/*
-		cp -R starter "${ED}/usr/share/doc/${PF}"
-		cp -R tutorial "${ED}/usr/share/doc/${PF}"
-	}
-
-	use source && java-pkg_dosrc build/src/* build/extras/*
-}
--- a/dev-java/jibx/jibx-1.1.5-r3.ebuild
+++ b/dev-java/jibx/jibx-1.1.5-r3.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 versionator
+
+MY_PV=$(replace_all_version_separators '_')
+
+DESCRIPTION="JiBX: Binding XML to Java Code"
+HOMEPAGE="http://jibx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+CDEPEND="
+	dev-java/bcel:0
+	dev-java/xpp3:0
+	dev-java/dom4j:1
+	dev-java/ant-core:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( changes.txt docs/binding.dtd docs/binding.xsd )
+HTML_DOCS=( readme.html docs starter tutorial )
+
+EANT_BUILD_TARGET="small-jars"
+EANT_BUILD_XML="build/build.xml"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	java-pkg_jar-from --into lib ant-core,bcel,dom4j-1,xpp3
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/lib/${PN}*.jar
+	use source && java-pkg_dosrc build/src/* build/extras/*
+	einstalldocs
+}
--- a/dev-java/jibx/jibx-1.2.6-r1.ebuild
+++ b/dev-java/jibx/jibx-1.2.6-r1.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=6

 JAVA_PKG_IUSE="doc source"

@ -16,7 +16,7 @@ SRC_URI="
 "

 LICENSE="BSD"
-SLOT="0"
+SLOT="1.2"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"

 CDEPEND="
--- a/dev-lang/ocaml/ocaml-4.04.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.04.2.ebuild
@ -16,7 +16,7 @@ LICENSE="QPL-1.0 LGPL-2"
 # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
 # so here we go with the subslot.
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="emacs flambda latex ncurses +ocamlopt X xemacs"

 RDEPEND="
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -1,7 +1,6 @@
 DIST php-5.6.30.tar.xz 12449696 SHA256 a363185c786432f75e3c7ff956b49c3369c3f6906a6b10459f8d1ddc22f70805 SHA512 fdf503925c236a79cc09bc9e5c06ce5afa7497ccf20ab486389b818a7d84db1b84ac119523b35586f64fff7d198b6c20164910fbf33254b35ec2f41015d9feef WHIRLPOOL d3217dfd3de0a2b2f178f1b869d2e0fa39128c4518deaf20f6f79d81a938f3730bf4cfb1cc19ddd55797a9e43a2ebad76555ae08004cefbf2430fc6916c49bd3
+DIST php-5.6.31.tar.xz 12461268 SHA256 c464af61240a9b7729fabe0314cdbdd5a000a4f0c9bd201f89f8628732fe4ae4 SHA512 b5d3bc306167c851460036aa21194a2f74a50a26aa5c46159394bddbff94e4a418b557d68d5e1315672b3571b13a231ef7810d5346f57c0094acfe29c2e70495 WHIRLPOOL 2cd74a9cfe82b9363b4fbad37b13a8f7cc9571d2493a95b52cdaeeafe2d04255a29b31792dce2db0c41696539ed6b203446a2a6a8ea0319d82066fe9622bfcb9
 DIST php-7.0.15.tar.xz 12575116 SHA256 300364d57fc4a6176ff7d52d390ee870ab6e30df121026649f8e7e0b9657fe93 SHA512 1d233edb908f44fb895184dbfdfd5684d52e4c831dc3e8184b3e645137e6f44bdc7abd16ceaf2249b9288cf1f1893b7dcca955c6e1c3a6b4afbe03cec2a85033 WHIRLPOOL 4ac7bf2521eb242204fcd9e231a53d06879b16e47928c6cdf9e04c2f16b25b880b16378c0d9425b3c1a183127dce062f3905eb3dd0a6cd196f3decb9304e2b7a
 DIST php-7.0.19.tar.xz 12595396 SHA256 640e5e3377d15a6d19adce2b94a9d876eeddabdb862d154a5e347987f4225ef6 SHA512 7e926ef791cc511b28a92fc6ad9e66cc5abbee0506f1318f55b18134834212f6af7ff38df3cbaf25c36b0f5c5dabf8c00a55cf2aedf48c76952b687be114720e WHIRLPOOL c717c821596c8ce8ee676030c6949e449797a9887e9b81c55d11af50a69afc36e93dde6ea599436af2048a099ab79b1c8b165842e1593f4cae3f74ff0f70c64c
-DIST php-7.0.20.tar.xz 12604260 SHA256 31b9cf1fb83fe3cd82c2f6603a0ae81ae6abacb5286827e362d8f85e68908e0a SHA512 60fe16d9d4d54410b23a6e7b113ce4e6f2f880d1739d01c088f0de4ca939f54044c57adce7d735483bf798b2d1cbfe3fd891445c88a2b8fe6ebf2bdeabf9b6b7 WHIRLPOOL 373881488ec8d8532b33df45bb89bb15c50d63ccb74d06781829a032eb1abaad486ee4b94d14724abc8b21032c537f6e451a1d59bd9a2c8348377c30a5a3819f
 DIST php-7.0.21.tar.xz 12626276 SHA256 6713fe3024365d661593235b525235045ef81f18d0043654658c9de1bcb8b9e3 SHA512 6fabbadc6076622628e5c408c1be546982412f56b631285f6abe4a98cedc2bbb5d05f4c1c14b07a7e0a04e24270a8a0d7361baa4f42a2232703baee70934ec34 WHIRLPOOL 4f2fbbdb2eca5515721f21924df3bf00d61a2856c06d15c46b5e7592700b7a036dc58f3745a20bb5b908469b1007b293c91ebd0c17cd60372a1b392fc9e0a8bb
-DIST php-7.1.5.tar.xz 12797696 SHA256 d149a3c396c45611f5dc6bf14be190f464897145a76a8e5851cf18ff7094f6ac SHA512 0583ccb3f31995ddc8e3023f8ca9b6299b45855fc950b5e17fe70a54811b59cd6c233d85a4d4ebfa6c727255ab99d3c477719406c3ab2095d9b0074a731a7a88 WHIRLPOOL 84fe668178a4563cd1d38d46e23e27bd3bb3309632326fd0815fe3148785e352459a2a03e0dafcb80571750faf7bade311720f053c8385eab64cce1999d4c7e0
-DIST php-7.1.6.tar.xz 12808680 SHA256 01584dc521ab7ec84b502b61952f573652fe6aa00c18d6d844fb9209f14b245b SHA512 b447435e8f2a28c34ca7c65e1f52147da7609f655301d7c49158052c58696a8159104c2b404d778ad4713b25df659dbc5bf186d3d1a8d51b33a03d6711e7ab65 WHIRLPOOL cbab739fcbb80124291759ac71152ba273ddd5b77e9e43da50c190b9d09d4720eec0ce8fb22de91856e0d128ae30dffae6dd15a04bf7b049d4ab34bb5b2d1f7d
+DIST php-7.1.7.tar.xz 12831708 SHA256 0d42089729be7b2bb0308cbe189c2782f9cb4b07078c8a235495be5874fff729 SHA512 aaf846feccc8ab1cc4ab68ec166596d1a610334ed461e1203208c40b7a7db4bbaee7a79d6e47be1cba07e59087846ea6d2f8fbbd17deae6cc724e08fa9813cd0 WHIRLPOOL 282f99e9ad03564edcb01e9a4bc8da38041c7c31f13c8f81ff526a811bbd712614bb4c4515cc59d7afba0ed0205d079f896863126ddb6e81289de99eae1ceac9
--- a/dev-lang/php/php-5.6.31.ebuild
+++ b/dev-lang/php/php-5.6.31.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-inherit flag-o-matic versionator systemd
+inherit autotools flag-o-matic versionator systemd

 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="http://php.net/"
@ -18,10 +18,10 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"

 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~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"

 # We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
+SAPIS="embed cli cgi fpm apache2"

 # SAPIs and SAPI-specific USE flags (cli SAPI is default on):
 IUSE="${IUSE}
@ -33,11 +33,11 @@ IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
 	enchant exif +fileinfo +filter firebird
 	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
 	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
-	mhash mssql mysql mysqli nls
+	mhash mssql mysql libmysqlclient mysqli nls
 	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
 	readline recode selinux +session sharedmem
 	+simplexml snmp soap sockets spell sqlite ssl
-	sysvipc systemd tidy +tokenizer truetype unicode wddx webp
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
 	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"

 # The supported (that is, autodetected) versions of BDB are listed in
@ -84,6 +84,10 @@ COMMON_DEPEND="
 	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
 	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
 	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/libmysqlclient:= )
+		mysqli? ( virtual/libmysqlclient:= )
+	)
 	nls? ( sys-devel/gettext )
 	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
 	odbc? ( >=dev-db/unixODBC-1.8.13 )
@ -98,18 +102,20 @@ COMMON_DEPEND="
 	spell? ( >=app-text/aspell-0.50 )
 	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
+		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl )
 	)
+	sybase-ct? ( dev-db/freetds )
 	tidy? ( app-text/htmltidy )
 	truetype? (
 		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
 		!gd? (
 			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	)
 	unicode? ( dev-libs/oniguruma )
+	vpx? ( media-libs/libvpx )
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp )
 	xml? ( >=dev-libs/libxml2-2.6.8 )
 	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
 	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
@ -141,9 +147,10 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
 	cli? ( ^^ ( readline libedit ) )
 	truetype? ( gd )
-	webp? ( gd )
+	vpx? ( gd )
 	cjk? ( gd )
 	exif? ( gd )
+
 	xpm? ( gd )
 	gd? ( zlib )
 	simplexml? ( xml )
@ -155,12 +162,18 @@ REQUIRED_USE="
 	ldap-sasl? ( ldap )
 	mhash? ( hash )
 	phar? ( hash )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
 	qdbm? ( !gdbm )
 	readline? ( !libedit )
-	recode? ( !imap !mysqli )
+	recode? ( !imap !mysql !mysqli )
 	sharedmem? ( !threads )
-	mysql? ( || ( mysqli pdo ) )
-	|| ( cli cgi fpm apache2 embed phpdbg )"
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"

 PHP_MV="$(get_major_version)"

@ -204,11 +217,9 @@ php_install_ini() {

 	# SAPI-specific handling
 	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		einfo "Installing FPM config file php-fpm.conf"
 		insinto "${PHP_INI_DIR#${EPREFIX}}"
 		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
 	fi

 	dodoc php.ini-{development,production}
@ -221,17 +232,43 @@ php_set_ini_dir() {
 }

 src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
+	eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch"
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
+		|| die
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	eapply_user
+
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
 }

 src_configure() {
@ -281,6 +318,7 @@ src_configure() {
 		$(use_with xml libxml-dir "${EPREFIX}/usr")
 		$(use_enable unicode mbstring)
 		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with mssql mssql "${EPREFIX}/usr")
 		$(use_with unicode onig "${EPREFIX}/usr")
 		$(use_with ssl openssl "${EPREFIX}/usr")
 		$(use_with ssl openssl-dir "${EPREFIX}/usr")
@ -298,6 +336,7 @@ src_configure() {
 		$(use_enable soap soap)
 		$(use_enable sockets sockets)
 		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
 		$(use_enable sysvipc sysvmsg)
 		$(use_enable sysvipc sysvsem)
 		$(use_enable sysvipc sysvshm)
@ -334,14 +373,13 @@ src_configure() {
 	# Support for the GD graphics library
 	our_conf+=(
 		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_with truetype t1lib "${EPREFIX}/usr")
 		$(use_enable cjk gd-jis-conv)
 		$(use_with gd jpeg-dir "${EPREFIX}/usr")
 		$(use_with gd png-dir "${EPREFIX}/usr")
 		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+		$(use_with vpx vpx-dir "${EPREFIX}/usr")
 	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
 	# enable gd last, so configure can pick up the previous settings
 	our_conf+=( $(use_with gd gd) )

@ -367,7 +405,10 @@ src_configure() {
 	# MySQL support
 	local mysqllib="mysqlnd"
 	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"

+	our_conf+=( $(use_with mysql mysql "${mysqllib}") )
 	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )

 	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
@ -387,7 +428,7 @@ src_configure() {
 	# PDO support
 	if use pdo ; then
 		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mssql pdo-dblib)
 			$(use_with mysql pdo-mysql "${mysqllib}")
 			$(use_with postgres pdo-pgsql)
 			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
@ -454,7 +495,7 @@ src_configure() {

 		for sapi in $SAPIS ; do
 			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
+				cli|cgi|embed|fpm)
 					if [[ "${one_sapi}" == "${sapi}" ]] ; then
 						sapi_conf+=( "--enable-${sapi}" )
 					else
@ -535,7 +576,7 @@ src_install() {
 				# We're specifically not using emake install-sapi as libtool
 				# may cause unnecessary relink failures (see bug #351266)
 				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+				newins ".libs/libphp5$(get_libname)" \
 					   "libphp${PHP_MV}$(get_libname)"
 				keepdir "/usr/$(get_libdir)/apache2/modules"
 			else
@ -555,9 +596,6 @@ src_install() {
 					embed)
 						source="libs/libphp${PHP_MV}$(get_libname)"
 						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
 					*)
 						die "unhandled sapi in src_install"
 						;;
@ -620,12 +658,8 @@ src_test() {
 		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
 	fi

-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
 	fi

 	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
--- a/dev-lang/php/php-7.1.5.ebuild
+++ b/dev-lang/php/php-7.1.5.ebuild
@ -1,738 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic versionator systemd
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="http://php.net/"
-SRC_URI="http://php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
-	coverage crypt +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	acl? ( sys-apps/acl )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	coverage? ( dev-util/lcov )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( dev-libs/gmp:0 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
-	truetype? (
-		=media-libs/freetype-2*
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	webp? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli )
-	sharedmem? ( !threads )
-	mysql? ( || ( mysqli pdo ) )
-	|| ( cli cgi fpm apache2 embed phpdbg )"
-
-PHP_MV="$(get_major_version)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with acl fpm-acl)
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with crypt mcrypt "${EPREFIX}/usr")
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with systemd fpm-systemd)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
--- a/dev-lang/php/php-7.1.7.ebuild
+++ b/dev-lang/php/php-7.1.7.ebuild
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@ -1,3 +1,2 @@
 DIST vala-0.32.1.tar.xz 2759528 SHA256 dd0d47e548a34cfb1e4b04149acd082a86414c49057ffb79902eb9a508a161a9 SHA512 d59db1bd9132f93f187c30ccabff9d21fe8685293a6494e5b009d883de4f844cc4b8dc5d3b6eb4e026a93490f2e4ff7ba83ff22a093c6f8f85e68d83f5fe1bb0 WHIRLPOOL d61a171cacb62f008e15408729b809f9a13f11880395526a9890ddfed1a41d0ad021c57c8d9d93ffdf6f99ee5231fffdb4fa1763d8b7238a8f62ae67f4aa22ca
-DIST vala-0.34.7.tar.xz 2776352 SHA256 1b2cb14f377d4c41fa3a86d3d01b93017015ce91b6714a85f27346073b4034fa SHA512 b7345f71ab59adfdba44a76529c7fe06255557aef8098f4214584c1d2ab4c014e1c2c60b2dfcb6cabc0d3d83b93dda850439fdab12b4a1498b2b202147c12e73 WHIRLPOOL 7102db5b0d6b563ec3f3fa5436209e4477804fa06ac6040d4c6f70e14864780f9698ce44881d7c8c688b920a7d245099977ea0032d5f47d9a93982ea770f6d29
 DIST vala-0.34.8.tar.xz 2778228 SHA256 22899bad63436ccfab4abc44face3bf4c1e4e72dea5891d67626dc360078c0a3 SHA512 03739173aa2b4e5d476037c77ac86543b97bd6eeb94f40dcce952da127e32baefa0dfa83f9d6e8ea254d4aee5ecd557964520926239bd119da72c771e30ece14 WHIRLPOOL b5874c5b08427d758fdd0e02f1f431296acc7451c609c75b06017e26ea11c835b89ddd1803de0a24f957b0c7f2ad6f4473c674b8cc76317a84c0d6d3b5ddaf8b
--- a/dev-lang/vala/vala-0.34.7.ebuild
+++ b/dev-lang/vala/vala-0.34.7.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0.34"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/vala-common-${PV}
-"
-DEPEND="${RDEPEND}
-	!${CATEGORY}/${PN}:0
-	dev-libs/libxslt
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-	test? (
-		dev-libs/dbus-glib
-		>=dev-libs/glib-2.26:2 )
-"
-
-src_configure() {
-	gnome2_src_configure --disable-unversioned
-}
--- a/dev-lang/vala/vala-0.34.8.ebuild
+++ b/dev-lang/vala/vala-0.34.8.ebuild
@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"

 LICENSE="LGPL-2.1"
 SLOT="0.34"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"

 RDEPEND="
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@ -1,3 +1,2 @@
 DIST appstream-glib-0.6.13.tar.xz 1974864 SHA256 1a3734b2cdaab55ad63c6e3ee31026fdceb122cecae39f9f7126a0305e8836bf SHA512 d7e95a31d3f6fba974af2fab423282c7b0291d1325a634d8040fe2c2c2fcde49981be18900415251b3d71f20bb9e945e16d7c00fa830b27deac2e5547ec4c8b0 WHIRLPOOL 91e8209ff79b564c51328d84ef34301872865ade73d2c85b71ba5dbfddffcd81ad30bce9867d44282822df566a3fa028cd291ee1a896b52612bb80d2f435251c
-DIST appstream-glib-0.6.7.tar.xz 1961284 SHA256 9767756e2c970709f0070d4c9e617bb3af2d62cd4fbce8486bd742092671b922 SHA512 cc8b58fa1eb8a4cb0c73f256ff3455d7ffc62282cf70676ae669a0b471c08278b3870d5d50dc70c386ec536031056136ba6742b674d94ca0c20d397f49615df2 WHIRLPOOL 93b8698d018eee7997b6fd232f8ee0447f34980628905147ae73b9274b2781fd422eca41ed266f89faee3ee63616cff86a12ca60e78d297ead56d462692534b7
 DIST appstream-glib-0.6.8.tar.xz 1962132 SHA256 23f009233a96d1246c4c46c9746be126ae9d422753399621445d07bff49cae41 SHA512 dac9e0cc6dd8dfb81cbcdb6796d6890b61d5ede634cbe31768d1cf5746ada3beaf8b46918bab24e72604d52cbf6c6602efa6aedbdf9379f4c10528929f926fe5 WHIRLPOOL d2f2dd1607f4cb03ab501e4e189862cbb5c58b0bc3e63af153d72c7a714e791509dc2981921b1414f11282f7681277b690cb3142ce71c2bacd2799a935bdfdc2
--- a/dev-libs/appstream-glib/appstream-glib-0.6.7.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.6.7.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit bash-completion-r1 gnome2
-
-DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
-HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/"
-SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/8" # soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="+introspection nls stemmer"
-
-RDEPEND="
-	app-arch/gcab
-	app-arch/libarchive
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.45.8:2
-	>=dev-libs/json-glib-1.1.1
-	dev-libs/libyaml
-	>=media-libs/fontconfig-2.11:1.0
-	>=media-libs/freetype-2.4:2
-	>=net-libs/libsoup-2.51.92:2.4
-	sys-apps/util-linux
-	>=x11-libs/gdk-pixbuf-2.31.5:2
-	x11-libs/gtk+:3
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
-	stemmer? ( dev-libs/snowball-stemmer )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.9
-	>=sys-devel/gettext-0.19.7
-"
-# ${PN} superseeds appdata-tools, require dummy package until all ebuilds
-# are migrated to appstream-glib
-RDEPEND="${RDEPEND}
-	!<dev-util/appdata-tools-0.1.8-r1
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-builder \
-		--enable-firmware \
-		--disable-rpm \
-		--disable-static \
-		--enable-dep11 \
-		--enable-man \
-		$(use_enable nls) \
-		$(use_enable introspection) \
-		$(use_enable stemmer) \
-		--with-bashcompletiondir="$(get_bashcompdir)"
-}
--- a/dev-libs/appstream-glib/appstream-glib-0.6.8.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.6.8.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"

 LICENSE="LGPL-2.1"
 SLOT="0/8" # soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="+introspection nls stemmer"

 RDEPEND="
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@ -1,2 +1 @@
-DIST atk-2.20.0.tar.xz 724200 SHA256 493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0 SHA512 3dab21e59f47deeee7c4b95dbda1c9a57a15007367af584a27c472e20f11bebd210ae7cd16b255e810f66df4c0a2bee14d904c46e1367ce5a6ade6f5af81bace WHIRLPOOL accada46d8c3b134aabea8dc88d33fb55be317ddc7fbb9bae7746e982df63a8515c530af87aa2310a7bcfee0080583080306cf094332acce7a747f80c6247484
 DIST atk-2.22.0.tar.xz 745572 SHA256 d349f5ca4974c9c76a4963e5b254720523b0c78672cbc0e1a3475dbd9b3d44b6 SHA512 af3f6197eb97de869ee706f19564449b02c1444c413e5418323e4bf4c8cf1d98c7c8baa25189f6879d63606d4bc75f33799cb901f4697c087e868bb9a5643cba WHIRLPOOL aec1b3944101532b6330f66f2094d3d821a30da10e07d3ba1b793b9063ef18ce8790faa3d016927fe2dd8383c4b5cba9ac4d85244f83fbb73bd06077c299e851
--- a/dev-libs/atk/atk-2.20.0.ebuild
+++ b/dev-libs/atk/atk-2.20.0.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="+introspection nls test"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	dev-util/gtk-doc-am
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=sys-devel/gettext-0.19.2 )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test; then
-		# don't waste time building tests (bug #226353)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# Building out of sources fails, https://bugzilla.gnome.org/show_bug.cgi?id=752507
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-#	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection)
-
-	# work-around gtk-doc out-of-source brokedness
-#	if multilib_is_native_abi; then
-#		ln -s "${S}"/docs/html docs/html || die
-#	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
--- a/dev-libs/atk/atk-2.22.0.ebuild
+++ b/dev-libs/atk/atk-2.22.0.ebuild
@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"

 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+introspection nls test"

 RDEPEND="
--- a/dev-libs/dbus-glib/dbus-glib-0.108.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.108.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"

 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs test"

 CDEPEND="
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@ -1,4 +1,3 @@
-DIST glib-2.48.2.tar.xz 6408644 SHA256 f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4 SHA512 2eac104eb2207d0a6488992e48069a34b417f51e141364f281ab7b0953a6de88be177b1c694dd9464a856c9a5d8021e3cf0193a8d9c5aaf6ea11f1f9ff743c43 WHIRLPOOL cba211000d5597e93d01113e5f2b6736e47f4daa00935a53af182b3304fef9a1ac25f78995c7a53cc1234261433a1bbd1ec751c87b556845a15da720af5b971b
 DIST glib-2.50.3.tar.xz 7589284 SHA256 82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999 SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af WHIRLPOOL fc8effb457005a234ccb164d74026cec4af7f9a70eef0a8d58efebfacdcf0d7f7713042a9476e6a89e4effbdf4b0d59377811790557cc991cf6b397e5e984f93
 DIST glib-2.52.2.tar.xz 7672064 SHA256 f00e5d9e2a2948b1da25fcba734a6b7a40f556de8bc9f528a53f6569969ac5d0 SHA512 3ea49b75b6f80d9974ebd3c40518d5aaffffd9d9d008c1ae3302690fa34899b91ae59c87f8235077129bbd8b01ef19211efb89bc7fdb08d0254b07735b1ba92d WHIRLPOOL f8e6a75b95ace42291a49307f6d9ad30070eddc5160fee21165c0d23db929da92cc3b0e78b907b05ff8c60d6dd68b19139862a970af373ee720f7a5538554138
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
--- a/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
+++ b/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
@ -1,95 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a01e58d..59d4527 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -367,14 +367,14 @@ AC_SUBST(PERL_PATH)
- # option to specify python interpreter to use; this just sets $PYTHON, so that
- # we will fallback to reading $PYTHON if --with-python is not given, and
- # python.m4 will get the expected input
-AC_ARG_WITH(python,
-            AS_HELP_STRING([--with-python=PATH],
-                           [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
-            [PYTHON="$withval"], [])
-if test x"$PYTHON" = xyes; then
-  AC_MSG_ERROR([--with-python option requires a path or program argument])
-fi
-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-+# AC_ARG_WITH(python,
-+#             AS_HELP_STRING([--with-python=PATH],
-+#                            [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
-+#             [PYTHON="$withval"], [])
-+# if test x"$PYTHON" = xyes; then
-+#   AC_MSG_ERROR([--with-python option requires a path or program argument])
-+# fi
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
- 
- 
- dnl ***********************
-@@ -3580,7 +3580,6 @@ gobject/glib-mkenums
- gobject/tests/Makefile
- gthread/Makefile
- gio/Makefile
-gio/gdbus-2.0/codegen/Makefile
- gio/gdbus-2.0/codegen/config.py
- gio/gnetworking.h
- gio/xdgmime/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 47fdd38..c7eb136 100644
--- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -157,8 +157,7 @@ man_MANS +=			\
- 	glib-compile-resources.1	\
- 	gsettings.1		\
- 	gresource.1		\
-	gdbus.1			\
-	gdbus-codegen.1
-+	gdbus.1
- 
- XSLTPROC_FLAGS = \
-         --nonet \
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index e993e2f..025ad94 100644
--- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
- 
-SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
- 
- if OS_UNIX
- SUBDIRS += xdgmime
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 2c54e59..3cd3c5a 100644
--- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -437,10 +437,8 @@ gnotification_SOURCES                    = $(gdbus_sessionbus_sources) gnotifica
- 
- BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h
-gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h: test-codegen.xml Makefile
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.project. \
- 		--generate-c-code gdbus-test-codegen-generated \
- 		--c-generate-object-manager \
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index d6d1412..62ef706 100644
--- a/gio/tests/gdbus-object-manager-example/Makefile.am
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
- 	gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml	\
- 	$(NULL)
- 
-$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- 		--c-namespace Example \
- 		--c-generate-object-manager \
--- a/dev-libs/glib/glib-2.48.2.ebuild
+++ b/dev-libs/glib/glib-2.48.2.ebuild
@ -1,282 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
-# adding new dependencies end up making stage3 to grow. Every addition needs
-# then to be think very closely.
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-# Completely useless with or without USE static-libs, people need to use
-# pkg-config
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
-	multilib multilib-minimal pax-utils python-r1  toolchain-funcs versionator virtualx
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
-REQUIRED_USE="
-	utils? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	utils? (
-		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-		virtual/libelf:0=
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-libs/libxslt-1.0
-	>=sys-devel/gettext-0.11
-	>=dev-util/gtk-doc-am-1.20
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	test? (
-		sys-devel/gdb
-		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-		>=sys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2
-"
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-# Earlier versions of gvfs do not work with glib
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
-	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
-
-	if use test; then
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-			ewarn "Some tests will be skipped due to missing terminal program"
-			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
-	fi
-
-	eapply "${FILESDIR}"/${PN}-2.50.3-fix-gdatetime-tests.patch
-
-	# gdbus-codegen is a separate package
-	eapply "${FILESDIR}"/${PN}-2.40.0-external-gdbus-codegen.patch
-
-	# Leave python shebang alone - handled by python_replicate_script
-	# We could call python_setup and give configure a valid --with-python
-	# arg, but that would mean a build dep on python when USE=utils.
-	sed -e '/${PYTHON}/d' \
-		-i glib/Makefile.{am,in} || die
-
-	# Also needed to prevent cross-compile failures, see bug #267603
-	eautoreconf
-
-	gnome2_src_prepare
-
-	epunt_cxx
-}
-
-multilib_src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig and
-	# native builds (cross-compiles won't need pkg-config
-	# in the target ROOT to work here)
-	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
-		if has_version sys-apps/dbus; then
-			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-			export DBUS1_LIBS="-ldbus-1"
-		fi
-		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
-		export LIBFFI_LIBS="-lffi"
-	fi
-
-	# These configure tests don't work when cross-compiling.
-	if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		case ${CHOST} in
-		hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		*)            export glib_cv_stack_grows=no ;;
-		esac
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756474
-		export glib_cv_uscore=no
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756475
-		export ac_cv_func_posix_get{pwuid,grgid}_r=yes
-	fi
-
-	local myconf
-
-	case "${CHOST}" in
-		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
-		*)        myconf="${myconf} --with-threads=posix" ;;
-	esac
-
-	# libelf used only by the gresource bin
-	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable xattr) \
-		$(use_enable fam) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable systemtap systemtap) \
-		$(multilib_native_use_enable utils libelf) \
-		--disable-compile-warnings \
-		--enable-man \
-		--with-pcre=system \
-		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-
-	if multilib_is_native_abi; then
-		local d
-		for d in glib gio gobject; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	python_setup
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	# Hardened: gdb needs this, bug #338891
-	if host-is-pax ; then
-		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
-			|| die "Hardened adjustment failed"
-	fi
-
-	# Need X for dbus-launch session X11 initialization
-	virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use utils ; then
-		python_replicate_script "${ED}"/usr/bin/gtester-report
-	else
-		rm "${ED}usr/bin/gtester-report"
-		rm "${ED}usr/share/man/man1/gtester-report.1"
-	fi
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${ED}/usr/lib/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"/${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="usr/$(get_libdir)/gio/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-
-	multilib_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	# force (re)generation of gschemas.compiled
-	GNOME2_ECLASS_GLIB_SCHEMAS="force"
-
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gio/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
--- a/dev-libs/glib/glib-2.50.3-r1.ebuild
+++ b/dev-libs/glib/glib-2.50.3-r1.ebuild
@ -27,7 +27,7 @@ REQUIRED_USE="
 	test? ( ${PYTHON_REQUIRED_USE} )
 "

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

 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@ -1,3 +1,2 @@
-DIST gobject-introspection-1.48.0.tar.xz 1371308 SHA256 fa275aaccdbfc91ec0bc9a6fd0562051acdba731e7d584b64a277fec60e75877 SHA512 62b23fd94e19fd7f1557c8bdd045b4ec19b9a39c55ec4b4a75b817fc97f936c6fdbf89fa3ad09ffa707afb542b1c644b718ccaaefe194f681ad40c08d5c53975 WHIRLPOOL c284623cf5b0f6edc4d543fbbbc6b31b2e5ceb119b2fb4da1dbb052673ba79eeadba997f34fcd191f42e320cbd697733986d96ef3c4d8655765d7e586f7dbd54
 DIST gobject-introspection-1.50.0.tar.xz 1415700 SHA256 1c6597c666f543c70ef3d7c893ab052968afae620efdc080c36657f4226337c5 SHA512 cb108cf3d49743e1686fe4ae99f2360799bc8825ad97bf0b97e097b3f89e2771079593de0f497a9e5b9cff892f6fbf870834a6c4d13f11bcde99162e9388ecfa WHIRLPOOL 6147c2608c911020800471c30e6c754385efd61fe9f875bb7fad7d161e73cb857fa37c810e66bf0cf16a43aca1ecf6d2e46a6cde90800970f303c7721fdc5edb
 DIST gobject-introspection-1.52.1.tar.xz 1384292 SHA256 2ed0c38d52fe1aa6fc4def0c868fe481cb87b532fc694756b26d6cfab29faff4 SHA512 878653ffa80c064c73453ea2878a977e52f0d6a0b2123bee8c3429379366f9da3e9fd991fad0dda170d74e4241314ea6c5120f5988e68fad4bfe9c333d11389f WHIRLPOOL 7489998d8ee9bcfbd576cf7d2e84e9bf9f531ef43bad5685c21433189dc93d815e0faff5ad8c01bc0475618eae92732ad8aadaca7f997f75b2144cb966dd1cc5
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.48.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.48.0.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="gobject-introspection"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for GObject Introspection"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
-# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
-# https://forums.gentoo.org/viewtopic-p-7421930.html
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/aclocal
-	insinto /usr/share/aclocal
-	doins m4/introspection.m4
-
-	dodir /usr/share/gobject-introspection-1.0
-	insinto /usr/share/gobject-introspection-1.0
-	doins Makefile.introspection
-}
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.50.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.50.0.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"

 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@ -1,3 +1,2 @@
-DIST gobject-introspection-1.48.0.tar.xz 1371308 SHA256 fa275aaccdbfc91ec0bc9a6fd0562051acdba731e7d584b64a277fec60e75877 SHA512 62b23fd94e19fd7f1557c8bdd045b4ec19b9a39c55ec4b4a75b817fc97f936c6fdbf89fa3ad09ffa707afb542b1c644b718ccaaefe194f681ad40c08d5c53975 WHIRLPOOL c284623cf5b0f6edc4d543fbbbc6b31b2e5ceb119b2fb4da1dbb052673ba79eeadba997f34fcd191f42e320cbd697733986d96ef3c4d8655765d7e586f7dbd54
 DIST gobject-introspection-1.50.0.tar.xz 1415700 SHA256 1c6597c666f543c70ef3d7c893ab052968afae620efdc080c36657f4226337c5 SHA512 cb108cf3d49743e1686fe4ae99f2360799bc8825ad97bf0b97e097b3f89e2771079593de0f497a9e5b9cff892f6fbf870834a6c4d13f11bcde99162e9388ecfa WHIRLPOOL 6147c2608c911020800471c30e6c754385efd61fe9f875bb7fad7d161e73cb857fa37c810e66bf0cf16a43aca1ecf6d2e46a6cde90800970f303c7721fdc5edb
 DIST gobject-introspection-1.52.1.tar.xz 1384292 SHA256 2ed0c38d52fe1aa6fc4def0c868fe481cb87b532fc694756b26d6cfab29faff4 SHA512 878653ffa80c064c73453ea2878a977e52f0d6a0b2123bee8c3429379366f9da3e9fd991fad0dda170d74e4241314ea6c5120f5988e68fad4bfe9c333d11389f WHIRLPOOL 7489998d8ee9bcfbd576cf7d2e84e9bf9f531ef43bad5685c21433189dc93d815e0faff5ad8c01bc0475618eae92732ad8aadaca7f997f75b2144cb966dd1cc5
--- a/dev-libs/gobject-introspection/gobject-introspection-1.48.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.48.0.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-single-r1 toolchain-funcs versionator
-
-DESCRIPTION="Introspection system for GObject-based libraries"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-IUSE="cairo doctool test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( cairo )
-"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# virtual/pkgconfig needed at runtime, bug #505408
-# We force glib and goi to be in sync by this way as explained in bug #518424
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.$(get_version_component_range 2):2
-	doctool? ( dev-python/mako )
-	virtual/libffi:=
-	virtual/pkgconfig
-	!<dev-lang/vala-0.20.0
-	${PYTHON_DEPS}
-"
-# Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.19
-	sys-devel/bison
-	sys-devel/flex
-"
-# PDEPEND to avoid circular dependencies, bug #391213
-PDEPEND="cairo? ( x11-libs/cairo[glib] )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	if ! has_version "x11-libs/cairo[glib]"; then
-		# Bug #391213: enable cairo-gobject support even if it's not installed
-		# We only PDEPEND on cairo to avoid circular dependencies
-		export CAIRO_LIBS="-lcairo -lcairo-gobject"
-		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
-	fi
-
-	# To prevent crosscompiling problems, bug #414105
-	gnome2_src_configure \
-		--disable-static \
-		CC="$(tc-getCC)" \
-		YACC="$(type -p yacc)" \
-		$(use_with cairo) \
-		$(use_enable doctool)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
-		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"usr/share/aclocal || die
-}
--- a/dev-libs/gobject-introspection/gobject-introspection-1.50.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.50.0.ebuild
@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and g-i to be in sync by this way as explained in bug #518424
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@ -1,2 +1 @@
-DIST json-glib-1.2.2.tar.xz 590376 SHA256 ea128ab52a824fcd06e5448fbb2bd8d9a13740d51c66d445828edba71321a621 SHA512 04cbb303c4c6fc6e8af8bc25353b7aff7454250e317f29e4544e850c251aa8c6c88f81cbada8aafd42db637f5521814a86720b0784bc6f202cb222140e993bcf WHIRLPOOL ad5d0d092356beb03537cd07adde488d125487484b02be6e15329eb5d14b0f80f7967b7abee843cbb153da81e440f31787742f12378e6d7c28a152485acc035c
 DIST json-glib-1.2.8.tar.xz 604336 SHA256 fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a SHA512 85d8ad431363b8698d71684927b8aa38749d99ea7236334ec09fd81482489f1ab9cb12dabcbe13f6b6ffd7e5d70ade47a36b511e275915d4aa858af647db90ba WHIRLPOOL 2c770d113e4b1911fe98ca127110c45443a5e992d442265c8e48a65f66d1429bff1099b4015f93d110b547734f4478febe1d27a81e7774cf3f23e0696c51fe18
--- a/dev-libs/json-glib/json-glib-1.2.2.ebuild
+++ b/dev-libs/json-glib/json-glib-1.2.2.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="Library providing GLib serialization and deserialization for the JSON format"
-HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-DEPEND="${RDEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-src_prepare() {
-	# Do not touch CFLAGS
-	sed -e 's/CFLAGS -g/CFLAGS/' -i "${S}"/configure || die
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# Coverage support is useless, and causes runtime problems
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--enable-man \
-		--disable-gcov \
-		$(usex debug --enable-debug=yes --enable-debug=minimum) \
-		$(multilib_native_use_enable introspection)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/reference/html doc/reference/html || die
-	fi
-}
-
-multilib_src_compile() {
-	gnome2_src_compile
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
--- a/dev-libs/json-glib/json-glib-1.2.8.ebuild
+++ b/dev-libs/json-glib/json-glib-1.2.8.ebuild
@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"

 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug +introspection"

 RDEPEND="
--- a/dev-libs/kreport/kreport-3.0.1.ebuild
+++ b/dev-libs/kreport/kreport-3.0.1.ebuild
@ -16,6 +16,8 @@ LICENSE="LGPL-2+"
 KEYWORDS="amd64 x86"
 IUSE="marble +scripting webkit"

+RESTRICT+=" test"
+
 RDEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
--- a/dev-libs/libgcrypt/libgcrypt-1.7.8.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.7.8.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"

 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-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 ~amd64-fbsd ~sparc-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 static-libs"

 RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
--- a/Show More
+++ b/Show More