Sync with portage [Mon Jan 18 17:41:19 MSK 2016].

8 years ago · 045e7f774f
parent ba319391c2
commit 045e7f774f
772 changed files with 6171 additions and 4711 deletions
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@ -1 +1,2 @@
 DIST KeePass-2.30-Source.zip 4767753 SHA256 4a3c3c217bc05b13bf903612b89a09b67ed1df68fdecd83324f2ef372313e9e4 SHA512 05404f273f6a7df33887b036aa0dba335124a7b2ae30b61957f8dc9c959cdd3342fdfa22a7d59ba5e9180f039fed5ecbac0a3154eb9d342a5a3a8a057d763182 WHIRLPOOL 4ddec9e592724b60724a2deaaf959dacc91f77d1ae97dd07af940f8efd882a008b4424ba68a4fcbd9ebe8d75c2b8a9a644ff7144ed593cfb3f0e361c0364a780
+DIST KeePass-2.31-Source.zip 4714301 SHA256 555b1a30f374f7077bf15906b09ab36b40fd3fc5753673a3c0ee3f30f0ed7881 SHA512 e2e81e7d60bc58a18ea3b9a82741bdd6e5be88bcfcf447ae587f6177a8ff97e7c82c02fb0695142f8321c7b5f92aa982254629928dd0c12393d659380f46026d WHIRLPOOL b8b572bd7db7ce9bc67ae0a241c71cd30595753d06bfed85efafece2b3cce4893c5cc213ee44cabd81c6ff12fc2fc98234d845ed94d0068d8111d116ccc39333
--- a/app-admin/keepass/keepass-2.31.ebuild
+++ b/app-admin/keepass/keepass-2.31.ebuild
@ -0,0 +1,110 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils fdo-mime gnome2-utils mono-env multilib
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="http://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND=">=dev-lang/mono-2.10.5"
+RDEPEND="${COMMON_DEPEND}
+	dev-dotnet/libgdiplus[cairo]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Remove Windows-specific things
+	pushd Build > /dev/null || die
+	. PrepMonoDev.sh || die
+	popd > /dev/null || die
+
+	# KeePass looks for some XSL files in the same folder as the executable,
+	# we prefer to have it in /usr/share/KeePass
+	epatch "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch"
+	# bug # 558094
+	if has_version ">=dev-lang/mono-4" ; then
+		sed -i -e 's! ToolsVersion="3.5"!!g' Translation/TrlUtil/TrlUtil.csproj || die
+		sed -i -e 's/Format Version 10.00/Format Version 11.00/' KeePass.sln || die
+	fi
+}
+
+src_compile() {
+	# Build with Release target
+	xbuild /target:KeePass /property:Configuration=Release || die
+
+	# Run Ahead Of Time compiler on the binary
+	if use aot; then
+		cp Ext/KeePass.exe.config Build/KeePass/Release/
+		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+	fi
+}
+
+src_install() {
+	# Wrapper script to launch mono
+	make_wrapper ${PN} "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+	# Some XSL files
+	insinto /usr/share/${PN}/XSL
+	doins Ext/XSL/*
+
+	insinto /usr/$(get_libdir)/${PN}/
+	exeinto /usr/$(get_libdir)/${PN}/
+	doins Ext/KeePass.exe.config
+	# Default configuration, simply says to use user-specific configuration
+	doins Ext/KeePass.config.xml
+
+	# The actual executable
+	doexe Build/KeePass/Release/KeePass.exe
+
+	# Copy the AOT compilation result
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
+
+	# Prepare the icons
+	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+	# Create a desktop entry and associate it with the KeePass mime type
+	make_desktop_entry ${PN} ${MY_PN} ${PN} "System;Security" "MimeType=application/x-keepass2;"
+
+	# MIME descriptor for .kdbx files
+	insinto /usr/share/mime/packages/
+	doins "${FILESDIR}/${PN}.xml"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+
+	if ! has_version x11-misc/xdotool ; then
+		elog "Optional dependencies:"
+		elog "	x11-misc/xdotool (enables autotype)"
+	fi
+
+	elog "Some systems may experience issues with copy and paste operations."
+	elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
--- a/app-admin/puppetserver/puppetserver-2.2.1-r1.ebuild
+++ b/app-admin/puppetserver/puppetserver-2.2.1-r1.ebuild
@ -0,0 +1,107 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib systemd user
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+="
+		>=virtual/jdk-1.7.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym /opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	dodir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# init type tasks
+	newconfd ext/default puppetserver
+	newinitd "${FILESDIR}/puppetserver.initd" puppetserver
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	newins ext/default gentoo.conf
+	systemd_dounit ext/redhat/puppetserver.service
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+}
+
+pkg_postinst() {
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+}
--- a/app-antivirus/clamav-unofficial-sigs/Manifest
+++ b/app-antivirus/clamav-unofficial-sigs/Manifest
@ -1,2 +1,3 @@
 DIST clamav-unofficial-sigs-3.7.2.tar.gz 38549 SHA256 96e98e6e4434c5950fa9831c6a43236fed7eabae44beded16171305cf3f9bdb9 SHA512 ee07bf521cca229bc85acb887c8e520149955732797a9d220e24f09cb9e89f9bd189ad77dc781c03c60bdaaec2bfa91a6c96cf7a0b689759cddf3ff231b8b0a4 WHIRLPOOL af4925c8a9bb8c09472131f98026b809da13e122a530c4a48614014b8156a259d37303cb1042da98d0bd8b0f4abef3cd7c05f2d549f87e1b7cd533d4a8d4d188
 DIST clamav-unofficial-sigs-4.5.3.tar.gz 44580 SHA256 ca5f9af4be401eed470148c7108ffed043f9251d53dd99ceffd633849948d65b SHA512 8b3f26253657188a9bc8ece0f2096b3564cbc97baa208989d04fca8443f73d3e391414b96fba27be38569141c312e8c674b2d1c8ba9ae9d45b4b8af03cf70542 WHIRLPOOL c69f6e8b1771f6f82936a145224353114eee00dbe88b8715ba57242d9ffff1cd4b6e68c0d005e1925cfebee8b0c78fa896721f89b46b5f3a6c66cc2313eec04a
+DIST clamav-unofficial-sigs-4.9.2.tar.gz 40301 SHA256 70e05f63add7e03d5af2dba6bcd31fda98646577798d99e6902e5f264c302e93 SHA512 46ec2e59c3838f4cff88562eacbd00ee1ad108f8f45500b9cde268c3d46bd3f6be68ff6136b7f3a4f6b628ff0b24f5dd10b2199e611b473acd7df82abf27b2c8 WHIRLPOOL 3029ee278629c3e8cf5471564e7ff054fc335e066d03653df82d07a87fa0dda76e41c5572c93fd0f28a434d002f3bdadd60043540378504c289333092aca412a
--- a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-4.9.2.ebuild
+++ b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-4.9.2.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Download and install third-party clamav signatures"
+HOMEPAGE="https://github.com/extremeshok/${PN}"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# We need its user/group.
+DEPEND="app-antivirus/clamav"
+
+# The script relies on either net-misc/socat, or Perl's
+# IO::Socket::UNIX. We already depend on Perl, and Gentoo's Perl ships
+# with IO::Socket::UNIX, so we can leave out net-misc/socat here.
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+	dev-lang/perl
+	net-dns/bind-tools
+	net-misc/curl"
+
+src_prepare() {
+	# Fix the user/group in the config file to match the ones used by
+	# clamav.
+	local user_default="clam_user=\"clam\""
+	local user_gentoo="clam_user=\"clamav\""
+
+	local group_default="clam_group=\"clam\""
+	local group_gentoo="clam_group=\"clamav\""
+
+	# Log to someplace that (likely) already exists. Omit the
+	# "log_file_path" variable name so that we can reuse these patterns
+	# later to sed the logrotate file.
+	local log_default="/var/log/clamav-unofficial-sigs"
+	local log_gentoo="/var/log/clamav"
+
+	# clamd listens on a local socket by default. The clamd_socket
+	# setting needs to be uncommented in the configuration file for it
+	# to take effect.
+	local socket_default="#clamd_socket=\"/var/run/clamd.socket\""
+	local socket_gentoo="clamd_socket=\"/var/run/clamav/clamd.sock\""
+
+	# The clamav init script doesn't provide a "reload" command,
+	# so we reload very manually.
+	local reload_default="clamd_restart_opt=\"service clamd restart\""
+	local reload_gentoo="clamd_restart_opt=\"clamdscan --reload\""
+
+	sed -i -e "s~${user_default}~${user_gentoo}~" \
+		-e "s~${group_default}~${group_gentoo}~" \
+		-e "s~${log_default}~${log_gentoo}~" \
+		-e "s~${socket_default}~${socket_gentoo}~" \
+		-e "s~${reload_default}~${reload_gentoo}~" \
+		"${PN}.conf" \
+		|| die "failed to update paths in ${PN}.conf"
+
+	# Fix the log path and username in the logrotate file, too.
+	sed -i -e "s~${log_default}~${log_gentoo}~" \
+		-e "s~create 0644 clam clam~create 0640 clamav clamav~" \
+		"${PN}-logrotate" \
+		|| die "failed to update path and userin ${PN}-logrotate"
+
+	eapply_user
+}
+
+src_install() {
+	dosbin "${PN}.sh"
+
+	# The script's working directory (set in the conf file). By default,
+	# it runs as clamav/clamav.
+	diropts -m 0755 -o clamav -g clamav
+	dodir "/var/lib/${PN}"
+
+	insinto /etc/logrotate.d
+	doins "${PN}-logrotate"
+
+	insinto /etc
+	doins "${PN}.conf"
+
+	doman "${PN}.8"
+	dodoc README.md
+}
+
+pkg_postinst() {
+	elog ''
+	elog "You will need to select databases in /etc/${PN}.conf."
+	elog "For details, please see the ${PN}(8) manual page."
+	elog ''
+	elog 'An up-to-date description of the available Sanesecurity'
+	elog 'databases is available at,'
+	elog ''
+	elog '  http://sanesecurity.com/usage/signatures/'
+	elog ''
+}
--- a/app-backup/burp/burp-1.3.48-r1.ebuild
+++ b/app-backup/burp/burp-1.3.48-r1.ebuild
@ -0,0 +1,100 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils user
+
+DESCRIPTION="Network backup and restore client and server for Unix and Windows"
+HOMEPAGE="http://burp.grke.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	http://burp.grke.org/downloads/${P}/${P}.tar.bz2"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl afs ipv6 nls tcpd xattr"
+
+DEPEND="
+	dev-libs/openssl:0
+	dev-libs/uthash
+	sys-libs/libcap
+	<net-libs/librsync-2.0
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	acl? ( sys-apps/acl )
+	afs? ( net-fs/openafs )
+	nls? ( sys-devel/gettext )
+	tcpd? ( sys-apps/tcp-wrappers )
+	xattr? ( sys-apps/attr )
+	"
+RDEPEND="${DEPEND}
+	virtual/logger
+	"
+
+DOCS=( CONTRIBUTORS DONATIONS UPGRADING )
+PATCHES=(
+	"${FILESDIR}/${PV}-non-zero-or-build-failure.patch"
+	"${FILESDIR}/${PV}-bedup-conf-path.patch"
+	"${FILESDIR}/${PV}-tinfo.patch"
+	"${FILESDIR}/${PV}-0001-Set-default_md-sha256-in-CA.cnf.patch"
+	)
+S="${WORKDIR}/burp"
+
+pkg_setup() {
+	enewgroup "${PN}"
+	enewuser "${PN}" -1 "" "" "${PN}"
+}
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	# see bug #426262
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sbindir=/usr/sbin
+		--sysconfdir=/etc/burp
+		--enable-largefile
+		$(use_enable acl)
+		$(use_enable afs)
+		$(use_enable ipv6)
+		$(use_enable nls)
+		$(use_enable xattr)
+		$(use_with tcpd tcp-wrappers)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	fowners root:burp /etc/burp /var/spool/burp
+	fperms 0775 /etc/burp /var/spool/burp
+	fowners root:burp /etc/burp/clientconfdir
+	fperms 0750 /etc/burp/clientconfdir
+	fowners root:burp /etc/burp/burp-server.conf
+	fperms 0640 /etc/burp/burp-server.conf
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	dodoc docs/*
+
+	sed -e 's|^# user=graham|user = burp|' \
+		-e 's|^# group=nogroup|group = burp|' \
+		-e 's|^pidfile = .*|lockfile = /run/lock/burp/server.lock|' \
+		-i "${D}"/etc/burp/burp-server.conf || die
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/burp/CA/index.txt ]]; then
+		elog "At first run burp server will generate DH parameters and SSL"
+		elog "certificates.  You should adjust configuration before."
+		elog "Server configuration is located at"
+		elog ""
+		elog "  /etc/burp/burp-server.conf"
+		elog ""
+	fi
+}
--- a/app-backup/burp/burp-1.3.48.ebuild
+++ b/app-backup/burp/burp-1.3.48.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$

@ -20,7 +20,7 @@ DEPEND="
 	dev-libs/openssl:0
 	dev-libs/uthash
 	sys-libs/libcap
-	net-libs/librsync
+	<net-libs/librsync-2.0
 	sys-libs/ncurses:0=
 	sys-libs/zlib
 	acl? ( sys-apps/acl )
@ -35,6 +35,7 @@ RDEPEND="${DEPEND}

 DOCS=( CONTRIBUTORS DONATIONS UPGRADING )
 PATCHES=(
+	"${FILESDIR}/${PV}-non-zero-or-build-failure.patch"
 	"${FILESDIR}/${PV}-bedup-conf-path.patch"
 	"${FILESDIR}/${PV}-tinfo.patch"
 	"${FILESDIR}/${PV}-0001-Set-default_md-sha256-in-CA.cnf.patch"
--- a/app-backup/burp/burp-1.3.8-r1.ebuild
+++ b/app-backup/burp/burp-1.3.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$

@ -19,7 +19,7 @@ DEPEND="
 	dev-libs/openssl:0
 	dev-libs/uthash
 	sys-libs/libcap
-	net-libs/librsync
+	<net-libs/librsync-2.0
 	sys-libs/ncurses:0=
 	sys-libs/zlib
 	acl? ( sys-apps/acl )
@ -34,6 +34,7 @@ RDEPEND="${DEPEND}

 DOCS=( CONTRIBUTORS DONATIONS UPGRADING )
 PATCHES=(
+	"${FILESDIR}/${PV}-non-zero-or-build-failure.patch"
 	"${FILESDIR}/${PV}-bedup-conf-path.patch"
 	"${FILESDIR}/${PV}-0001-Set-default_md-sha256-in-CA.cnf.patch"
 	)
--- a/app-backup/burp/burp-1.4.40-r1.ebuild
+++ b/app-backup/burp/burp-1.4.40-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$

@ -20,7 +20,7 @@ DEPEND="
 	dev-libs/openssl:0
 	dev-libs/uthash
 	sys-libs/libcap
-	net-libs/librsync
+	<net-libs/librsync-2.0
 	sys-libs/ncurses:0=
 	sys-libs/zlib
 	acl? ( sys-apps/acl )
@ -35,6 +35,7 @@ RDEPEND="${DEPEND}

 DOCS=( CONTRIBUTORS DONATIONS UPGRADING )
 PATCHES=(
+	"${FILESDIR}/${PV}-non-zero-or-build-failure.patch"
 	"${FILESDIR}/${PV}-bedup-conf-path.patch"
 	"${FILESDIR}/${PV}-tinfo.patch"
 	)
--- a/app-backup/burp/files/1.3.48-non-zero-or-build-failure.patch
+++ b/app-backup/burp/files/1.3.48-non-zero-or-build-failure.patch
@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index ac22a24..f99ce96 100755
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -40,7 +40,7 @@ all: Makefile
+ 	@for I in ${all_subdirs}; \
+ 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
+ 	      $(MAKE) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
+-			    echo ""; echo "";)); \
+			    echo ""; echo ""; exit 1;)) || exit 1; \
+ 	done
+ 
+ depend:
--- a/app-backup/burp/files/1.3.8-non-zero-or-build-failure.patch
+++ b/app-backup/burp/files/1.3.8-non-zero-or-build-failure.patch
@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index ac22a24..f99ce96 100755
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -40,7 +40,7 @@ all: Makefile
+ 	@for I in ${all_subdirs}; \
+ 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
+ 	      $(MAKE) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
+-			    echo ""; echo "";)); \
+			    echo ""; echo ""; exit 1;)) || exit 1; \
+ 	done
+ 
+ depend:
--- a/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch
+++ b/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch
@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index ac22a24..f99ce96 100755
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -40,7 +40,7 @@ all: Makefile
+ 	@for I in ${all_subdirs}; \
+ 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
+ 	      $(MAKE) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
+-			    echo ""; echo "";)); \
+			    echo ""; echo ""; exit 1;)) || exit 1; \
+ 	done
+ 
+ depend:
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@ -1 +1 @@
-DIST letsencrypt-0.1.1.tar.gz 533715 SHA256 3f5210fc2e28577b1b24c4fbfb5c20ac259925a5fad81cf69a1b4f62d76511db SHA512 bd045622f77272447b9d497c410a128c30371c6df5beab418089c2c8b26fef9e87ecc6055bdf4017d7d2fb5f840b4900ff9efba848d07a2bf3a1be9d7fc0df99 WHIRLPOOL b89bcbf1dea41bd0a391cc3db86c4a7413cdf9c5e64c2398b60b7c57c5950c221bd64a51f773a7fb2fc725d93f3d672170c97147d5b5b644a008309e95dd8576
+DIST letsencrypt-0.2.0.tar.gz 564016 SHA256 71324323eb6c9fe9a2cee95f012a44e9c7bdc8c9dfe14c26d56129306f188650 SHA512 a00618c0f3ae78cfdb70adfea81ff9d672123fa38585cfda8ed44659be14bd37143f2c5bc076b92d116356437ea08af079142a4ae09a8a6ad06f2793276b973e WHIRLPOOL cd413fd1ca4d2e462bcc573c8b0403010cfc27dca577c56c1465e5d794e7769a0621bac361078762eec12f2296d968421572cb8794cb1a49824b37292dbab572
--- a/app-crypt/acme/acme-0.2.0.ebuild
+++ b/app-crypt/acme/acme-0.2.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$

--- a/app-crypt/letsencrypt/Manifest
+++ b/app-crypt/letsencrypt/Manifest
@ -1,2 +1 @@
-DIST letsencrypt-0.1.1-corrected.tar.gz 533644 SHA256 d9efa11a90cd38bf38218e51c541978ebb836f00ede0c9c8155301ca30a55774 SHA512 26e8b41280a0e9bdbd7324d223c7d72915d2a9149b6a569bad3c17deb01c3426b93b86d4e411865526308e656df5a7d1fb6eaca9fab95600f6ed87def5c30a5a WHIRLPOOL a6aa6f761abd591b4ffdd5d6c071bac31683eedc58ce142389a3a03bd5ab83ef18d8b0f4319d376653de5236f9c66c6721573618b0cba58ad98d2a601d561ed8
-DIST letsencrypt-0.1.1.tar.gz 533715 SHA256 3f5210fc2e28577b1b24c4fbfb5c20ac259925a5fad81cf69a1b4f62d76511db SHA512 bd045622f77272447b9d497c410a128c30371c6df5beab418089c2c8b26fef9e87ecc6055bdf4017d7d2fb5f840b4900ff9efba848d07a2bf3a1be9d7fc0df99 WHIRLPOOL b89bcbf1dea41bd0a391cc3db86c4a7413cdf9c5e64c2398b60b7c57c5950c221bd64a51f773a7fb2fc725d93f3d672170c97147d5b5b644a008309e95dd8576
+DIST letsencrypt-0.2.0.tar.gz 564016 SHA256 71324323eb6c9fe9a2cee95f012a44e9c7bdc8c9dfe14c26d56129306f188650 SHA512 a00618c0f3ae78cfdb70adfea81ff9d672123fa38585cfda8ed44659be14bd37143f2c5bc076b92d116356437ea08af079142a4ae09a8a6ad06f2793276b973e WHIRLPOOL cd413fd1ca4d2e462bcc573c8b0403010cfc27dca577c56c1465e5d794e7769a0621bac361078762eec12f2296d968421572cb8794cb1a49824b37292dbab572
--- a/app-crypt/letsencrypt/letsencrypt-0.1.1-r1.ebuild
+++ b/app-crypt/letsencrypt/letsencrypt-0.1.1-r1.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}-corrected.tar.gz -> ${P}-corrected.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/configargparse[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-0.7[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/parsedatetime[${PYTHON_USEDEP}]
-	>=dev-python/psutil-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.15[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	>=dev-python/pythondialog-3.2.2:python-2[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${P}-corrected
-
-python_test() {
-	nosetests -w ${PN}/tests || die
-}
--- a/app-crypt/letsencrypt/letsencrypt-0.2.0.ebuild
+++ b/app-crypt/letsencrypt/letsencrypt-0.2.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$

@ -24,7 +24,7 @@ SLOT="0"
 IUSE="test"

 RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/configargparse[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.10.0[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-0.7[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@ -1,3 +1 @@
-DIST emacs-25.0.50_pre20150523.tar.xz 25311384 SHA256 2dd6e7adb8e3359e00a8cbc15a28ef31b631c8363602e3be7566908f2ee2b047 SHA512 a897c4a4d7bd19c9c9a181b23240aed102295e30f1ba9a167b5c1a3231c05a4613023e6810ca0226cedea6325999a35efb0ea2a2b7e535a0338b7b688592438f WHIRLPOOL ce81ceca640c15437af427cef79090f71c8f19a78c8b2d5966f1887e88fff3bd35c00bcb266fb0d8133ee95b22cac8576f12462fa04c41feebcc7aad2f1ddb7e
-DIST emacs-25.0.50_pre20150731.tar.xz 26825232 SHA256 80127a9d905918066c97df81f3e489dbd30f323e9dec2353d33f124522f91c81 SHA512 9834d191e98e780e8ba8f2fa07b50dda6d380a3e220ad0590bdc160d9e2c9cd3c0b0acd5e8d52f3f0f44070280e3686bd7facd78f9bd4b3f6ce0723f1b3311bf WHIRLPOOL 0c0ec4f99630771da61d5bc80b9001a61fa3b7f49f09b6e9a5dd402a383c4d13717c50d86da9d63ad01dd2fce5ac5d7812bcdcd3e31eefb5f0ad4b00d0cc342f
 DIST emacs-25.0.50_pre20151113.tar.xz 26904832 SHA256 dcfd575afa3123bd63eba12b2ae2c7d1390c8fbccc911e9a4a70028feb207240 SHA512 cc8e871e9bb236ffd99ea93750aabc55401cdfad171f56df81c3127fba41b223196d31a64baf597268805b39015df773587e239192870f70671d131d9c6fc9b8 WHIRLPOOL 9571b10e49c028e4f8a10a54fce10bea16ff9b726e8a266650af180a57a370d225ac3bdffc12828c6d170680e514c9fb1179b3676dd4d4de3e6794147dc935ab
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150523.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150523.ebuild
@ -1,372 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git"
-	EGIT_BRANCH="master"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	#S="${WORKDIR}/emacs-${FULL_VERSION}"
-	S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="25"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses:0
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gfile? ( >=dev-libs/glib-2.28.6 )
-	gnutls? ( net-libs/gnutls )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? (
-		sys-apps/attr
-		sys-apps/paxctl
-	)"
-
-if [[ ${PV##*.} = 9999 ]]; then
-	DEPEND="${DEPEND}
-	sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	epatch_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser=":gamestat" \
-		--without-compress-install \
-		--with-file-notification=$(usev gfile || usev inotify || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with gpm) \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	local pvr
-	for pvr in ${REPLACING_VERSIONS}; do
-		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150731.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150731.ebuild
@ -1,377 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git"
-	EGIT_BRANCH="master"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	#S="${WORKDIR}/emacs-${FULL_VERSION}"
-	S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="25"
-IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses:0
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gfile? ( >=dev-libs/glib-2.28.6 )
-	gnutls? ( net-libs/gnutls )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? (
-		sys-apps/attr
-		sys-apps/paxctl
-	)"
-
-if [[ ${PV##*.} = 9999 ]]; then
-	DEPEND="${DEPEND}
-	sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	epatch_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser=":gamestat" \
-		--without-compress-install \
-		--with-file-notification=$(usev gfile || usev inotify || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with gpm) \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	local pvr
-	for pvr in ${REPLACING_VERSIONS}; do
-		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.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$

@ -53,7 +53,7 @@ RDEPEND="sys-libs/ncurses:0
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
+		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.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$

@ -53,7 +53,7 @@ RDEPEND="sys-libs/ncurses:0
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
+		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
--- a/app-editors/emacs-vcs/emacs-vcs-25.1.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.1.9999.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$

@ -53,7 +53,7 @@ RDEPEND="sys-libs/ncurses:0
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
+		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
--- a/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8558.patch
+++ b/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8558.patch
@ -0,0 +1,50 @@
+https://bugs.gentoo.org/568246
+
+From 156a2e4dbffa85997636a7a39ef12da6f1b40254 Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Mon, 14 Dec 2015 09:21:23 +0100
+Subject: [PATCH] ehci: make idt processing more robust
+
+Make ehci_process_itd return an error in case we didn't do any actual
+iso transfer because we've found no active transaction.  That'll avoid
+ehci happily run in circles forever if the guest builds a loop out of
+idts.
+
+This is CVE-2015-8558.
+
+Cc: qemu-stable@nongnu.org
+Reported-by: Qinghao Tang <luodalongde@gmail.com>
+Tested-by: P J P <ppandit@redhat.com>
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+---
+ hw/usb/hcd-ehci.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
+index 4e2161b..d07f228 100644
+--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
+@@ -1389,7 +1389,7 @@ static int ehci_process_itd(EHCIState *ehci,
+ {
+     USBDevice *dev;
+     USBEndpoint *ep;
+-    uint32_t i, len, pid, dir, devaddr, endp;
+    uint32_t i, len, pid, dir, devaddr, endp, xfers = 0;
+     uint32_t pg, off, ptr1, ptr2, max, mult;
+ 
+     ehci->periodic_sched_active = PERIODIC_ACTIVE;
+@@ -1479,9 +1479,10 @@ static int ehci_process_itd(EHCIState *ehci,
+                 ehci_raise_irq(ehci, USBSTS_INT);
+             }
+             itd->transact[i] &= ~ITD_XACT_ACTIVE;
+            xfers++;
+         }
+     }
+-    return 0;
+    return xfers ? 0 : -1;
+ }
+ 
+ 
+-- 
+2.6.2
+
--- a/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8567.patch
+++ b/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8567.patch
@ -0,0 +1,95 @@
+https://bugs.gentoo.org/567868
+
+From aa4a3dce1c88ed51b616806b8214b7c8428b7470 Mon Sep 17 00:00:00 2001
+From: P J P <ppandit@redhat.com>
+Date: Tue, 15 Dec 2015 12:27:54 +0530
+Subject: [PATCH] net: vmxnet3: avoid memory leakage in activate_device
+
+Vmxnet3 device emulator does not check if the device is active
+before activating it, also it did not free the transmit & receive
+buffers while deactivating the device, thus resulting in memory
+leakage on the host. This patch fixes both these issues to avoid
+host memory leakage.
+
+Reported-by: Qinghao Tang <luodalongde@gmail.com>
+Reviewed-by: Dmitry Fleytman <dmitry@daynix.com>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+---
+ hw/net/vmxnet3.c | 24 ++++++++++++++++--------
+ 1 file changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
+index a5dd79a..9c1adfc 100644
+--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
+@@ -1194,8 +1194,13 @@ static void vmxnet3_reset_mac(VMXNET3State *s)
+ 
+ static void vmxnet3_deactivate_device(VMXNET3State *s)
+ {
+-    VMW_CBPRN("Deactivating vmxnet3...");
+-    s->device_active = false;
+    if (s->device_active) {
+        VMW_CBPRN("Deactivating vmxnet3...");
+        vmxnet_tx_pkt_reset(s->tx_pkt);
+        vmxnet_tx_pkt_uninit(s->tx_pkt);
+        vmxnet_rx_pkt_uninit(s->rx_pkt);
+        s->device_active = false;
+    }
+ }
+ 
+ static void vmxnet3_reset(VMXNET3State *s)
+@@ -1204,7 +1209,6 @@ static void vmxnet3_reset(VMXNET3State *s)
+ 
+     vmxnet3_deactivate_device(s);
+     vmxnet3_reset_interrupt_states(s);
+-    vmxnet_tx_pkt_reset(s->tx_pkt);
+     s->drv_shmem = 0;
+     s->tx_sop = true;
+     s->skip_current_tx_pkt = false;
+@@ -1431,6 +1435,12 @@ static void vmxnet3_activate_device(VMXNET3State *s)
+         return;
+     }
+ 
+    /* Verify if device is active */
+    if (s->device_active) {
+        VMW_CFPRN("Vmxnet3 device is active");
+        return;
+    }
+
+     vmxnet3_adjust_by_guest_type(s);
+     vmxnet3_update_features(s);
+     vmxnet3_update_pm_state(s);
+@@ -1627,7 +1637,7 @@ static void vmxnet3_handle_command(VMXNET3State *s, uint64_t cmd)
+         break;
+ 
+     case VMXNET3_CMD_QUIESCE_DEV:
+-        VMW_CBPRN("Set: VMXNET3_CMD_QUIESCE_DEV - pause the device");
+        VMW_CBPRN("Set: VMXNET3_CMD_QUIESCE_DEV - deactivate the device");
+         vmxnet3_deactivate_device(s);
+         break;
+ 
+@@ -1741,7 +1751,7 @@ vmxnet3_io_bar1_write(void *opaque,
+          * shared address only after we get the high part
+          */
+         if (val == 0) {
+-            s->device_active = false;
+            vmxnet3_deactivate_device(s);
+         }
+         s->temp_shared_guest_driver_memory = val;
+         s->drv_shmem = 0;
+@@ -2021,9 +2031,7 @@ static bool vmxnet3_peer_has_vnet_hdr(VMXNET3State *s)
+ static void vmxnet3_net_uninit(VMXNET3State *s)
+ {
+     g_free(s->mcast_list);
+-    vmxnet_tx_pkt_reset(s->tx_pkt);
+-    vmxnet_tx_pkt_uninit(s->tx_pkt);
+-    vmxnet_rx_pkt_uninit(s->rx_pkt);
+    vmxnet3_deactivate_device(s);
+     qemu_del_nic(s->nic);
+ }
+ 
+-- 
+2.6.2
+
--- a/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8701.patch
+++ b/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8701.patch
@ -0,0 +1,49 @@
+https://bugs.gentoo.org/570110
+
+From 007cd223de527b5f41278f2d886c1a4beb3e67aa Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Mon, 28 Dec 2015 16:24:08 +0530
+Subject: [PATCH] net: rocker: fix an incorrect array bounds check
+
+While processing transmit(tx) descriptors in 'tx_consume' routine
+the switch emulator suffers from an off-by-one error, if a
+descriptor was to have more than allowed(ROCKER_TX_FRAGS_MAX=16)
+fragments. Fix an incorrect bounds check to avoid it.
+
+Reported-by: Qinghao Tang <luodalongde@gmail.com>
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+---
+ hw/net/rocker/rocker.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
+index c57f1a6..2e77e50 100644
+--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
+@@ -232,6 +232,9 @@ static int tx_consume(Rocker *r, DescInfo *info)
+         frag_addr = rocker_tlv_get_le64(tlvs[ROCKER_TLV_TX_FRAG_ATTR_ADDR]);
+         frag_len = rocker_tlv_get_le16(tlvs[ROCKER_TLV_TX_FRAG_ATTR_LEN]);
+ 
+        if (iovcnt >= ROCKER_TX_FRAGS_MAX) {
+            goto err_too_many_frags;
+        }
+         iov[iovcnt].iov_len = frag_len;
+         iov[iovcnt].iov_base = g_malloc(frag_len);
+         if (!iov[iovcnt].iov_base) {
+@@ -244,10 +247,7 @@ static int tx_consume(Rocker *r, DescInfo *info)
+             err = -ROCKER_ENXIO;
+             goto err_bad_io;
+         }
+-
+-        if (++iovcnt > ROCKER_TX_FRAGS_MAX) {
+-            goto err_too_many_frags;
+-        }
+        iovcnt++;
+     }
+ 
+     if (iovcnt) {
+-- 
+2.6.2
+
--- a/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8743.patch
+++ b/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8743.patch
@ -0,0 +1,50 @@
+https://bugs.gentoo.org/570988
+
+From aa7f9966dfdff500bbbf1956d9e115b1fa8987a6 Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Thu, 31 Dec 2015 17:05:27 +0530
+Subject: [PATCH] net: ne2000: fix bounds check in ioport operations
+
+While doing ioport r/w operations, ne2000 device emulation suffers
+from OOB r/w errors. Update respective array bounds check to avoid
+OOB access.
+
+Reported-by: Ling Liu <liuling-it@360.cn>
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+---
+ hw/net/ne2000.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
+index 010f9ef..a3dffff 100644
+--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
+@@ -467,8 +467,9 @@ static inline void ne2000_mem_writel(NE2000State *s, uint32_t addr,
+                                      uint32_t val)
+ {
+     addr &= ~1; /* XXX: check exact behaviour if not even */
+-    if (addr < 32 ||
+-        (addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE)) {
+    if (addr < 32
+        || (addr >= NE2000_PMEM_START
+            && addr + sizeof(uint32_t) <= NE2000_MEM_SIZE)) {
+         stl_le_p(s->mem + addr, val);
+     }
+ }
+@@ -497,8 +498,9 @@ static inline uint32_t ne2000_mem_readw(NE2000State *s, uint32_t addr)
+ static inline uint32_t ne2000_mem_readl(NE2000State *s, uint32_t addr)
+ {
+     addr &= ~1; /* XXX: check exact behaviour if not even */
+-    if (addr < 32 ||
+-        (addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE)) {
+    if (addr < 32
+        || (addr >= NE2000_PMEM_START
+            && addr + sizeof(uint32_t) <= NE2000_MEM_SIZE)) {
+         return ldl_le_p(s->mem + addr);
+     } else {
+         return 0xffffffff;
+-- 
+2.6.2
+
--- a/app-emulation/qemu/files/qemu-2.5.0-CVE-2016-1568.patch
+++ b/app-emulation/qemu/files/qemu-2.5.0-CVE-2016-1568.patch
@ -0,0 +1,41 @@
+https://bugs.gentoo.org/571566
+
+From 4ab0359a8ae182a7ac5c99609667273167703fab Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Mon, 11 Jan 2016 14:10:42 -0500
+Subject: [PATCH] ide: ahci: reset ncq object to unused on error
+
+When processing NCQ commands, AHCI device emulation prepares a
+NCQ transfer object; To which an aio control block(aiocb) object
+is assigned in 'execute_ncq_command'. In case, when the NCQ
+command is invalid, the 'aiocb' object is not assigned, and NCQ
+transfer object is left as 'used'. This leads to a use after
+free kind of error in 'bdrv_aio_cancel_async' via 'ahci_reset_port'.
+Reset NCQ transfer object to 'unused' to avoid it.
+
+[Maintainer edit: s/ACHI/AHCI/ in the commit message. --js]
+
+Reported-by: Qinghao Tang <luodalongde@gmail.com>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Reviewed-by: John Snow <jsnow@redhat.com>
+Message-id: 1452282511-4116-1-git-send-email-ppandit@redhat.com
+Signed-off-by: John Snow <jsnow@redhat.com>
+---
+ hw/ide/ahci.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
+index dd1912e..17f1cbd 100644
+--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
+@@ -910,6 +910,7 @@ static void ncq_err(NCQTransferState *ncq_tfs)
+     ide_state->error = ABRT_ERR;
+     ide_state->status = READY_STAT | ERR_STAT;
+     ncq_tfs->drive->port_regs.scr_err |= (1 << ncq_tfs->tag);
+    ncq_tfs->used = 0;
+ }
+ 
+ static void ncq_finish(NCQTransferState *ncq_tfs)
+-- 
+2.6.2
+
--- a/app-emulation/qemu/qemu-2.5.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.5.0-r1.ebuild
@ -0,0 +1,657 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses,readline"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+	user udev fcaps readme.gentoo pax-utils
+
+BACKPORTS=
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-2
+	SRC_URI=""
+else
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
+	${BACKPORTS:+
+		https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
+gnutls gtk gtk2 infiniband iscsi +jpeg \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
+png pulseaudio python \
+rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu
+static-user systemtap tci test +threads usb usbredir +uuid vde +vhost-net \
+virgl virtfs +vnc vte xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
+mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
+x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	gtk2? ( gtk )
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	sdl2? ( sdl )
+	static? ( static-softmmu static-user )
+	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 )
+	virtfs? ( xattr )
+	vte? ( gtk )"
+
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+#
+# Older versions of gnutls are supported, but it's simpler to just require
+# the latest versions.  This is also why we require nettle.
+COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? ( app-accessibility/brltty[static-libs(+)] )
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		dev-libs/nettle[static-libs(+)]
+		>=net-libs/gnutls-3.0[static-libs(+)]
+	)
+	gtk? (
+		gtk2? (
+			x11-libs/gtk+:2
+			vte? ( x11-libs/vte:0 )
+		)
+		!gtk2? (
+			x11-libs/gtk+:3
+			vte? ( x11-libs/vte:2.90 )
+		)
+	)
+	infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	jpeg? ( virtual/jpeg:=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses:0=[static-libs(+)] )
+	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gles2]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		!sdl2? (
+			media-libs/libsdl[X]
+			>=media-libs/libsdl-1.2.11[static-libs(+)]
+		)
+		sdl2? (
+			media-libs/libsdl2[X]
+			media-libs/libsdl2[static-libs(+)]
+		)
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy[static-libs(+)] )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
+X86_FIRMWARE_DEPEND="
+	>=sys-firmware/ipxe-1.0.0_p20130624
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.8.2
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/seabios
+		sys-firmware/sgabios
+		sys-firmware/vgabios
+	)"
+CDEPEND="
+	!static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) )
+	!static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xen? ( app-emulation/xen-tools:= )"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-apps/texinfo
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) )
+	static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-qemu )
+"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or32
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
+you have the kernel module loaded before running kvm. The easiest way to
+ensure that the kernel module is loaded is to load it on boot.\n
+For AMD CPUs the module is called 'kvm-amd'\n
+For Intel CPUs the module is called 'kvm-intel'\n
+Please review /etc/conf.d/modules for how to load these\n\n
+Make sure your user is in the 'kvm' group\n
+Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+
+qemu_support_kvm() {
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+		use qemu_softmmu_targets_s390x; then
+		return 0
+	fi
+
+	return 1
+}
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	# Cheap hack to disable gettext .mo generation.
+	use nls || rm -f po/*.po
+
+	epatch "${FILESDIR}"/qemu-2.5.0-cflags.patch
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	epatch "${FILESDIR}"/${P}-CVE-2015-8567.patch #567868
+	epatch "${FILESDIR}"/${P}-CVE-2015-8558.patch #568246
+	epatch "${FILESDIR}"/${P}-CVE-2015-8701.patch #570110
+	epatch "${FILESDIR}"/${P}-CVE-2015-8743.patch #570988
+	epatch "${FILESDIR}"/${P}-CVE-2016-1568.patch #571566
+
+	# Fix ld and objcopy being called directly
+	tc-export AR LD OBJCOPY
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	epatch_user
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+	local static_flag="static-${buildtype}"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		--enable-docs
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets as the default configure
+	# options will autoprobe and try to link in a bunch of unused junk.
+	conf_softmmu() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		$(conf_softmmu accessibility brlapi)
+		$(conf_softmmu aio linux-aio)
+		$(conf_softmmu bluetooth bluez)
+		$(conf_softmmu caps cap-ng)
+		$(conf_softmmu curl)
+		$(conf_softmmu fdt)
+		$(conf_softmmu glusterfs)
+		$(conf_softmmu gnutls)
+		$(conf_softmmu gnutls nettle)
+		$(conf_softmmu gtk)
+		$(conf_softmmu infiniband rdma)
+		$(conf_softmmu iscsi libiscsi)
+		$(conf_softmmu jpeg vnc-jpeg)
+		$(conf_softmmu kernel_linux kvm)
+		$(conf_softmmu lzo)
+		$(conf_softmmu ncurses curses)
+		$(conf_softmmu nfs libnfs)
+		$(conf_softmmu numa)
+		$(conf_softmmu opengl)
+		$(conf_softmmu png vnc-png)
+		$(conf_softmmu rbd)
+		$(conf_softmmu sasl vnc-sasl)
+		$(conf_softmmu sdl)
+		$(conf_softmmu seccomp)
+		$(conf_softmmu smartcard)
+		$(conf_softmmu snappy)
+		$(conf_softmmu spice)
+		$(conf_softmmu ssh libssh2)
+		$(conf_softmmu usb libusb)
+		$(conf_softmmu usbredir usb-redir)
+		$(conf_softmmu uuid)
+		$(conf_softmmu vde)
+		$(conf_softmmu vhost-net)
+		$(conf_softmmu virgl virglrenderer)
+		$(conf_softmmu virtfs)
+		$(conf_softmmu vnc)
+		$(conf_softmmu vte)
+		$(conf_softmmu xen)
+		$(conf_softmmu xen xen-pci-passthrough)
+		$(conf_softmmu xfs xfsctl)
+	)
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		;;
+	softmmu)
+		# audio options
+		local audio_opts="oss"
+		use alsa && audio_opts="alsa,${audio_opts}"
+		use sdl && audio_opts="sdl,${audio_opts}"
+		use pulseaudio && audio_opts="pa,${audio_opts}"
+
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--with-system-pixman
+			--audio-drv-list="${audio_opts}"
+		)
+		use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
+		use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+		)
+		static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		gcc-specs-pie && conf_opts+=( --enable-pie )
+	fi
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	[[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	if [[ -z ${softmmu_targets}${user_targets} ]]; then
+		cd "${S}/tools-build"
+		default
+	fi
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake -j1 check
+		emake -j1 check-report.html
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/kvm_stat"
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets
+		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dohtml check-report.html
+
+		if use kernel_linux; then
+			udev_dorules "${FILESDIR}"/65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	if [[ -z ${softmmu_targets}${user_targets} ]]; then
+		cd "${S}/tools-build"
+		emake DESTDIR="${ED}" install
+	fi
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	# Remove the docdir placed qmp-commands.txt
+	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/" || die
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dodoc docs/qmp-*.txt
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+		fi
+
+		# Remove vgabios since we're using the vgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+			dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	qemu_support_kvm && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if qemu_support_kvm; then
+		readme.gentoo_print_elog
+	fi
+
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/vgabios)"
+}
--- a/app-i18n/im-freewnn/im-freewnn-0.0.2-r1.ebuild
+++ b/app-i18n/im-freewnn/im-freewnn-0.0.2-r1.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="1"
-
-inherit autotools eutils gnome2-utils multilib
-
-DESCRIPTION="Japanese FreeWnn input method module for GTK+2"
-HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/"
-SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib
-	x11-libs/pango
-	>=x11-libs/gtk+-2.4:2
-	>=app-i18n/freewnn-1.1.1_alpha21-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-wnnrc-gentoo.diff"
-	# bug #298744
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	epatch "${FILESDIR}/${P}-implicit-declaration.patch"
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	gnome2_query_immodules_gtk2
-}
--- a/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
+++ b/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"

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

 RDEPEND="
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@ -1,2 +1,2 @@
-DIST ckb-0.2.1.tar.gz 430544 SHA256 0a44c72ad56cd9c0ee939cafea736b396c7ea72a24466fa0bee1beb4c8100496 SHA512 d8527cb2efc0be4d8bfe5f8ce95faa9c4bb2e7d2a85301591ea170f68cd6e58479ee49ac2de29ae80c8365137c31f78e83c13bc0c6d0a1659d702cfc740125fb WHIRLPOOL a036431118c15515825327b841b864741cdee9f1ec409af06750d82f65e2b8eb02425809a568f41752a943ffb6d729aa2bca143dd522cc867def9189997ea543
 DIST ckb-0.2.2.tar.gz 513180 SHA256 bb916af087fb6fd9f9955c79edc899c6343b12c9db576d6adbd6c608b22e9f7b SHA512 0f6236f922330b497c1297e0fec609400e1c7723937fe4e58702b62647068cc8271bbdd95c424d70debdbe81b843af22c09c9ce4a178f9b9796794b287847cfc WHIRLPOOL c65fb7b01eeef73ad6d2bc0755955af5e5a68f3797e5d737aca058a37744c166106c242081d89ac041743e45cb5f5c305a455ca439b9986b8e0e1a8a97c150f5
+DIST ckb-0.2.3.tar.gz 520320 SHA256 ee5ef3470444d422451a3e84b164723f54d697be8a6f86e31d7a6554c7cf0dc4 SHA512 7fd369b61c66f169445f88202fcb5a1cc73e12448ccb1da0d1849c39f0c779e0835039ede0eb1dd458d73a0660b1d526d97f629c5a716393eb54596bdbe637e4 WHIRLPOOL 45305b3846a17bf88d8051f62a2ab89639ab23fcf41decd90b3a935f4357028f8585911a39fdd076c7cc5f4c0bbb0b8247c17636553ebb83c9d5c322d919145d
--- a/app-misc/ckb/ckb-0.2.3.ebuild
+++ b/app-misc/ckb/ckb-0.2.3.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$

--- a/app-misc/hello/Manifest
+++ b/app-misc/hello/Manifest
@ -1,2 +1,3 @@
+DIST hello-2.10.tar.gz 725946 SHA256 31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b SHA512 e301d785135c52575a8b4c35994c0316f8d366451f604eb5e74c1f907077502aebd5a1a32cd1e26cd7ca32c22f4de5623a335f8ae7e735ac977420df664f01de WHIRLPOOL cd2e1c42ac74e059cbc6e236a389f66569bf5895c652f7917453a8e02b1cbd25319de8fbc4b2288fe01b551cf4199442b3be1f304c6ab0c1e1e5195251fecab4
 DIST hello-2.8.tar.gz 697483 SHA256 e6b77f81f7cf7daefad4a9f5b65de6cae9c3f13b8cfbaea8cb53bb5ea5460d73 SHA512 87fdd330fccc7d42c76df9902e21184e7976e4eb95f43dd30417030170471c34be68c37958acb6e4d3ac5f2ed7f6897730388bb6d38f5b0c06202cb8ffccb6e7 WHIRLPOOL 33f8043d8915a3ca6ce7569d2559df990d9abe17f89773230506b7ef480444fec417bbe0073c8d97d85187069b294ed4233faf81933d57c65707ab7648184b9d
 DIST hello-2.9.tar.gz 723645 SHA256 ecbb7a2214196c57ff9340aa71458e1559abd38f6d8d169666846935df191ea7 SHA512 b2be91f436d8ebbf431af7f2bb9b61453cfcd336e2745971be48c2c94d7b6ea615e05ef0526fc25f235377d3f7073e1c432c0d522891a8978252267a61aeec86 WHIRLPOOL daf3efa4571bda38f22f4cabb8707ddba883e39a097171013093fe70aa36385032331336f785a1788f51a7b7ab331c11093d88d3028893d2034aaf84eca51ef4
--- a/app-misc/hello/hello-2.10.ebuild
+++ b/app-misc/hello/hello-2.10.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+DESCRIPTION="GNU \"Hello, world\" application"
+HOMEPAGE="https://www.gnu.org/software/hello/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+DOCS=(AUTHORS ChangeLog ChangeLog.O NEWS README THANKS TODO contrib/evolution.txt)
+
+src_configure() {
+	econf $(use_enable nls)
+}
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@ -1,3 +1,4 @@
 DIST screenfetch-2.7.7.zip 41420 SHA256 c50322375929c78b13afc5fd4e62259087db3988283109ddcf60e98194f3adc8 SHA512 b783c05fc385d176e8d4e06c647c86ceef0ec465ddaa7ceab4116dc844e6a3a4cb10a706aef62ed4c0e1893942be4761dc1962e99d45b528742372415bd17b10 WHIRLPOOL ab863a39d5610ca86302cdbedbb83c4a4da6909093c0a6b7e43d92c1a5f1bf86a34f2ce316ab6168fa6097d478b4838160758a8ce0de9c0404ed538461f868c3
 DIST screenfetch-3.2.2.tar.gz 46668 SHA256 6f30cc06b1f19cbeffc211afdf4c754c1e77b5e35965240ea77b032bb2e32bd4 SHA512 f8ddfcebe69919c9163c2377de8dfb28f15c9dd59c43d73245591b2ba6c41123c6c8130b673d87e6068850fca3b277f93bbb626e228266ea0c87be5856e823da WHIRLPOOL 7514eafaa7fb1df51a8beb5720f771217b32b902ca4e4433cfbe0f058dc11ccd82529b7622a1686878ad2e983063cfeaed0c9302b47f335a1dc4e5cb628568e4
 DIST screenfetch-3.6.5.tar.gz 54153 SHA256 b6605a94be9720a5e64778dcc43ddf23e435d6704c5d177b671aa57d34966f20 SHA512 291ec0d313deebe7931b739578b69f590ae32cb7a59c5ae6975b25240d9c5bd92b8957d6a53baf78aa95737642eadd37e081fae5b5ca5120da5a9d76bb980c59 WHIRLPOOL 33b8be75c98e09adde332792b10ff1aa808d6ed5d170aaeb9ee8eaa25925119b82a49902d39d810ae908fc65a864d5b7b6cbe9ce956054b08a8eda96e3ac4ab3
+DIST screenfetch-3.7.0.tar.gz 60223 SHA256 6711fe924833919d53c1dfbbb43f3777d33e20357a1b1536c4472f6a1b3c6be0 SHA512 9a6e89ef2cd48f12b22230c7aff356ac2ece8dc7437034a51a66f8026e5ca4a630af43511a60b21e9fc9f89af9e2493b8cfa3a06294e74c3d611ae3bb0db922d WHIRLPOOL 3db52291ceef4403742f06644e1a6fc1a36a95aec9f1c3cc730676d8b731eedb9fe4efc6fd81b6701d3e26039c6783bea684cea8c14ed73bf218c04d90db4ff0
--- a/app-misc/screenfetch/screenfetch-3.7.0.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.7.0.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+MY_PN="${PN/f/F}"
+
+DESCRIPTION="Bash Screenshot Information Tool"
+HOMEPAGE="https://github.com/KittyKatt/screenFetch"
+SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	newbin ${PN}-dev ${PN}
+	dodoc CHANGELOG README.mkdn TODO
+}
+
+pkg_postinst() {
+	optfeature "resoluton detection" x11-apps/xdpyinfo
+	optfeature "screenshot taking" media-gfx/scrot
+	optfeature "screenshot uploading" net-misc/curl
+}
--- a/app-misc/screenfetch/screenfetch-9999.ebuild
+++ b/app-misc/screenfetch/screenfetch-9999.ebuild
@ -1,31 +1,29 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=4
+EAPI=6
+
+inherit eutils git-r3

 MY_PN="${PN/f/F}"
-DESCRIPTION="A Bash Screenshot Information Tool"
+
+DESCRIPTION="Bash Screenshot Information Tool"
 HOMEPAGE="https://github.com/KittyKatt/screenFetch"
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> \
-		${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
+EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch"

 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS=""
 IUSE="X"

-DEPEND=""
-RDEPEND="X? ( media-gfx/scrot x11-apps/xdpyinfo )"
-
 src_install() {
 	newbin ${PN}-dev ${PN}
 	dodoc CHANGELOG README.mkdn TODO
 }
+
+pkg_postinst() {
+	optfeature "resoluton detection" x11-apps/xdpyinfo
+	optfeature "screenshot taking" media-gfx/scrot
+	optfeature "screenshot uploading" net-misc/curl
+}
--- a/app-office/scribus/scribus-1.4.5.ebuild
+++ b/app-office/scribus/scribus-1.4.5.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc ~x86"
 IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"

 # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@ -1,2 +1,3 @@
 DIST texstudio-2.10.2.tar.gz 25669897 SHA256 0cf97c752ba30aba8a0536492893b71ed454c62e6a6e34cff65a8a4eeb308e64 SHA512 3c29b2ef0bb8ed290c66802ffc9419f39d5ff5c4905523ee3adb7177f1159739639d5e4eb9d038fd28472c6618e68b7839b9c816da462dd24046691ebcd9796c WHIRLPOOL e66da4486fa17aa940557af75a098cd03eeaefabe2bf16d38589a37fd065c313c911f76d44b7b81054ae8460a93da323d3472139445fa67df21bb661143ba607
 DIST texstudio-2.10.4.tar.gz 25810583 SHA256 87e7b7c52d51791178fac4c48feeded7a920bc39bcfb710a745b467d80111c3c SHA512 13c6624bf38ee2633f9a86eb9c7ba03503b63de1f954c3f7c4a24182127b9d4db1e8524a122552412a2ceccb288a0dad3d70e9368fd897d6ec123a16e37816e5 WHIRLPOOL 357796f638d3e558a9560a62d972555474850ebd6b5a61bdaa14037b728113222ce9c9f2438b851fdaa20687e1444a8913cd222d5849de67293b0589085a6dc9
+DIST texstudio-2.10.6.tar.gz 25956475 SHA256 16368d7334f809aebe7a656f9bfa97f0ececb09d437fdb35ae7fc1888f1525e1 SHA512 061bad8530503aa611a09e5e2013fb5e956f436de00e2cd773fbd5e76c7a198fc9a628e4785e45f63dae5a2d0fed3e7f88d4a1a4a1f6fd0babdc44cc51eee0ab WHIRLPOOL 42d34dcae31f941b4d43af948e91a00be34d002bc85476f12e8e38b83d518f439b012c0c53aeb22728de984a55d2ee6a9139ff96c4aa1fe993059c935727a780
--- a/app-office/texstudio/files/texstudio-2.10.6-desktop.patch
+++ b/app-office/texstudio/files/texstudio-2.10.6-desktop.patch
@ -0,0 +1,18 @@
+--- utilities/texstudio.desktop.old	2016-01-17 16:38:44.283878626 +0100
+++ utilities/texstudio.desktop	2016-01-17 16:39:08.374876711 +0100
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Categories=Office;Publishing;Qt;X-SuSE-Core-Office;X-Mandriva-Office-Publishing;X-Misc;
+-Encoding=UTF-8
+ Exec=texstudio %F
+ GenericName=LaTeX Editor
+ GenericName[fr]=Editeur LaTeX
+@@ -8,7 +7,7 @@
+ Comment[fr]=Environnement de développement LaTeX
+ Icon=texstudio
+ Keywords=LaTeX;TeX;editor;
+-MimeType=text/x-tex;
+MimeType=text/X-tex;
+ Name=TeXstudio
+ StartupNotify=false
+ Terminal=false
--- a/app-office/texstudio/texstudio-2.10.6.ebuild
+++ b/app-office/texstudio/texstudio-2.10.6.ebuild
@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime prefix qmake-utils
+
+DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
+HOMEPAGE="http://texstudio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="video qt4 +qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+COMMON_DEPEND="
+	app-text/hunspell
+	app-text/poppler:=[qt4?,qt5?]
+	>=dev-libs/quazip-0.7.1[qt4?,qt5?]
+	dev-qt/qtsingleapplication[X,qt4?,qt5?]
+	x11-libs/libX11
+	x11-libs/libXext
+	qt4? (
+		dev-qt/designer:4
+		>=dev-qt/qtgui-4.8.5:4
+		>=dev-qt/qtcore-4.6.1:4
+		>=dev-qt/qtscript-4.6.1:4
+		>=dev-qt/qtsvg-4.6.1:4
+		>=dev-qt/qttest-4.6.1:4
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtcore:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtscript:5
+		dev-qt/qtsvg:5
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	video? ( media-libs/phonon[qt4?,qt5?] )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/-/}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.4-hunspell-quazip.patch
+	"${FILESDIR}"/${PN}-2.10.6-desktop.patch
+	)
+
+src_prepare() {
+	find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
+
+	if use video; then
+		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
+	fi
+
+	sed \
+		-e '/hunspell.pri/d' \
+		-e '/quazip.pri/d' \
+		-e '/qtsingleapplication.pri/d' \
+		-e '/QUAZIP_STATIC/d' \
+		-i ${PN}.pro || die
+
+#	cat >> ${PN}.pro <<- EOF
+#	exists(texmakerx_my.pri):include(texmakerx_my.pri)
+#	EOF
+
+	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
+	eprefixify ${PN}.pri
+
+	epatch ${PATCHES[@]}
+}
+
+src_configure() {
+	if use qt5; then
+		eqmake5
+	else
+		eqmake4
+	fi
+}
+
+src_install() {
+	local i
+	for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
+		insinto /usr/share/icons/hicolor/${i}
+		newins utilities/${PN}${i}.png ${PN}.png
+	done
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/app-shells/zsh/zsh-5.2.ebuild
+++ b/app-shells/zsh/zsh-5.2.ebuild
@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
-	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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
 		doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi
--- a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
@ -20,7 +20,7 @@ HOMEPAGE="http://www.antlr2.org/"
 SRC_URI="http://www.antlr2.org/download/${MY_P}.tar.gz"
 LICENSE="public-domain"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ppc ~x86"
 IUSE="doc examples static-libs"
 RESTRICT="test" # No tests but test target blows up!

--- a/dev-db/phpmyadmin/phpmyadmin-4.4.15.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.15.2.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 hppa ~ia64 ~ppc ppc64 sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"

 RDEPEND="
--- a/dev-db/phpmyadmin/phpmyadmin-4.5.3.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.5.3.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 hppa ~ia64 ~ppc ppc64 sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"

 RDEPEND="
--- a/dev-lang/luajit/luajit-2.0.4.ebuild
+++ b/dev-lang/luajit/luajit-2.0.4.ebuild
@ -21,7 +21,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat"

 S="${WORKDIR}/${MY_P}"
--- a/dev-lang/php/php-5.5.31.ebuild
+++ b/dev-lang/php/php-5.5.31.ebuild
@ -6,7 +6,7 @@ EAPI=5

 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd

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

 function php_get_uri ()
 {
--- a/dev-lang/php/php-5.6.17.ebuild
+++ b/dev-lang/php/php-5.6.17.ebuild
@ -6,7 +6,7 @@ EAPI=5

 inherit eutils autotools flag-o-matic versionator depend.apache apache-module libtool systemd

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

 function php_get_uri ()
 {
--- a/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild
@ -16,7 +16,7 @@ SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"

 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86"
 IUSE="debug gtk gtk3 +introspection"

 RDEPEND="
--- a/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild
+++ b/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"

 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc ~x86"
 IUSE="gtk +introspection"

 RESTRICT="test" # consequence of the -no-mono.patch
--- a/dev-libs/liblinear/liblinear-210-r1.ebuild
+++ b/dev-libs/liblinear/liblinear-210-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="blas"

 RDEPEND="
--- a/dev-perl/Apache-Reload/Apache-Reload-0.120.0-r1.ebuild
+++ b/dev-perl/Apache-Reload/Apache-Reload-0.120.0-r1.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=PHRED
-MODULE_VERSION=0.12
-inherit perl-module
-
-DESCRIPTION="Perl module for Apache::Reload"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="www-apache/mod_perl"
-DEPEND="${RDEPEND}"
--- a/dev-perl/Apache-Reload/Apache-Reload-0.130.0.ebuild
+++ b/dev-perl/Apache-Reload/Apache-Reload-0.130.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Perl module for Apache::Reload"

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

 RDEPEND="www-apache/mod_perl"
--- a/dev-perl/Apache-Reload/Manifest
+++ b/dev-perl/Apache-Reload/Manifest
@ -1,2 +1 @@
-DIST Apache-Reload-0.12.tar.gz 19015 SHA256 f688ab7ab8f5d315d1ade235111fc475ebeb98bb688cd9f1bc0ccd88a6dda219 SHA512 579b5c9a43cb430bcc96b33abec42b813132d1d7937945886a3bbb29b045073c7184f652b25c082fb9f6eea6d72ca5facd865fc8833b80eed3b7671d4ddefd94 WHIRLPOOL 076d86e12585c1b292eda165a90c9acd23a384d7942b86d3bbbf12dd849a21f2e311c366f2fea724532dd44f85e131475ccc154905f59dd1a2541b9f4d908e80
 DIST Apache-Reload-0.13.tar.gz 18908 SHA256 c8d0bfc1c18f0f0de39f4ad7f374f1a66a22daa3d1120f6deac2b8c550aa296a SHA512 7209fbd682093cca5f724050ee71d8bd26d101c3edfedb2cdaaf2e09df903e1f12cdf5cb6f4717eb8814802924359a01c89657dd5769f94c46d064db30c9f7e2 WHIRLPOOL 992e7f9bb1a08087721a5b4fb547cb725e488e22bcb16588627c035e38eb27df1f6eda7d6e603c62de255aa921ecd3b2d0354484739d4d3854b4c7cc6c579e6a
--- a/dev-perl/Apache-Session/Apache-Session-1.900.0-r1.ebuild
+++ b/dev-perl/Apache-Session/Apache-Session-1.900.0-r1.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=CHORNY
-MODULE_VERSION=1.90
-inherit perl-module
-
-DESCRIPTION="Perl module for Apache::Session"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE=""
-
-RDEPEND="
-	virtual/perl-Digest-MD5
-	virtual/perl-Storable"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-"
-#	test? (
-#		dev-perl/Test-Deep
-#		dev-perl/Test-Exception
-#	)
--- a/dev-perl/Apache-Session/Apache-Session-1.930.0.ebuild
+++ b/dev-perl/Apache-Session/Apache-Session-1.930.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A persistence framework for session data"

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

 RDEPEND="
--- a/dev-perl/Apache-Session/Manifest
+++ b/dev-perl/Apache-Session/Manifest
@ -1,2 +1 @@
-DIST Apache-Session-1.90.tar.gz 48643 SHA256 26ab8ba2fc3f09e7c67ab69d147e5c73813e4df8cda6cfe6cb375f0695353eb1 SHA512 c60f0e61b7839a8975b11439e54478321353eac637ba8d812af8d62f46ab16574f8d0a8caf9579ec68fc82b8147ec03cf8b90ad6fda0e83c0439036639a97108 WHIRLPOOL 4b300624879f959dc9e82816c605fa647090d5151af91d95a1e585302527792c9ce82910e332b1aa25a310e6c713e84ec498911e62813a61cca263ee9b00ae56
 DIST Apache-Session-1.93.tar.gz 49995 SHA256 8e5a4882ac8ec657d1018d74d3ba37854e2688a41ddd0e1d73955ea59f276e8d SHA512 568653b5151df61dbbc4b034043e1d4be75642122ab920a13155c4abbe052e4d96915b1453eb9f2f06bd1159d95efef7ed5905b4d2f2b8c6fdd3711d0cf5dbe4 WHIRLPOOL b3f7c327f44b58dd57797ff288921e968ba7ad7451f59d0f9545f24f4960f783c862b87663cdbe2f8738ac0ab28412f27379e2aac14685e293b70ee2bd8e9596
--- a/dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild
+++ b/dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Modules for reading & writing Microsoft WAV files"

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

 RDEPEND="
--- a/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild
+++ b/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module eutils db-use
 DESCRIPTION="This module provides Berkeley DB interface for Perl"

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

 # Install DB_File if you want older support. BerkleyDB no longer
--- a/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild
+++ b/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Efficient bit vector, set of integers and big int math library"

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

 RDEPEND="
--- a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Perl API for memcached"
 HOMEPAGE="http://www.danga.com/memcached/ ${HOMEPAGE}"

 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 ~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 ~x86-macos"
 IUSE=""

 DEPEND="dev-perl/string-crc32"
--- a/dev-perl/Cairo/Cairo-1.106.0.ebuild
+++ b/dev-perl/Cairo/Cairo-1.106.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Perl interface to the cairo library"

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

 RDEPEND="
--- a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild
+++ b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild
@ -12,7 +12,7 @@ inherit perl-module eutils
 DESCRIPTION="Create generic methods for OO Perl"

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

 DEPEND="
--- a/dev-perl/Clone/Clone-0.380.0.ebuild
+++ b/dev-perl/Clone/Clone-0.380.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Recursively copy Perl datatypes"

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

 RDEPEND=""
--- a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
+++ b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Extract data from Macintosh BinHex files"

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

 RDEPEND="
--- a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild
+++ b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="OpenSSL support for LWP"

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

 RDEPEND="
--- a/dev-perl/Curses/Curses-1.320.0.ebuild
+++ b/dev-perl/Curses/Curses-1.320.0.ebuild
@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Curses interface modules for Perl"

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

 DEPEND=">=sys-libs/ncurses-5:0=[unicode?]"
--- a/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="PostgreSQL database driver for the DBI module"

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

 RDEPEND="virtual/perl-version
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Self Contained RDBMS in a DBI Driver"

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

 RDEPEND="
--- a/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild
@ -11,7 +11,7 @@ inherit eutils perl-module
 DESCRIPTION="The Perl DBD:mysql Module"

 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"
 IUSE="embedded test"

 RDEPEND="dev-perl/DBI
--- a/dev-perl/DBI/DBI-1.634.0.ebuild
+++ b/dev-perl/DBI/DBI-1.634.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module eutils
 DESCRIPTION="Database independent interface for Perl"

 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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-perl/Data-Structure-Util/Data-Structure-Util-0.150.0.ebuild
+++ b/dev-perl/Data-Structure-Util/Data-Structure-Util-0.150.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Change nature of data within a structure"

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

 RDEPEND="
--- a/dev-perl/Data-UUID/Data-UUID-1.217.0-r1.ebuild
+++ b/dev-perl/Data-UUID/Data-UUID-1.217.0-r1.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=1.217
-inherit perl-module
-
-DESCRIPTION="Generate Globally/Universally Unique Identifiers (GUIDs/UUIDs)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="virtual/perl-Digest-MD5"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
--- a/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild
+++ b/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Generate Globally/Universally Unique Identifiers (GUIDs/UUIDs)"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="
--- a/dev-perl/Data-UUID/Manifest
+++ b/dev-perl/Data-UUID/Manifest
@ -1,2 +1 @@
-DIST Data-UUID-1.217.tar.gz 15907 SHA256 18c0c41998b211b4249102367400d2d3aa7df479c3a3368a32c0d6c0299bfe6d SHA512 b6920f6a4519d1249823d0aa17e622b9e098c8669aaf8361440d8d8531582530ef0c6cd365f0919b272880a69e2b833b8337f480c30276cf4a75088a3d758030 WHIRLPOOL 1a54497a55bcacc4d60639b3e2b4df0aad03c498c44e32f61c7e9bf685a88638138bf3e794073beac87ebc62e78f4d1385fcd1ed54b1dfeaefbd8e5b5c6cc63f
 DIST Data-UUID-1.221.tar.gz 17041 SHA256 3cc7b2a3a7b74b45a059e013f7fd878078500ea4b7269036f84556b022078667 SHA512 fa40219890f9adeb486a7ff636603d8695d81765ee858e396130100aaba96b524d80eef76e0c06eac2086fe3bb2d26114d94459466d29ddc82a7a7fcb2f5adac WHIRLPOOL 1aff0953df75d0fa6906b3473b618af4fc4f89651c4eeaaf9f9ea319629a390984555b1873faff2a502251ac05a294c27a9574037042778a250872eafe950fba
--- a/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild
+++ b/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Gregorian calendar date calculations"

 LICENSE="${LICENSE} LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~s390 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 ppc ~ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="
--- a/dev-perl/DateTime/DateTime-1.200.0.ebuild
+++ b/dev-perl/DateTime/DateTime-1.200.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="A date and time object"

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

 RDEPEND="
--- a/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
+++ b/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Meatier versions of caller"

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

 DEPEND="dev-perl/PadWalker"
--- a/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
+++ b/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Alias lexical variables"

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

 DEPEND=">=dev-perl/Devel-Caller-2.03"
--- a/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild
+++ b/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Generic CRC function"

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

 RDEPEND=""
--- a/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild
+++ b/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="safely and cleanly create closures via string eval"

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

 # Scalar::Util -> Scalar-List-Utils
--- a/dev-perl/Event/Event-1.210.0.ebuild
+++ b/dev-perl/Event/Event-1.210.0.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=JPRIT
-MODULE_VERSION=1.21
-inherit perl-module
-
-DESCRIPTION="fast, generic event loop"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
-
-mydoc="ANNOUNCE INSTALL TODO Tutorial.pdf"
--- a/dev-perl/Event/Event-1.240.0.ebuild
+++ b/dev-perl/Event/Event-1.240.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Fast, generic event loop"

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

 DEPEND="virtual/perl-ExtUtils-MakeMaker"
--- a/dev-perl/Event/Manifest
+++ b/dev-perl/Event/Manifest
@ -1,2 +1 @@
-DIST Event-1.21.tar.gz 253340 SHA256 66ef435bdaf471c64a19f3afbdc0cbf71705a4ebd818f352e5d94082e84055d7 SHA512 9e2ba21d88bd841fd8a2ad6d9f42a29f6a30f47b21f0407dde2b66e9e48dfd04dcba30301e3df8e1bb15edd479e23b1cd43a821ecface4139606e8afc78ef08a WHIRLPOOL d0c89a191ad813a2e3ce7d59e8cb2efcd016ef6b426c34a148ee999587e3e840063d84e127c468e62eb95932845aebb73abfd85b21505cf49036013d0d770ea4
 DIST Event-1.24.tar.gz 254789 SHA256 8a7ff96b6f058f2f2b45e5eef8438dcc335151571c274ae2bdbe2d91abb36d7e SHA512 5e6a54f74117fd47f4ef29b65e3432fe1b87fd6f61a8a11143116a13f14c42f070a178777415d89e710e757ccb69eb0777a1a6b8d95adf8bcfffb2fd762307b2 WHIRLPOOL c7c7e6442f7eb08ad06d641117a7ea2b53281887764fe4b1d825d2204bc11bed0cbb2a22ff95e7056178c04c35b2db91c16e29f039ddec7fdde8cf2dc2712814
--- a/dev-perl/FCGI/FCGI-0.740.0-r1.ebuild
+++ b/dev-perl/FCGI/FCGI-0.740.0-r1.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=FLORA
-MODULE_VERSION=0.74
-inherit perl-module
-
-DESCRIPTION="Fast CGI"
-
-LICENSE="FastCGI"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
-IUSE=""
-
-SRC_TEST="do"
--- a/dev-perl/FCGI/FCGI-0.770.0.ebuild
+++ b/dev-perl/FCGI/FCGI-0.770.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Fast CGI module"

 LICENSE="FastCGI"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
 IUSE=""

 RDEPEND="
--- a/dev-perl/FCGI/Manifest
+++ b/dev-perl/FCGI/Manifest
@ -1,2 +1 @@
-DIST FCGI-0.74.tar.gz 97599 SHA256 f59e46f6de960a67f7d15003504b2df6cb10511bb172f1904753df79004e0854 SHA512 f650d78c19ff7648c307c869df19abe87f4bfe4863972ea22b649b39a146c5a9b11ed434a5dd58583b83580dbf62600cb17697385243c8ffba9d53daf0dc7c6b WHIRLPOOL 443adefa257b9bb72f16f0a4f79b0835853e74c50d21ab856efa4ba38f81893609b6e57324be79562d64592b278e254f3e11b28af77fb7b065d1ce00524b8de5
 DIST FCGI-0.77.tar.gz 90561 SHA256 352cdfe3309d77c2815aa18fe7fbd9b4be68e8b1b26d062039e78f8664aa25a8 SHA512 8586b6bb675aebc04eaa8b56fb762c292fe9f991083c447cbe0ba9ac943cd3e6e56853ba732cac9a6e3bfe8eb0767719794351ad3bce9550bc2df516819f47f4 WHIRLPOOL 21f42d5e38cecefcd2fba013e7b9795b3232c71d2df1af518406602d683feede9a1d5ecd3a810ebd958b60442fa191572d9e8110b3e804ae6f6b87be0d111b15
--- a/dev-perl/File-Flock/File-Flock-2014.10.0.ebuild
+++ b/dev-perl/File-Flock/File-Flock-2014.10.0.ebuild
@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="flock() wrapper.  Auto-create locks"

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

 SRC_TEST="do"
--- a/dev-perl/File-Map/File-Map-0.560.0.ebuild
+++ b/dev-perl/File-Map/File-Map-0.560.0.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=LEONT
-MODULE_VERSION=0.56
-inherit perl-module
-
-DESCRIPTION="Memory mapping made simple and safe"
-
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/Const-Fast
-	dev-perl/PerlIO-Layers
-	>=dev-perl/Sub-Exporter-Progressive-0.1.5
-"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		dev-perl/Test-Exception
-		dev-perl/Test-NoWarnings
-		dev-perl/Test-Warn
-	)
-"
-SRC_TEST=do
--- a/dev-perl/File-Map/File-Map-0.640.0.ebuild
+++ b/dev-perl/File-Map/File-Map-0.640.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Memory mapping made simple and safe"

 SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/File-Map/Manifest
+++ b/dev-perl/File-Map/Manifest
@ -1,2 +1 @@
-DIST File-Map-0.56.tar.gz 73947 SHA256 960d614c038e2fb74d4a14543b82e6158d7d7e296a3acbe6a683c3280c73e535 SHA512 e9ab48c525fde25207866e69894c0ffa4e71bd213f5dd39e1b423ace62376c10c83c862693d84860b91e57cea4c275dc0f7f52650f32ad5e3087feb6b6312d68 WHIRLPOOL 9fe0ace81d5f28958984860a70c0497e879cd9c7e5945658041ef1ec10199fc4050f80b26e328480d127471314fe342c9911a6f15b783bae62c935b05d2cdc99
 DIST File-Map-0.64.tar.gz 78083 SHA256 03e42eb2de185b1e257c7a0ed9761a20b7d51f522464c713b20f43d47491a8c9 SHA512 dc1182e79d20e835e19c78f5187dd108b45938209933a7074674d472ac300277fc1fb7604b023ad7d3456ef5837bb8274a94e1cac79f95f2a2235855c59d3809 WHIRLPOOL 1e0d887f51f652d9aa8938c83e5c7d2fe68676de94306f90f6a7a5d5de778532e751351a2fbce40ca38b6f09a6cc9e6593a63e02b087baf646bf12b2aa6af942
--- a/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.300-r1.ebuild
+++ b/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.300-r1.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DCOPPIT
-MODULE_VERSION=0.1623
-inherit perl-module versionator
-
-DESCRIPTION="A FileHandle which supports ungetting of multiple bytes"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ia64 ppc sparc x86"
-IUSE=""
-
-SRC_TEST=do
--- a/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.800.ebuild
+++ b/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.800.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="A FileHandle which supports ungetting of multiple bytes"

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

 RDEPEND=">=virtual/perl-Scalar-List-Utils-1.140.0"
--- a/dev-perl/FileHandle-Unget/Manifest
+++ b/dev-perl/FileHandle-Unget/Manifest
@ -1,2 +1 @@
-DIST FileHandle-Unget-0.1623.tar.gz 32166 SHA256 5f328639e5a7b6f7c2c26af8a10640747693aed63146f9ffda7a1aab14f85b9e SHA512 fa1554226a6fac5cba8d4f1b359d820990550700328907b8f606e69e9eed99d04e6899fc2048befb168227e374c3a4690180691b96e5beab36ee3dfa249480ae WHIRLPOOL 8fcc1c6f9cff5b6f8c10a775e24af31e3b86ca4e4c86def7510da43784bafc26229f68dddc8daf47457c195a935299de25ca8aa48010ee8f25800c125e44d984
 DIST FileHandle-Unget-0.1628.tar.gz 40259 SHA256 9ef4eb765ddfdc35b350905d8dd0a1e12139eabc586652811bfab41972100fdf SHA512 7c4aca0c7d22ab7091c19b7bc5876ed4f83ff961e49900e0ec70124cedc4e34109a31edf5180c6958772f85a021e2be6a8a9e69c393b495e413c24a8b2b6ff3f WHIRLPOOL 8980b1223a50a9b2266776fbb956ad254f9177590cbe98c2a317effd1b6233cd2f7841d2c81c4ba1a4f0af07c1e665a8908d6baa2fa08d6723ff21163b3decd3
--- a/dev-perl/IO-Event/IO-Event-0.813.0.ebuild
+++ b/dev-perl/IO-Event/IO-Event-0.813.0.ebuild
@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Tied Filehandles for Nonblocking IO with Object Callbacks"

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

 RDEPEND="
--- a/dev-perl/Path-Class/Path-Class-0.350.0.ebuild
+++ b/dev-perl/Path-Class/Path-Class-0.350.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Cross-platform path specification manipulation"

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

 RDEPEND="
--- a/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild
+++ b/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Test strings and data structures and show differences if not ok"

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

 RDEPEND="dev-perl/Text-Diff
--- a/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
+++ b/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Most commonly needed test functions and features"

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

 RDEPEND="
--- a/dev-perl/Test-SharedFork/Test-SharedFork-0.330.0.ebuild
+++ b/dev-perl/Test-SharedFork/Test-SharedFork-0.330.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="fork test"

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

 RDEPEND="
--- a/Show More
+++ b/Show More