Sync with portage [Mon Jan 16 01:13:33 MSK 2017].

7 years ago · a42805130e
parent a2ac4c7a1b
commit a42805130e
2908 changed files with 8832 additions and 33660 deletions
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@ -1,4 +1,3 @@
 DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c
 DIST httpd-2.2.32.tar.bz2 5777509 SHA256 527bc9d8092d784daf08910dd6c9d2681d6a2325055b2cc69806a0a7df7ed650 SHA512 b1802579f4fc950705ddcf0a24f502ffadbd91d5693fdd3b290ac7ca40122f8fa48132ad1055afae9b841dd55e8bb343239be07ca431b0f60ea081f5c2fad2c3 WHIRLPOOL ee2f1cb74b77f4b3eae7d58bb9bf2728d95a6e215a460d85abf60e220b816cb0e22080169167e3610872e3165951f1cc9ac753f02e46dc75e047a98a1b7384a5
 DIST httpd-2.4.23.tar.bz2 6351875 SHA256 0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58 SHA512 c520de5be748c0a785ef0dc77102749eb4f47e224968b8d4bed2ae644faa0964623a0e960b64486a0888446790d050b52a6ae34fe61717fab95b37384b4825b1 WHIRLPOOL f3defbd06a878c66236adfcac2b59b6f47115ac815708bb45f2152bd1754b14a01458c9331eb7a65cba52e0bc53e2e66b32a384d44a029b07ffdd068c7c08a19
 DIST httpd-2.4.25.tar.bz2 6398218 SHA256 f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2 SHA512 6ba4ce1dcef71416cf1c0de2468c002767b5637a75744daf5beb0edd045749a751b3826c4132f594c48e4b33ca8e1b25ebfb63ac4c8b759ca066a89d3261fb22 WHIRLPOOL ccb783875632241e8acf7b43c59163c25b13357b307416abaa3adb0ac868fc547b3cff9585b347e98a8663ec26bea3edad4d42604e6ae86b0db5f769fc11d072
--- a/app-admin/apache-tools/apache-tools-2.4.23.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.23.ebuild
@ -1,107 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 inherit flag-o-matic eutils multilib toolchain-funcs
 DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
 HOMEPAGE="https://httpd.apache.org/"
 SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 RDEPEND=">=dev-libs/apr-1.5.0:1
 	dev-libs/apr-util:1
 	dev-libs/expat
 	dev-libs/libpcre
 	kernel_linux? ( sys-apps/util-linux )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)"
 DEPEND="${RDEPEND}
 	sys-devel/libtool"
 S="${WORKDIR}/httpd-${PV}"
 PATCHES=(
 	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
 )
 src_prepare() {
 	default
 	# This package really should upgrade to using pcre's .pc file.
 	cat <<-\EOF >"${T}"/pcre-config
 	#!/bin/bash
 	flags=()
 	for flag; do
 		if [[ ${flag} == "--version" ]]; then
 			flags+=( --modversion )
 		else
 			flags+=( "${flag}" )
 		fi
 	done
 	exec ${PKG_CONFIG} libpcre "${flags[@]}"
 	EOF
 	chmod a+x "${T}"/pcre-config
 }
 src_configure() {
 	# Brain dead check.
 	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
 	tc-export PKG_CONFIG
 	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
 	append-ldflags $(no-as-needed)
 	# econf overwrites the stuff from config.layout.
 	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
 	econf \
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
 		--sbindir="${EPREFIX}"/usr/sbin \
 		--with-perl="${EPREFIX}"/usr/bin/perl \
 		--with-expat="${EPREFIX}"/usr \
 		--with-z="${EPREFIX}"/usr \
 		--with-apr="${SYSROOT}${EPREFIX}"/usr \
 		--with-apr-util="${SYSROOT}${EPREFIX}"/usr \
 		--with-pcre="${T}"/pcre-config \
 		$(use_enable ssl) \
 		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
 	sed -i \
 		-e '/^LTFLAGS/s:--silent::' \
 		build/rules.mk build/config_vars.mk || die
 }
 src_compile() {
 	emake -C support
 }
 src_install() {
 	emake -C support DESTDIR="${D}" install
 	dodoc CHANGES
 	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
 		docs/man/{htcacheclean,rotatelogs}.8
 	# Providing compatiblity symlinks for #177697 (which we'll stop to install
 	# at some point).
 	pushd "${ED}"/usr/sbin >/dev/null || die
 	local i
 	for i in *; do
 		dosym ${i} /usr/sbin/${i}2
 	done
 	popd >/dev/null || die
 	# Provide a symlink for ab-ssl
 	if use ssl; then
 		dosym ab /usr/bin/ab-ssl
 		dosym ab /usr/bin/ab2-ssl
 	fi
 }
--- a/app-admin/apache-tools/apache-tools-2.4.25.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.25.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
--- a/app-admin/augeas/augeas-1.7.0.ebuild
+++ b/app-admin/augeas/augeas-1.7.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://download.augeas.net/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
 IUSE="static-libs test"
 RDEPEND="
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@ -1,2 +1 @@
-DIST cdist-3.1.13.tar.gz 303245 SHA256 9363b25d3119ca6266a3066fcae145009e00253745bd81987d92ebcb9e10f987 SHA512 df6562dda7b4fcedcc8e651f33f5ce59a7d6c297a32f7685529865a4d965b9111f352ddd38a15ba28dc5cc53385a483ec87cc43b235ef9eee02512b7fabc6f41 WHIRLPOOL d0b7ad0955d6a16018a9dd1d452afd714e819a0427dc685e20745847658a0c0a3323dd1f5d03967547bb879e448f09ea84ba69a11fa00ea6dcd06ce3180ef6c5
+DIST cdist-4.4.1.tar.gz 377850 SHA256 adf4c558667aaec010fa391524c0c5a9f07e89b658d51e515bc04baf79ac8bbc SHA512 ed955c48c708c5b97dc803d3b8ea8742581b7b0153c2494dad64cecbaca00bad414c624f77caa9d5cea44130adea3b5a547bbbf3db2d5546ea694f4c736bd3b4 WHIRLPOOL f7e8e17dec5f1fbc64aefbda99147709eb67e4c54c931e77841f0490ec3dad16e2a0d9892c75986e70325f23dc185cb02c6cd872e34f3cf76f36605ba3ff1bb3
 DIST cdist-3.1.9.tar.gz 260817 SHA256 37eb340a83f52f035468b817d9f1218c5954ba2910fb7a800dfe04cf8abae85b SHA512 e2cc40a38961fa5cbb6f51fc5ea2f6a8a1f86cd5b42d85204f2f71e2aba8393d5041a63e756d7c5666cc30c9ab528a9e0e5bccaea8c5a9ed079453cc87d76d06 WHIRLPOOL 41f9d06401149e06969f3d799c7b812e6a992ade3892c6de9f0723bf2a697d45a6c4d1fc46805ee81c340d1f8cb5ffead32d45e7e5bb8b46cbf6aca8a53dd7fa
--- a/app-admin/cdist/cdist-3.1.9.ebuild
+++ b/app-admin/cdist/cdist-3.1.9.ebuild
@ -1,26 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 PYTHON_COMPAT=( python3_4 )
 inherit distutils-r1
 DESCRIPTION="A usable configuration management system"
 HOMEPAGE="http://www.nico.schottelius.org/software/cdist/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 DOCS=( README )
 python_install_all() {
 	if use doc; then
 		HTML_DOCS=( docs/man/man1/*.html docs/man/man7/*.html )
 	fi
 	distutils-r1_python_install_all
 	doman docs/man/man1/*.1 docs/man/man7/*.7
 }
--- a/app-admin/cdist/cdist-3.1.13.ebuild
+++ b/app-admin/cdist/cdist-3.1.13.ebuild
@ -1,9 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python{3_4,3_5} )
 inherit distutils-r1
 DESCRIPTION="A usable configuration management system"
@ -15,12 +17,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 DOCS=( README )
 python_install_all() {
-	if use doc; then
+	use doc && HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
 		HTML_DOCS=( docs/man/man1/*.html docs/man/man7/*.html )
 	fi
 	distutils-r1_python_install_all
-	doman docs/man/man1/*.1 docs/man/man7/*.7
+
 	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
 }
--- a/app-admin/cgmanager/cgmanager-0.41.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.41.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ppc ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 x86"
 IUSE="pam selinux"
 RDEPEND="sys-libs/libnih[dbus]
--- a/app-admin/conky/conky-1.10.4.ebuild
+++ b/app-admin/conky/conky-1.10.4.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ppc x86"
+KEYWORDS="alpha amd64 ~arm ppc x86"
 IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
 	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
 	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
--- a/app-admin/kpcli/Manifest
+++ b/app-admin/kpcli/Manifest
@ -1,3 +1,2 @@
 DIST kpcli-2.7.pl 166288 SHA256 6bb1f7320b4474d6dbb73915393e5df96862f27c6228aa042a810fef46e2b777 SHA512 4a64164cc43b51a2f35a4dc348054e0299a8ac745ac8ca280b43b37b2813200afe2c7ec393ccca6a4e357252f59ca2315e71c87a5e512ff2f2b1569160a76b4e WHIRLPOOL 4b9e4872b6479b7c5757c95d07be6e72c32bb11cdaf559a64bf8f8e94a970c511be44ec566beeb30d805059a5651be90b1438faa08f41ac5ca5e66007d6de4be
 DIST kpcli-2.8.pl 176617 SHA256 21351afe96bd8d151cc5b551b9852249199802deac5ed05ba8538f18c308b2ee SHA512 45ed8e67e4a985faa53476d35613ae90f68983d97cc85fba31d92d615cf021e62167179edc733a8acd0ace4eeee910ac8556939ff1cc6c3d6fb6badf5547fab7 WHIRLPOOL a6fe2d2ddb7cd3bb86d809518fa3263c230dff2d4d34639ac41bf5d8284ed1d7c3e78f5b44d3602501586d5a633e2dd32c119aa71bd3596bb52a3d9ab8dbc52d
 DIST kpcli-3.0.pl 181841 SHA256 947b7b0485215f72e14bb8936c847abb583253c597f58234650922270259049c SHA512 fb1243ed81408507090ce6e7b06e958f923ac9c64e6994b104605bb85deb08e1b63b28fdb2c5a4eb24e128734b65ecb0209000f08ec9a7644f3d6a8fbb781587 WHIRLPOOL 096d8e516fe2e0cabd605232bd8b1f41d6dec6e5081cc2429ff97aea95e575c3a4faf760c59012a1535494afcf2755710496b394dc9153eb1a99d0738d56c3a0
 DIST kpcli-3.1.pl 193792 SHA256 f1f07704a30d0eae126717d5dae0d24ccced43c316454e4a7b868fe0a239a21a SHA512 2bcfaa4535fd35d7bbf512e704392e207237efa669bf5d6845d1657e44511f04b80fddd4404f3a8d409f330f8bfbb5cf9f1e09fb8a425685b3d7309a8040df5e WHIRLPOOL 832d16d71892933b81bc5d29099118cfd838fa5b96b6766d6a4b732fc579f8dd616441c89ebc2eb5670045da2ca2bd183f83a407111c2db64978986b611f7bf2
--- a/app-admin/kpcli/kpcli-2.7.ebuild
+++ b/app-admin/kpcli/kpcli-2.7.ebuild
@ -1,42 +0,0 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 DESCRIPTION="A command line interface to KeePass database files"
 HOMEPAGE="http://kpcli.sourceforge.net"
 SRC_URI="http://downloads.sourceforge.net/project/kpcli/${P}.pl"
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 RDEPEND="dev-lang/perl
 	dev-perl/Clone
 	dev-perl/Crypt-Rijndael
 	dev-perl/TermReadKey
 	dev-perl/Sort-Naturally
 	dev-perl/Term-ShellUI
 	>=dev-perl/File-KeePass-0.30.0
 	virtual/perl-File-Spec
 	virtual/perl-Getopt-Long
 	virtual/perl-Digest-MD5
 	virtual/perl-Digest-SHA
 	virtual/perl-Data-Dumper
 	virtual/perl-Term-ANSIColor
 	virtual/perl-Carp
 "
 src_unpack() {
 	mkdir "${S}" || die
 	cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
 }
 src_compile() { :; }
 src_install() {
 	dobin kpcli
 }
--- a/app-admin/kpcli/kpcli-3.1.ebuild
+++ b/app-admin/kpcli/kpcli-3.1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=5
+EAPI=6
 DESCRIPTION="A command line interface to KeePass database files"
 HOMEPAGE="http://kpcli.sourceforge.net"
@ -11,10 +11,11 @@ SRC_URI="http://downloads.sourceforge.net/project/kpcli/${P}.pl"
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="X"
 DEPEND=""
-RDEPEND="dev-lang/perl
+RDEPEND="
 	dev-lang/perl
 	dev-perl/Clone
 	dev-perl/Crypt-Rijndael
 	dev-perl/TermReadKey
@ -27,7 +28,12 @@ RDEPEND="dev-lang/perl
 	virtual/perl-Digest-SHA
 	virtual/perl-Data-Dumper
 	virtual/perl-Term-ANSIColor
 	virtual/perl-Time-Piece
 	virtual/perl-Carp
 	X? (
 		dev-perl/Capture-Tiny
 		dev-perl/Clipboard
 	)
 "
 src_unpack() {
--- a/app-admin/logrotate/logrotate-3.11.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.11.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> $
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl +cron selinux"
 CDEPEND="
--- a/app-admin/monit/monit-5.20.0.ebuild
+++ b/app-admin/monit/monit-5.20.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
 IUSE="libressl pam ssl"
 RDEPEND="
--- a/app-admin/salt/salt-9999.ebuild
+++ b/app-admin/salt/salt-9999.ebuild
@ -89,7 +89,7 @@ RESTRICT="x86? ( test )"
 python_prepare() {
 	# this test fails because it trys to "pip install distribute"
 	rm tests/unit/{modules,states}/zcbuildout_test.py \
-		tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die
+		tests/unit/modules/{rh_ip,win_network}_test.py || die
 	# apparently libcloud does not know about this?
 	rm tests/unit/cloud/clouds/dimensiondata_test.py || die
--- a/app-admin/swatchdog/swatchdog-3.2.4.ebuild
+++ b/app-admin/swatchdog/swatchdog-3.2.4.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/swatch/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 RDEPEND="dev-perl/Date-Manip
--- a/app-admin/sysstat/sysstat-11.4.0.ebuild
+++ b/app-admin/sysstat/sysstat-11.4.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="debug isag nls lm_sensors selinux static"
 CDEPEND="
--- a/app-arch/dump/dump-0.4.46.ebuild
+++ b/app-arch/dump/dump-0.4.46.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
 # We keep uuid USE flag default dsiabled for this version. Don't forget
 # to default enable it for later versions as this is the upstream default.
 IUSE="bzip2 debug ermt libressl lzo readline selinux sqlite ssl static test uuid zlib"
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@ -1,2 +1 @@
 DIST libarchive-3.2.1.tar.gz 5448888 SHA256 72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2 SHA512 a5d43cb0bf36b687fabfbc874e7adc1fa94c563e7f073e107db8d4e79e8d0d8146cb985809f8115fbb882fc2d8a2a477d0a7364e93e6df62f292bb5e9865ec5c WHIRLPOOL 1dd79ec3d7cf53be237d6730476c6a47c0722a5a7d0f2adc347aa491ba95ba7c77342a39a9e3d0fbff64111b552bb558cb571aa74dd6c18e6c60987bf0f41d7c
 DIST libarchive-3.2.2.tar.gz 5458241 SHA256 691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f SHA512 a67920c37d49cf9478032d77fc4fa21827cebb96e9b83d9ecb8466328834052e4ab3d3a9bc4e2edf405d6cb14ffd648c9fa100b578257f6e5842c99bbea558a7 WHIRLPOOL 8fdc2e9245db27a7da3cfdeecb6283b170a25fc6ea8201fe5a414b4c1b523ae6b05745246f867f24062d91b7a040780b687b1a44a95503c4e252f9836218ffef
--- a/app-arch/libarchive/files/libarchive-3.2.1-fix-tests-gnu99.patch
+++ b/app-arch/libarchive/files/libarchive-3.2.1-fix-tests-gnu99.patch
@ -1,47 +0,0 @@
 From 11f5b75c9ba12ba73b5fa34dc9d285983d99c01b Mon Sep 17 00:00:00 2001
 From: Joerg Sonnenberger <joerg@bec.de>
 Date: Wed, 22 Jun 2016 23:09:27 +0200
 Subject: [PATCH] Avoid use of C99 for-scope declarations to fix issue #729.
 ---
 libarchive/test/test_write_format_gnutar_filenames.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 diff --git a/libarchive/test/test_write_format_gnutar_filenames.c b/libarchive/test/test_write_format_gnutar_filenames.c
 index 38b4ca9..26457d3 100644
 --- a/libarchive/test/test_write_format_gnutar_filenames.c
 +++ b/libarchive/test/test_write_format_gnutar_filenames.c
@@ -42,6 +42,7 @@ DEFINE_TEST(test_write_format_gnutar_filenames)
 	struct archive_entry *ae, *template;
 	struct archive *a;
 	size_t used;
 +	int i;
 	buff = malloc(buffsize); /* million bytes of work area */
 	assert(buff != NULL);
@@ -55,7 +56,7 @@ DEFINE_TEST(test_write_format_gnutar_filenames)
 	archive_entry_set_mode(template, S_IFREG | 0755);
 	archive_entry_set_size(template, 8);
 -	for (int i = 0; i < 2000; ++i) {
 +	for (i = 0; i < 2000; ++i) {
 		filename[i] = 'a';
 		filename[i + 1] = '\0';
 		archive_entry_copy_pathname(template, filename);
@@ -97,6 +98,7 @@ DEFINE_TEST(test_write_format_gnutar_linknames)
 	struct archive_entry *ae, *template;
 	struct archive *a;
 	size_t used;
 +	int i;
 	buff = malloc(buffsize); /* million bytes of work area */
 	assert(buff != NULL);
@@ -110,7 +112,7 @@ DEFINE_TEST(test_write_format_gnutar_linknames)
 	archive_entry_set_mode(template, S_IFLNK | 0755);
 	archive_entry_copy_pathname(template, "link");
 -	for (int i = 0; i < 2000; ++i) {
 +	for (i = 0; i < 2000; ++i) {
 		filename[i] = 'a';
 		filename[i + 1] = '\0';
 		archive_entry_copy_symlink(template, filename);
--- a/app-arch/libarchive/files/libarchive-3.2.1-osx-fix-acl.patch
+++ b/app-arch/libarchive/files/libarchive-3.2.1-osx-fix-acl.patch
@ -1,32 +0,0 @@
 From 3e66829717c8fde611b2b611497f08a46da40ce7 Mon Sep 17 00:00:00 2001
 From: Joerg Sonnenberger <joerg@bec.de>
 Date: Tue, 21 Jun 2016 18:29:07 +0200
 Subject: [PATCH] Dummy out copy_acls if sys/acl.h is missing or ACL support is
 disabled.
 ---
 libarchive/archive_write_disk_posix.c | 4 ++++
 1 file changed, 4 insertions(+)
 diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c
 index 6737cd7..67aacf1 100644
 --- a/libarchive/archive_write_disk_posix.c
 +++ b/libarchive/archive_write_disk_posix.c
@@ -3487,6 +3487,9 @@ copy_xattrs(struct archive_write_disk *a, int tmpfd, int dffd)
 static int
 copy_acls(struct archive_write_disk *a, int tmpfd, int dffd)
 {
 +#ifndef HAVE_SYS_ACL_H
 +	return 0;
 +#else
 	acl_t acl, dfacl = NULL;
 	int acl_r, ret = ARCHIVE_OK;
@@ -3514,6 +3517,7 @@ copy_acls(struct archive_write_disk *a, int tmpfd, int dffd)
 	if (dfacl)
 		acl_free(dfacl);
 	return (ret);
 +#endif
 }
 static int
--- a/app-arch/libarchive/files/libarchive-3.2.1-xz-utils-thread-detection.patch
+++ b/app-arch/libarchive/files/libarchive-3.2.1-xz-utils-thread-detection.patch
@ -1,27 +0,0 @@
 From 7c3148ec0a2fed4834c6f9869ff7d2da77ba804c Mon Sep 17 00:00:00 2001
 From: Joerg Sonnenberger <joerg@bec.de>
 Date: Wed, 22 Jun 2016 23:03:43 +0200
 Subject: [PATCH] Ignore the MT encoder in XZ 5.2 prerelease versions.
 ---
 configure.ac | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 diff --git a/configure.ac b/configure.ac
 index 64775fa..4f7f432 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -374,8 +374,11 @@ if test "x$with_lzma" != "xno"; then
   AC_CACHE_CHECK(
     [whether we have multithread support in lzma],
     ac_cv_lzma_has_mt,
 -    [AC_COMPILE_IFELSE([
 -      AC_LANG_PROGRAM([[#include <lzma.h>]],
 +    [AC_LINK_IFELSE([
 +      AC_LANG_PROGRAM([[#include <lzma.h>]
 +                       [#if LZMA_VERSION < 50020000]
 +                       [#error unsupported]
 +                       [#endif]],
                       [[lzma_stream_encoder_mt(0, 0);]])],
       [ac_cv_lzma_has_mt=yes], [ac_cv_lzma_has_mt=no])])
   if test "x$ac_cv_lzma_has_mt" != xno; then
--- a/app-arch/libarchive/libarchive-3.2.1-r3.ebuild
+++ b/app-arch/libarchive/libarchive-3.2.1-r3.ebuild
@ -1,125 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 inherit autotools eutils multilib-minimal toolchain-funcs
 DESCRIPTION="BSD tar command"
 HOMEPAGE="http://www.libarchive.org/"
 SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs xattr +zlib"
 RDEPEND="
 	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
 	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
 	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
 	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
 	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
 	kernel_linux? (
 		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
 	)
 	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
 	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
 	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
 	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
 	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	kernel_linux? (
 		virtual/os-headers
 		e2fsprogs? ( sys-fs/e2fsprogs )
 	)"
 PATCHES=(
 	"${FILESDIR}/${P}-fix-tests-gnu99.patch"
 	"${FILESDIR}/${P}-osx-fix-acl.patch" #587890
 )
 src_prepare() {
 	default
 	eautoreconf # elibtoolize is required for Solaris sol2_ld linker fix
 }
 multilib_src_configure() {
 	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
 	local myconf=()
 	myconf=(
 		$(use_enable acl)
 		$(use_enable static-libs static)
 		$(use_enable xattr)
 		$(use_with bzip2 bz2lib)
 		$(use_with expat)
 		$(use_with !expat xml2)
 		$(use_with iconv)
 		$(use_with lz4)
 		$(use_with lzma)
 		$(use_with lzo lzo2)
 		$(use_with nettle)
 		$(use_with zlib)
 	)
 	if multilib_is_native_abi ; then myconf+=(
 		--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
 		--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
 		--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
 	); else myconf+=(
 		--disable-bsdcat
 		--disable-bsdcpio
 		--disable-bsdtar
 	); fi
 	# We disable lzmadec because we support the newer liblzma from xz-utils
 	# and not liblzmadec with this version.
 	myconf+=(
 		--without-lzmadec
 	)
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 multilib_src_compile() {
 	if multilib_is_native_abi ; then
 		emake
 	else
 		emake libarchive.la
 	fi
 }
 multilib_src_test() {
 	# Replace the default src_test so that it builds tests in parallel
 	multilib_is_native_abi && emake check
 }
 multilib_src_install() {
 	if multilib_is_native_abi ; then
 		emake DESTDIR="${D}" install
 		# Create symlinks for FreeBSD
 		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
 			for bin in cat cpio tar; do
 				dosym bsd${bin} /usr/bin/${bin}
 				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
 				doman "${T}"/${bin}.1
 			done
 		fi
 	else
 		emake DESTDIR="${D}" \
 			install-includeHEADERS \
 			install-libLTLIBRARIES \
 			install-pkgconfigDATA
 	fi
 	# Libs.private: should be used from libarchive.pc instead
 	prune_libtool_files
 }
 multilib_src_install_all() {
 	cd "${S}" || die
 	einstalldocs
 }
--- a/app-arch/libarchive/libarchive-3.2.1-r5.ebuild
+++ b/app-arch/libarchive/libarchive-3.2.1-r5.ebuild
@ -1,127 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 inherit autotools eutils multilib-minimal toolchain-funcs
 DESCRIPTION="BSD tar command"
 HOMEPAGE="http://www.libarchive.org/"
 SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
 RDEPEND="
 	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
 	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
 	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
 	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
 	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
 	kernel_linux? (
 		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
 	)
 	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
 	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
 	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
 	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
 	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	kernel_linux? (
 		virtual/os-headers
 		e2fsprogs? ( sys-fs/e2fsprogs )
 	)"
 PATCHES=(
 	"${FILESDIR}/${P}-fix-tests-gnu99.patch"
 	"${FILESDIR}/${P}-osx-fix-acl.patch" #587890
 	"${FILESDIR}/${P}-xz-utils-thread-detection.patch" #589654
 )
 src_prepare() {
 	default
 	eautoreconf # elibtoolize is required for Solaris sol2_ld linker fix
 }
 multilib_src_configure() {
 	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
 	local myconf=()
 	myconf=(
 		$(use_enable acl)
 		$(use_enable static-libs static)
 		$(use_enable xattr)
 		$(use_with bzip2 bz2lib)
 		$(use_with expat)
 		$(use_with !expat xml2)
 		$(use_with iconv)
 		$(use_with lz4)
 		$(use_with lzma)
 		$(use_with lzo lzo2)
 		$(use_with nettle)
 		$(use_with zlib)
 	)
 	if multilib_is_native_abi ; then myconf+=(
 		--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
 		--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
 		--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
 	); else myconf+=(
 		--disable-bsdcat
 		--disable-bsdcpio
 		--disable-bsdtar
 	); fi
 	# We disable lzmadec because we support the newer liblzma from xz-utils
 	# and not liblzmadec with this version.
 	myconf+=(
 		--without-lzmadec
 	)
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 multilib_src_compile() {
 	if multilib_is_native_abi ; then
 		emake
 	else
 		emake libarchive.la
 	fi
 }
 multilib_src_test() {
 	# Replace the default src_test so that it builds tests in parallel
 	multilib_is_native_abi && emake check
 }
 multilib_src_install() {
 	if multilib_is_native_abi ; then
 		emake DESTDIR="${D}" install
 		# Create symlinks for FreeBSD
 		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
 			# Exclude cat for the time being #589876
 			for bin in cpio tar; do
 				dosym bsd${bin} /usr/bin/${bin}
 				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
 				doman "${T}"/${bin}.1
 			done
 		fi
 	else
 		emake DESTDIR="${D}" \
 			install-includeHEADERS \
 			install-libLTLIBRARIES \
 			install-pkgconfigDATA
 	fi
 	# Libs.private: should be used from libarchive.pc instead
 	prune_libtool_files
 }
 multilib_src_install_all() {
 	cd "${S}" || die
 	einstalldocs
 }
--- a/app-arch/lzip/lzip-1.18.ebuild
+++ b/app-arch/lzip/lzip-1.18.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P/_/-}.tar
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 S="${WORKDIR}/${P/_/-}"
--- a/app-arch/mt-st/mt-st-1.3.ebuild
+++ b/app-arch/mt-st/mt-st-1.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${P}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86"
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
--- a/app-arch/snappy/snappy-1.1.3-r1.ebuild
+++ b/app-arch/snappy/snappy-1.1.3-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 src_prepare() {
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@ -1,3 +1,2 @@
 DIST unzip552.tar.gz 1140291 SHA256 145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9 SHA512 9b852687a7cbce3a6696f8da176f97eded1e99b1f10ae5e4b29bf870df374fea3e4266b3a731d7cdfc28ce5c060a01dd8d3f9c3d8250d1d774273de16d70528b WHIRLPOOL 4148fe091cf9847245be67c7d85fc6fcdcc2a385dad0434757a0c7dea41131085f9bcd5ca6eedc065091a473f27780341921f90ddcae32e73618319da9122d70
 DIST unzip60.tar.gz 1376845 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d WHIRLPOOL eab32d6d0ab100d302b608658a3ae290d3dad4beddccebaf6cb6527102bb238f751ec6482dea68ae62474005de89f11f9e0cf1b1e12bee2ca5a2336a3c0c9808
 DIST unzip_6.0-20.debian.tar.xz 16680 SHA256 7ddfafb1a771ae8d6b4e25c5e31f22c717e0fe606b1bafadcdd574c01f671490 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe WHIRLPOOL ea5ebd5d95638ff8cd2e91eb77f5be544e33ac6fd478aa00c04da193cd3fad980c5ac1975dfedb2c242192cee6c4eee8bbaf3581299f6c3fa45faa639f0169fd
--- a/app-arch/unzip/files/unzip-5.52-CVE-2008-0888.patch
+++ b/app-arch/unzip/files/unzip-5.52-CVE-2008-0888.patch
@ -1,35 +0,0 @@
 http://bugs.gentoo.org/213761
 fix for CVE-2008-0888
 --- inflate.c
 +++ inflate.c
@@ -983,6 +983,7 @@
   unsigned l;           /* last length */
   unsigned m;           /* mask for bit lengths table */
   unsigned n;           /* number of lengths to get */
 +  struct huft *tlp;     
   struct huft *tl;      /* literal/length code table */
   struct huft *td;      /* distance code table */
   unsigned bl;          /* lookup bits for tl */
@@ -996,6 +997,8 @@
   int retval = 0;       /* error code returned: initialized to "no error" */
 +  td = tlp = tl = (struct huft *)NULL;
 +
   /* make local bit buffer */
   Trace((stderr, "\ndynamic block"));
   b = G.bb;
@@ -1047,9 +1050,9 @@
   while (i < n)
   {
     NEEDBITS(bl)
 -    j = (td = tl + ((unsigned)b & m))->b;
 +    j = (tlp = tl + ((unsigned)b & m))->b;
     DUMPBITS(j)
 -    j = td->v.n;
 +    j = tlp->v.n;
     if (j < 16)                 /* length of code in bits (0..15) */
       ll[i++] = l = j;          /* save last length in l */
     else if (j == 16)           /* repeat last length 3 to 6 times */
--- a/app-arch/unzip/files/unzip-5.52-no-exec-stack.patch
+++ b/app-arch/unzip/files/unzip-5.52-no-exec-stack.patch
@ -1,13 +0,0 @@
 Make sure that the asm files don't incorrectly trigger an executable
 stack marking in the final shared library.  That's bad, mmmkay.
 --- unzip/crc_i386.S
 +++ unzip/crc_i386.S
@@ -238,3 +238,7 @@
 #endif /* i386 || _i386 || _I386 || __i386 */
 #endif /* !USE_ZLIB */
 +
 +#ifdef __ELF__
 +.section .note.GNU-stack,"",%progbits
 +#endif
--- a/app-arch/unzip/unzip-5.52-r2.ebuild
+++ b/app-arch/unzip/unzip-5.52-r2.ebuild
@ -1,58 +0,0 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 inherit eutils toolchain-funcs flag-o-matic
 DESCRIPTION="unzipper for pkzip-compressed files"
 HOMEPAGE="http://www.info-zip.org/"
 SRC_URI="mirror://gentoo/${PN}${PV/.}.tar.gz"
 LICENSE="Info-ZIP"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE=""
 DEPEND=""
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-no-exec-stack.patch
 	epatch "${FILESDIR}"/${P}-CVE-2008-0888.patch #213761
 	sed -i \
 		-e 's:-O3:$(CFLAGS) $(CPPFLAGS):' \
 		-e 's:-O :$(CFLAGS) $(CPPFLAGS) :' \
 		-e "s:CC=gcc :CC=$(tc-getCC) :" \
 		-e "s:LD=gcc :LD=$(tc-getCC) :" \
 		-e "s:AS=gcc :AS=$(tc-getCC) :" \
 		-e 's:LF2 = -s:LF2 = :' \
 		-e 's:LF = :LF = $(LDFLAGS) :' \
 		-e 's:SL = :SL = $(LDFLAGS) :' \
 		-e 's:FL = :FL = $(LDFLAGS) :' \
 		unix/Makefile \
 		|| die "sed unix/Makefile failed"
 }
 src_compile() {
 	local TARGET
 	case ${CHOST} in
 		i?86*-linux*) TARGET=linux_asm ;;
 		*-linux*)     TARGET=linux_noasm ;;
 		i?86*-freebsd* | i?86*-dragonfly* | i?86*-openbsd* | i?86*-netbsd*)
 					  TARGET=freebsd ;; # mislabelled bsd with x86 asm
 		*-freebsd* | *-dragonfly* | *-openbsd* | *-netbsd*)
 					  TARGET=bsd ;;
 		*-darwin*)    TARGET=macosx ;;
 		*)            die "Unknown target, you suck" ;;
 	esac
 	append-lfs-flags #104315
 	emake -f unix/Makefile ${TARGET} || die "emake failed"
 }
 src_install() {
 	dobin unzip funzip unzipsfx unix/zipgrep || die "dobin failed"
 	dosym unzip /usr/bin/zipinfo || die
 	doman man/*.1
 	dodoc BUGS History* README ToDo WHERE
 }
--- a/app-arch/unzip/unzip-6.0-r3.ebuild
+++ b/app-arch/unzip/unzip-6.0-r3.ebuild
@ -1,73 +0,0 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="2"
 inherit eutils toolchain-funcs flag-o-matic
 MY_P="${PN}${PV/.}"
 DESCRIPTION="unzipper for pkzip-compressed files"
 HOMEPAGE="http://www.info-zip.org/"
 SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz"
 LICENSE="Info-ZIP"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="bzip2 natspec unicode"
 DEPEND="bzip2? ( app-arch/bzip2 )
 	natspec? ( dev-libs/libnatspec )"
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-no-exec-stack.patch
 	use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
 	sed -i -r \
 		-e '/^CFLAGS/d' \
 		-e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
 		-e '/^STRIP/s:=.*:=true:' \
 		-e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
 		-e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
 		-e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
 		-e 's:LF2 = -s:LF2 = :' \
 		-e 's:LF = :LF = $(LDFLAGS) :' \
 		-e 's:SL = :SL = $(LDFLAGS) :' \
 		-e 's:FL = :FL = $(LDFLAGS) :' \
 		-e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
 		-e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
 		unix/Makefile \
 		|| die "sed unix/Makefile failed"
 }
 src_compile() {
 	local TARGET
 	case ${CHOST} in
 		i?86*-*linux*)       TARGET=linux_asm ;;
 		*linux*)             TARGET=linux_noasm ;;
 		i?86*-*bsd* | \
 		i?86*-dragonfly*)    TARGET=freebsd ;; # mislabelled bsd with x86 asm
 		*bsd* | *dragonfly*) TARGET=bsd ;;
 		*-darwin*)           TARGET=macosx ;;
 		*-cygwin*)           TARGET=cygwin ;;
 		*) die "Unknown target, you suck" ;;
 	esac
 	[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
 	use bzip2 && append-cppflags -DUSE_BZIP2
 	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
 	append-cppflags -DLARGE_FILE_SUPPORT #281473
 	ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" emake \
 		-f unix/Makefile \
 		${TARGET} || die "emake failed"
 }
 src_install() {
 	dobin unzip funzip unzipsfx unix/zipgrep || die "dobin failed"
 	dosym unzip /usr/bin/zipinfo || die
 	doman man/*.1
 	dodoc BUGS History* README ToDo WHERE
 }
--- a/app-backup/rsnapshot/rsnapshot-1.4.2.ebuild
+++ b/app-backup/rsnapshot/rsnapshot-1.4.2.ebuild
@ -10,7 +10,7 @@ SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 RDEPEND=">=dev-lang/perl-5.8.2
 		dev-perl/Lchown
--- a/app-crypt/ccid/ccid-1.4.24.ebuild
+++ b/app-crypt/ccid/ccid-1.4.24.ebuild
@ -14,7 +14,7 @@ SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.b
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="twinserial kobil-midentity +usb"
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
--- a/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/${PV}/${MY_P}.tgz
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="libressl"
 DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
--- a/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static"
 CDEPEND="
--- a/app-doc/doxygen/doxygen-1.8.11-r2.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.11-r2.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 else
 	SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@ -1,3 +1,2 @@
 DIST kicad-doc-4.0.1.tar.gz 23365382 SHA256 be8dc4bddb89869996956d3d1421584c5a8197282997902e22fda888a8d433bb SHA512 ae57a9c29f3cd4b3d85d4b7d7bc940957c33b0e1c1404b82c8a9261695c0670866cb4a95ab7ad5c35b1faa6fbd3969f277467fa7d33e38e728a3dd9b65203021 WHIRLPOOL d9834312a0a315bf1d5dca048999d5adcb2ee60c42a41d8266522ad6c0ca49ec7bad5c9bad322b6d73c41c9f24cb1f4088d6889c6a51abf4671271dd7ec8af9d
 DIST kicad-doc-4.0.2.tar.gz 23365338 SHA256 4a475b3831f9a54a20dc94631cada3e305ede23345a6b4059077ac6900f3d35a SHA512 8cf2ff11141d3a5319d3b17a13648903518aaf0625802762df875550dd5811515e8a65d7414859624a18402cc6289ec70247a6c1f235081768ee344ec42c3b35 WHIRLPOOL f0279935fd823c62a6545afab6c2916173a72b5c881f71d8118ef897972e2d9de2c567944689a70aeeb4bae9b4938f636e9c526d0fd838bb42b8e2b4b4d23b4f
 DIST kicad-doc-4.0.4.tar.gz 33705865 SHA256 5564217076641926a2523d4dc66e78810de2fe4b5bd4d2f0ba40a522203c4d27 SHA512 97a45ebbd11ab7f92eff1409bc03512b7685fb4a85dd1d87675e92742cc6672a1332c5fe8d63577eba93ed976af1bb4acaa461dbada5e4695a161cefa82c9ff4 WHIRLPOOL be03128787fc9461e9220845a42acd6d7a6bac5adfdc3106365e8c46e7bd185b6a25857b66c91d444a13a03184fb3a260d04d156768304bddb577ce8e776676a
--- a/app-doc/kicad-doc/kicad-doc-4.0.2.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-4.0.2.ebuild
@ -1,72 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit cmake-utils
 DESCRIPTION="Electronic Schematic and PCB design tools manuals"
 HOMEPAGE="http://www.kicad-pcb.org/"
 SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="html pdf"
 LANGS="en fr it ja nl pl"
 for lang in ${LANGS}; do
 	IUSE+=" l10n_${lang}"
 done
 DEPEND=">=app-text/asciidoc-8.6.9
 	app-text/dblatex
 	app-text/texlive:=[l10n_en?,l10n_fr?,l10n_it?,l10n_ja?,l10n_nl?,l10n_pl?]
 	>=app-text/po4a-0.45
 	>=sys-devel/gettext-0.18
 	dev-util/source-highlight
 	dev-perl/Unicode-LineBreak
 	l10n_ja? ( media-fonts/vlgothic )"
 RDEPEND=""
 src_prepare() {
 	DOCPATH="KICAD_DOC_INSTALL_PATH share/doc/kicad"
 	sed "s|${DOCPATH}|${DOCPATH}-${PV}|g" -i CMakeLists.txt || die "sed failed"
 }
 src_configure() {
 	local formats=""
 	local doclang=""
 	local format lang
 	# construct format string
 	for format in html pdf; do
 		use ${format} && formats+="${format};"
 	done
 	if [[ -z ${formats} ]]; then
 		formats="html;"
 		ewarn "Neither \"html\" nor \"pdf\" USE flag set, using html."
 	fi
 	# find out which language is requested
 	for lang in ${LANGS}; do
 		if use l10n_${lang}; then
 			if [[ -z ${doclang} ]]; then
 				doclang="${lang}"
 			else
 				ewarn "Only one single language can be enabled." \
 					"Using \"${doclang}\", ignoring \"${lang}\"."
 			fi
 		fi
 	done
 	if [[ -z ${doclang} ]]; then
 		doclang="en"
 		ewarn "No language flag set, falling back to \"en\"."
 	fi
 	local mycmakeargs=(
 		-DBUILD_FORMATS="${formats}"
 		-DSINGLE_LANGUAGE="${doclang}"
 	)
 	cmake-utils_src_configure
 }
--- a/app-doc/kicad-doc/kicad-doc-4.0.4.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-4.0.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -12,7 +12,7 @@ SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="html pdf"
 LANGS="en fr it ja nl pl"
 for lang in ${LANGS}; do
--- a/app-editors/hteditor/hteditor-2.1.0.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="X"
 RDEPEND="sys-libs/ncurses
--- a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_P}/emacs"
 SITEFILE="50${PN}-gentoo-3.12.1.el"
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@ -1,3 +1,4 @@
 DIST docker-1.11.0.tar.gz 10637394 SHA256 088869b9a19ae17656e068aa6d3d473866e8133365427c601c671da1b2189057 SHA512 ecb7f531a5632fd6274e3eec59a5194c61d0788ab9f3864845cbc248232c2f14671a26c34abab8c5ca85ce6106ae72ea3ae4e5d133ad1efb126069ae82a2dba0 WHIRLPOOL 20b0ef1642d2fea2ae186a17786d95f138fb7df92daa104f00c481488f82eadd5e8f27a0a8e926d68f495fd62bc132d83817a0831f84b3786474a9408d87878f
 DIST docker-1.12.6.tar.gz 13694205 SHA256 0413f3513c2a6842ed9cf837154c8a722e9b34cb36b33430348489baa183707e SHA512 98e0fa0ec0dad4d392188b0d2cf42b2b564403463c369e1fe060f1abc2e97d97375a88587080671ef905e6a34b991d83265f43c3112575af019cf85eef0c2c25 WHIRLPOOL 55d10e4c4ab960320094637a847768ad85dc1fccaa6cc77ea0ca82f2d23b27e92e2f2c0cbc03f53676012c95883f65c6fa16d26970138fa129d37bf278fc8c0b
 DIST docker-1.13.0_rc6.tar.gz 7744500 SHA256 ee8166529a47e7aeb28b12e93161a24b71cc5382256aa7b0aac652853b563a8e SHA512 19ea7d4256f30e90d30eb8cf41ba6c76cba8900bbee85ec183686e365cbf0b7766768f3e7bdec18bcf86c93749ff51b36eba2074811ee9c6fddec455f0de8ebd WHIRLPOOL ba54e42ba5ef14b339b78f74ca88daab0f8ee230dca63175361d6b6133975479b7345d9849c983fdd3ae9d60addc9fb58bb2e0494112201b4d4604b0009ea66b
 DIST docker-1.13.0_rc7.tar.gz 7745191 SHA256 fe87ec128309c9cd212690844d799ceb83a0ef25fca0a6b4a0c4f58c60f79391 SHA512 4f574bee7d0ef2d734843418f7e13e7ba83cc22b2b98261771fbfd40854a0a7efaf3eeb152662d00d21aaba7b6fe7d7e5de051ba7fd6919da8d28a7470023f3b WHIRLPOOL 10252222d7e7c598c808c7b01f3d658fab379462ff3c5a6cdb70d2b2dd9a73c052f436be170ffe74e73b21bf49e761205102ac049b0f0363aaa29d81991d2721
--- a/app-emulation/docker/docker-1.13.0_rc7.ebuild
+++ b/app-emulation/docker/docker-1.13.0_rc7.ebuild
@ -0,0 +1,287 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 EGO_PN="github.com/docker/docker"
 if [[ ${PV} = *9999* ]]; then
 	# Docker cannot be fetched via "go get", thanks to autogenerated code
 	EGIT_REPO_URI="https://${EGO_PN}.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
 	inherit git-r3
 else
 	MY_PV="${PV/_/-}"
 	DOCKER_GITCOMMIT="48a9e53"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
 inherit bash-completion-r1 golang-base linux-info systemd udev user
 DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
 HOMEPAGE="https://dockerproject.org"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp"
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
 CDEPEND="
 	>=dev-db/sqlite-3.7.9:3
 	device-mapper? (
 		>=sys-fs/lvm2-2.02.89[thin]
 	)
 	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
 	apparmor? ( sys-libs/libapparmor )
 "
 DEPEND="
 	${CDEPEND}
 	dev-go/go-md2man
 	btrfs? (
 		>=sys-fs/btrfs-progs-3.16.1
 	)
 "
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
 RDEPEND="
 	${CDEPEND}
 	!app-emulation/docker-bin
 	>=net-firewall/iptables-1.4
 	sys-process/procps
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
 	>=app-emulation/containerd-0.2.5
 	app-emulation/runc[apparmor?,seccomp?]
 	app-emulation/docker-proxy
 	container-init? ( >=sys-process/tini-0.13.0[static] )
 "
 RESTRICT="installsources strip"
 S="${WORKDIR}/${P}/src/${EGO_PN}"
 # see "contrib/check-config.sh" from upstream's sources
 CONFIG_CHECK="
 	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
 	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
 	~KEYS
 	~VETH ~BRIDGE ~BRIDGE_NETFILTER
 	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
 	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
 	~NF_NAT ~NF_NAT_NEEDED
 	~POSIX_MQUEUE
 	~USER_NS
 	~SECCOMP
 	~CGROUP_PIDS
 	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
 	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
 	~CGROUP_PERF
 	~CGROUP_HUGETLB
 	~NET_CLS_CGROUP
 	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
 	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT
 	~VXLAN
 	~XFRM_ALGO ~XFRM_USER
 	~IPVLAN
 	~MACVLAN ~DUMMY
 "
 ERROR_KEYS="CONFIG_KEYS: is mandatory"
 ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
 ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
 ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
 ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
 ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
 ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
 ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
 ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
 pkg_setup() {
 	if kernel_is lt 3 10; then
 		ewarn ""
 		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
 		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
 	fi
 	# for where these kernel versions come from, see:
 	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
 	if ! {
 		kernel_is ge 3 16 \
 		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
 		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
 		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
 	}; then
 		ewarn ""
 		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
 		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
 		ewarn ""
 		ewarn "See also https://github.com/docker/docker/issues/2960"
 	fi
 	if kernel_is le 3 18; then
 		CONFIG_CHECK+="
 			~RESOURCE_COUNTERS
 		"
 	fi
 	if kernel_is le 3 13; then
 		CONFIG_CHECK+="
 			~NETPRIO_CGROUP
 		"
 	else
 		CONFIG_CHECK+="
 			~CGROUP_NET_PRIO
 		"
 	fi
 	if kernel_is lt 4 5; then
 		CONFIG_CHECK+="
 			~MEMCG_KMEM
 		"
 		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
 	fi
 	if kernel_is lt 4 7; then
 		CONFIG_CHECK+="
 			~DEVPTS_MULTIPLE_INSTANCES
 		"
 	fi
 	if use aufs; then
 		CONFIG_CHECK+="
 			~AUFS_FS
 			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
 		"
 		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
 	fi
 	if use btrfs; then
 		CONFIG_CHECK+="
 			~BTRFS_FS
 			~BTRFS_FS_POSIX_ACL
 		"
 	fi
 	if use device-mapper; then
 		CONFIG_CHECK+="
 			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
 		"
 	fi
 	if use overlay; then
 		CONFIG_CHECK+="
 			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
 		"
 	fi
 	linux-info_pkg_setup
 	# create docker group for the code checking for it in /etc/group
 	enewgroup docker
 }
 src_compile() {
 	export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
 	# setup CFLAGS and LDFLAGS for separate build target
 	# see https://github.com/tianon/docker-overlay/pull/10
 	export CGO_CFLAGS="-I${ROOT}/usr/include"
 	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
 	# if we're building from a tarball, we need the GITCOMMIT value
 	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
 	if use hardened; then
 		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
 		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
 		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
 			-i hack/make/dynbinary-client || die
 		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
 			-i hack/make/dynbinary-daemon || die
 		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
 		grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed'
 	fi
 	# let's set up some optional features :)
 	export DOCKER_BUILDTAGS=''
 	for gd in aufs btrfs device-mapper overlay; do
 		if ! use $gd; then
 			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
 		fi
 	done
 	for tag in apparmor pkcs11 seccomp; do
 		if use $tag; then
 			DOCKER_BUILDTAGS+=" $tag"
 		fi
 	done
 	# time to build!
 	./hack/make.sh dynbinary || die 'dynbinary failed'
 	# build the man pages too
 	./man/md2man-all.sh || die "unable to generate man pages"
 }
 src_install() {
 	VERSION="$(cat VERSION)"
 	newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker
 	newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd
 	dosym containerd /usr/bin/docker-containerd
 	dosym containerd-shim /usr/bin/docker-containerd-shim
 	dosym runc /usr/bin/docker-runc
 	use container-init && dosym tini /usr/bin/docker-init
 	newinitd contrib/init/openrc/docker.initd docker
 	newconfd contrib/init/openrc/docker.confd docker
 	systemd_dounit contrib/init/systemd/docker.{service,socket}
 	udev_dorules contrib/udev/*.rules
 	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
 	dodoc -r docs/*
 	doman man/man*/*
 	dobashcomp contrib/completion/bash/*
 	insinto /usr/share/zsh/site-functions
 	doins contrib/completion/zsh/_*
 	insinto /usr/share/vim/vimfiles
 	doins -r contrib/syntax/vim/ftdetect
 	doins -r contrib/syntax/vim/syntax
 	# note: intentionally not using "doins" so that we preserve +x bits
 	dodir /usr/share/${PN}/contrib
 	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
 }
 pkg_postinst() {
 	udev_reload
 	elog
 	elog "To use Docker, the Docker daemon must be running as root. To automatically"
 	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
 	elog "  rc-update add docker default"
 	elog "Similarly for systemd:"
 	elog "  systemctl enable docker.service"
 	elog
 	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
 	elog "  usermod -aG docker youruser"
 	elog
 }
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@ -1,3 +1 @@
 DIST libguestfs-1.26.1.tar.gz 11912359 SHA256 d047f951e79cc2f00b62a7e8d4e3acf18bb69c6be0a75884158923828b5264f6 SHA512 080a90d54b2063e2bf133c456a0624d63678cf7f80aa485dc5fd0c1d3577056c9fb894fd4fec67cbab29ac70f3b1c9ab070cf86ba5a09a8c8fc266f490c68809 WHIRLPOOL 54193361453d8d51da8070d0b4b5fe4e28fbf5e39aedbb3991c6f20876fed8a9f9c41218048dec697894d06d0edb29c887030edb38da899eb336278dd60ad974
 DIST libguestfs-1.28.3.tar.gz 12701662 SHA256 082ebcb14156198e73b3f64249d4a9fcf9811af53ba9b3e3dc85f9f853b39f6f SHA512 2b2324b90ea57c86749eed40f8384a4131a11f96f05eb4832762f30ca539fffc40bff5f848e751dec71ae95337833e69a7c3652aed1eda62c2092b2cb078862f WHIRLPOOL 77fecef7d1db6a65fa310cd47eaf9415e690468cb06cb5dffbb41fdab497444a24338c00011d3193637247aeb0b0776830b525abbb4e4146fc3d27aedb72ae22
 DIST libguestfs-1.28.5.tar.gz 12747537 SHA256 e9f38c6ad15cefe18b096a86334a60fc7df6367358f2641d8c5c5f3122ad9d91 SHA512 5ab25498fa9141950c1077cc52bae05a2781fa86a983b5fa49fbd4a4bca70710db3d4f7b9f45fb6f8b4ee8e3d77ffde7c4c0d9e9e526443e2a8251a62306ebb6 WHIRLPOOL cbbac5cce87dd41ad05b13732d0f5a3442c980152d8864522f5df47ffed7a260a131c819ceb40edd07cd74454fc9f4c0c7eb41fe734509a4e123d28bc58d813f
--- a/app-emulation/libguestfs/files/1.24/0001_add_gentoo_names_to_configure.patch
+++ b/app-emulation/libguestfs/files/1.24/0001_add_gentoo_names_to_configure.patch
@ -1,15 +0,0 @@
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
@@ -482,6 +482,11 @@
         DISTRO=UBUNTU
     fi
 fi
 +
 +if test -f /etc/gentoo-release; then
 +    DISTRO=GENTOO
 +fi
 +
 if test -f /etc/arch-release; then
     DISTRO=ARCHLINUX
 fi
--- a/app-emulation/libguestfs/files/1.24/0002_add_gentooway_to_remove_la_files.patch
+++ b/app-emulation/libguestfs/files/1.24/0002_add_gentooway_to_remove_la_files.patch
@ -1,16 +0,0 @@
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
@@ -1487,8 +1487,10 @@
 dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
 dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
 -LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
 -AC_SUBST([LIBTOOL])
 +dnl LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
 +dnl AC_SUBST([LIBTOOL])
 +LT_INIT
 +
 dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
--- a/app-emulation/libguestfs/files/1.24/0004_add_icoutils_configure_drop_automagic.patch
+++ b/app-emulation/libguestfs/files/1.24/0004_add_icoutils_configure_drop_automagic.patch
@ -1,57 +0,0 @@
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
@@ -621,28 +621,36 @@
 fi
 dnl Check for netpbm programs (optional).
 -AC_CHECK_PROGS([PBMTEXT],[pbmtext],[no])
 -AC_CHECK_PROGS([PNMTOPNG],[pnmtopng],[no])
 -AC_CHECK_PROGS([BMPTOPNM],[bmptopnm],[no])
 -AC_CHECK_PROGS([PAMCUT],[pamcut],[no])
 -if test "x$PBMTEXT" != "xno"; then
 -    AC_DEFINE_UNQUOTED([PBMTEXT],["$PBMTEXT"],[Name of pbmtext program.])
 -fi
 -if test "x$PNMTOPNG" != "xno"; then
 -    AC_DEFINE_UNQUOTED([PNMTOPNG],["$PNMTOPNG"],[Name of pnmtopng program.])
 -fi
 -if test "x$BMPTOPNM" != "xno"; then
 -    AC_DEFINE_UNQUOTED([BMPTOPNM],["$BMPTOPNM"],[Name of bmptopnm program.])
 -fi
 -if test "x$PAMCUT" != "xno"; then
 -    AC_DEFINE_UNQUOTED([PAMCUT],["$PAMCUT"],[Name of pamcut program.])
 -fi
 +AC_ARG_ENABLE([icoutils],
 +       AS_HELP_STRING([with-icoutils], [ Enable ico and bmp icon file inspection]),
 +       [enable_icoutils=no],
 +       [enable_icoutils=yes])
 +AS_IF([test "enable_icoutils" != "xno"],
 +  [
 +       AC_CHECK_PROGS([PBMTEXT],[pbmtext],[no])
 +       AC_CHECK_PROGS([PNMTOPNG],[pnmtopng],[no])
 +       AC_CHECK_PROGS([BMPTOPNM],[bmptopnm],[no])
 +       AC_CHECK_PROGS([PAMCUT],[pamcut],[no])
 +       if test "x$PBMTEXT" != "xno"; then
 +           AC_DEFINE_UNQUOTED([PBMTEXT],["$PBMTEXT"],[Name of pbmtext program.])
 +       fi
 +       if test "x$PNMTOPNG" != "xno"; then
 +           AC_DEFINE_UNQUOTED([PNMTOPNG],["$PNMTOPNG"],[Name of pnmtopng program.])
 +       fi
 +       if test "x$BMPTOPNM" != "xno"; then
 +           AC_DEFINE_UNQUOTED([BMPTOPNM],["$BMPTOPNM"],[Name of bmptopnm program.])
 +       fi
 +       if test "x$PAMCUT" != "xno"; then
 +           AC_DEFINE_UNQUOTED([PAMCUT],["$PAMCUT"],[Name of pamcut program.])
 +       fi
 dnl Check for icoutils (optional).
 AC_CHECK_PROGS([WRESTOOL],[wrestool],[no])
 if test "x$WRESTOOL" != "xno"; then
 -    AC_DEFINE_UNQUOTED([WRESTOOL],["$WRESTOOL"],[Name of wrestool program.])
 +   AC_DEFINE_UNQUOTED([WRESTOOL],["$WRESTOOL"],[Name of wrestool program.])
 fi
 +],
 +[])
 dnl Check for QEMU for running binaries on this $host_cpu, fall
 dnl back to basic 'qemu'.  Allow the user to override it.
--- a/app-emulation/libguestfs/files/1.24/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
+++ b/app-emulation/libguestfs/files/1.24/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
@ -1,21 +0,0 @@
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
@@ -1491,11 +1491,12 @@
 ])
 # check for gtk-doc
 -m4_ifdef([GTK_DOC_CHECK], [
 -    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
 -],[
 -    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
 -])
 +#m4_ifdef([GTK_DOC_CHECK], [
 +#    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
 +#],[
 +#    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
 +#])
 +GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
 dnl Library versioning.
 MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
--- a/app-emulation/libguestfs/files/1.24/0103_disable_php_bindings_makefile.patch
+++ b/app-emulation/libguestfs/files/1.24/0103_disable_php_bindings_makefile.patch
@ -1,13 +0,0 @@
 diff --git a/Makefile.am b/Makefile.am
 --- a/Makefile.am
 +++ b/Makefile.am
@@ -88,9 +88,6 @@
 if HAVE_HASKELL
 SUBDIRS += haskell
 endif
 -if HAVE_PHP
 -SUBDIRS += php
 -endif
 if HAVE_ERLANG
 SUBDIRS += erlang erlang/examples
 endif
--- a/app-emulation/libguestfs/files/1.26/0000_bug_499150.patch
+++ b/app-emulation/libguestfs/files/1.26/0000_bug_499150.patch
@ -1,10 +0,0 @@
 --- a/configure.ac	2014-01-24 19:04:05.633056872 +0100
 +++ b/configure.ac	2014-01-24 19:04:34.685691757 +0100
@@ -24,6 +24,7 @@
 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 AC_CONFIG_AUX_DIR([build-aux])
 +AM_GNU_GETTEXT_VERSION(0.18.3)
 dnl Initialize automake.  automake < 1.12 didn't have serial-tests and
 dnl gives an error if it sees this, but for automake >= 1.13
--- a/app-emulation/libguestfs/files/1.26/0001_add_gentoo_names_to_configure.patch
+++ b/app-emulation/libguestfs/files/1.26/0001_add_gentoo_names_to_configure.patch
@ -1,15 +0,0 @@
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
@@ -482,6 +482,11 @@
         DISTRO=UBUNTU
     fi
 fi
 +
 +if test -f /etc/gentoo-release; then
 +    DISTRO=GENTOO
 +fi
 +
 if test -f /etc/arch-release; then
     DISTRO=ARCHLINUX
 fi
--- a/app-emulation/libguestfs/files/1.26/0002_add_gentooway_to_remove_la_files.patch
+++ b/app-emulation/libguestfs/files/1.26/0002_add_gentooway_to_remove_la_files.patch
@ -1,16 +0,0 @@
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
@@ -1487,8 +1487,10 @@
 dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
 dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
 -LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
 -AC_SUBST([LIBTOOL])
 +dnl LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
 +dnl AC_SUBST([LIBTOOL])
 +LT_INIT
 +
 dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
--- a/app-emulation/libguestfs/files/1.26/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
+++ b/app-emulation/libguestfs/files/1.26/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
@ -1,21 +0,0 @@
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
@@ -1491,11 +1491,12 @@
 ])
 # check for gtk-doc
 -m4_ifdef([GTK_DOC_CHECK], [
 -    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
 -],[
 -    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
 -])
 +#m4_ifdef([GTK_DOC_CHECK], [
 +#    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
 +#],[
 +#    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
 +#])
 +GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
 dnl Library versioning.
 MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
--- a/app-emulation/libguestfs/files/1.26/0020_all_qemu_configure.patch
+++ b/app-emulation/libguestfs/files/1.26/0020_all_qemu_configure.patch
@ -1,27 +0,0 @@
 https://bugs.gentoo.org/528386
 From 101d728e80cce73b882aac7af457013491d03311 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 22 Apr 2014 22:21:57 -0400
 Subject: [PATCH] configure: Make sure grep matches qemu 2.x version string.
 ---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/configure.ac b/configure.ac
 index 34e4ddb..bb1a361 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -777,7 +777,7 @@ working.
         fi
         AC_MSG_CHECKING([for $QEMU version >= 1])
 -        if $QEMU -version | grep -sq 'version @<:@1-@:>@'; then
 +        if $QEMU -version | grep -sq 'version @<:@1-9@:>@'; then
             AC_MSG_RESULT([yes])
         else
             AC_MSG_RESULT([no])
 -- 
 2.1.3
--- a/app-emulation/libguestfs/files/1.26/0103_disable_php_bindings_makefile.patch
+++ b/app-emulation/libguestfs/files/1.26/0103_disable_php_bindings_makefile.patch
@ -1,13 +0,0 @@
 diff --git a/Makefile.am b/Makefile.am
 --- a/Makefile.am
 +++ b/Makefile.am
@@ -88,9 +88,6 @@
 if HAVE_HASKELL
 SUBDIRS += haskell
 endif
 -if HAVE_PHP
 -SUBDIRS += php
 -endif
 if HAVE_ERLANG
 SUBDIRS += erlang erlang/examples
 endif
--- a/app-emulation/libguestfs/libguestfs-1.26.1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.26.1.ebuild
@ -1,161 +0,0 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="5"
 WANT_LIBTOOL=latest
 AUTOTOOLS_IN_SOURCE_BUILD=1
 inherit autotools-utils autotools versionator eutils \
 multilib linux-info perl-module base
 MY_PV_1="$(get_version_component_range 1-2)"
 MY_PV_2="$(get_version_component_range 2)"
 [[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development"
 DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
 HOMEPAGE="http://libguestfs.org/"
 SRC_URI="http://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/${MY_PV_1}"
 KEYWORDS="~amd64"
 IUSE="erlang +fuse debug +ocaml doc +perl ruby static-libs
 selinux systemtap introspection inspect-icons test lua"
 # Failires - doc
 # Failures - bash-completion, see GBZ #486306
 COMMON_DEPEND="
 	sys-libs/ncurses
 	sys-devel/gettext
 	>=app-misc/hivex-1.3.1
 	dev-libs/libpcre
 	app-arch/cpio
 	dev-lang/perl
 	app-cdr/cdrkit
 	>=app-emulation/qemu-1.2.2[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64,tci,systemtap?,selinux?,filecaps]
 	sys-apps/fakeroot
 	sys-apps/file
 	app-emulation/libvirt
 	dev-libs/libxml2:2
 	>=sys-apps/fakechroot-2.8
 	>=app-admin/augeas-1.0.0
 	sys-fs/squashfs-tools
 	dev-libs/libconfig
 	dev-libs/libpcre
 	sys-libs/readline
 	>=sys-libs/db-4.6
 	perl? ( virtual/perl-ExtUtils-MakeMaker
 			>=dev-perl/Sys-Virt-0.2.4
 			virtual/perl-Getopt-Long
 			virtual/perl-Data-Dumper
 			dev-perl/libintl-perl
 			>=app-misc/hivex-1.3.1[perl?]
 			dev-perl/String-ShellQuote
 			)
 	fuse? ( sys-fs/fuse )
 	introspection? (
 		>=dev-libs/gobject-introspection-1.30.0
 		dev-libs/gjs
 		)
 	selinux? ( sys-libs/libselinux  sys-libs/libsemanage )
 	systemtap? ( dev-util/systemtap )
 	ocaml? ( dev-lang/ocaml[ocamlopt]
 			dev-ml/findlib[ocamlopt]
 			dev-ml/ocaml-gettext
 			)
 	erlang? ( dev-lang/erlang )
 	inspect-icons? ( media-libs/netpbm
 			media-gfx/icoutils
 			)
 	virtual/acl
 	sys-libs/libcap
 	lua? ( dev-lang/lua )
 	"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	doc? ( app-text/po4a )
 	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
 	"
 RDEPEND="${COMMON_DEPEND}
 	app-emulation/libguestfs-appliance
 	"
 PATCHES=( "${FILESDIR}/${MY_PV_1}"/*.patch  )
 DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
 pkg_setup () {
 		CONFIG_CHECK="~KVM ~VIRTIO"
 		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
 }
 src_prepare() {
 	base_src_prepare
 	eaclocal
 	eautomake
 	eautoconf
 }
 src_configure() {
 	# Disable feature test for kvm for more reason
 	# i.e: not loaded module in __build__ time,
 	# build server not supported kvm, etc. ...
 	#
 	# In fact, this feature is virtio support and requires
 	# configured kernel.
 	export vmchannel_test=no
 	local myeconfargs=(
 		$(use_enable test gcc-warnings)
 		--disable-appliance
 		--disable-daemon
 		--with-extra="-gentoo"
 		--with-readline
 		--disable-php
 		--disable-python
 		--without-java
 		$(use_enable perl)
 		$(use_enable fuse)
 		$(use_enable ocaml)
 		$(use_enable ruby)
 		--disable-haskell
 		$(use_enable introspection gobject)
 		$(use_enable erlang)
 		$(use_enable systemtap probes)
 		$(use_enable lua)
 	)
 	autotools-utils_src_configure
 }
 src_compile() {
 	autotools-utils_src_compile
 }
 src_test() {
 	autotools-utils_src_test
 }
 src_install() {
 	strip-linguas -i po
 	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
 	use perl && perl_delete_localpod
 }
 pkg_postinst() {
 	if ! use perl ; then
 		einfo "Perl based tools NOT build"
 	fi
 	if ! use ocaml ; then
 		einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
 	fi
 }
--- a/app-emulation/libguestfs/libguestfs-1.28.3.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.28.3.ebuild
@ -1,170 +0,0 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="5"
 WANT_LIBTOOL=latest
 WANT_AUTOMAKE=1.14
 AUTOTOOLS_IN_SOURCE_BUILD=1
 inherit autotools-utils autotools versionator eutils \
 multilib linux-info perl-module base
 MY_PV_1="$(get_version_component_range 1-2)"
 MY_PV_2="$(get_version_component_range 2)"
 [[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development"
 DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
 HOMEPAGE="http://libguestfs.org/"
 SRC_URI="http://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/"${MY_PV_1}""
 KEYWORDS="~amd64"
 IUSE="bash-completion erlang +fuse debug ocaml doc +perl ruby static-libs
 selinux systemtap introspection inspect-icons test lua"
 # Failires - doc
 # Failures - bash-completion, see GBZ #486306
 COMMON_DEPEND="
 	sys-libs/ncurses
 	sys-devel/gettext
 	>=app-misc/hivex-1.3.1
 	dev-libs/libpcre
 	app-arch/cpio
 	dev-lang/perl
 	app-cdr/cdrkit
 	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
 	sys-apps/fakeroot
 	sys-apps/file
 	app-emulation/libvirt
 	dev-libs/libxml2:2
 	>=sys-apps/fakechroot-2.8
 	>=app-admin/augeas-1.0.0
 	sys-fs/squashfs-tools
 	dev-libs/libconfig
 	dev-libs/libpcre
 	sys-libs/readline
 	>=sys-libs/db-4.6
 	app-arch/xz-utils
 	app-arch/lzma
 	app-crypt/gnupg
 	app-arch/unzip[natspec]
 	perl? ( virtual/perl-ExtUtils-MakeMaker
 			>=dev-perl/Sys-Virt-0.2.4
 			virtual/perl-Getopt-Long
 			virtual/perl-Data-Dumper
 			dev-perl/libintl-perl
 			>=app-misc/hivex-1.3.1[perl?]
 			dev-perl/String-ShellQuote
 			)
 	fuse? ( sys-fs/fuse )
 	introspection? (
 		>=dev-libs/gobject-introspection-1.30.0
 		dev-libs/gjs
 		)
 	selinux? ( sys-libs/libselinux  sys-libs/libsemanage )
 	systemtap? ( dev-util/systemtap )
 	ocaml? ( dev-lang/ocaml[ocamlopt]
 			dev-ml/findlib[ocamlopt]
 			dev-ml/ocaml-gettext
 			)
 	erlang? ( dev-lang/erlang )
 	inspect-icons? ( media-libs/netpbm
 			media-gfx/icoutils
 			)
 	virtual/acl
 	sys-libs/libcap
 	lua? ( dev-lang/lua )
 	>=app-shells/bash-completion-2.0
 	dev-libs/yajl"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	doc? ( app-text/po4a )
 	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
 	${AUTOTOOLS_DEPEND}
 	"
 RDEPEND="${COMMON_DEPEND}
 	app-emulation/libguestfs-appliance
 	"
 PATCHES=( "${FILESDIR}/${MY_PV_1}"/*.patch  )
 DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
 pkg_setup () {
 		CONFIG_CHECK="~KVM ~VIRTIO"
 		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
 }
 src_prepare() {
 	base_src_prepare
 	eaclocal
 	eautomake
 	eautoconf
 }
 src_configure() {
 	# Disable feature test for kvm for more reason
 	# i.e: not loaded module in __build__ time,
 	# build server not supported kvm, etc. ...
 	#
 	# In fact, this feature is virtio support and requires
 	# configured kernel.
 	export vmchannel_test=no
 	local myeconfargs=(
 		$(use_enable test werror)
 		--with-libvirt
 		--with-default-backend=libvirt
 		--disable-appliance
 		--disable-daemon
 		--with-extra="-gentoo"
 		--with-readline
 		--disable-php
 		--disable-python
 		--without-java
 		$(use_enable perl)
 		$(use_enable fuse)
 		$(use_enable ocaml)
 		$(use_enable ruby)
 		--disable-haskell
 		--disable-golang
 		$(use_enable introspection gobject)
 		$(use_enable erlang)
 		$(use_enable systemtap probes)
 		$(use_enable lua)
 	)
 	autotools-utils_src_configure
 }
 src_compile() {
 	autotools-utils_src_compile
 }
 src_test() {
 	autotools-utils_src_test
 }
 src_install() {
 	strip-linguas -i po
 	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
 	use perl && perl_delete_localpod
 }
 pkg_postinst() {
 	if ! use perl ; then
 		einfo "Perl based tools NOT build"
 	fi
 	if ! use ocaml ; then
 		einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
 	fi
 }
--- a/app-emulation/libguestfs/libguestfs-1.28.5-r1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.28.5-r1.ebuild
@ -1,176 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="5"
 WANT_LIBTOOL=latest
 WANT_AUTOMAKE=1.14
 AUTOTOOLS_IN_SOURCE_BUILD=1
 PYTHON_COMPAT=( python{2_7,3_4} )
 inherit python-single-r1 autotools-utils autotools versionator eutils \
 multilib linux-info perl-module base
 MY_PV_1="$(get_version_component_range 1-2)"
 MY_PV_2="$(get_version_component_range 2)"
 [[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development"
 DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
 HOMEPAGE="http://libguestfs.org/"
 SRC_URI="http://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/"${MY_PV_1}""
 KEYWORDS="~amd64"
 IUSE="bash-completion erlang +fuse debug ocaml doc +perl python ruby static-libs
 selinux systemtap introspection inspect-icons test lua"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # Failures - doc
 # Failures - bash-completion, see GBZ #486306
 COMMON_DEPEND="
 	sys-libs/ncurses
 	sys-devel/gettext
 	>=app-misc/hivex-1.3.1
 	dev-libs/libpcre
 	app-arch/cpio
 	dev-lang/perl
 	app-cdr/cdrkit
 	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
 	sys-apps/fakeroot
 	sys-apps/file
 	app-emulation/libvirt
 	dev-libs/libxml2:2
 	>=sys-apps/fakechroot-2.8
 	>=app-admin/augeas-1.0.0
 	sys-fs/squashfs-tools:*
 	dev-libs/libconfig
 	dev-libs/libpcre
 	sys-libs/readline:=
 	>=sys-libs/db-4.6:*
 	app-arch/xz-utils
 	app-arch/lzma
 	app-crypt/gnupg
 	app-arch/unzip[natspec]
 	perl? ( virtual/perl-ExtUtils-MakeMaker
 			>=dev-perl/Sys-Virt-0.2.4
 			virtual/perl-Getopt-Long
 			virtual/perl-Data-Dumper
 			dev-perl/libintl-perl
 			>=app-misc/hivex-1.3.1[perl?]
 			dev-perl/String-ShellQuote
 			)
 	python? ( ${PYTHON_DEPS} )
 	fuse? ( sys-fs/fuse )
 	introspection? (
 		>=dev-libs/gobject-introspection-1.30.0
 		dev-libs/gjs
 		)
 	selinux? ( sys-libs/libselinux  sys-libs/libsemanage )
 	systemtap? ( dev-util/systemtap )
 	ocaml? ( dev-lang/ocaml[ocamlopt]
 			dev-ml/findlib[ocamlopt]
 			dev-ml/ocaml-gettext
 			)
 	erlang? ( dev-lang/erlang )
 	inspect-icons? ( media-libs/netpbm
 			media-gfx/icoutils
 			)
 	virtual/acl
 	sys-libs/libcap
 	lua? ( dev-lang/lua:* )
 	>=app-shells/bash-completion-2.0
 	dev-libs/yajl"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	doc? ( app-text/po4a )
 	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
 	${AUTOTOOLS_DEPEND}
 	"
 RDEPEND="${COMMON_DEPEND}
 	app-emulation/libguestfs-appliance
 	"
 PATCHES=( "${FILESDIR}/${MY_PV_1}"/*.patch  )
 DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
 pkg_setup () {
 		CONFIG_CHECK="~KVM ~VIRTIO"
 		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
 		use python && python-single-r1_pkg_setup
 }
 src_prepare() {
 	base_src_prepare
 	eaclocal
 	eautomake
 	eautoconf
 }
 src_configure() {
 	# Disable feature test for kvm for more reason
 	# i.e: not loaded module in __build__ time,
 	# build server not supported kvm, etc. ...
 	#
 	# In fact, this feature is virtio support and requires
 	# configured kernel.
 	export vmchannel_test=no
 	local myeconfargs=(
 		$(use_enable test werror)
 		--with-libvirt
 		--with-default-backend=libvirt
 		--disable-appliance
 		--disable-daemon
 		--with-extra="-gentoo"
 		--with-readline
 		--disable-php
 		$(use_enable python)
 		--without-java
 		$(use_enable perl)
 		$(use_enable fuse)
 		$(use_enable ocaml)
 		$(use_enable ruby)
 		--disable-haskell
 		--disable-golang
 		$(use_enable introspection gobject)
 		$(use_enable erlang)
 		$(use_enable systemtap probes)
 		$(use_enable lua)
 	)
 	autotools-utils_src_configure
 }
 src_compile() {
 	autotools-utils_src_compile
 }
 src_test() {
 	autotools-utils_src_test
 }
 src_install() {
 	strip-linguas -i po
 	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
 	use perl && perl_delete_localpod
 }
 pkg_postinst() {
 	if ! use perl ; then
 		einfo "Perl based tools NOT build"
 	fi
 	if ! use ocaml ; then
 		einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
 	fi
 }
--- a/app-emulation/libguestfs/libguestfs-1.28.5.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.28.5.ebuild
@ -1,170 +0,0 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="5"
 WANT_LIBTOOL=latest
 WANT_AUTOMAKE=1.14
 AUTOTOOLS_IN_SOURCE_BUILD=1
 inherit autotools-utils autotools versionator eutils \
 multilib linux-info perl-module base
 MY_PV_1="$(get_version_component_range 1-2)"
 MY_PV_2="$(get_version_component_range 2)"
 [[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development"
 DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
 HOMEPAGE="http://libguestfs.org/"
 SRC_URI="http://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/"${MY_PV_1}""
 KEYWORDS="~amd64"
 IUSE="bash-completion erlang +fuse debug ocaml doc +perl ruby static-libs
 selinux systemtap introspection inspect-icons test lua"
 # Failires - doc
 # Failures - bash-completion, see GBZ #486306
 COMMON_DEPEND="
 	sys-libs/ncurses
 	sys-devel/gettext
 	>=app-misc/hivex-1.3.1
 	dev-libs/libpcre
 	app-arch/cpio
 	dev-lang/perl
 	app-cdr/cdrkit
 	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
 	sys-apps/fakeroot
 	sys-apps/file
 	app-emulation/libvirt
 	dev-libs/libxml2:2
 	>=sys-apps/fakechroot-2.8
 	>=app-admin/augeas-1.0.0
 	sys-fs/squashfs-tools
 	dev-libs/libconfig
 	dev-libs/libpcre
 	sys-libs/readline
 	>=sys-libs/db-4.6
 	app-arch/xz-utils
 	app-arch/lzma
 	app-crypt/gnupg
 	app-arch/unzip[natspec]
 	perl? ( virtual/perl-ExtUtils-MakeMaker
 			>=dev-perl/Sys-Virt-0.2.4
 			virtual/perl-Getopt-Long
 			virtual/perl-Data-Dumper
 			dev-perl/libintl-perl
 			>=app-misc/hivex-1.3.1[perl?]
 			dev-perl/String-ShellQuote
 			)
 	fuse? ( sys-fs/fuse )
 	introspection? (
 		>=dev-libs/gobject-introspection-1.30.0
 		dev-libs/gjs
 		)
 	selinux? ( sys-libs/libselinux  sys-libs/libsemanage )
 	systemtap? ( dev-util/systemtap )
 	ocaml? ( dev-lang/ocaml[ocamlopt]
 			dev-ml/findlib[ocamlopt]
 			dev-ml/ocaml-gettext
 			)
 	erlang? ( dev-lang/erlang )
 	inspect-icons? ( media-libs/netpbm
 			media-gfx/icoutils
 			)
 	virtual/acl
 	sys-libs/libcap
 	lua? ( dev-lang/lua )
 	>=app-shells/bash-completion-2.0
 	dev-libs/yajl"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	doc? ( app-text/po4a )
 	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
 	${AUTOTOOLS_DEPEND}
 	"
 RDEPEND="${COMMON_DEPEND}
 	app-emulation/libguestfs-appliance
 	"
 PATCHES=( "${FILESDIR}/${MY_PV_1}"/*.patch  )
 DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
 pkg_setup () {
 		CONFIG_CHECK="~KVM ~VIRTIO"
 		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
 }
 src_prepare() {
 	base_src_prepare
 	eaclocal
 	eautomake
 	eautoconf
 }
 src_configure() {
 	# Disable feature test for kvm for more reason
 	# i.e: not loaded module in __build__ time,
 	# build server not supported kvm, etc. ...
 	#
 	# In fact, this feature is virtio support and requires
 	# configured kernel.
 	export vmchannel_test=no
 	local myeconfargs=(
 		$(use_enable test werror)
 		--with-libvirt
 		--with-default-backend=libvirt
 		--disable-appliance
 		--disable-daemon
 		--with-extra="-gentoo"
 		--with-readline
 		--disable-php
 		--disable-python
 		--without-java
 		$(use_enable perl)
 		$(use_enable fuse)
 		$(use_enable ocaml)
 		$(use_enable ruby)
 		--disable-haskell
 		--disable-golang
 		$(use_enable introspection gobject)
 		$(use_enable erlang)
 		$(use_enable systemtap probes)
 		$(use_enable lua)
 	)
 	autotools-utils_src_configure
 }
 src_compile() {
 	autotools-utils_src_compile
 }
 src_test() {
 	autotools-utils_src_test
 }
 src_install() {
 	strip-linguas -i po
 	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
 	use perl && perl_delete_localpod
 }
 pkg_postinst() {
 	if ! use perl ; then
 		einfo "Perl based tools NOT build"
 	fi
 	if ! use ocaml ; then
 		einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
 	fi
 }
--- a/app-eselect/eselect-python/eselect-python-20160516.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20160516.ebuild
@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 DESCRIPTION="Eselect module for management of multiple Python versions"
--- a/app-misc/abook/abook-0.6.1.ebuild
+++ b/app-misc/abook/abook-0.6.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86"
 IUSE="nls"
 RDEPEND="sys-libs/ncurses
--- a/app-misc/ca-certificates/ca-certificates-20161102.3.27.2-r2.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20161102.3.27.2-r2.ebuild
@ -59,7 +59,7 @@ fi
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="insecure_certs"
 ${PRECOMPILED} || IUSE+=" cacert"
--- a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
+++ b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.asty.org/${PN}/dist/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ppc ~ppc64 sparc x86"
 IUSE="X"
 DEPEND="
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@ -1 +1,2 @@
 DIST ddcutil-0.6.0.tar.gz 323380 SHA256 ae435699578297cdb40006471e046576e825d971c6c867822568660d815e966a SHA512 ab5882c22e7cbf17f8513a80443a25b2d1698e45b2fd3bf6f163fd86691808a5244830da2664b882ddc6592a9228afbd9f4c8f6821115167fd28b114c986e172 WHIRLPOOL 37a334a0075b08f0b6e01cc721d414aedb9e06f36fc295698662616c5fbf98ca4c256eba91344748409766fa9139173335d14b8243bc0ee7404c2914a10b38c6
 DIST ddcutil-0.7.0.tar.gz 400076 SHA256 3da9be53ecba1b3000cf859bb4b212649bb6255526866c528d9d5b03eec77f93 SHA512 c81783fdfdfeeb88e81ee107e3bf3dfbf34541e83b4c8291816e547a1ff83b10767aec2a6db1c691895f38f6f81aba608a51cf6b6461761d756d916ad19343cf WHIRLPOOL ef5f1695c742f1617daef7f55c37ba8c8ae627b87b2ef9ea75334dad985a3ba91104f1d928d2aebe9a3ec13bfc605f07b6a93441c7d9a337fd86aa918635c03d
--- a/app-misc/ddcutil/ddcutil-0.7.0.ebuild
+++ b/app-misc/ddcutil/ddcutil-0.7.0.ebuild
@ -0,0 +1,105 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 inherit autotools linux-info udev user
 DESCRIPTION="Program for querying and changing monitor settings"
 HOMEPAGE="http://www.ddcutil.com/"
 SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 # Binary drivers need special instructions compared to the open source counterparts.
 # If a user switches drivers, they will need to set different use flags for
 # Xorg or Wayland or Mesa, so this will trigger the rebuild against
 # the different drivers.
 IUSE="enable-api-libs usb-monitor user-permissions video_cards_fglrx video_cards_nvidia"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RDEPEND="x11-libs/libXrandr
 	 x11-libs/libX11
 	 dev-libs/glib:2
 	 sys-apps/i2c-tools
 	 virtual/udev
 	 usb-monitor? (
 		dev-libs/hidapi
 		virtual/libusb:1
 		sys-apps/usbutils )"
 DEPEND="video_cards_fglrx? ( x11-libs/amd-adl-sdk )
 	virtual/pkgconfig
 	${RDEPEND}"
 pkg_pretend() {
 	# This program needs /dev/ic2-* devices to communicate with the monitor.
 	CONFIG_CHECK="~I2C_CHARDEV"
 	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
 	if use usb-monitor; then
 		CONFIG_CHECK+="~HIDRAW ~USB_HIDDEV"
 		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
 		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
 	fi
 	# Now do the actual checks setup above
 	check_extra_config
 }
 src_prepare() {
 	default
 	eautoreconf
 }
 src_configure() {
 	# Python API is still very experimental. Upstream recommends not using it.
 	local myeconfargs=(
 		$(use_enable enable-api-libs)
 		$(use_enable usb-monitor usb)
 		$(usex video_cards_fglrx "--with-adl-headers=/usr/include/ADL" "")
 		--disable-swig
 	)
 	econf "${myeconfargs[@]}"
 }
 src_install() {
 	default
 	if use user-permissions; then
 		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
 		if use usb-monitor; then
 			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
 		fi
 	fi
 }
 pkg_postinst() {
 	if use user-permissions; then
 		enewgroup i2c
 		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
 		einfo "users to the i2c group: usermod -aG i2c user"
 		einfo "Restart the computer or reload the i2c-dev module to activate"
 		einfo "the new udev rule."
 		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
 		if use usb-monitor; then
 			enewgroup video
 			einfo "To allow non-root users access to USB monitors, add those users"
 			einfo "to the video group: usermod -aG video user"
 			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
 			einfo "the monitor to activate the new udev rule."
 			einfo "For more information read: http://www.ddcutil.com/usb/"
 		fi
 		udev_reload
 	fi
 	if use video_cards_nvidia; then
 		einfo "=================================================================="
 		einfo "Please read the following webpage on proper usage with the nVidia "
 		einfo "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
 		einfo "=================================================================="
 	fi
 }
--- a/app-misc/ddcutil/metadata.xml
+++ b/app-misc/ddcutil/metadata.xml
@ -19,6 +19,9 @@
 	</longdescription>
 	<use>
 		<flag name="enable-api-libs" restrict="&gt;=app-misc/ddcutil-0.7.0">
 			Enables the C/C++ API.
 		</flag>
 		<flag name="user-permissions">
 			Adds a udev rules to allow non-root users in the i2c group to
 			access the /dev/i2c-* devices. If usb-monitor is selected, users
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@ -1,17 +1,2 @@
-DIST elasticsearch-1.7.4.tar.gz 28510433 SHA256 395f3417c26a6b36125f6a062c1129b454a961efea09151c692adc63562e5a94 SHA512 7a31c274a833d0f27dbfd54ce6c8d8f6d01562289e1c4c9258a7c338f3e4ecc9d842d2a5c0c804f333f9cdf9dcfec437640fb4a4e5cfdda3fa958bdb7a402022 WHIRLPOOL 0acff3f5b8047c2647b716d57255e7f884f06ea57e468c784e1a84742b47973570d175a723a4341c54a027b9a442c89e9bed2f66bb29c292d6c59ca40ffb3855
+DIST elasticsearch-2.4.3.tar.gz 27342693 SHA256 01eb684943be01d4af3131c6795073187b1a5868b6525d9686cc0d7a315db12e SHA512 357a145050ba155d60239f0127e8b772705efcddc9246492d80792c65c613f82a87dd4e4ea4a36c9555a0b5a536a34e2168d57c5b851c36f042f9a52ab3e24a8 WHIRLPOOL 07cd05120ac3bb15cd65b29caca6cc847f0e21cae7ff9a1d1002bcb66a54334c85cfc739e05d8452ba128fb3bdecb6c6cc4726e498f4c9e4e7cb8995c7ea7c2b
 DIST elasticsearch-1.7.5.tar.gz 28487351 SHA256 0aa58947d66b487488e86059352deb7c6cab5da4accdff043cce9fed7c3d2fa7 SHA512 372e9edf5bd9f68c476e15276fc90cf2ecddbafde17fe803e6a50261c2d3a80616a9440d86494d8cfa411703f87cf053d31c62f4cdee260d64cdc0c07b5741ba WHIRLPOOL e4b02117d868dd1998639aa6fa513928d2af6f9226da1d61e84c674941130b7b960aea44bc51f09f0dc852946ad41ad38ca209c4b50351afc451f329ad51f715
 DIST elasticsearch-2.1.1.tar.gz 29007342 SHA256 ebd69c0483f20ba7e51caa9606d4e3ce5fe2667e1216c799f0cdbb815c317ce6 SHA512 eff12cd7342dc0036dc88f03ced9c7cc90d284222efeca86adfd9e4cf254cb8f96105c58673b239cfc9eb9764a2a669d2cd171ca73eb43b1ec1470a13c5e1776 WHIRLPOOL 2b0e069d162ee07eddc90d879d4ce5dd2cef9e4a804a9aaeb3d99e5d532f583589e2c6a36b5e856bf19a610f220eea6aaa75d28e7b6687b60eab7bf83b2def51
 DIST elasticsearch-2.1.2.tar.gz 29008904 SHA256 069cf3ab88a36d01f86e54b46169891b0adef6eda126ea35e540249d904022e1 SHA512 25757972839e644719f0c129d862bb342bb3d76df19328b9a7e59ca65c62c695e61d8bb21a2a5bd20841b8fd5ba981cd35e83dc2c78a958a344b798b9e71c714 WHIRLPOOL aab6c78edf24101d72ca619d01617661c8701c29c9b49222262c1573912a2ab7eceeca21a367fdc7d600a38c4b381abd9ec4bf5ea59ee9f59e5fe97a76750453
 DIST elasticsearch-2.2.0.tar.gz 29419005 SHA256 ed70cc81e1f55cd5f0032beea2907227b6ad8e7457dcb75ddc97a2cc6e054d30 SHA512 b1c9d10ba6c778fe1a440c058b4968bae1cfb81cff9e00508e406ce02ec5eb889b6d7caf8fb69ef132a2e681b127fbe3b71c6298ee0c9f047aeaeec29cdc1cc6 WHIRLPOOL 1e57b2cca97d90756d592ca96ceb4e1fc026e1c9deaeceb3df3a59937a9cd8710222d6c74ece2883dd425aeb1bfde034413d2f04ea0f4a4c276c0d7de3671cee
 DIST elasticsearch-2.2.2.tar.gz 29425370 SHA256 c706db594f1feb5051d90697c6c412eadd60e00a9ec3b4f345a122801183af69 SHA512 144ca47dd3b9730e5ff81dd93e5db09d57a6f0d61d4445e8609c0ece833f57ca05d81fdf702d56008bc5e370604deb83d2d527132783467d5ae1eddc6cefeb84 WHIRLPOOL 4d6ced926237490a6ee8531ccf09128cc6bff5d73cff6f36159552a4a7a0dfbe01df0dfafb583d1c7ddc47ad5fa054ab6dd8c188cc7e3fe196f6917519e1afac
 DIST elasticsearch-2.3.0.tar.gz 27556947 SHA256 d68482c7633f2986263bc5f11f93b8a58c54c6cf5e337b615446d0a7c6fdcd8b SHA512 26671d64e6cd3406ad1de4543d84c66f58be4906d00ad22584350c5b28359c2b878850fb7cd0e49c9913d968380e8e386d77376c4f32fc37d3a43913c21558db WHIRLPOOL d26a3128d12630fca4defb669b7e23749f9742e1bf7c9497860effdbe6f51c8e86b467d3a16c78c77b7dd93efaa25e21c9694308292567eaa8e07794c57d60db
 DIST elasticsearch-2.3.1.tar.gz 27540442 SHA256 f0092e73038e0472fcdd923e5f2792e13692ea0f09ca034a54dd49b217110ebb SHA512 447d8824c4bfbec9b8431d213e3a8ae6720d1486e1389c271cc67cce5546861a817ef8c7db1c3c3669a50a61b5305739ac26f46b04d5674bbca203c3b5dbcf2f WHIRLPOOL e55501ca7fa702c33cd826d51c2d90dcfcc2843fb5b24b2d20df917cc291fe53f203360bfac6249b57c4c2914d92da92ca56b6505b6be885ece196983c176b9c
 DIST elasticsearch-2.3.2.tar.gz 27543334 SHA256 04c4d3913d496d217e038da88df939108369ae2e78eea29cb1adf1c4ab3a000a SHA512 73c4ca82eb0f4dc22907a94b9025e79183f6fcd38dbb82795800d10fc810dbee412784e62f9247390f0fb9aa19545976584bd2b62f1afe79d2cd64bb55f76dc8 WHIRLPOOL 5cc44a827de5281a9fb823a8a2e43755e0853dc5aa27f5ef7f8d1c5605d80a2dbf4c8756f01811a54307938cb3030634be6c8af2ffa465e2f35cd2a4aabeeb20
 DIST elasticsearch-2.3.3.tar.gz 27542289 SHA256 5fe0a6887432bb8a8d3de2e79c9b81c83cfa241e6440f0f0379a686657789165 SHA512 d3899d2f45128d218693ed2a0f9210ec6ce5fe4101d543b46edaaadceeb6768fe3cf04bf161ad09b38629bada74368133727dd735ef11132fffe81aabe0ef88b WHIRLPOOL 5f51b0c1a913a60073c212c9ee06b024b0ca50bbf7857f2ce1883ab51bbb8295c51c1c2d4e7fd98b5dc9db65cd753fd282a0eccf7568fad6608b3529f5e9ea36
 DIST elasticsearch-2.3.4.tar.gz 27547169 SHA256 371e0c5f4ded0a8548f1cce55faff3efebcfd5f895c2c816f220146521f6f06e SHA512 d6b61069b499d2fab1f4102240a5dfd9c0a0806d0cd7047935ef49da669e61066ca37284bd367df96aec79c47417b499988094737bf2e5a6e4c69f682e311bc0 WHIRLPOOL 46311e0a24d64d3b464ba1640b80294ab5ce2ab34a215a48f72a98492c2f07fd878ec99edd36a206b3445c4eebffac7be30e5af140e475ced312a6de2a8d3c06
 DIST elasticsearch-2.3.5.tar.gz 27547995 SHA256 1119a8c18620b98c4b85261318663a1f26dea92a26f34dfeb7f813fb7cbb468a SHA512 9c0cc8a9ae0fa2b52db583a5c006b05a84c1f84e1b8dbbafa88bec111190d056a23bd384d4241ce00dc8b56a6840857b296e4c0d2bf911f352ef67f128a87ca7 WHIRLPOOL de2aee3773d14c9b4abc0f20c3c8df1fe374a91ea54493f2c1df59fb8c02c97d684fd94b6bfaf140eebcfea4913197b10469b5aef34f62db89d825ae508a5095
 DIST elasticsearch-2.4.0.tar.gz 27364449 SHA256 3ae01140ae7bcbb91436feef381fbed774e36ef6d1e8e6a3153640db82acf4c9 SHA512 931f4d42cba43131718ec7480439b5fda0b9222a51cf9639d99ab4c00bdbedbe7e8da7a6016d88b848772cd416bc49fe7af09202160cecf839e39d803b45e869 WHIRLPOOL e03a2f7a6ea5913ce112b82e8578183c401f2d5901070a77c509ddbe7333fe62622fb2bb3e0f786a914bb15c56793e8b13220ae4588271baa3bbbcdf86223f47
 DIST elasticsearch-2.4.1.tar.gz 27364109 SHA256 23a369ef42955c19aaaf9e34891eea3a055ed217d7fbe76da0998a7a54bbe167 SHA512 69b22d5c2fc93e9bc83c5da415e110105d4d977aa98633041f51f8c55ba9e6045803584965367f6e1f962122ad81a8e07fefcc5a01c5381057ec921d65bc1751 WHIRLPOOL 893056d0cd23ae41e2cb9e3db4591108777b4360ad6be5c52782cc98379ab0f0c36b42758f9815fbaf8557c9e06723c03765fd9eb4cbfcf9fe0d3203d8e6039d
 DIST elasticsearch-5.0.0.tar.gz 32968292 SHA256 a866534f0fa7428e980c985d712024feef1dee04709add6e360fc7b73bb1e7ae SHA512 a4fa650d643c242a1f90059cfe6eb27e3d240b3deafc426abeae72c13aeae84b01ffb8b872b748619dfc58225ca29bde054fe10e1529522f9a06a1051991e4cd WHIRLPOOL a05a6dc785c00bb461ea286490cacc0222f9f95f0dea7ba61c6308cee0284edc53ee0a2047f723e990fa99f7ed09feda46313997b8f6dd487b042a6b26ecf8d6
 DIST elasticsearch-5.0.1.tar.gz 32944777 SHA256 542e197485fbcb1aac46097439337d2e9ac6a54b7b1e29ad17761f4d65898833 SHA512 3c4c5a692cc77b01b978d3a02f049fcce36b573b6a2097a9d6714618ec0e6de0583f750516ba461eb1d13386ffad636d8663134452edaaeb2b8889c701316598 WHIRLPOOL d5ceb8e87e36be880f3bf746bfa52f7431d62ff9cd666c9dc64093760474d973ffcad792fd0a5927bef61a8e36c2fced76e03eae42e77eb1d158dcd05579b858
 DIST elasticsearch-5.1.1.tar.gz 33291322 SHA256 cd45bafb1f74a7df9bad12c77b7bf3080069266bcbe0b256b0959ef2536e31e8 SHA512 2b5faf97c5ff41a9f12e21749d60f3632b39987d4886713ee9646110acdd17323d263168980d7dd4035732556b604acd68dc37ae7b805d84493075776b9d7bcd WHIRLPOOL ebb46d4a5643f09c0c903055c407a54d46264347924ca37cc73adfee3dd8a9bf2157b1be92b9b1d85636ea92b2d1f89d558c5413c804412996ea9bce42f1c3c6
--- a/app-misc/elasticsearch/elasticsearch-1.7.4.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-1.7.4.ebuild
@ -1,71 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 QA_PREBUILT="usr/share/elasticsearch/lib/sigar/libsigar-*.so"
 RDEPEND="|| ( virtual/jre:1.7 virtual/jre:1.8 )"
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
 }
 src_prepare() {
 	rm -rf lib/sigar/*{solaris,winnt,freebsd,macosx}*
 	rm -rf bin/*.{bat,exe}
 	rm lib/sigar/libsigar-ia64-linux.so
 	rm LICENSE.txt
 	use amd64 && {
 		rm lib/sigar/libsigar-x86-linux.so
 	}
 	use x86 && {
 		rm lib/sigar/libsigar-amd64-linux.so
 	}
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	insinto /usr/share/doc/${P}/examples
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	newinitd "${FILESDIR}/elasticsearch.init4" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Each of the example files in /usr/share/doc/${P}/examples"
 	elog "should be extracted to the proper configuration directory:"
 	elog "/etc/${MY_PN} (for standard init)"
 	elog "/etc/${MY_PN}/instance (for symlinked init)"
 	elog
 }
--- a/app-misc/elasticsearch/elasticsearch-1.7.5.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-1.7.5.ebuild
@ -1,71 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 QA_PREBUILT="usr/share/elasticsearch/lib/sigar/libsigar-*.so"
 RDEPEND="|| ( virtual/jre:1.7 virtual/jre:1.8 )"
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
 }
 src_prepare() {
 	rm -rf lib/sigar/*{solaris,winnt,freebsd,macosx}*
 	rm -rf bin/*.{bat,exe}
 	rm lib/sigar/libsigar-ia64-linux.so
 	rm LICENSE.txt
 	use amd64 && {
 		rm lib/sigar/libsigar-x86-linux.so
 	}
 	use x86 && {
 		rm lib/sigar/libsigar-amd64-linux.so
 	}
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	insinto /usr/share/doc/${P}/examples
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	newinitd "${FILESDIR}/elasticsearch.init4" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Each of the example files in /usr/share/doc/${P}/examples"
 	elog "should be extracted to the proper configuration directory:"
 	elog "/etc/${MY_PN} (for standard init)"
 	elog "/etc/${MY_PN}/instance (for symlinked init)"
 	elog
 }
--- a/app-misc/elasticsearch/elasticsearch-2.1.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-2.1.1.ebuild
@ -1,62 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_PN}/${PV}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe}
 	rm LICENSE.txt
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	dodir /etc/${MY_PN}/scripts
 	insinto /usr/share/doc/${P}/examples
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	keepdir /usr/share/${MY_PN}/plugins
 	newinitd "${FILESDIR}/elasticsearch.init5" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Each of the example files in /usr/share/doc/${P}/examples"
 	elog "should be extracted to the proper configuration directory:"
 	elog "/etc/${MY_PN} (for standard init)"
 	elog "/etc/${MY_PN}/instance (for symlinked init)"
 	elog
 }
--- a/app-misc/elasticsearch/elasticsearch-2.1.2.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-2.1.2.ebuild
@ -1,62 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_PN}/${PV}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe}
 	rm LICENSE.txt
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	dodir /etc/${MY_PN}/scripts
 	insinto /usr/share/doc/${P}/examples
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	keepdir /usr/share/${MY_PN}/plugins
 	newinitd "${FILESDIR}/elasticsearch.init5" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Each of the example files in /usr/share/doc/${P}/examples"
 	elog "should be extracted to the proper configuration directory:"
 	elog "/etc/${MY_PN} (for standard init)"
 	elog "/etc/${MY_PN}/instance (for symlinked init)"
 	elog
 }
--- a/app-misc/elasticsearch/elasticsearch-2.2.0.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-2.2.0.ebuild
@ -1,62 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_PN}/${PV}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe}
 	rm LICENSE.txt
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	dodir /etc/${MY_PN}/scripts
 	insinto /usr/share/doc/${P}/examples
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	keepdir /usr/share/${MY_PN}/plugins
 	newinitd "${FILESDIR}/elasticsearch.init5" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Each of the example files in /usr/share/doc/${P}/examples"
 	elog "should be extracted to the proper configuration directory:"
 	elog "/etc/${MY_PN} (for standard init)"
 	elog "/etc/${MY_PN}/instance (for symlinked init)"
 	elog
 }
--- a/app-misc/elasticsearch/elasticsearch-2.2.2.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-2.2.2.ebuild
@ -1,62 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_PN}/${PV}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe}
 	rm LICENSE.txt
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	dodir /etc/${MY_PN}/scripts
 	insinto /usr/share/doc/${P}/examples
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	keepdir /usr/share/${MY_PN}/plugins
 	newinitd "${FILESDIR}/elasticsearch.init5" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Each of the example files in /usr/share/doc/${P}/examples"
 	elog "should be extracted to the proper configuration directory:"
 	elog "/etc/${MY_PN} (for standard init)"
 	elog "/etc/${MY_PN}/instance (for symlinked init)"
 	elog
 }
--- a/app-misc/elasticsearch/elasticsearch-2.3.0.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-2.3.0.ebuild
@ -1,62 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_PN}/${PV}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe}
 	rm LICENSE.txt
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	dodir /etc/${MY_PN}/scripts
 	insinto /usr/share/doc/${P}/examples
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	keepdir /usr/share/${MY_PN}/plugins
 	newinitd "${FILESDIR}/elasticsearch.init5" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Each of the example files in /usr/share/doc/${P}/examples"
 	elog "should be extracted to the proper configuration directory:"
 	elog "/etc/${MY_PN} (for standard init)"
 	elog "/etc/${MY_PN}/instance (for symlinked init)"
 	elog
 }
--- a/app-misc/elasticsearch/elasticsearch-2.3.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-2.3.1.ebuild
@ -1,62 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_PN}/${PV}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe}
 	rm LICENSE.txt
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	dodir /etc/${MY_PN}/scripts
 	insinto /usr/share/doc/${P}/examples
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	keepdir /usr/share/${MY_PN}/plugins
 	newinitd "${FILESDIR}/elasticsearch.init5" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Each of the example files in /usr/share/doc/${P}/examples"
 	elog "should be extracted to the proper configuration directory:"
 	elog "/etc/${MY_PN} (for standard init)"
 	elog "/etc/${MY_PN}/instance (for symlinked init)"
 	elog
 }
--- a/app-misc/elasticsearch/elasticsearch-2.3.2.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-2.3.2.ebuild
@ -1,76 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_PN}/${PV}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 pkg_preinst() {
 	if has_version '<app-misc/elasticsearch-2.3.2'; then
 		export UPDATE_NOTES=1
 	fi
 }
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
 	esethome ${MY_PN} /usr/share/${MY_PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe}
 	rm LICENSE.txt
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	dodir /etc/${MY_PN}/scripts
 	insinto /etc/${MY_PN}
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	insinto /usr/share/${MY_PN}/bin
 	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	keepdir /usr/share/${MY_PN}/plugins
 	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Please make sure you put elasticsearch.yml and logging.yml"
 	elog "into the configuration directory of the instance:"
 	elog "/etc/${MY_PN}/instance"
 	elog
 	if ! [ -z ${UPDATE_NOTES} ]; then
 		elog "This update changes some configuration variables. Please review"
 		elog "/etc/conf.d/elasticsearch before restarting your services."
 	fi
 }
--- a/app-misc/elasticsearch/elasticsearch-2.3.3.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-2.3.3.ebuild
@ -1,76 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_PN}/${PV}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 pkg_preinst() {
 	if has_version '<app-misc/elasticsearch-2.3.2'; then
 		export UPDATE_NOTES=1
 	fi
 }
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
 	esethome ${MY_PN} /usr/share/${MY_PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe}
 	rm LICENSE.txt
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	dodir /etc/${MY_PN}/scripts
 	insinto /etc/${MY_PN}
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	insinto /usr/share/${MY_PN}/bin
 	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	keepdir /usr/share/${MY_PN}/plugins
 	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Please make sure you put elasticsearch.yml and logging.yml"
 	elog "into the configuration directory of the instance:"
 	elog "/etc/${MY_PN}/instance"
 	elog
 	if ! [ -z ${UPDATE_NOTES} ]; then
 		elog "This update changes some configuration variables. Please review"
 		elog "/etc/conf.d/elasticsearch before restarting your services."
 	fi
 }
--- a/app-misc/elasticsearch/elasticsearch-2.3.4.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-2.3.4.ebuild
@ -1,76 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_PN}/${PV}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 pkg_preinst() {
 	if has_version '<app-misc/elasticsearch-2.3.2'; then
 		export UPDATE_NOTES=1
 	fi
 }
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
 	esethome ${MY_PN} /usr/share/${MY_PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe}
 	rm LICENSE.txt
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	dodir /etc/${MY_PN}/scripts
 	insinto /etc/${MY_PN}
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	insinto /usr/share/${MY_PN}/bin
 	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	keepdir /usr/share/${MY_PN}/plugins
 	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Please make sure you put elasticsearch.yml and logging.yml"
 	elog "into the configuration directory of the instance:"
 	elog "/etc/${MY_PN}/instance"
 	elog
 	if ! [ -z ${UPDATE_NOTES} ]; then
 		elog "This update changes some configuration variables. Please review"
 		elog "/etc/conf.d/elasticsearch before restarting your services."
 	fi
 }
--- a/app-misc/elasticsearch/elasticsearch-2.3.5.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-2.3.5.ebuild
@ -1,82 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_PN}/${PV}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 pkg_preinst() {
 	if has_version '<app-misc/elasticsearch-2.3.2'; then
 		export UPDATE_NOTES=1
 	fi
 }
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
 	esethome ${MY_PN} /usr/share/${MY_PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe}
 	rm LICENSE.txt
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	dodir /etc/${MY_PN}/scripts
 	insinto /etc/${MY_PN}
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	insinto /usr/share/${MY_PN}/bin
 	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	keepdir /usr/share/${MY_PN}/plugins
 	insinto /usr/lib/tmpfiles.d
 	newins "${FILESDIR}/${MY_PN}.tmpfiles.d" "${MY_PN}.conf"
 	insinto /etc/sysctl.d
 	newins "${FILESDIR}/${MY_PN}.sysctl.d" "${MY_PN}.conf"
 	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Please make sure you put elasticsearch.yml and logging.yml"
 	elog "into the configuration directory of the instance:"
 	elog "/etc/${MY_PN}/instance"
 	elog
 	if ! [ -z ${UPDATE_NOTES} ]; then
 		elog "This update changes some configuration variables. Please review"
 		elog "/etc/conf.d/elasticsearch before restarting your services."
 	fi
 }
--- a/app-misc/elasticsearch/elasticsearch-2.4.0.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-2.4.0.ebuild
@ -1,82 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_PN}/${PV}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 pkg_preinst() {
 	if has_version '<app-misc/elasticsearch-2.3.2'; then
 		export UPDATE_NOTES=1
 	fi
 }
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
 	esethome ${MY_PN} /usr/share/${MY_PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe}
 	rm LICENSE.txt
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	dodir /etc/${MY_PN}/scripts
 	insinto /etc/${MY_PN}
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	insinto /usr/share/${MY_PN}/bin
 	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	keepdir /usr/share/${MY_PN}/plugins
 	insinto /usr/lib/tmpfiles.d
 	newins "${FILESDIR}/${MY_PN}.tmpfiles.d" "${MY_PN}.conf"
 	insinto /etc/sysctl.d
 	newins "${FILESDIR}/${MY_PN}.sysctl.d" "${MY_PN}.conf"
 	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Please make sure you put elasticsearch.yml and logging.yml"
 	elog "into the configuration directory of the instance:"
 	elog "/etc/${MY_PN}/instance"
 	elog
 	if ! [ -z ${UPDATE_NOTES} ]; then
 		elog "This update changes some configuration variables. Please review"
 		elog "/etc/conf.d/elasticsearch before restarting your services."
 	fi
 }
--- a/app-misc/elasticsearch/elasticsearch-2.4.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-2.4.1.ebuild
@ -1,82 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_PN}/${PV}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 pkg_preinst() {
 	if has_version '<app-misc/elasticsearch-2.3.2'; then
 		export UPDATE_NOTES=1
 	fi
 }
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
 	esethome ${MY_PN} /usr/share/${MY_PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe}
 	rm LICENSE.txt
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	dodir /etc/${MY_PN}/scripts
 	insinto /etc/${MY_PN}
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	insinto /usr/share/${MY_PN}/bin
 	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	keepdir /usr/share/${MY_PN}/plugins
 	insinto /usr/lib/tmpfiles.d
 	newins "${FILESDIR}/${MY_PN}.tmpfiles.d" "${MY_PN}.conf"
 	insinto /etc/sysctl.d
 	newins "${FILESDIR}/${MY_PN}.sysctl.d" "${MY_PN}.conf"
 	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Please make sure you put elasticsearch.yml and logging.yml"
 	elog "into the configuration directory of the instance:"
 	elog "/etc/${MY_PN}/instance"
 	elog
 	if ! [ -z ${UPDATE_NOTES} ]; then
 		elog "This update changes some configuration variables. Please review"
 		elog "/etc/conf.d/elasticsearch before restarting your services."
 	fi
 }
--- a/app-misc/elasticsearch/elasticsearch-2.4.3.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-2.4.3.ebuild
@ -0,0 +1,81 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 inherit eutils systemd user
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://download.elasticsearch.org/${PN}/release/org/${PN}/distribution/tar/${PN}/${PV}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 pkg_preinst() {
 	if has_version '<app-misc/elasticsearch-2.3.2'; then
 		export UPDATE_NOTES=1
 	fi
 }
 pkg_setup() {
 	enewgroup ${PN}
 	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe} || die
 	rm LICENSE.txt || die
 	default
 }
 src_install() {
 	keepdir /etc/${PN}
 	dodir /etc/${PN}/scripts
 	insinto /etc/${PN}
 	doins config/*
 	rm -rf config || die
 	insinto /usr/share/${PN}
 	doins -r ./*
 	exeinto /usr/share/${PN}/bin
 	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
 	chmod +x "${D}"/usr/share/${PN}/bin/* || die
 	keepdir /var/{lib,log}/${PN}
 	keepdir /usr/share/${PN}/plugins
 	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" "${PN}.conf"
 	insinto /etc/sysctl.d
 	newins "${FILESDIR}/${PN}.sysctl.d" "${PN}.conf"
 	newinitd "${FILESDIR}/${PN}.init6" "${PN}"
 	newconfd "${FILESDIR}/${PN}.conf2" "${PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
 	elog
 	elog "Please make sure you put elasticsearch.yml and logging.yml"
 	elog "into the configuration directory of the instance:"
 	elog "/etc/${PN}/instance"
 	elog
 	if ! [ -z ${UPDATE_NOTES} ]; then
 		elog "This update changes some configuration variables. Please review"
 		elog "${EROOT%/}/etc/conf.d/elasticsearch before restarting your services."
 	fi
 }
--- a/app-misc/elasticsearch/elasticsearch-5.0.0.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.0.0.ebuild
@ -1,84 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 S="${WORKDIR}/${MY_PN}-${PV}"
 pkg_preinst() {
 	if has_version '<app-misc/elasticsearch-2.3.2'; then
 		export UPDATE_NOTES=1
 	fi
 }
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
 	esethome ${MY_PN} /usr/share/${MY_PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe}
 	rm LICENSE.txt
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	dodir /etc/${MY_PN}/scripts
 	insinto /etc/${MY_PN}
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	insinto /usr/share/${MY_PN}/bin
 	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	keepdir /usr/share/${MY_PN}/plugins
 	insinto /usr/lib/tmpfiles.d
 	newins "${FILESDIR}/${MY_PN}.tmpfiles.d" "${MY_PN}.conf"
 	insinto /etc/sysctl.d
 	newins "${FILESDIR}/${MY_PN}.sysctl.d" "${MY_PN}.conf"
 	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Please make sure you put elasticsearch.yml and logging.yml"
 	elog "into the configuration directory of the instance:"
 	elog "/etc/${MY_PN}/instance"
 	elog
 	if ! [ -z ${UPDATE_NOTES} ]; then
 		elog "This update changes some configuration variables. Please review"
 		elog "/etc/conf.d/elasticsearch before restarting your services."
 	fi
 }
--- a/app-misc/elasticsearch/elasticsearch-5.0.1-r1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.0.1-r1.ebuild
@ -1,84 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 S="${WORKDIR}/${MY_PN}-${PV}"
 pkg_preinst() {
 	if has_version '<app-misc/elasticsearch-2.3.2'; then
 		export UPDATE_NOTES=1
 	fi
 }
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
 	esethome ${MY_PN} /usr/share/${MY_PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe}
 	rm LICENSE.txt
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	dodir /etc/${MY_PN}/scripts
 	insinto /etc/${MY_PN}
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	insinto /usr/share/${MY_PN}/bin
 	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	keepdir /usr/share/${MY_PN}/plugins
 	insinto /usr/lib/tmpfiles.d
 	newins "${FILESDIR}/${MY_PN}.tmpfiles.d" "${MY_PN}.conf"
 	insinto /etc/sysctl.d
 	newins "${FILESDIR}/${MY_PN}.sysctl.d" "${MY_PN}.conf"
 	newinitd "${FILESDIR}/elasticsearch.init7" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf3" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Please make sure you put elasticsearch.yml and logging.yml"
 	elog "into the configuration directory of the instance:"
 	elog "/etc/${MY_PN}/instance"
 	elog
 	if ! [ -z ${UPDATE_NOTES} ]; then
 		elog "This update changes some configuration variables. Please review"
 		elog "/etc/conf.d/elasticsearch before restarting your services."
 	fi
 }
--- a/app-misc/elasticsearch/elasticsearch-5.0.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.0.1.ebuild
@ -1,84 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
 SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="strip"
 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 S="${WORKDIR}/${MY_PN}-${PV}"
 pkg_preinst() {
 	if has_version '<app-misc/elasticsearch-2.3.2'; then
 		export UPDATE_NOTES=1
 	fi
 }
 pkg_setup() {
 	enewgroup ${MY_PN}
 	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
 	esethome ${MY_PN} /usr/share/${MY_PN}
 }
 src_prepare() {
 	rm -rf bin/*.{bat,exe}
 	rm LICENSE.txt
 }
 src_install() {
 	dodir /etc/${MY_PN}
 	dodir /etc/${MY_PN}/scripts
 	insinto /etc/${MY_PN}
 	doins config/*
 	rm -rf config
 	insinto /usr/share/${MY_PN}
 	doins -r ./*
 	insinto /usr/share/${MY_PN}/bin
 	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
 	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
 	keepdir /var/{lib,log}/${MY_PN}
 	keepdir /usr/share/${MY_PN}/plugins
 	insinto /usr/lib/tmpfiles.d
 	newins "${FILESDIR}/${MY_PN}.tmpfiles.d" "${MY_PN}.conf"
 	insinto /etc/sysctl.d
 	newins "${FILESDIR}/${MY_PN}.sysctl.d" "${MY_PN}.conf"
 	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
 }
 pkg_postinst() {
 	elog
 	elog "You may create multiple instances of ${MY_PN} by"
 	elog "symlinking the init script:"
 	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
 	elog
 	elog "Please make sure you put elasticsearch.yml and logging.yml"
 	elog "into the configuration directory of the instance:"
 	elog "/etc/${MY_PN}/instance"
 	elog
 	if ! [ -z ${UPDATE_NOTES} ]; then
 		elog "This update changes some configuration variables. Please review"
 		elog "/etc/conf.d/elasticsearch before restarting your services."
 	fi
 }
--- a/app-misc/elasticsearch/elasticsearch-5.1.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.1.1.ebuild
@ -6,10 +6,9 @@ EAPI=6
 inherit eutils systemd user
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
@ -18,8 +17,6 @@ RESTRICT="strip"
 RDEPEND="virtual/jre:1.8"
 S="${WORKDIR}/${MY_PN}-${PV}"
 pkg_preinst() {
 	if has_version '<app-misc/elasticsearch-2.3.2'; then
 		export UPDATE_NOTES=1
@ -27,8 +24,8 @@ pkg_preinst() {
 }
 pkg_setup() {
-	enewgroup ${MY_PN}
+	enewgroup ${PN}
-	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
+	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
 }
 src_prepare() {
@ -39,43 +36,43 @@ src_prepare() {
 }
 src_install() {
-	keepdir /etc/${MY_PN}
+	keepdir /etc/${PN}
-	keepdir /etc/${MY_PN}/scripts
+	keepdir /etc/${PN}/scripts
-	insinto /etc/${MY_PN}
+	insinto /etc/${PN}
 	doins config/*
 	rm -rf config || die
-	insinto /usr/share/${MY_PN}
+	insinto /usr/share/${PN}
 	doins -r ./*
-	exeinto /usr/share/${MY_PN}/bin
+	exeinto /usr/share/${PN}/bin
 	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
+	chmod +x "${D}"/usr/share/${PN}/bin/* || die
-	keepdir /var/{lib,log}/${MY_PN}
+	keepdir /var/{lib,log}/${PN}
-	keepdir /usr/share/${MY_PN}/plugins
+	keepdir /usr/share/${PN}/plugins
-	systemd_newtmpfilesd "${FILESDIR}/${MY_PN}.tmpfiles.d" "${MY_PN}.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" "${PN}.conf"
 	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${MY_PN}.sysctl.d" "${MY_PN}.conf"
+	newins "${FILESDIR}/${PN}.sysctl.d" "${PN}.conf"
-	newinitd "${FILESDIR}/elasticsearch.init7" "${MY_PN}"
+	newinitd "${FILESDIR}/${PN}.init7" "${PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf3" "${MY_PN}"
+	newconfd "${FILESDIR}/${PN}.conf3" "${PN}"
 	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
 }
 pkg_postinst() {
 	elog
-	elog "You may create multiple instances of ${MY_PN} by"
+	elog "You may create multiple instances of ${PN} by"
 	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
 	elog
 	elog "Please make sure you put elasticsearch.yml and logging.yml"
 	elog "into the configuration directory of the instance:"
-	elog "/etc/${MY_PN}/instance"
+	elog "/etc/${PN}/instance"
 	elog
 	if ! [ -z ${UPDATE_NOTES} ]; then
 		elog "This update changes some configuration variables. Please review"
--- a/app-misc/elasticsearch/files/elasticsearch.conf
+++ b/app-misc/elasticsearch/files/elasticsearch.conf
@ -1,20 +0,0 @@
 # please modify/copy
 # /etc/elasticsearch/elasticsearch.in.sh.sample
 # to 
 # /etc/elasticsearch/[instance/]elasticsearch.in.sh
 #
 # many variables/options are available in this file
 # ES_USER="elasticsearch:elasticsearch"
 ## set max fds (ulimit -n X)
 # ES_MAX_FD=""
 ## override elasticsearch.in.sh
 #
 # ES_CLASSPATH=""
 # JAVA_OPTS=""
 # ES_JAVA_OPTS=""
 # ES_HEAP_SIZE=""
 # ES_HEAP_NEWSIZE=""
 # ES_DIRECT_SIZE=""
 # ES_USE_IPV4=""
--- a/app-misc/elasticsearch/files/elasticsearch.init4
+++ b/app-misc/elasticsearch/files/elasticsearch.init4
@ -1,87 +0,0 @@
 #!/sbin/openrc-run
 name="Elasticsearch"
 description=""
 ES_USER=${ES_USER:="elasticsearch"}
 ES_INSTANCE=${SVCNAME#*.}
 if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
 	PIDFILE="/run/elasticsearch/elasticsearch.${ES_INSTANCE}.pid"
 	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
 	ES_CONF_PATH="/etc/elasticsearch/${ES_INSTANCE}"
 	ES_LOG_PATH="/var/log/elasticsearch/${ES_INSTANCE}"
 else
 	PIDFILE="/run/elasticsearch/elasticsearch.pid"
 	ES_BASE_PATH="/var/lib/elasticsearch/_default"
 	ES_CONF_PATH="/etc/elasticsearch"
 	ES_LOG_PATH="/var/log/elasticsearch/_default"
 fi
 ES_DATA_PATH="${ES_BASE_PATH}/data"
 ES_WORK_PATH="${ES_BASE_PATH}/work"
 export ES_INCLUDE="/usr/share/elasticsearch/bin/elasticsearch.in.sh"
 export JAVA_OPTS
 export ES_JAVA_OPTS
 export ES_HEAP_SIZE
 export ES_HEAP_NEWSIZE
 export ES_DIRECT_SIZE
 export ES_USE_IPV4
 server_command="/usr/share/elasticsearch/bin/elasticsearch"
 server_args=" -p ${PIDFILE} -Des.default.path.conf=\"${ES_CONF_PATH}\" -Des.default.path.data=\"${ES_DATA_PATH}\" -Des.default.path.work=\"${ES_WORK_PATH}\" -Des.default.path.logs=\"${ES_LOG_PATH}\""
 depend() {
 	use net
 }
 start() {
 	# elasticsearch -Des.config=/path/to/config/file
 	# elasticsearch -Des.network.host=10.0.0.4
 	[ ! -f "${ES_INCLUDE}" ] && {
 		eerror "${ES_INCLUDE} must be copied into place"
 		return 1
 	}
 	local conf
 	local conf_file
 	for conf in elasticsearch.yml logging.yml; do
 		conf_file="${ES_CONF_PATH}/${conf}"
 		if [ ! -f "${conf_file}" ]; then
 			eerror "${conf_file} must be copied into place"
 			return 1
 		fi
 	done
 	ebegin "Starting ${SVCNAME}"
 	if [ -n "${ES_MAX_FD}" ]; then
 		ulimit -n ${ES_MAX_FD}
 		einfo "Max open filedescriptors  : ${ES_MAX_FD}"
 	fi
 	checkpath -d -o "${ES_USER}" -m750 "/var/lib/elasticsearch"
 	checkpath -d -o "${ES_USER}" -m750 "/var/log/elasticsearch"
 	checkpath -d -o "${ES_USER}" -m750 "$(dirname "${PIDFILE}")"
 	checkpath -d -o "${ES_USER}" -m750 "${ES_BASE_PATH}"
 	checkpath -d -o "${ES_USER}" -m750 "${ES_LOG_PATH}"
 	start-stop-daemon --start \
 		--background \
 		--chdir "${ES_BASE_PATH}" \
 		--user="${ES_USER}" \
 		--pidfile="${PIDFILE}" \
 		--exec ${server_command} -- ${server_args}
 	eend $?
 }
 stop() {
 	ebegin "Stopping ${SVCNAME}"
 	start-stop-daemon --stop \
 		--pidfile=${PIDFILE} \
 		--user="${ES_USER}" \
 		--retry=TERM/20/KILL/5
 	eend $?
 }
--- a/app-misc/elasticsearch/files/elasticsearch.init5
+++ b/app-misc/elasticsearch/files/elasticsearch.init5
@ -1,87 +0,0 @@
 #!/sbin/openrc-run
 name="Elasticsearch"
 description=""
 ES_USER=${ES_USER:="elasticsearch"}
 ES_INSTANCE=${SVCNAME#*.}
 if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
 	PIDFILE="/run/elasticsearch/elasticsearch.${ES_INSTANCE}.pid"
 	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
 	ES_CONF_PATH="/etc/elasticsearch/${ES_INSTANCE}"
 	ES_LOG_PATH="/var/log/elasticsearch/${ES_INSTANCE}"
 else
 	PIDFILE="/run/elasticsearch/elasticsearch.pid"
 	ES_BASE_PATH="/var/lib/elasticsearch/_default"
 	ES_CONF_PATH="/etc/elasticsearch"
 	ES_LOG_PATH="/var/log/elasticsearch/_default"
 fi
 ES_DATA_PATH="${ES_BASE_PATH}/data"
 ES_WORK_PATH="${ES_BASE_PATH}/work"
 export ES_INCLUDE="/usr/share/elasticsearch/bin/elasticsearch.in.sh"
 export JAVA_OPTS
 export ES_JAVA_OPTS
 export ES_HEAP_SIZE
 export ES_HEAP_NEWSIZE
 export ES_DIRECT_SIZE
 export ES_USE_IPV4
 server_command="/usr/share/elasticsearch/bin/elasticsearch"
 server_args=" -p ${PIDFILE} -Des.default.path.conf=${ES_CONF_PATH} -Des.default.path.data=${ES_DATA_PATH} -Des.default.path.work=${ES_WORK_PATH} -Des.default.path.logs=${ES_LOG_PATH}"
 depend() {
 	use net
 }
 start() {
 	# elasticsearch -Des.config=/path/to/config/file
 	# elasticsearch -Des.network.host=10.0.0.4
 	[ ! -f "${ES_INCLUDE}" ] && {
 		eerror "${ES_INCLUDE} must be copied into place"
 		return 1
 	}
 	local conf
 	local conf_file
 	for conf in elasticsearch.yml logging.yml; do
 		conf_file="${ES_CONF_PATH}/${conf}"
 		if [ ! -f "${conf_file}" ]; then
 			eerror "${conf_file} must be copied into place"
 			return 1
 		fi
 	done
 	ebegin "Starting ${SVCNAME}"
 	if [ -n "${ES_MAX_FD}" ]; then
 		ulimit -n ${ES_MAX_FD}
 		einfo "Max open filedescriptors  : ${ES_MAX_FD}"
 	fi
 	checkpath -d -o "${ES_USER}" -m750 "/var/lib/elasticsearch"
 	checkpath -d -o "${ES_USER}" -m750 "/var/log/elasticsearch"
 	checkpath -d -o "${ES_USER}" -m750 "$(dirname "${PIDFILE}")"
 	checkpath -d -o "${ES_USER}" -m750 "${ES_BASE_PATH}"
 	checkpath -d -o "${ES_USER}" -m750 "${ES_LOG_PATH}"
 	start-stop-daemon --start \
 		--background \
 		--chdir "${ES_BASE_PATH}" \
 		--user="${ES_USER}" \
 		--pidfile="${PIDFILE}" \
 		--exec ${server_command} -- ${server_args}
 	eend $?
 }
 stop() {
 	ebegin "Stopping ${SVCNAME}"
 	start-stop-daemon --stop \
 		--pidfile=${PIDFILE} \
 		--user="${ES_USER}" \
 		--retry=TERM/20/KILL/5
 	eend $?
 }
--- a/app-misc/elasticsearch/files/elasticsearch.init6
+++ b/app-misc/elasticsearch/files/elasticsearch.init6
@ -21,7 +21,7 @@ fi
 ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
 ES_USER=${ES_USER:="elasticsearch"}
 ES_GROUP=${ES_GROUP:="elasticsearch"}
-ES_GC_LOG_FILE=${ES_GC_LOG_FILE:="${LOG_DIR}/gc.log"}
+ES_GC_LOG_FILE=${ES_GC_LOG_FILE:="/dev/null"}
 MAX_OPEN_FILES=${MAX_OPEN_FILES:=65535}
 MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
--- a/app-misc/elasticsearch/files/elasticsearch.service4
+++ b/app-misc/elasticsearch/files/elasticsearch.service4
@ -1,11 +0,0 @@
 [Unit]
 Description=Elasticsearch
 After=network.target
 [Service]
 User=elasticsearch
 Environment=ES_INCLUDE=/usr/share/elasticsearch/bin/elasticsearch.in.sh
 ExecStart=/usr/share/elasticsearch/bin/elasticsearch -Des.default.path.conf=/etc/elasticsearch
 [Install]
 WantedBy=multi-user.target
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r11.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r11.ebuild
@ -1,177 +0,0 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 GENTOO_DEPEND_ON_PERL="no"
 PYTHON_DEPEND="python? *"
 SUPPORT_PYTHON_ABIS="1"
 inherit eutils linux-info perl-module python base
 DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver"
 HOMEPAGE="http://g15daemon.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="perl python static-libs"
 DEPEND="virtual/libusb:0
 	>=dev-libs/libg15-1.2.4
 	>=dev-libs/libg15render-1.2
 	perl? (
 		dev-lang/perl
 		dev-perl/GDGraph
 		>=dev-perl/Inline-0.4
 	)"
 RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-forgotten-open-mode.patch"
 	"${FILESDIR}/${P}-overflow-fix.patch"
 )
 uinput_check() {
 	ebegin "Checking for uinput support"
 	local rc=1
 	linux_config_exists && linux_chkconfig_present INPUT_UINPUT
 	rc=$?
 	if [[ $rc -ne 0 ]] ; then
 		eerror "To use g15daemon, you need to compile your kernel with uinput support."
 		eerror "Please enable uinput support in your kernel config, found at:"
 		eerror
 		eerror "Device Drivers -> Input Device ... -> Miscellaneous devices -> User level driver support."
 		eerror
 		eerror "Once enabled, you should have the /dev/input/uinput device."
 		eerror "g15daemon will not work without the uinput device."
 	fi
 }
 pkg_setup() {
 	linux-info_pkg_setup
 	uinput_check
 	if use python; then
 		python_pkg_setup
 	fi
 }
 src_unpack() {
 	unpack ${A}
 	if use perl; then
 		unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
 	fi
 	if use python; then
 		unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
 	fi
 }
 src_prepare() {
 	if use perl; then
 		perl-module_src_prepare
 		sed -i \
 			-e '1i#!/usr/bin/perl' \
 			"${S}"/contrib/testbindings.pl
 	else
 		# perl-module_src_prepare always calls base_src_prepare
 		base_src_prepare
 	fi
 }
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable static-libs static)
 	if use perl; then
 		cd "${WORKDIR}/G15Daemon-0.2"
 		perl-module_src_configure
 	fi
 }
 src_compile() {
 	default
 	if use perl; then
 		cd "${WORKDIR}/G15Daemon-0.2"
 		perl-module_src_compile
 	fi
 }
 src_install() {
 	default
 	find "${ED}" -name '*.la' -exec rm -f {} +
 	# remove odd docs installed my make
 	rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage}
 	insinto /usr/share/${PN}/contrib
 	doins contrib/xmodmaprc
 	doins contrib/xmodmap.sh
 	if use perl; then
 		doins contrib/testbindings.pl
 	fi
 	newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
 	newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
 	dobin "${FILESDIR}/g15daemon-hotplug"
 	insinto /lib/udev/rules.d
 	doins "${FILESDIR}/99-g15daemon.rules"
 	insinto /etc
 	doins "${FILESDIR}"/g15daemon.conf
 	# Gentoo bug #301340, debian bug #611649
 	exeinto /usr/lib/pm-utils/sleep.d
 	doexe "${FILESDIR}"/20g15daemon
 	if use perl; then
 		ebegin "Installing Perl Bindings (G15Daemon.pm)"
 		cd "${WORKDIR}/G15Daemon-0.2"
 		docinto perl
 		perl-module_src_install
 	fi
 	if use python; then
 		ebegin "Installing Python Bindings (g15daemon.py)"
 		cd "${WORKDIR}/pyg15daemon"
 		installation() {
 			insinto $(python_get_sitedir)
 			doins g15daemon.py
 		}
 		python_execute_function installation
 		docinto python
 		dodoc AUTHORS
 	fi
 }
 pkg_postinst() {
 	if use python; then
 		python_mod_optimize g15daemon.py
 		echo ""
 	fi
 	elog "To use g15daemon, you need to add g15daemon to the default runlevel."
 	elog "This can be done with:"
 	elog "# /sbin/rc-update add g15daemon default"
 	elog "You can edit some g15daemon options at /etc/conf.d/g15daemon"
 	elog ""
 	elog "To have all new keys working in X11, you'll need create a "
 	elog "specific xmodmap in your home directory or edit the existent one."
 	elog ""
 	elog "Create the xmodmap:"
 	elog "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap"
 	elog ""
 	elog "Adding keycodes to an existing xmodmap:"
 	elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
 }
 pkg_postrm() {
 	if use python; then
 		python_mod_cleanup g15daemon.py
 	fi
 }
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r20.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r20.ebuild
@ -1,179 +0,0 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 GENTOO_DEPEND_ON_PERL="no"
 PYTHON_DEPEND="python? *"
 SUPPORT_PYTHON_ABIS="1"
 inherit eutils linux-info perl-module python base
 DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver"
 HOMEPAGE="http://g15daemon.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="perl python static-libs"
 DEPEND="virtual/libusb:0
 	>=dev-libs/libg15-9999
 	>=dev-libs/libg15render-1.2
 	perl? (
 		dev-lang/perl
 		dev-perl/GDGraph
 		>=dev-perl/Inline-0.4
 	)"
 RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-forgotten-open-mode.patch"
 	"${FILESDIR}/${P}-overflow-fix.patch"
 	"${FILESDIR}/${P}-g510-keys.patch"
 )
 uinput_check() {
 	ebegin "Checking for uinput support"
 	local rc=1
 	linux_config_exists && linux_chkconfig_present INPUT_UINPUT
 	rc=$?
 	if [[ $rc -ne 0 ]] ; then
 		eerror "To use g15daemon, you need to compile your kernel with uinput support."
 		eerror "Please enable uinput support in your kernel config, found at:"
 		eerror
 		eerror "Device Drivers -> Input Device ... -> Miscellaneous devices -> User level driver support."
 		eerror
 		eerror "Once enabled, you should have the /dev/input/uinput device."
 		eerror "g15daemon will not work without the uinput device."
 	fi
 }
 pkg_setup() {
 	linux-info_pkg_setup
 	uinput_check
 	if use python; then
 		python_pkg_setup
 	fi
 }
 src_unpack() {
 	unpack ${A}
 	if use perl; then
 		unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
 	fi
 	if use python; then
 		unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
 	fi
 }
 src_prepare() {
 	if use perl; then
 		perl-module_src_prepare
 		sed -i \
 			-e '1i#!/usr/bin/perl' \
 			"${S}"/contrib/testbindings.pl
 	else
 		# perl-module_src_prepare always calls base_src_prepare
 		base_src_prepare
 	fi
 }
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable static-libs static)
 	if use perl; then
 		cd "${WORKDIR}/G15Daemon-0.2"
 		perl-module_src_configure
 	fi
 }
 src_compile() {
 	default
 	if use perl; then
 		cd "${WORKDIR}/G15Daemon-0.2"
 		perl-module_src_compile
 	fi
 }
 src_install() {
 	default
 	find "${ED}" -name '*.la' -exec rm -f {} +
 	# remove odd docs installed my make
 	rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage}
 	insinto /usr/share/${PN}/contrib
 	doins contrib/xmodmaprc
 	doins contrib/xmodmap.sh
 	if use perl; then
 		doins contrib/testbindings.pl
 	fi
 	newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
 	newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
 	dobin "${FILESDIR}/g15daemon-hotplug"
 	insinto /lib/udev/rules.d
 	doins "${FILESDIR}/99-g15daemon.rules"
 	insinto /etc
 	doins "${FILESDIR}"/g15daemon.conf
 	# Gentoo bug #301340, debian bug #611649
 	exeinto /usr/lib/pm-utils/sleep.d
 	doexe "${FILESDIR}"/20g15daemon
 	if use perl; then
 		ebegin "Installing Perl Bindings (G15Daemon.pm)"
 		cd "${WORKDIR}/G15Daemon-0.2"
 		docinto perl
 		perl-module_src_install
 	fi
 	if use python; then
 		ebegin "Installing Python Bindings (g15daemon.py)"
 		cd "${WORKDIR}/pyg15daemon"
 		installation() {
 			insinto $(python_get_sitedir)
 			doins g15daemon.py
 		}
 		python_execute_function installation
 		docinto python
 		dodoc AUTHORS
 	fi
 }
 pkg_postinst() {
 	if use python; then
 		python_mod_optimize g15daemon.py
 		echo ""
 	fi
 	elog "To use g15daemon, you need to add g15daemon to the default runlevel."
 	elog "This can be done with:"
 	elog "# /sbin/rc-update add g15daemon default"
 	elog "You can edit some g15daemon options at /etc/conf.d/g15daemon"
 	elog ""
 	elog "To have all new keys working in X11, you'll need create a "
 	elog "specific xmodmap in your home directory or edit the existent one."
 	elog ""
 	elog "Create the xmodmap:"
 	elog "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap"
 	elog ""
 	elog "Adding keycodes to an existing xmodmap:"
 	elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
 }
 pkg_postrm() {
 	if use python; then
 		python_mod_cleanup g15daemon.py
 	fi
 }
--- a/app-misc/gentoo/gentoo-0.20.7.ebuild
+++ b/app-misc/gentoo/gentoo-0.20.7.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ~ppc64 sparc x86"
 IUSE="nls"
 RDEPEND="
--- a/app-misc/gramps/metadata.xml
+++ b/app-misc/gramps/metadata.xml
@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<!-- maintainer-needed -->
 		<email>kevin@kblob.com</email>
 		<name>Kevin Simmons</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
 GRAMPS helps you track your family tree. It allows you to store, edit,
 and research genealogical data. GRAMPS attempts to provide all of the
--- a/app-misc/iguanaIR/Manifest
+++ b/app-misc/iguanaIR/Manifest
@ -1,2 +1 @@
 DIST iguanaIR-0.93.tar.bz2 1006655 SHA256 4a2f546eb0f99a3617efe20676633f06e2b74f8b352be939acff30d226cabca8 SHA512 c955c366aba87f58638ed187657ff4c73e03dc3a8f0295ea740ce612bb38f639fa48c56735156268712a6fd00c85b132e14819fb7cf21988dbb18cc0cc4fce9d WHIRLPOOL d051fa30aaa70e2e53b4f7ec7aac28d30126e57d92ffac4e6bfa5aa7a749b66cb54ba4d82f288770d90a05e136c596503f2079be262afd06aabf1b9d9de4ef34
 DIST iguanaIR-1.0.1.tar.bz2 287572 SHA256 1ba324667671892b2a36aee0089d0afafd266f8b255b073b113eb5ab71f38fcc SHA512 d70e792d6d51b99d9d82e4411bb16de24846d87b5066592734b614a866cdfb317f3aafbab6ef478552b57c4077776daa6db89b44201103ecaec8fd44df041e0e WHIRLPOOL 5b04d462c30b8e141b95614de8e08a951792d3f0e0bf71f535ba84c15f0b445ac136f296d7be5f829cf9f0aec37267af4ca6f9b9ad5d8a7936003bfa94c0023a
--- a/app-misc/iguanaIR/files/iguanaIR-0.93-asneeded.patch
+++ b/app-misc/iguanaIR/files/iguanaIR-0.93-asneeded.patch
@ -1,29 +0,0 @@
 --- iguanaIR-0.93.orig/Makefile.in	2009-12-13 15:27:50.942734390 +0100
 +++ iguanaIR-0.93/Makefile.in	2009-12-13 15:29:58.580486676 +0100
@@ -48,14 +48,14 @@
 igclient igdaemon: libiguanaIR.so
 libiguanaIR.so: iguanaIR.o support.o dataPackets.o pipes.o base.o
 -	$(CC) -shared $(CPPFLAGS) $^ -lpopt -lrt -o $@
 +	$(CC) -shared $(CPPFLAGS) $^ -o $@ -lpopt -lrt
 igdaemon: daemon.o client-interface.o device-interface.o usbclient.o \
           list.o compatibility.o
 -	$(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LIBS) -lusb -L. -liguanaIR -o $@
 +	$(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ -L. -liguanaIR -lusb -lpopt
 igclient: client.o list.o
 -	$(CC) $(CPPFLAGS) $^ -lpopt -L. -liguanaIR -o $@
 +	$(CC) $(CPPFLAGS) $^ -o $@ -L. -liguanaIR -lpopt
 %.o: %.c Makefile iguanaIR.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
@@ -71,7 +71,7 @@
 	swig $(CPPFLAGS) -python $<
 _iguanaIR.so: iguanaIR_wrap.c
 -	$(CC) $(CPPFLAGS) -shared $(CFLAGS) -Wno-strict-aliasing -Wno-unused -Wno-implicit-function-declaration -Wno-long-long @PYTHON_CPPFLAGS@ $^ -L. -liguanaIR -o $@
 +	$(CC) $(CPPFLAGS) -shared $(CFLAGS) -Wno-strict-aliasing -Wno-unused -Wno-implicit-function-declaration -Wno-long-long @PYTHON_CPPFLAGS@ $^ -o $@ -L. -liguanaIR
 endif
 .PHONY: install
--- a/app-misc/iguanaIR/files/iguanaIR-0.93-gentoo.diff
+++ b/app-misc/iguanaIR/files/iguanaIR-0.93-gentoo.diff
@ -1,34 +0,0 @@
 diff -Naur iguanaIR-0.93.orig/iguanaIR.gentoo.init iguanaIR-0.93/iguanaIR.gentoo.init
 --- iguanaIR-0.93.orig/iguanaIR.gentoo.init	2008-03-20 15:34:46.000000000 +0100
 +++ iguanaIR-0.93/iguanaIR.gentoo.init	2008-03-20 15:38:06.000000000 +0100
@@ -1,7 +1,7 @@
 #!/sbin/openrc-run
 # load the settings
 -[ -f /etc/default/iguanaIR ] && . /etc/default/iguanaIR
 +[ -f /etc/iguanaIR/iguanaIR ] && . /etc/iguanaIR/iguanaIR
 # common defaults
 IGPATH=/usr/bin/igdaemon
 diff -Naur iguanaIR-0.93.orig/Makefile.in iguanaIR-0.93/Makefile.in
 --- iguanaIR-0.93.orig/Makefile.in	2008-03-20 15:34:46.000000000 +0100
 +++ iguanaIR-0.93/Makefile.in	2008-03-20 15:36:49.000000000 +0100
@@ -79,12 +79,12 @@
 	install -D igclient $(DESTDIR)/usr/bin/igclient
 	install -D igdaemon $(DESTDIR)/usr/bin/igdaemon
 	install -D libiguanaIR.so $(DESTDIR)/usr/$(LIBDIR)/libiguanaIR.so
 -	install -D iguanaIR.init $(DESTDIR)/etc/rc.d/init.d/iguanaIR
 -	install -D --mode=0644 iguanaIR.options $(DESTDIR)/etc/default/iguanaIR
 -	install -D iguanaIR.h $(DESTDIR)/usr/include/iguanaIR.h
 -	install -D --mode 644 plug-trigger/udev/iguanaIR.rules \
 -	                      $(DESTDIR)/etc/udev/rules.d/iguanaIR.rules
 -	install --mode 755 -d $(DESTDIR)/etc/udev/devices/iguanaIR
 +	install -D iguanaIR.gentoo.init $(DESTDIR)/etc/init.d/iguanaIR
 +	install -D --mode=0644 iguanaIR.options $(DESTDIR)/etc/iguanaIR/iguanaIR
 +	install -D --mode=0644 iguanaIR.h $(DESTDIR)/usr/include/iguanaIR.h
 +#	install -D --mode=644 plug-trigger/udev/iguanaIR.rules \
 +#	                      $(DESTDIR)/etc/udev/rules.d/iguanaIR.rules
 +#	install --mode 755 -d $(DESTDIR)/etc/udev/devices/iguanaIR
 # This is for fairly old versions of Fedora....
 #	install -D --mode 644 plug-trigger/hotplug/iguanaIR.usermap \
 #	                      $(DESTDIR)/etc/hotplug/usb/iguanaIR.usermap
--- a/app-misc/iguanaIR/iguanaIR-0.93.ebuild
+++ b/app-misc/iguanaIR/iguanaIR-0.93.ebuild
@ -1,42 +0,0 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=4
 inherit eutils flag-o-matic python
 DESCRIPTION="library for Irman control of Unix software"
 HOMEPAGE="http://iguanaworks.net/index.php"
 SRC_URI="http://iguanaworks.net/downloads/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 RDEPEND="dev-libs/popt
 	virtual/libusb:0"
 DEPEND="${RDEPEND}
 	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )"
 pkg_setup() {
 	append-flags -fPIC
 	python_set_active_version 2
 	python_pkg_setup
 }
 src_prepare() {
 	sed -i -e 's:CFLAGS =:CFLAGS ?=:' Makefile.in || die
 	epatch \
 		"${FILESDIR}"/${P}-gentoo.diff \
 		"${FILESDIR}"/${P}-asneeded.patch
 }
 src_install() {
 	emake DESTDIR="${D}" install
 	insinto /lib/udev/rules.d
 	doins "${FILESDIR}"/40-iguanaIR.rules
 }
--- a/Show More
+++ b/Show More
`@ -1,2 +1 @@`
	`DIST cdist-3.1.13.tar.gz 303245 SHA256 9363b25d3119ca6266a3066fcae145009e00253745bd81987d92ebcb9e10f987 SHA512 df6562dda7b4fcedcc8e651f33f5ce59a7d6c297a32f7685529865a4d965b9111f352ddd38a15ba28dc5cc53385a483ec87cc43b235ef9eee02512b7fabc6f41 WHIRLPOOL d0b7ad0955d6a16018a9dd1d452afd714e819a0427dc685e20745847658a0c0a3323dd1f5d03967547bb879e448f09ea84ba69a11fa00ea6dcd06ce3180ef6c5`	`DIST cdist-4.4.1.tar.gz 377850 SHA256 adf4c558667aaec010fa391524c0c5a9f07e89b658d51e515bc04baf79ac8bbc SHA512 ed955c48c708c5b97dc803d3b8ea8742581b7b0153c2494dad64cecbaca00bad414c624f77caa9d5cea44130adea3b5a547bbbf3db2d5546ea694f4c736bd3b4 WHIRLPOOL f7e8e17dec5f1fbc64aefbda99147709eb67e4c54c931e77841f0490ec3dad16e2a0d9892c75986e70325f23dc185cb02c6cd872e34f3cf76f36605ba3ff1bb3`
	`DIST cdist-3.1.9.tar.gz 260817 SHA256 37eb340a83f52f035468b817d9f1218c5954ba2910fb7a800dfe04cf8abae85b SHA512 e2cc40a38961fa5cbb6f51fc5ea2f6a8a1f86cd5b42d85204f2f71e2aba8393d5041a63e756d7c5666cc30c9ab528a9e0e5bccaea8c5a9ed079453cc87d76d06 WHIRLPOOL 41f9d06401149e06969f3d799c7b812e6a992ade3892c6de9f0723bf2a697d45a6c4d1fc46805ee81c340d1f8cb5ffead32d45e7e5bb8b46cbf6aca8a53dd7fa`
`@ -1,2 +1 @@`
	`DIST libarchive-3.2.1.tar.gz 5448888 SHA256 72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2 SHA512 a5d43cb0bf36b687fabfbc874e7adc1fa94c563e7f073e107db8d4e79e8d0d8146cb985809f8115fbb882fc2d8a2a477d0a7364e93e6df62f292bb5e9865ec5c WHIRLPOOL 1dd79ec3d7cf53be237d6730476c6a47c0722a5a7d0f2adc347aa491ba95ba7c77342a39a9e3d0fbff64111b552bb558cb571aa74dd6c18e6c60987bf0f41d7c`
	`DIST libarchive-3.2.2.tar.gz 5458241 SHA256 691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f SHA512 a67920c37d49cf9478032d77fc4fa21827cebb96e9b83d9ecb8466328834052e4ab3d3a9bc4e2edf405d6cb14ffd648c9fa100b578257f6e5842c99bbea558a7 WHIRLPOOL 8fdc2e9245db27a7da3cfdeecb6283b170a25fc6ea8201fe5a414b4c1b523ae6b05745246f867f24062d91b7a040780b687b1a44a95503c4e252f9836218ffef`	`DIST libarchive-3.2.2.tar.gz 5458241 SHA256 691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f SHA512 a67920c37d49cf9478032d77fc4fa21827cebb96e9b83d9ecb8466328834052e4ab3d3a9bc4e2edf405d6cb14ffd648c9fa100b578257f6e5842c99bbea558a7 WHIRLPOOL 8fdc2e9245db27a7da3cfdeecb6283b170a25fc6ea8201fe5a414b4c1b523ae6b05745246f867f24062d91b7a040780b687b1a44a95503c4e252f9836218ffef`
`@ -1 +1,2 @@`
	`DIST ddcutil-0.6.0.tar.gz 323380 SHA256 ae435699578297cdb40006471e046576e825d971c6c867822568660d815e966a SHA512 ab5882c22e7cbf17f8513a80443a25b2d1698e45b2fd3bf6f163fd86691808a5244830da2664b882ddc6592a9228afbd9f4c8f6821115167fd28b114c986e172 WHIRLPOOL 37a334a0075b08f0b6e01cc721d414aedb9e06f36fc295698662616c5fbf98ca4c256eba91344748409766fa9139173335d14b8243bc0ee7404c2914a10b38c6`	`DIST ddcutil-0.6.0.tar.gz 323380 SHA256 ae435699578297cdb40006471e046576e825d971c6c867822568660d815e966a SHA512 ab5882c22e7cbf17f8513a80443a25b2d1698e45b2fd3bf6f163fd86691808a5244830da2664b882ddc6592a9228afbd9f4c8f6821115167fd28b114c986e172 WHIRLPOOL 37a334a0075b08f0b6e01cc721d414aedb9e06f36fc295698662616c5fbf98ca4c256eba91344748409766fa9139173335d14b8243bc0ee7404c2914a10b38c6`
		`DIST ddcutil-0.7.0.tar.gz 400076 SHA256 3da9be53ecba1b3000cf859bb4b212649bb6255526866c528d9d5b03eec77f93 SHA512 c81783fdfdfeeb88e81ee107e3bf3dfbf34541e83b4c8291816e547a1ff83b10767aec2a6db1c691895f38f6f81aba608a51cf6b6461761d756d916ad19343cf WHIRLPOOL ef5f1695c742f1617daef7f55c37ba8c8ae627b87b2ef9ea75334dad985a3ba91104f1d928d2aebe9a3ec13bfc605f07b6a93441c7d9a337fd86aa918635c03d`
`@ -1,2 +1 @@`
	`DIST iguanaIR-0.93.tar.bz2 1006655 SHA256 4a2f546eb0f99a3617efe20676633f06e2b74f8b352be939acff30d226cabca8 SHA512 c955c366aba87f58638ed187657ff4c73e03dc3a8f0295ea740ce612bb38f639fa48c56735156268712a6fd00c85b132e14819fb7cf21988dbb18cc0cc4fce9d WHIRLPOOL d051fa30aaa70e2e53b4f7ec7aac28d30126e57d92ffac4e6bfa5aa7a749b66cb54ba4d82f288770d90a05e136c596503f2079be262afd06aabf1b9d9de4ef34`
	`DIST iguanaIR-1.0.1.tar.bz2 287572 SHA256 1ba324667671892b2a36aee0089d0afafd266f8b255b073b113eb5ab71f38fcc SHA512 d70e792d6d51b99d9d82e4411bb16de24846d87b5066592734b614a866cdfb317f3aafbab6ef478552b57c4077776daa6db89b44201103ecaec8fd44df041e0e WHIRLPOOL 5b04d462c30b8e141b95614de8e08a951792d3f0e0bf71f535ba84c15f0b445ac136f296d7be5f829cf9f0aec37267af4ca6f9b9ad5d8a7936003bfa94c0023a`	`DIST iguanaIR-1.0.1.tar.bz2 287572 SHA256 1ba324667671892b2a36aee0089d0afafd266f8b255b073b113eb5ab71f38fcc SHA512 d70e792d6d51b99d9d82e4411bb16de24846d87b5066592734b614a866cdfb317f3aafbab6ef478552b57c4077776daa6db89b44201103ecaec8fd44df041e0e WHIRLPOOL 5b04d462c30b8e141b95614de8e08a951792d3f0e0bf71f535ba84c15f0b445ac136f296d7be5f829cf9f0aec37267af4ca6f9b9ad5d8a7936003bfa94c0023a`