Sync with portage [Thu Dec 22 15:11:36 MSK 2016].

2016-12-22 15:11:37 +03:00 · 2016-12-22 15:11:37 +03:00 · 0c7880d368
commit 0c7880d368
parent b82ca8a8c7
571 changed files with 2717 additions and 1889 deletions
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r1.ebuild
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r1.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="app-crypt/gcr
+	dev-python/eventlet
+	dev-python/flask
+	dev-python/greenlet
+	dev-python/setproctitle
+	www-servers/gunicorn"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	default
+	mkdir "${P}"
+	tar -xf data.tar.xz -C "${S}" || die
+	tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
+}
+
+src_install() {
+	mv opt/amc/amc/* opt/amc/
+	rm -rf opt/amc/amc
+	rm -f opt/amc/install
+	rm -f opt/amc/bin/uninstall
+	rm -f opt/amc/bin/amc_*.sh
+	rm -f opt/amc/bin/gunicorn
+	rm -rf opt/amc/server/site-packages/
+	rm -rf opt/amc/server/setups/
+
+	insinto /etc/logrotate.d
+	newins opt/amc/config/logrotate amc
+	rm -f opt/amc/config/logrotate
+
+	insinto /etc/cron.daily
+	newins opt/amc/config/logcron amc
+	rm -f opt/amc/config/logcron
+
+	sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
+
+	insinto /etc/amc/config
+	doins -r opt/amc/config/*
+	rm -rf opt/amc/config/
+
+	echo "${PV}" > opt/amc/amc_version
+
+	insinto /opt/amc/
+	doins -r opt/amc/*
+
+	keepdir /var/log/amc
+
+	newinitd "${FILESDIR}"/amc.init2 amc
+}
--- a/app-admin/aerospike-amc-community/files/amc.init2
+++ b/app-admin/aerospike-amc-community/files/amc.init2
@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd-r2,v 1.2 2014/05/26 08:03:45 ultrabug Exp $
+
+config_file=${config_file:-/etc/amc/config/gunicorn_config.py}
+run_dir=${run_dir:-/run}
+
+command="/usr/bin/gunicorn"
+command_args="--daemon --config ${config_file} flaskapp:app"
+command_progress="true"
+retry='TERM/30/KILL/5'
+pidfile=${run_dir}/${SVCNAME}.pid
+user=${user:-root}
+group=${group:-root}
+start_stop_daemon_args="--user ${user} --group ${group}"
+required_files="${config_file}"
+
+depend() {
+	use net
+}
+
+start_post() {
+	ewaitfile 60 "${pidfile}"
+}
--- a/app-admin/apache-tools/apache-tools-2.4.25.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.25.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"

--- a/app-admin/sudo/sudo-1.8.18_p1.ebuild
+++ b/app-admin/sudo/sudo-1.8.18_p1.ebuild
@ -24,7 +24,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="ISC BSD"
 SLOT="0"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
 fi
 IUSE="ldap nls pam offensive selinux skey +sendmail"

--- a/app-arch/libarchive/libarchive-3.2.2.ebuild
+++ b/app-arch/libarchive/libarchive-3.2.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"

 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"

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

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

 REQUIRED_USE="kde? ( wxwidgets )"
--- a/app-arch/unrar/unrar-5.4.5.ebuild
+++ b/app-arch/unrar/unrar-5.4.5.ebuild
@ -14,7 +14,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"

 LICENSE="unRAR"
 SLOT="0"
-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-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@ -0,0 +1 @@
+DIST VeraCrypt_1.19.tar.gz 23235780 SHA256 7d3fa5007b8e9dc93691c2da78dee497954b0596763a50e21724ec0564eb761b SHA512 ebce681099e04d938ff0dc10a1af848c82dafd80b165b2431ec355d64e29be4e60d1d63f0d5c9fd1182394080d00f0f573e3ae90f3e2167533dea2b895bd0164 WHIRLPOOL 7a1968e29a6f2757c2d7a1187e9e062872ffd26721b27b3df791cbe8c82c18dc98d42d249725f8bc4fd721fe80eb7dbe4642dde26f89ad0c0f84803c1f06a439
--- a/app-crypt/veracrypt/files/veracrypt-1.19-execstack-fix.patch
+++ b/app-crypt/veracrypt/files/veracrypt-1.19-execstack-fix.patch
@ -0,0 +1,60 @@
+--- src/Crypto/Aes_hw_cpu.asm.old
+++ src/Crypto/Aes_hw_cpu.asm
+@@ -328,3 +328,12 @@
+
+
+ %endif	; __BITS__ != 16
+	%ifidn __OUTPUT_FORMAT__,elf
+	section .note.GNU-stack noalloc noexec nowrite progbits
+	%endif
+	%ifidn __OUTPUT_FORMAT__,elf32
+	section .note.GNU-stack noalloc noexec nowrite progbits
+	%endif
+	%ifidn __OUTPUT_FORMAT__,elf64
+	section .note.GNU-stack noalloc noexec nowrite progbits
+	%endif
+--- src/Crypto/AesSmall_x86.asm.old
+++ src/Crypto/AesSmall_x86.asm
+@@ -1442,3 +1442,12 @@
+     db  v8(0xe1),v8(0x69),v8(0x14),v8(0x63),v8(0x55),v8(0x21),v8(0x0c),v8(0x7d)
+
+ %endif
+	%ifidn __OUTPUT_FORMAT__,elf
+	section .note.GNU-stack noalloc noexec nowrite progbits
+	%endif
+	%ifidn __OUTPUT_FORMAT__,elf32
+	section .note.GNU-stack noalloc noexec nowrite progbits
+	%endif
+	%ifidn __OUTPUT_FORMAT__,elf64
+	section .note.GNU-stack noalloc noexec nowrite progbits
+	%endif
+--- src/Crypto/Aes_x64.asm.old
+++ src/Crypto/Aes_x64.asm
+@@ -905,3 +905,12 @@
+ %endif
+
+ %endif
+	%ifidn __OUTPUT_FORMAT__,elf
+	section .note.GNU-stack noalloc noexec nowrite progbits
+	%endif
+	%ifidn __OUTPUT_FORMAT__,elf32
+	section .note.GNU-stack noalloc noexec nowrite progbits
+	%endif
+	%ifidn __OUTPUT_FORMAT__,elf64
+	section .note.GNU-stack noalloc noexec nowrite progbits
+	%endif
+--- src/Crypto/Aes_x86.asm.old
+++ src/Crypto/Aes_x86.asm
+@@ -644,3 +644,12 @@
+     do_exit
+
+ %endif
+	%ifidn __OUTPUT_FORMAT__,elf
+	section .note.GNU-stack noalloc noexec nowrite progbits
+	%endif
+	%ifidn __OUTPUT_FORMAT__,elf32
+	section .note.GNU-stack noalloc noexec nowrite progbits
+	%endif
+	%ifidn __OUTPUT_FORMAT__,elf64
+	section .note.GNU-stack noalloc noexec nowrite progbits
+	%endif
--- a/app-crypt/veracrypt/files/veracrypt-1.19-makefile-archdetect.patch
+++ b/app-crypt/veracrypt/files/veracrypt-1.19-makefile-archdetect.patch
@ -0,0 +1,26 @@
+From 181857089b11045c701e9195275a408430beb580 Mon Sep 17 00:00:00 2001
+From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
+Date: Sat, 5 Nov 2016 23:39:46 +0100
+Subject: [PATCH] Linux: Always use "uname -m" to determine processor type.
+ This fixes Slackware build issue.
+
+---
+ src/Makefile | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 7bfc5ad..00e6e5b 100644
+--- src/Makefile
+++ src/Makefile
+@@ -131,10 +131,7 @@ export PLATFORM_UNSUPPORTED := 0
+ export CPU_ARCH ?= unknown
+ export SIMD_SUPPORTED := 0
+ 
+-ARCH = $(shell uname -p)
+-ifeq "$(ARCH)" "unknown"
+-	ARCH = $(shell uname -m)
+-endif
+ARCH = $(shell uname -m)
+ 
+ ifneq (,$(filter i386 i486 i586 i686 x86,$(ARCH)))
+ 	CPU_ARCH = x86
--- a/app-crypt/veracrypt/files/veracrypt-1.19-remove-packaging-from-makefile.patch
+++ b/app-crypt/veracrypt/files/veracrypt-1.19-remove-packaging-from-makefile.patch
@ -0,0 +1,52 @@
+--- src/Main/Main.make.orig
+++ src/Main/Main.make
+@@ -190,49 +190,6 @@
+ 	rm -fr "$(PWD)/Setup/MacOSX/VeraCrypt_dmg"
+ endif
+
+-
+-
+-ifeq "$(PLATFORM)" "Linux"
+-ifeq "$(TC_BUILD_CONFIG)" "Release"
+-	mkdir -p $(PWD)/Setup/Linux/usr/bin
+-	mkdir -p $(PWD)/Setup/Linux/usr/share/$(APPNAME)/doc
+-	cp $(PWD)/Main/$(APPNAME) $(PWD)/Setup/Linux/usr/bin/$(APPNAME)
+-	cp $(PWD)/Setup/Linux/$(APPNAME)-uninstall.sh $(PWD)/Setup/Linux/usr/bin/$(APPNAME)-uninstall.sh
+-	chmod +x $(PWD)/Setup/Linux/usr/bin/$(APPNAME)-uninstall.sh
+-	cp $(PWD)/License.txt $(PWD)/Setup/Linux/usr/share/$(APPNAME)/doc/License.txt
+-	cp "$(PWD)/Release/Setup Files/VeraCrypt User Guide.pdf" "$(PWD)/Setup/Linux/usr/share/$(APPNAME)/doc/VeraCrypt User Guide.pdf"
+-
+-ifndef TC_NO_GUI
+-	mkdir -p $(PWD)/Setup/Linux/usr/share/applications
+-	mkdir -p $(PWD)/Setup/Linux/usr/share/pixmaps
+-	cp $(PWD)/Resources/Icons/VeraCrypt-256x256.xpm $(PWD)/Setup/Linux/usr/share/pixmaps/$(APPNAME).xpm
+-	cp $(PWD)/Setup/Linux/$(APPNAME).desktop $(PWD)/Setup/Linux/usr/share/applications/$(APPNAME).desktop
+-endif
+-
+-
+-	tar cfz $(PWD)/Setup/Linux/$(PACKAGE_NAME) --directory $(PWD)/Setup/Linux usr
+-
+-	@rm -fr $(INTERNAL_INSTALLER_NAME)
+-	@echo "#!/bin/sh" > $(INTERNAL_INSTALLER_NAME)
+-	@echo "VERSION=$(TC_VERSION)" >> $(INTERNAL_INSTALLER_NAME)
+-	@echo "PACKAGE_TYPE=tar" >> $(INTERNAL_INSTALLER_NAME)
+-	@echo "PACKAGE_NAME=$(PACKAGE_NAME)" >> $(INTERNAL_INSTALLER_NAME)
+-	@echo "PACKAGE_START=1107" >> $(INTERNAL_INSTALLER_NAME)
+-	@echo "INSTALLER_TYPE=$(INSTALLER_TYPE)" >> $(INTERNAL_INSTALLER_NAME)
+-
+-	@cat $(PWD)/Setup/Linux/veracrypt_install_template.sh >> $(INTERNAL_INSTALLER_NAME)
+-	@cat $(PWD)/Setup/Linux/$(PACKAGE_NAME) >> $(INTERNAL_INSTALLER_NAME)
+-	chmod +x $(INTERNAL_INSTALLER_NAME)
+-
+-	rm -fr $(PWD)/Setup/Linux/packaging
+-	mkdir -p $(PWD)/Setup/Linux/packaging
+-	cp $(INTERNAL_INSTALLER_NAME) $(PWD)/Setup/Linux/packaging/.
+-	makeself $(PWD)/Setup/Linux/packaging $(PWD)/Setup/Linux/$(INSTALLER_NAME) "VeraCrypt $(TC_VERSION) Installer" ./$(INTERNAL_INSTALLER_NAME)
+-
+-endif
+-
+-endif
+-
+ $(OBJS): $(PCH)
+
+ Resources.o: $(RESOURCES)
--- a/app-crypt/veracrypt/files/veracrypt.init
+++ b/app-crypt/veracrypt/files/veracrypt.init
@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	after localmount
+	need device-mapper
+}
+
+stop() {
+	# Try to remove any dm-crypt mappings
+	if [ -x /usr/bin/veracrypt ]; then
+		ebegin "Removing veracrypt mappings"
+		! /usr/bin/veracrypt -l > /dev/null 2>&1  || /usr/bin/veracrypt -d
+		eend $?
+	fi
+}
--- a/app-crypt/veracrypt/metadata.xml
+++ b/app-crypt/veracrypt/metadata.xml
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<longdescription>
+	Platform independent filesystem or container encryptor
+	derived from truecrypt
+</longdescription>
+<use>
+	<flag name="asm">Enable assembly for optimization</flag>
+</use>
+<maintainer type="person">
+	<email>fdsfgs@krutt.org</email>
+	<name>soredake</name>
+</maintainer>
+<maintainer type="person">
+	<email>gokturk@gentoo.org</email>
+	<name>Göktürk Yüksek</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<upstream>
+	<remote-id type="github">veracrypt/VeraCrypt</remote-id>
+</upstream>
+</pkgmetadata>
--- a/app-crypt/veracrypt/veracrypt-1.19.ebuild
+++ b/app-crypt/veracrypt/veracrypt-1.19.ebuild
@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils linux-info pax-utils toolchain-funcs wxwidgets
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://veracrypt.codeplex.com"
+SRC_URI="https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz"
+
+LICENSE="Apache-2.0 truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X +asm"
+RESTRICT="mirror bindist"
+
+WX_GTK_VER="3.0"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	asm? ( dev-lang/nasm )
+"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
+
+pkg_setup() {
+	local CONFIG_CHECK="~BLK_DEV_DM ~DM_CRYPT ~FUSE_FS ~CRYPTO ~CRYPTO_XTS"
+	linux-info_pkg_setup
+
+	setup-wxwidgets
+}
+
+PATCHES=(
+	# TODO: remove in >=1.20
+	"${FILESDIR}/${P}-makefile-archdetect.patch"
+	"${FILESDIR}/${P}-execstack-fix.patch"
+	"${FILESDIR}/${P}-remove-packaging-from-makefile.patch"
+)
+
+src_compile() {
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		TC_EXTRA_CFLAGS="${CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+		TC_EXTRA_LFLAGS="${LDFLAGS}"
+		WX_CONFIG="${WX_CONFIG}"
+	)
+	use X || myemakeargs+=( NOGUI=1 )
+	use asm || myemakeargs+=( NOASM=1 )
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	"${S}/Main/veracrypt" --text --test || die "tests failed"
+}
+
+src_install() {
+	dobin Main/veracrypt
+	dodoc Readme.txt "Release/Setup Files/VeraCrypt User Guide.pdf"
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	if use X; then
+		newicon Resources/Icons/VeraCrypt-48x48.xpm veracrypt.xpm
+		make_desktop_entry ${PN} "VeraCrypt" ${PN} "System"
+	fi
+
+	pax-mark -m "${D%/}/usr/bin/veracrypt"
+}
+
+pkg_postinst() {
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}
--- a/app-editors/adie/adie-1.7.54.ebuild
+++ b/app-editors/adie/adie-1.7.54.ebuild
@ -10,7 +10,7 @@ DESCRIPTION="Text editor based on the FOX Toolkit"

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

 DEPEND="~x11-libs/fox-${PV}
--- a/app-editors/gvim/gvim-8.0.0106.ebuild
+++ b/app-editors/gvim/gvim-8.0.0106.ebuild
@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi

 DESCRIPTION="GUI version of the Vim text editor"
--- a/app-editors/vim-core/vim-core-8.0.0106.ebuild
+++ b/app-editors/vim-core/vim-core-8.0.0106.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-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 ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="vim and gvim shared files"
--- a/app-editors/vim/vim-8.0.0106.ebuild
+++ b/app-editors/vim/vim-8.0.0106.ebuild
@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-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 ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="Vim, an improved vi-style text editor"
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@ -1,4 +1,4 @@
 DIST diskimage-builder-1.23.0.tar.gz 255659 SHA256 c235f459f4a52bf0cff134bb6921d29cdf7b87a4427d070e97e16c4b486fb66d SHA512 18d420759df167762c8b41249c94243081ffcf5312727dfc882964c9957752acadd6c526ef34fc49dcf9539b15852542f51f0d83630d27d67fc1c82efa144708 WHIRLPOOL bdd5ce22ae37f96420d9faae40a3cbcfa0d89ff1698f911759b2d79bfb7f867bee4fd0d827a14c1d825969c2bac6996d108cf9427fac5615de7c3527c268c8ee
 DIST diskimage-builder-1.24.0.tar.gz 256522 SHA256 e5236e0be1d07e0111bceae344bfe6f9dd8b0ed9eba64240e218ecc70b9a7b03 SHA512 27e99142e3d951c2137bf53b16298cc9aacfb5167e9fb4572e735e36b555628262c730570b177ea65565f27afce76c0fb8fdee97c9aa7a2346dfdbae1909fd30 WHIRLPOOL 95f77d78b2d723ec9bdcff190d6e583a0ea6963104126ca146221cf53974137d675e795133659dcd55477645cc2c7c7e8734acd8029f903e98130efd196f16a8
 DIST diskimage-builder-1.25.2.tar.gz 258530 SHA256 a0dce083d24e0f19f88f645db817acd88c32fea42fc40bcd497c619c12f6c87e SHA512 25c4fc0b0d23f157cf98a122e41486937ff20a6e942894371a923d10ce9ffdf9b477accaaa2fc806ddb5e2a2cdb3f1d84809ba7527a2c6ab35eb2e2e8fd5bc98 WHIRLPOOL a9ee5edeb0fa632e8b6d8877ae8e397ad3ca1683f527faa370241f4c67d95b2f7bf58c2d1030e7b700681e488eabef11939411f8440783aff1306414c4ea8e32
-DIST diskimage-builder-1.26.0.tar.gz 262007 SHA256 27f1aea5cb1661a22004d165bc98fe6d7f4d32bd491e000b9de5359dd454336e SHA512 54ff3a87d3739e45e2d911af0fd24a6ecb95820c7edbcf88b5f5f1610c77ac8f830c8081b1fafdb2d08a34fe0a6deaf2dc6e821be065b8dff7c0026cdeb607ee WHIRLPOOL 80c7232f6c86d46578958741de580e8f7429a03110bbefd521299a7b7e255fec8383102aad57684bbaee5e22e3e23597d4f96180b86c4ec84ab105303a7de979
+DIST diskimage-builder-1.26.1.tar.gz 260140 SHA256 dd842a364124a59aaa3751fe178f8799c39e29badbc69d1459d2ed35b9042660 SHA512 698c97b7e016a87c2acd83d27400bd009e8148bb76efc737fae3344aa2c860fdf4060f1608eaa38566c24fa68c5fdbf51559ab64f9d9ef26d0adbe3a1b69325f WHIRLPOOL 83e86a6b5a1629041465be971657968fbdad3377ba9c3bb60ce29b2dd658165541f6e3b5a67eaa13727221e0a44032aafb26b30e042453e2a4c4e085cb26f3da
--- a/app-emulation/diskimage-builder/diskimage-builder-1.26.1.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-1.26.1.ebuild
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@ -1,3 +1,3 @@
-DIST vagrant-1.8.5.tar.gz 1738399 SHA256 e6882f9b44a52888760c34d6c43e3fa3f118e9eb96730bcd466cd8ae948c3126 SHA512 b1e162b870fb991c42c98704cf7ad10ebe6090bacb00376e5b5684734508300847e9065393c33b49699ec884f12f8c48150b3cea2e17ba009917578817dd2f6b WHIRLPOOL bb535b3598e7224112326e3033fe38fccea54b18527954a5849e8cbdc1ebc9521294c6699335eacc0d32476731bb3e522a52e071e620c72c12c546fb62c4583c
 DIST vagrant-1.8.6.tar.gz 1749696 SHA256 de1204c56feeeb327f542e58d39c9dd55fef78a9b753594a3b30e330d72d23e4 SHA512 dba8226b4039a8fa3587254f5d57fb7c967dde993aa87cffd745d7e176d2f78b45830e04711d90e48bca47197b11d1a46e34bf29e5bc0e1d6d78eecb2e636e36 WHIRLPOOL 3c32f00a4b4d773d6f795ad8a088c4a4316d612a8d4504348f2d2790bfc38bf5299a9e730c28b721858a36cff4210b322e8f6225b144e37282689c3beee1971b
 DIST vagrant-1.8.7.tar.gz 1756302 SHA256 5371d39679d40d4f6913728dd3d93c103e74c76ecc813710191a2c378b83a1e2 SHA512 b9cffded481b03d676d5815b1d6ba55b56cd5ae8ac7ddbaca19f36880df8cd3fdc9efc240782001619bd3790518e192ba82e8bbde2e4eba12894e78603e6a3b7 WHIRLPOOL 37e4dfe3b4f4681c01887ce75ec035cc8efdf2950b2d04bac0793dd527d65d3f7c991880e7fb402831eb746bb3cb1f84cf7b4529316435b007d6a0cf682f3393
+DIST vagrant-1.9.1.tar.gz 1762644 SHA256 ed30e5a277b5614ee83d9417793ed2af870977368c2b0344855694040c4d6449 SHA512 07ea6e2d881806ce61395a30abdaa7b4f7c2c39bb909d6c6e0aa14101945a9a26078ed18ebb8e238d97f05ee060564fb290615ac4868b80ee29b64b88a666452 WHIRLPOOL 16ece1985a78942c75774181c803e42ffe81cd0580314372932af6a3c5084b43f8d3db0d6137eaa3186a9cdbf33e8e9d59f27f95be6ebe2ed5d93a90577e7fb9
--- a/app-emulation/vagrant/files/vagrant-1.9.1
+++ b/app-emulation/vagrant/files/vagrant-1.9.1
@ -4,7 +4,7 @@
 # Vagrant installation directory. This sets up proper environmental variables
 # so that everything loads and compiles to proper directories.

-VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.8.5"' )"
+VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.9.1"' )"

 # Export GEM_HOME based on VAGRANT_HOME
 #
@ -37,10 +37,9 @@ OS=$(uname -s 2>/dev/null)
 export VAGRANT_DETECTED_OS="${OS}"

 VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant"
-VAGRANT_LAUNCHER="${VAGRANT_DIR}/lib/vagrant/pre-rubygems.rb"

 # Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit
 export VAGRANT_EXECUTABLE

 # Call the actual Vagrant bin with our arguments
-exec ruby "${VAGRANT_LAUNCHER}" "$@"
+exec ruby "${VAGRANT_EXECUTABLE}" "$@"
--- a/app-emulation/vagrant/vagrant-1.8.5-r1.ebuild
+++ b/app-emulation/vagrant/vagrant-1.8.5-r1.ebuild
@ -3,7 +3,7 @@
 # $Id$

 EAPI="5"
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"

 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
@ -27,7 +27,6 @@ RDEPEND="${RDEPEND}
 	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"

 ruby_add_rdepend "
-	>=dev-ruby/bundler-1.12.5
 	>=dev-ruby/childprocess-0.5.0
 	>=dev-ruby/erubis-2.7.0
 	>=dev-ruby/i18n-0.6.0:* <dev-ruby/i18n-0.8.0:*
@ -43,7 +42,7 @@ ruby_add_rdepend "
 "

 ruby_add_bdepend "
-	dev-ruby/rake
+	>=dev-ruby/rake-11.3.0
 "

 all_ruby_prepare() {
@ -52,8 +51,9 @@ all_ruby_prepare() {
 	rm Gemfile || die

 	# loosen dependencies
-	sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp/s/~>/>=/' \
-		-e '/nokogiri\|bundler/s/=/>=/' \
+	sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake/s/~>/>=/' \
+		-e '/ruby_dep/s/<=/>=/' \
+		-e '/nokogiri/s/=/>=/' \
 		-i ${PN}.gemspec || die

 	# remove windows-specific gems
@ -64,18 +64,11 @@ all_ruby_prepare() {
 	sed -e '/rb-kqueue/d' \
 		-i ${PN}.gemspec || die

-	# see https://github.com/mitchellh/vagrant/pull/5877
-	epatch "${FILESDIR}"/${PN}-1.8.4-install-plugins-in-isolation.patch
-
 	# disable embedded CA certs and use system ones
 	epatch "${FILESDIR}"/${PN}-1.8.1-disable-embedded-cacert.patch

 	# fix rvm issue (bug #474476)
 	epatch "${FILESDIR}"/${PN}-1.8.1-rvm.patch
-
-	# https://github.com/mitchellh/vagrant/issues/7610 (#592996)
-	sed -e 's/bsd/linux/g ; 57i \              chmod 0600 ~/.ssh/authorized_keys' \
-		-i plugins/guests/linux/cap/public_key.rb || die
 }

 all_ruby_install() {
--- a/app-portage/tatt/metadata.xml
+++ b/app-portage/tatt/metadata.xml
@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>kensington@gentoo.org</email>
+  </maintainer>
  <maintainer type="person">
    <email>tomka@gentoo.org</email>
    <name>Thomas Kahle</name>
@ -13,6 +16,6 @@ Tatt arch testing tool can be use to automatically generate scripts for various
 It aims at developers. If you are a normal user you will not need tatt.
 </longdescription>
  <upstream>
-    <remote-id type="github">tom111/tatt</remote-id>
+    <remote-id type="github">kensington/tatt</remote-id>
  </upstream>
 </pkgmetadata>
--- a/app-portage/tatt/tatt-9999.ebuild
+++ b/app-portage/tatt/tatt-9999.ebuild
@ -1,17 +1,17 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 PYTHON_COMPAT=( python2_7 python3_4 )

 inherit distutils-r1 git-r3

 DESCRIPTION="arch testing tool"
-HOMEPAGE="https://github.com/tom111/tatt"
-EGIT_REPO_URI="https://github.com/tom111/tatt.git \
-	git://github.com/tom111/tatt.git"
+HOMEPAGE="https://github.com/kensington/tatt"
+EGIT_REPO_URI="https://github.com/kensington/tatt.git \
+	git://github.com/kensington/tatt.git"

 LICENSE="GPL-2"
 SLOT="0"
--- a/app-text/dos2unix/dos2unix-7.3.4.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.4.ebuild
@ -16,7 +16,7 @@ SRC_URI="

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"

 RDEPEND="
--- a/dev-cpp/gtkmm-utils/gtkmm-utils-0.4.1.ebuild
+++ b/dev-cpp/gtkmm-utils/gtkmm-utils-0.4.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -7,9 +7,9 @@ inherit eutils flag-o-matic

 DESCRIPTION="Utility functions, classes and widgets written on top of gtkmm and
 glibmm."
-HOMEPAGE="https://code.google.com/p/gtkmm-utils/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-LICENSE="LGPL-2"
+HOMEPAGE="https://github.com/markoa/gtkmm-utils"
+SRC_URI="https://github.com/markoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2+"

 SLOT="0"
 KEYWORDS="~amd64 ~x86"
--- a/dev-db/phpmyadmin/phpmyadmin-4.6.5.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.6.5.1.ebuild
@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"

 RDEPEND="
--- a/dev-db/postgresql/postgresql-9.1.24.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.24.ebuild
@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

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

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.2.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.19.ebuild
@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

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

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.3.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.15.ebuild
@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

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

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.4.10.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.10.ebuild
@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

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

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.5.5.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.5.ebuild
@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

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

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-embedded/avrdude/avrdude-6.3.ebuild
+++ b/dev-embedded/avrdude/avrdude-6.3.ebuild
@ -16,7 +16,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="doc ftdi ncurses readline"

 RDEPEND="virtual/libusb:1
--- a/dev-lang/python/python-2.7.12.ebuild
+++ b/dev-lang/python/python-2.7.12.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz

 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"

 # Do not add a dependency on dev-lang/python to this ebuild.
--- a/dev-lang/python/python-3.4.5.ebuild
+++ b/dev-lang/python/python-3.4.5.ebuild
@ -17,7 +17,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz

 LICENSE="PSF-2"
 SLOT="3.4/3.4m"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"

 # Do not add a dependency on dev-lang/python to this ebuild.
--- a/dev-libs/botan/botan-1.10.13.ebuild
+++ b/dev-libs/botan/botan-1.10.13.ebuild
@ -13,7 +13,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="http://botan.randombit.net/"
 SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz"

-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 sparc x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos"
 SLOT="0"
 LICENSE="BSD"
 IUSE="bindist doc python bzip2 gmp ssl static-libs threads zlib"
--- a/dev-libs/expat/expat-2.2.0-r1.ebuild
+++ b/dev-libs/expat/expat-2.2.0-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/expat/${P}.tar.bz2"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
--- a/dev-libs/icu/icu-58.1-r1.ebuild
+++ b/dev-libs/icu/icu-58.1-r1.ebuild
@ -14,7 +14,7 @@ LICENSE="BSD"

 SLOT="0/${PV}"

-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc examples static-libs"

 DEPEND="
--- a/dev-libs/libebml/libebml-1.3.4.ebuild
+++ b/dev-libs/libebml/libebml-1.3.4.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://dl.matroska.org/downloads/${PN}/${P}.tar.bz2"

 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug static-libs"

 src_prepare() {
--- a/dev-libs/libnl/libnl-3.2.28.ebuild
+++ b/dev-libs/libnl/libnl-3.2.28.ebuild
@ -18,7 +18,7 @@ SRC_URI="
 "
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="static-libs python utils"

 RDEPEND="
--- a/dev-libs/libsodium/libsodium-1.0.11.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.11.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"

 LICENSE="ISC"
 SLOT="0/18"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"

 PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
--- a/dev-libs/libvformat/libvformat-1.13-r2.ebuild
+++ b/dev-libs/libvformat/libvformat-1.13-r2.ebuild
@ -14,7 +14,7 @@ SRC_URI="

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="static-libs"

 S="${WORKDIR}/${P}.orig"
--- a/dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch
+++ b/dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch
@ -0,0 +1,29 @@
+From 2fbf5b1f440534a46b7b440a487768620cfb039c Mon Sep 17 00:00:00 2001
+From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
+Date: Wed, 13 Jul 2016 13:31:05 +0200
+Subject: Add WIN32_EXTRA_LDFLAGS to tests/plugins/Makefile.am
+
+Fixes a compilation problem with Cygwin.
+
+Fixes bug #766669:
+https://bugzilla.gnome.org/show_bug.cgi?id=766669
+---
+ tests/plugins/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am
+index e0736ab..0f8c378 100644
+--- a/tests/plugins/Makefile.am
+++ b/tests/plugins/Makefile.am
+@@ -21,7 +21,7 @@ plugindir = $(abs_builddir)/.libs
+ xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
+ xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c
+ xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
+-xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version -rpath $(plugindir)
+xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -rpath $(plugindir)
+ 
+ test-logall:
+ 	@echo '## Running plugin tests'
+-- 
+cgit v0.12
+
--- a/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild
@ -0,0 +1,131 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils python-r1 toolchain-funcs multilib-minimal
+
+DESCRIPTION="XSLT libraries and tools"
+HOMEPAGE="http://www.xmlsoft.org/"
+SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="crypt debug examples python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}]
+	crypt?  ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/libxml2:2[python,${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xslt-config
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libxslt/xsltconfig.h
+)
+
+src_prepare() {
+	default
+
+	DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=684621
+	eapply "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch
+	# https://bugzilla.gnome.org/show_bug.cgi?id=766669
+	eapply "${FILESDIR}"/${PN}-1.1.29-cygwin.patch
+
+	# Simplify python setup
+	eapply "${FILESDIR}"/${PN}-1.1.28-simplify-python.patch
+	eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch
+
+	mv configure.{in,ac} || die
+
+	eautoreconf
+	# If eautoreconf'd with new autoconf, then epunt_cxx is not necessary
+	# and it is propably otherwise too if upstream generated with new
+	# autoconf
+#	epunt_cxx
+	# But Prefix always needs elibtoolize if not eautoreconf'd.
+#	elibtoolize
+}
+
+multilib_src_configure() {
+	libxslt_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
+			--with-html-subdir=html \
+			$(use_with crypt crypto) \
+			$(use_with debug) \
+			$(use_with debug mem-debug) \
+			$(use_enable static-libs static) \
+			"$@"
+	}
+
+	libxslt_py_configure() {
+		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
+		run_in_build_dir libxslt_configure --with-python
+	}
+
+	libxslt_configure --without-python # build python bindings separately
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl libxslt_py_configure
+	fi
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use python && libxslt_foreach_py_emake all
+}
+
+multilib_src_test() {
+	default
+	multilib_is_native_abi && use python && libxslt_foreach_py_emake test
+}
+
+multilib_src_install() {
+	# "default" does not work here - docs are installed by multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python; then
+		libxslt_foreach_py_emake \
+			DESTDIR="${D}" \
+			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+			EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+			install
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+	fi
+
+	prune_libtool_files --modules
+}
+
+libxslt_foreach_py_emake() {
+	libxslt_py_emake() {
+		pushd "${BUILD_DIR}/python" > /dev/null || die
+		emake "$@"
+		popd > /dev/null
+	}
+	local native_builddir=${BUILD_DIR}
+	python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@"
+}
--- a/dev-perl/Class-Load-XS/Class-Load-XS-0.60.0-r1.ebuild
+++ b/dev-perl/Class-Load-XS/Class-Load-XS-0.60.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ DESCRIPTION="XS implementation of parts of Class::Load"

 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~x64-macos"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/DBD-mysql/DBD-mysql-4.41.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.41.0.ebuild
@ -11,7 +11,7 @@ inherit eutils perl-module
 DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"

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

 # embedded=on disables ssl support
 # https://metacpan.org/source/MICHIELB/DBD-mysql-4.036/dbdimp.c#L1886
--- a/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.120.0.ebuild
+++ b/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.120.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION='Returns the equivalent of ${^GLOBAL_PHASE} eq DESTRUCT for older perls'

 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
 IUSE=""

 RDEPEND=">=dev-perl/Sub-Exporter-Progressive-0.1.11"
--- a/dev-perl/Devel-StackTrace/Devel-StackTrace-2.0.0.ebuild
+++ b/dev-perl/Devel-StackTrace/Devel-StackTrace-2.0.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ DESCRIPTION="An object representing a stack trace"

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

 RDEPEND="
--- a/dev-perl/Eval-Closure/Eval-Closure-0.80.0-r1.ebuild
+++ b/dev-perl/Eval-Closure/Eval-Closure-0.80.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="safely and cleanly create closures via string eval"

 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~x64-macos"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/Exception-Class/Exception-Class-1.390.0.ebuild
+++ b/dev-perl/Exception-Class/Exception-Class-1.390.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A module that allows you to declare real exception classes in Perl"

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

 RDEPEND="
--- a/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
+++ b/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Perl encapsulation of invoking the Latex programs"

 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild
+++ b/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ DESCRIPTION="Encode characters for LaTeX formatting"

 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6.ebuild
+++ b/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for the automatic generation of LaTeX tables"

 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/Module-Refresh/Module-Refresh-0.170.0-r1.ebuild
+++ b/dev-perl/Module-Refresh/Module-Refresh-0.170.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Refresh %INC files when updated on disk"

 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd"
 IUSE="test"

 RDEPEND=""
--- a/dev-perl/Moose/Moose-2.60.400-r1.ebuild
+++ b/dev-perl/Moose/Moose-2.60.400-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A postmodern object system for Perl 5"

 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~x64-macos"
 IUSE="test"

 CONFLICTS="
--- a/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0.ebuild
+++ b/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ DESCRIPTION="Name your accessors get_foo() and set_foo(), whatever that may mean

 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd"
 IUSE=""

 RDEPEND="
--- a/dev-perl/PadWalker/PadWalker-2.100.0.ebuild
+++ b/dev-perl/PadWalker/PadWalker-2.100.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="play with other peoples' lexical variables"

 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""

 DEPEND="virtual/perl-ExtUtils-MakeMaker"
--- a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
+++ b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ DESCRIPTION="Convert Pod data to formatted LaTeX"

 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd"
 IUSE=""

 RDEPEND="
--- a/dev-perl/Pod-Markdown/Pod-Markdown-3.5.0.ebuild
+++ b/dev-perl/Pod-Markdown/Pod-Markdown-3.5.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module

 DESCRIPTION="Convert POD to Markdown"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test minimal"

 RDEPEND="
--- a/dev-perl/Pod-Readme/Pod-Readme-1.1.2.ebuild
+++ b/dev-perl/Pod-Readme/Pod-Readme-1.1.2.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Intelligently generate a README file from POD"

 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="minimal test"

 RDEPEND="
--- a/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0.ebuild
+++ b/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module

 DESCRIPTION="format Pod as LaTeX"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/Readonly/Readonly-2.0.0.ebuild
+++ b/dev-perl/Readonly/Readonly-2.0.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Facility for creating read-only scalars, arrays, hashes"

 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"

 DEPEND="
--- a/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild
+++ b/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Perl interface for cyclic redundancy check generation"

 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""

 SRC_TEST=do
--- a/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.60.0.ebuild
+++ b/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.60.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ DESCRIPTION="LaTeX support for the Template Toolkit"

 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.12.0.ebuild
+++ b/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.12.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="provides an XS boost for some of Type::Tiny's built-in type constraints"

 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test minimal"

 RDEPEND="
--- a/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r3.ebuild
+++ b/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r3.ebuild
@ -11,7 +11,7 @@ USE_PHP="php5-5 php5-6"

 inherit php-ext-pecl-r3

-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"

 DESCRIPTION="PHP extension for parsing RFC822 and RFC2045 (MIME) messages"
 LICENSE="PHP-2.02"
--- a/dev-php/xdebug-client/xdebug-client-2.4.1.ebuild
+++ b/dev-php/xdebug-client/xdebug-client-2.4.1.ebuild
@ -4,7 +4,7 @@

 EAPI=6

-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 x86"

 MY_PV="${PV/_/}"
 MY_PV="${MY_PV/rc/RC}"
--- a/dev-php/xdebug/xdebug-2.4.1.ebuild
+++ b/dev-php/xdebug/xdebug-2.4.1.ebuild
@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"

 inherit php-ext-source-r3

-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 x86"

 DESCRIPTION="A PHP debugging and profiling extension"
 HOMEPAGE="http://www.xdebug.org/"
--- a/dev-python/certifi/certifi-2016.9.26.ebuild
+++ b/dev-python/certifi/certifi-2016.9.26.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND=""
--- a/dev-python/coverage/coverage-4.2.ebuild
+++ b/dev-python/coverage/coverage-4.2.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

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

 RDEPEND=""
--- a/dev-python/cython/cython-0.24.1.ebuild
+++ b/dev-python/cython/cython-0.24.1.ebuild
@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"

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

 IUSE="doc emacs test"

--- a/dev-python/greenlet/greenlet-0.4.10.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.10.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 -hppa ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 -hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"

 DEPEND="
--- a/dev-python/lxml/lxml-3.6.4-r1.ebuild
+++ b/dev-python/lxml/lxml-3.6.4-r1.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD ElementTree GPL-2 PSF-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 examples +threads test"

 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
--- a/dev-python/pyalsa/pyalsa-1.0.29.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.0.29.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/pyalsa/${P}.tar.bz2"

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

 RDEPEND="media-libs/alsa-lib"
--- a/dev-python/pyserial/pyserial-3.2.1.ebuild
+++ b/dev-python/pyserial/pyserial-3.2.1.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc examples"

 DEPEND="
--- a/dev-python/pywebkitgtk/metadata.xml
+++ b/dev-python/pywebkitgtk/metadata.xml
@ -13,7 +13,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="google-code">pywebkitgtk</remote-id>
-	</upstream>
 </pkgmetadata>
--- a/dev-python/pywebkitgtk/pywebkitgtk-1.1.8-r1.ebuild
+++ b/dev-python/pywebkitgtk/pywebkitgtk-1.1.8-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -8,10 +8,10 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools-utils python-r1 virtualx

 DESCRIPTION="Python bindings for the WebKit GTK+ port"
-HOMEPAGE="https://code.google.com/p/pywebkitgtk/"
-SRC_URI="https://pywebkitgtk.googlecode.com/files/${P}.tar.gz"
+HOMEPAGE="https://github.com/jmalonzo/pywebkitgtk"
+SRC_URI="https://github.com/jmalonzo/${PN}/archive/${PN^^}_${PV//./_}.tar.gz -> ${P}.tar.gz"

-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="test"
--- a/dev-python/simplejson/simplejson-3.10.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.10.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 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 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

--- a/dev-python/zope-event/zope-event-4.2.0.ebuild
+++ b/dev-python/zope-event/zope-event-4.2.0.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"

 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"

 DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
--- a/dev-python/zope-interface/zope-interface-4.3.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"

 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"

 RDEPEND=""
--- a/dev-ruby/amatch/amatch-0.3.0.ebuild
+++ b/dev-ruby/amatch/amatch-0.3.0.ebuild
@ -3,7 +3,7 @@
 # $Id$

 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"

 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc"
--- a/dev-ruby/gherkin/gherkin-2.12.2.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.12.2.ebuild
@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/cucumber/gherkin"
 LICENSE="MIT"
 SRC_URI="https://github.com/cucumber/gherkin/archive/v${PV}.tar.gz -> ${P}-git.tgz"

-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="doc test"

--- a/dev-ruby/http-form_data/http-form_data-1.0.1.ebuild
+++ b/dev-ruby/http-form_data/http-form_data-1.0.1.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility-belt to build form data request bodies"
-HOMEPAGE="https://github.com/httprb/form_data.rb"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/SimpleCov.start/ s:^:#:' spec/spec_helper.rb || die
-}
--- a/dev-ruby/multi_test/multi_test-0.1.2.ebuild
+++ b/dev-ruby/multi_test/multi_test-0.1.2.ebuild
@ -16,7 +16,7 @@ DESCRIPTION="A uniform interface for Ruby testing libraries"
 HOMEPAGE="http://cukes.info/"
 LICENSE="MIT"

-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE=""

--- a/dev-ruby/net-ssh/net-ssh-2.10.0.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-2.10.0.ebuild
@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${P

 LICENSE="GPL-2"
 SLOT="2.6"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test"

 ruby_add_rdepend "virtual/ruby-ssl"
--- a/dev-ruby/nokogiri/nokogiri-1.6.8.1.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.6.8.1.ebuild
@ -18,7 +18,7 @@ HOMEPAGE="http://nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"

-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""

--- a/dev-ruby/pkg-config/pkg-config-1.1.7.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.1.7.ebuild
@ -15,7 +15,7 @@ DESCRIPTION="A pkg-config implementation by Ruby"
 HOMEPAGE="https://github.com/rcairo/pkg-config"
 LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"

-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test"

--- a/dev-ruby/ruby-beautify/ruby-beautify-0.97.4.ebuild
+++ b/dev-ruby/ruby-beautify/ruby-beautify-0.97.4.ebuild
@ -16,7 +16,7 @@ DESCRIPTION="a cli tool (and module) to beautify ruby code"
 HOMEPAGE="https://github.com/erniebrodeur/ruby-beautify"
 LICENSE="MIT"

-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE=""

--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@ -3,3 +3,4 @@ DIST selenium-webdriver-3.0.0.gem 817664 SHA256 a538699a9e01ff75590892cb0efaf617
 DIST selenium-webdriver-3.0.1.gem 818176 SHA256 bdadc0ccc5e7b62091516d1e1ae419327b5f57909213fc73f02040a75728ed55 SHA512 8d89578fed67aac9707014e825e864eac67c3f05bb5c82cd336d617496a8b84894e3cf1b7bf6838da3be7caa28619b5c4b164fb32b0a8349efa35c4004c7c582 WHIRLPOOL a7db9acadca0af5bb59aef461bc8b663463198abb8fc5ef58fa511885d5eaba5c156f9c552e7b7c1ad9c9e96f3f60f14eb46d77d3cfd6172987ef9526ea85aa9
 DIST selenium-webdriver-3.0.2.gem 818176 SHA256 0ac27b904a16948c69fbd9ba884c8e1bb0171b0c0f75f8042173715ff0ecdb65 SHA512 4ad1853a6eeb460856ec9f6b92a523afe8ad79805b6cce437ec64cd78553f7c7add56d0965077408685451a83f3b11c7bf0be4accd1ee5f8ac708ddc668fb616 WHIRLPOOL 78ea8c39946c7644d129915c31c6320f8e66d6b2c46b99390d92279a90d88621fb393bf7af2ddc68bb6d9f4425f506513fe39fbda13e7e8864e3da979e5da020
 DIST selenium-webdriver-3.0.3.gem 818176 SHA256 39c5515b10866308a9bf00e294b462df66d66f47284ed0da90afac2938206ea1 SHA512 e8d0ba7482fe5c68b662774d127711c3bf9938494c83e7430797dfd996ae1c6cc9a1533ee072a0a86f13d866e8c82668bd7867f2395d477ead7d32886ebcf3d4 WHIRLPOOL ef4cece2306a04b174c41af29290128e98cc16d20462ea030ed860118b7d2590137158ea8f4139e1ab8661490ace8049e3f341e06be3862a187cc89abb5c781a
+DIST selenium-webdriver-3.0.4.gem 820224 SHA256 ba752daddc05e20066a9491c2dd2d7bef864ee1edd214ff7d9abd86794a628d3 SHA512 e5869366a66108c00ca260d62079b3372ca1be1850e065c3a62d723b915ed2f547aa18230fc26deca779bf63d982d49e41c8f5a2a132f57884cea7b70292e82f WHIRLPOOL 6ddecf0617736a7c35ff3a9a38443b530233f2b2e852cf8ada56f9fe0ec00d104325973a62bb5d375d118f41d64fc219abd47a75d2dd7f9986a2ab00eefbc2ba
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.0.4.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.0.4.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at https://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="https://github.com/seleniumhq/selenium"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
+	dev-ruby/rubyzip:1"
+
+all_ruby_prepare() {
+	# Make websocket a development dependency since it is only needed
+	# for the safari driver which we don't support on Gentoo.
+	sed -i -e '/websocket/,/version_requirements/ s/runtime/development/' ../metadata || die
+}
--- a/dev-util/ctags/ctags-20161028.ebuild
+++ b/dev-util/ctags/ctags-20161028.ebuild
@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~radhermit/vim/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-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 ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="json xml yaml"

 COMMON_DEPEND="
--- a/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
+++ b/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
@ -18,7 +18,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"

-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="examples test"

--- a/dev-util/skipfish/Manifest
+++ b/dev-util/skipfish/Manifest
@ -1 +1 @@
-DIST skipfish-2.10b.tgz 244528 SHA256 1a4fbc9d013f1f9b970946ea7228d943266127b7f4100c994ad26c82c5352a9e SHA512 ef961cbd6794083779a3e0d1a51dc68b6d0b580b840b213a16cf6dc4d2af858121db8527dcc590cf76efe6cdf0e2ee02dbb7a61956eb0017e9005a19f3537a74 WHIRLPOOL 7b22e892cd90a7ae616cf309849e5ec63b38224a670cbf726c2aeb1d66ea6a2aa7d69e5479d6c0b84f4fb48edf08bf4da7d76a727b0cc42b0f4e55bc8f0472c4
+DIST skipfish-2.10_beta.tar.gz 243827 SHA256 4b239304974dd0d24b54c11072da8a100c92544348030fbc8271a12d2961e3ae SHA512 a726bb7e53299ae3941c6a1645b89bb0a4c1d8a4ced6154696932d9a4844fc22d0a1f29d9311d083908b640155d65466ffea7b342c1f7c38e2c26f657c393af9 WHIRLPOOL 005204ece9cd7efcb6bc2f2512108d89f7fd1478c18c4246328b562b665e2b96b29d630b20833497c1981d9b20801781b1c04feb244fe00d24aab5b620d31ccc
--- a/dev-util/skipfish/metadata.xml
+++ b/dev-util/skipfish/metadata.xml
@ -4,18 +4,13 @@
 	<maintainer type="person">
 		<email>givi-zurabovich@mail.ru</email>
 		<name>Georgy Kovtunov</name>
-		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
-		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="google-code">skipfish</remote-id>
-	</upstream>
 </pkgmetadata>
--- a/dev-util/skipfish/skipfish-2.10_beta.ebuild
+++ b/dev-util/skipfish/skipfish-2.10_beta.ebuild
@ -1,15 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5
-inherit toolchain-funcs versionator
+inherit toolchain-funcs vcs-snapshot versionator

-MY_P="$PN-$(get_version_component_range 1-2)b"
+MY_COMMIT_HASH="093800c9de4116706258982376abce01928a3f7b"

 DESCRIPTION="A fully automated, active web application security reconnaissance tool"
-HOMEPAGE="https://code.google.com/p/skipfish/"
-SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tgz"
+HOMEPAGE="https://github.com/spinkham/skipfish"
+SRC_URI="https://github.com/spinkham/${PN}/archive/${MY_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"

 LICENSE="Apache-2.0 LGPL-3"
 SLOT="0"
@ -22,8 +22,6 @@ RDEPEND="dev-libs/openssl:0
 	sys-libs/zlib"
 DEPEND="${RDEPEND}"

-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	sed -i \
 		-e '/CFLAGS_GEN/s:-g -ggdb::' \
--- a/dev-vcs/git/git-2.10.2.ebuild
+++ b/dev-vcs/git/git-2.10.2.ebuild
@ -37,7 +37,7 @@ if [[ ${PV} != *9999 ]]; then
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 LICENSE="GPL-2"
--- a/dev-vcs/subversion/subversion-1.8.17.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.17.ebuild
@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax"

 COMMON_DEPEND=">=dev-db/sqlite-3.7.12
--- a/dev-vcs/subversion/subversion-1.9.5.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.5.ebuild
@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax"

 COMMON_DEPEND=">=dev-db/sqlite-3.7.12
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@ -566,6 +566,9 @@ linux-mod_pkg_setup() {
 		return
 	fi

+	# External modules use kernel symbols (bug #591832)
+	CONFIG_CHECK+=" !TRIM_UNUSED_KSYMS"
+
 	linux-info_pkg_setup;
 	require_configured_kernel
 	check_kernel_built;
@ -592,7 +595,7 @@ linux-mod_pkg_setup_binary() {
 		[[ ${config:0:1} == "~" ]] && optional=''
 		new_CONFIG_CHECK="${new_CONFIG_CHECK} ${optional}${config}"
 	done
-	export CONFIG_CHECK="${new_CONFIG_CHECK}"
+	CONFIG_CHECK="${new_CONFIG_CHECK}"
 	linux-info_pkg_setup;
 }

--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST VeraCrypt_1.19.tar.gz 23235780 SHA256 7d3fa5007b8e9dc93691c2da78dee497954b0596763a50e21724ec0564eb761b SHA512 ebce681099e04d938ff0dc10a1af848c82dafd80b165b2431ec355d64e29be4e60d1d63f0d5c9fd1182394080d00f0f573e3ae90f3e2167533dea2b895bd0164 WHIRLPOOL 7a1968e29a6f2757c2d7a1187e9e062872ffd26721b27b3df791cbe8c82c18dc98d42d249725f8bc4fd721fe80eb7dbe4642dde26f89ad0c0f84803c1f06a439`