Sync with portage [Sat Jan 14 23:14:04 MSK 2017].

2017-01-14 23:14:04 +03:00 · 2017-01-14 23:14:04 +03:00 · a2ac4c7a1b
commit a2ac4c7a1b
parent 8c6f9686c2
1041 changed files with 9782 additions and 10673 deletions
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,4 +1,5 @@
 DIST ansible-1.9.6.tar.gz 941457 SHA256 50773781b1e76f2885bbeb2351a97cf1c6a29239d3e073da939a104e7e81ee5d SHA512 97ea17f032bf253c53d5e1f79071603f0b3b7caffe4e267534cf181ab88b7186d953c41203c762e0650ab70302bde7e84bb5ee8bcd03153a3e4a76e41d1a3bec WHIRLPOOL b26390090aeabd2a6e8e27916a7cc0e89e0041715bd036118f034292da52df55107d27c577fe38e838b3455d3167cf3e876533fa47fe184d02ebfaa98cf46f5e
 DIST ansible-2.1.3.0.tar.gz 1851643 SHA256 a3bb0487687b70d5586277f0f0c9a419d05ad1811b81fa18535a568e5d064c0b SHA512 6a73a361a89e2785ba5157e309e18c04e2dd09a4133f9ab437d0b05f4e56790bc0430e08976638306c0254aa6b8eac4b558bbcd058f8f5bdba420de8f48c8c34 WHIRLPOOL 7dbb85ddb4533a2b4189aec7aa911a173e51646902bca71c7fdad2fadb7e3f3b88b3463dbf4a75913df0a9c72b3073dbad4b6c962dd484f638d5c58b5112ec4d
+DIST ansible-2.1.4.0-0.3.rc3.tar.gz 1856688 SHA256 53f6e183576867d2ee17071a55fc7eea4875b92976bbeae02f6f96101cd910a5 SHA512 15bb447617aa144458407aef0239fb374dc14492e7409a7c186dc98facf15fc7b054f5696b9d5184ac79d985ed17f01caafb6f59bb01dd72f06d80fde249d550 WHIRLPOOL e119f93833dbfebc47ac2f7ba4b21352dc28081d8f6d12c05d2cf0216e387a765ddb79d29000aca27c874ebccd303d6ec14fc93061979c87215c82e57d0a41c9
 DIST ansible-2.2.0.0.tar.gz 2441851 SHA256 d9f198d293394ce0f8ba802561b21368888e3301036a706b5584641b49408586 SHA512 8bb8360f41e920c46552ead826a342311d0acffa264334c8c8ae868f8bf45caad4ff2b9c9c0ec4e551653edaf80eb49d8dece5c2ba7e1088c2ce74d3ff0e3130 WHIRLPOOL 911ba4959fbca8527e9cf4b46c86cefc415433cab21486ff47302d02e60c4c2da1abc91c7ab564642a518acd5a5c1cbc8b3930ef7f596518c5aa358f001f4064
-DIST ansible-2.2.1.0-0.1.rc1.tar.gz 1665098 SHA256 c0ac6f74970cb798b8ba11e0508d43cfcd623510c9075afef9db72b96734f0d9 SHA512 5e0d5e4efe1cf14c2f09a673816d9c62c19cc2d5c9ee566320fb35c72f8fd5fad608473adb5ad0fd2711bdd5deb33d2e1f00ef019c05062b5edd621fc52ce653 WHIRLPOOL 51b75cf601668344a70717184cac52f9fa0f611d631f3bd18b4b75fdc2c10d654374d79a6099c6a9db3c04124fd37adc4c3a5d2511ba2e44b7f34a0a2439bad5
+DIST ansible-2.2.1.0-0.5.rc5.tar.gz 2454925 SHA256 af4c186c9e7c010496425904a14183c3a15af6f160d725a37920135af60b54cd SHA512 5e2078181e54e6713ea0674fa7c6334023e65354334c192f19945631e4215cf8cc871e93f3e1c2af411c053c4185f3e6ba81f24c0ee7b59d75c9144fa7500f5b WHIRLPOOL cd71658a3ace432f2efab4aa0ada38acf5f03eb33f74e50a4c5e5357ef46e6048044cbc600d43fbe3b18f685de1988aede13ca0d649945b5370a2a93f0f82b57
--- a/app-admin/ansible/ansible-2.1.4.0_rc3.ebuild
+++ b/app-admin/ansible/ansible-2.1.4.0_rc3.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+MY_V="$(get_version_component_range 1-4)"
+MY_PV="${MY_V}-0.3.rc3"
+SRC_URI="http://releases.ansible.com/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="keyczar test"
+
+RDEPEND="
+	keyczar? ( dev-python/keyczar[${PYTHON_USEDEP}] )
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	<dev-python/jinja-2.9[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		<dev-python/mock-1.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+S=${WORKDIR}/${PN}-${MY_V}
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+}
--- a/app-admin/ansible/ansible-2.2.1.0_rc5.ebuild
+++ b/app-admin/ansible/ansible-2.2.1.0_rc5.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$

@ -10,9 +10,9 @@ inherit distutils-r1 eutils versionator

 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="http://ansible.com/"
-# This is a release candidate, so we need to do things a little differently
-MY_PV="$(get_version_component_range 1-4)-0.1.rc1"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+MY_V="$(get_version_component_range 1-4)"
+MY_PV="${MY_V}-0.5.rc5"
+SRC_URI="http://releases.ansible.com/${PN}/${PN}-${MY_PV}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
@ -45,7 +45,7 @@ DEPEND="
 		dev-vcs/git
 	)"

-S=${WORKDIR}/${PN}-${MY_PV}
+S=${WORKDIR}/${PN}-${MY_V}

 # not included in release tarball
 RESTRICT="test"
--- a/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~mips x86 ~x86-fbsd"
 IUSE=""

 RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -1,3 +1,4 @@
 DIST sudo-1.8.16.tar.gz 2707358 SHA256 2d83826fc5125bf073acc203dbda1cf2abeee017090ccc9dddb0431a53d5064d SHA512 7cf5399eb65c4b39071213c27c34d35ed2ea9c4578f19f6e8d3777179914fa30a2848c042e9f85e90e3b5d056322b9eb6c79e2d3b9b210a795e9921a1b00200b WHIRLPOOL 747bff26e93475441aab6bb6ff8e51114f8155277d570cbdb28909b7e63a49fcdcf5d65f186a2ec067f1100cac3c0a2e6f3a7611f78d83794f41d6884a8c6fc9
 DIST sudo-1.8.18p1.tar.gz 2822109 SHA256 e5a0471c721281a693025bbde33ebd9d3db43245d83ab8516bbfc23980379434 SHA512 8dceeb5024c4f94fcc15e75fa2fd164af5e0597734f95df43207738b3258c4d396e102faf2b6811e399f1cdbdbf617b87e5bfcc1e591ea6722f45d81d1098fe5 WHIRLPOOL 094c1232517706a6da4a0548f7ab5c0c7b9e12f8ce584db97d0c4793a38c4044538637f2834b9f3104326bd5b4b826d08ab79b1dc2c5b950de7d7f558685ef7b
 DIST sudo-1.8.19p1.tar.gz 2860124 SHA256 b8afb1cf8736b6c61f171f2bf4b174818d9e00e92ef73da55fabcd01286ffc92 SHA512 99fd482d34166021210b96959404aec22b4e793d04fd2037f7ca07118a817fe17ce2133662f20b820aa1f409e8f153ee3c1635e775a667dd4c95bcc94bfd6474 WHIRLPOOL a8ae1ac6a1af8b4e23a61efa00372a67fce6d171ef1a13b60a2d93a1326098f016906875a097567002794e1d61d0b45966f12099ac21fa0de5f1db8b54b93a2a
+DIST sudo-1.8.19p2.tar.gz 2861855 SHA256 237e18e67c2ad59ecacfa4b7707198b09fcf84914621585a9bc670dcc31a52e0 SHA512 21c83403e7ff219a273b2c4873be0d858997558ca150bc8239379a9dfcc587fdd7c0c49cdf4cdc27dfd6dd45f9f089fa034b58bfcee07dceb4a481542251b3fc WHIRLPOOL 550ed115ea711d6ba9aa698cd988295b74327dd770d79b6852f9f3f00a1c0420bbdcce5cc7c49467e0cf8a57fc79dbcfc73edaf3ad697e06ba9fd48919fece0b
--- a/app-admin/sudo/sudo-1.8.19_p2.ebuild
+++ b/app-admin/sudo/sudo-1.8.19_p2.ebuild
@ -0,0 +1,202 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils pam multilib libtool
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+*_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="http://www.sudo.ws/"
+SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+	ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
+fi
+IUSE="ldap nls pam offensive selinux skey +sendmail"
+
+DEPEND="pam? ( virtual/pam )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-sudo )
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	sendmail? ( virtual/mta )"
+DEPEND="${DEPEND}
+	sys-devel/bison"
+
+S=${WORKDIR}/${MY_P}
+
+REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+set_rootpath() {
+	# FIXME: secure_path is a compile time setting. using ROOTPATH
+	# is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path ..."
+
+	# first extract the default ROOTPATH from build env
+	ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+	if [[ -z ${ROOTPATH} ]] ; then
+		ewarn "	Failed to find ROOTPATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:$thisp
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		ROOTPATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${ROOTPATH} ; do
+			for e ; do [[ $thisp == $e ]] && continue 2 ; done
+			newpath+=:$thisp
+		done
+		ROOTPATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local ROOTPATH
+	set_rootpath
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	econf \
+		--enable-zlib=system \
+		--with-secure-path="${ROOTPATH}" \
+		--with-editor="${EPREFIX}"/usr/libexec/editor \
+		--with-env-editor \
+		$(use_with offensive insults) \
+		$(use_with offensive all-insults) \
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \
+		$(use_with ldap) \
+		$(use_enable nls) \
+		$(use_with pam) \
+		$(use_with skey) \
+		$(use_with selinux) \
+		$(use_with sendmail) \
+		--without-opie \
+		--without-linux-audit \
+		--with-rundir="${EPREFIX}"/var/run/sudo \
+		--with-vardir="${EPREFIX}"/var/db/sudo \
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP
+		dosbin plugins/sudoers/sudoers2ldif
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins doc/schema.OpenLDAP sudo.schema
+	fi
+
+	pamd_mimic system-auth sudo auth account session
+
+	keepdir /var/db/sudo
+	fperms 0700 /var/db/sudo
+
+	# Don't install into /var/run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${D}"/var/run
+}
+
+pkg_postinst() {
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@ -1,3 +1,2 @@
 DIST bonnie++-1.97.2.tgz 102533 SHA256 3f34a4c52ae9b2c3d493af8f794ba18cbf6732e9b76c3a4fa64549d95d914ce3 SHA512 e8303720be9a4ebcc454dbc8906a6843d63909c5101d66524a126ce0db3db7113d01edb7ed2f292bf9d08a6799579c4960f0ee4595019fbacda1601eba52a170 WHIRLPOOL 1f66eef8a583ce9cb851a6c301019ba76d104bf3a6322d504cd7c8d1eb073c48235efcff6fec2b2f49207aa696db1071c55c94a3943a01917b2a7aa7349b0b73
 DIST bonnie++-1.97.3.tgz 100166 SHA256 e27b386ae0dc054fa7b530aab6bdead7aea6337a864d1f982bc9ebacb320746e SHA512 44de20b5e46aeaf7f7214766b3c555b8799138f6fd92f87fe9b7dfa6f19815c629d6122c2ef4e4d98a5528dbfcd4c70b3b850eeba05739f6dd20251bf8d7c893 WHIRLPOOL d889c059b0bd5fb77948fd60aee3d1926f2967464a72e4c287cd14d2946e8dc73059d775bb4cfe1c0065ecbe159543dfdd519d880207974e50ec978a666721af
-DIST bonnie++-1.97.tgz 102604 SHA256 44f5a05937648a6526ba99354555d7d15f2dd392e55d3436f6746da6f6c35982 SHA512 985fd4d0ef643fda5363e61609a5d73206ecfdd1c27470cc7babeaf9b7d87136c6bf40f62366d3f3ea58c50a307fa62aea59dc5efa69854fff9c43d1c940d3ab WHIRLPOOL 23af9926691868a208fd69f7ec401fa0c2332835ccc63e4b0143497faabb02f21ddd56a41014b532287f4418e0ac92c712aff2bc0657ad2512961fa5aa3567b9
--- a/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-DESCRIPTION="Hard drive bottleneck testing benchmark suite"
-HOMEPAGE="http://www.coker.com.au/bonnie++/"
-SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug"
-
-S="${WORKDIR}/${P}.1"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.96-compile-flags.patch" #426788
-	"${FILESDIR}"/${P}-zcav-array-indexing-fix.patch #309319
-)
-
-DOCS=( README.txt README-2.00 debian/changelog credits.txt )
-HTML_DOCS=( readme.html )
-
-src_configure() {
-	econf \
-		$(usex debug "--enable-debug" "") \
-		--disable-stripping
-}
-
-src_install() {
-	dobin bonnie++ zcav bon_csv2html bon_csv2txt
-	sed -i -e \
-		"s:/usr/share/doc/bonnie++:${EPREFIX}/usr/share/doc/${PF}/html:g" \
-		bonnie++.8 || die #431684
-	doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
-	einstalldocs
-}
--- a/app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild
@ -10,7 +10,7 @@ SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"

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

 S="${WORKDIR}/${P}"
--- a/app-crypt/ccid/ccid-1.4.24.ebuild
+++ b/app-crypt/ccid/ccid-1.4.24.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="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/loop-aes-losetup/loop-aes-losetup-2.21.ebuild
+++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.21.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ MY_P="util-linux-${MY_PV}"
 LOOPAES_PV="${PV}-20120228"
 S="${WORKDIR}/${MY_P}"

-DESCRIPTION="Various useful Linux utilities"
+DESCRIPTION="Loop-AES losetup utility"
 HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
 SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
 	http://loop-aes.sourceforge.net/updates/util-linux-${LOOPAES_PV}.diff.bz2"
--- a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.26.ebuild
+++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.26.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,7 @@ MY_P="util-linux-${MY_PV}"
 LOOPAES_PV="${PV}-20150310"
 S="${WORKDIR}/${MY_P}"

-DESCRIPTION="Various useful Linux utilities"
+DESCRIPTION="Loop-AES losetup utility"
 HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
 SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
 	http://loop-aes.sourceforge.net/updates/util-linux-${LOOPAES_PV}.diff.bz2"
--- a/app-crypt/mcrypt/files/mcrypt-2.6.8-format-string.patch
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-format-string.patch
@ -1,5 +1,5 @@
--- src/errors.c
-+++ src/errors.c
+--- a/src/errors.c
+++ b/src/errors.c
@@ -25,24 +25,24 @@
 
 void err_quit(char *errmsg)
--- a/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch
@ -1,5 +1,5 @@
--- src/rfc2440.c	2008-11-17 06:50:01.000000000 +1100
-+++ src/rfc2440.c	2010-08-10 13:48:28.000000000 +1000
+--- a/src/rfc2440.c	2008-11-17 06:50:01.000000000 +1100
+++ b/src/rfc2440.c	2010-08-10 13:48:28.000000000 +1000
@@ -23,7 +23,7 @@
 #include <zlib.h>
 #endif
--- a/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild
+++ b/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+DESCRIPTION="replacement of the old unix crypt(1)"
+HOMEPAGE="http://mcrypt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-macos"
+IUSE="nls"
+
+DEPEND=">=dev-libs/libmcrypt-2.5.8
+	>=app-crypt/mhash-0.9.9
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.7-qa.patch"
+	"${FILESDIR}/${P}-stdlib.h.patch"
+	"${FILESDIR}/${P}-segv.patch"
+	"${FILESDIR}/${P}-sprintf.patch"
+	"${FILESDIR}/${P}-format-string.patch"
+	"${FILESDIR}/${P}-overflow.patch"
+)
+
+src_configure() {
+	econf $(use_enable nls)
+}
--- a/app-crypt/mcrypt/metadata.xml
+++ b/app-crypt/mcrypt/metadata.xml
@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-    <name>Robin H. Johnson</name>
-  </maintainer>
  <maintainer type="project">
    <email>crypto@gentoo.org</email>
    <name>Crypto</name>
--- a/app-crypt/mhash/metadata.xml
+++ b/app-crypt/mhash/metadata.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-    <name>Robin H. Johnson</name>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
  </maintainer>
  <upstream>
    <remote-id type="sourceforge">mhash</remote-id>
--- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="library providing a uniform interface to a large number of hash algorithms"
+HOMEPAGE="http://mhash.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="dev-lang/perl" # pod2html
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.9-fix-mem-leak.patch"
+	"${FILESDIR}/${PN}-0.9.9-fix-snefru-segfault.patch"
+	"${FILESDIR}/${PN}-0.9.9-fix-whirlpool-segfault.patch"
+	"${FILESDIR}/${PN}-0.9.9-autotools-namespace-stomping.patch"
+	"${FILESDIR}/${P}-remove_premature_free.patch"
+	"${FILESDIR}/${P}-force64bit-tiger.patch"
+	"${FILESDIR}/${P}-align.patch"
+	"${FILESDIR}/${P}-alignment.patch"
+)
+
+DOCS=(
+	doc/{example.c,skid2-authentication}
+	doc/mhash.html
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's/--netscape//' \
+		"${S}"/doc/Makefile.in
+}
+
+src_configure() {
+	# https://sourceforge.net/p/mhash/patches/11/
+	export ac_cv_func_malloc_0_nonnull=yes
+
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	emake -C doc mhash.html
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
--- a/app-crypt/nasty/files/nasty-0.6-flags.patch
+++ b/app-crypt/nasty/files/nasty-0.6-flags.patch
@ -1,5 +1,5 @@
--- Makefile
-+++ Makefile
+--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,16 @@
 VERSION=0.6
 
--- a/app-crypt/nasty/metadata.xml
+++ b/app-crypt/nasty/metadata.xml
@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-  <email>crypto@gentoo.org</email>
-  <name>Crypto</name>
-</maintainer>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
 </pkgmetadata>
--- a/app-crypt/nasty/nasty-0.6-r1.ebuild
+++ b/app-crypt/nasty/nasty-0.6-r1.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="2"
+EAPI="6"

-inherit eutils toolchain-funcs
+inherit toolchain-funcs

 DESCRIPTION="Proof-of-concept GPG passphrase recovery tool"
 HOMEPAGE="http://www.vanheusden.com/nasty/"
@ -16,15 +16,15 @@ IUSE=""
 RDEPEND="app-crypt/gpgme"
 DEPEND="${RDEPEND}"

-src_prepare() {
-	epatch "${FILESDIR}/${P}-flags.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${P}-flags.patch"
+)

 src_compile() {
-	emake CC="$(tc-getCC)" DEBUG= || die "emake failed"
+	emake CC="$(tc-getCC)" DEBUG=
 }

 src_install() {
-	dobin nasty || die "dobin nasty failed"
+	dobin nasty
 	dodoc readme.txt
 }
--- a/app-crypt/onak/metadata.xml
+++ b/app-crypt/onak/metadata.xml
@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-  <email>crypto@gentoo.org</email>
-  <name>Crypto</name>
-</maintainer>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
 </pkgmetadata>
--- a/app-crypt/onak/onak-0.4.0.ebuild
+++ b/app-crypt/onak/onak-0.4.0.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=2
-inherit autotools eutils
+EAPI=6
+inherit autotools

 DESCRIPTION="onak is an OpenPGP keyserver"
 HOMEPAGE="http://www.earth.li/projectpurple/progs/onak.html"
@ -18,8 +18,7 @@ DEPEND="berkdb? ( >=sys-libs/db-4 )
 	postgres? ( dev-db/postgresql[server] )"

 src_prepare() {
-	# Merged upstream
-	#epatch "${FILESDIR}"/${P}-berkdb-5.0.patch
+	default
 	eautoreconf
 }

@ -37,7 +36,7 @@ src_install() {
 	keepdir /var/lib/onak
 	dosbin onak maxpath sixdegrees onak-mail.pl
 	dobin splitkeys stripkey
-	doman *.[1-8]
+	doman *[^0].[1-8]
 	insinto /etc
 	doins onak.conf
 	dodir /var/lib/onak/doc
--- a/app-crypt/quickcrypt/metadata.xml
+++ b/app-crypt/quickcrypt/metadata.xml
@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-  <email>crypto@gentoo.org</email>
-  <name>Crypto</name>
-</maintainer>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
 </pkgmetadata>
--- a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
+++ b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+MY_P=${P/-/_}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="gives you a quick MD5 Password from any string"
+HOMEPAGE="http://linux.netpimpz.com/quickcrypt/"
+SRC_URI="http://linux.netpimpz.com/quickcrypt/download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64 ~ia64 ~hppa ~mips"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.6
+	virtual/perl-Digest-MD5"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin quickcrypt
+	dodoc README BUGS
+}
--- a/app-editors/pluma/pluma-1.16.0-r1.ebuild
+++ b/app-editors/pluma/pluma-1.16.0-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$

@ -58,7 +58,8 @@ COMMON_DEPEND="dev-libs/atk:0
 	)
 	!!app-editors/mate-text-editor"

-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]"

 DEPEND="${COMMON_DEPEND}
 	~app-text/docbook-xml-dtd-4.1.2
--- a/app-emacs/edb/Manifest
+++ b/app-emacs/edb/Manifest
@ -1 +1,2 @@
 DIST edb-1.31.tar.gz 585728 SHA256 f97bc288af71c5011aa6c251ac0bbf458b30b926b1c1a1f12e2cb0470e0e4c38 SHA512 99af00f1e876b490205e9c3b1807d0af0efcd9a5bff018629f00e36d1572f7d05e979d6bfb50f9c15edfe3ad5382fa6f6171f13c638f3143ece53790bdaa31c3 WHIRLPOOL 53f7b8f47ef0030bf5967bf2983602f15aa7bdaf397ffae4598a9a0c6f7b58346e9abb6d118ec65180b6f72534a92221b2a7c01ab1d965e986cca074c4d55dba
+DIST edb-1.32.tar.gz 692581 SHA256 b85046de79f00eccadb0181840771385ee9e3a40ae745e503c750c70debd1e80 SHA512 ee8bd642c019d30401202f540b37f28c914c17083123ca61b741de72d168ecb855d0508f922af208bb717b02b4819cf6f3c5137d589f2e858410a3e9ab4034e0 WHIRLPOOL 267c4642b9b1a0ebf8d78391b35ee6a6ae30efcaca3bc3bad83121b03fae105ea462db9c540b3c7b121de9d6c16f347c69d657054794a18fa2c9e6c65b3f3a81
--- a/app-emacs/edb/edb-1.32.ebuild
+++ b/app-emacs/edb/edb-1.32.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="EDB, The Emacs Database"
+HOMEPAGE="http://www.gnuvola.org/software/edb/
+	http://www.emacswiki.org/emacs/EmacsDataBase"
+SRC_URI="http://www.gnuvola.org/software/edb/${P}.tar.gz"
+
+LICENSE="GPL-3+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+	default
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake -j1 \
+		sitelisp="${ED}${SITELISP}" \
+		infodir="${ED}/usr/share/info" \
+		install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc AUTHORS BUGS ChangeLog HACKING NEWS README THANKS TODO doc/refcard.ps
+	dodoc -r examples
+}
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@ -1,2 +1,3 @@
 DIST docker-compose-1.10.0_rc1.tar.gz 164196 SHA256 122a8eae97e0f80ddcf82cc194b274ff46cf92ba9f6ad66b4a2080b62c366ba9 SHA512 3e93cd686f887e5fab1be4d084cbae515142aaa01a511cc8904969288cf63cc9e4959a93d9fd0d7750ec9b17b3d9dba9724c13c088be66f69d053c2ebcaab947 WHIRLPOOL 9d77c4a0c9daa3dc032aba0cdaa763c59eb0b34fb1e523fb710b61129aaf5fb3f2671c58b43b2eae31ccfad246aa4dd9a3d335b2676aa8429e227a6dac5b6645
+DIST docker-compose-1.10.0_rc2.tar.gz 164871 SHA256 54cf58d7b0dbdffbe1b3131326277fb9b7ff535b4c16bb1a72754983cad31738 SHA512 ca08f665de893d1774d5bb2759053dcd9a32e42061e26b4fe6cc09beff64da625ef6ec9c669a144f80b2cc8ee3673cc64f6d465bb36096c254efeb680472a448 WHIRLPOOL ce991effaf60358ae3c5911eafcbbef20ca3b2de84bb9497eaabb0430844902e5901de24f228019c85fb979eed3f76acc52775cff4d5f6e9d2954ba42be9a13b
 DIST docker-compose-1.9.0.tar.gz 156392 SHA256 98fb664c79c06a0777af2540b83eaa63c6a05ae7eb9e7417193899df2f96e27f SHA512 9d145807406ce4de3e91245bba4f774d80e0a39a81115fc111624e1a56b7e8a7505d49700df68b062efc65f8de661c8dca08067615a7504b3d7adf6c15d156d0 WHIRLPOOL ca64f1e8e9c830c3cab01193be0d809cbb80fbea2a451dd7f51ff688d76a376a047bdc781471b292de06a275f933ebf755c4b24cc60fe19fe77fb4729101b9e5
--- a/app-emulation/docker-compose/docker-compose-1.10.0_rc2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.10.0_rc2.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit bash-completion-r1 distutils-r1 vcs-snapshot
+
+MY_PV=${PV//_/}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/cached-property-2[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.4[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.0.1[${PYTHON_USEDEP}]
+	<dev-python/docker-py-3.0[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+	<dev-python/requests-2.12[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.8.1[${PYTHON_USEDEP}]
+	<dev-python/texttable-0.9[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@ -1,4 +1,3 @@
 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_rc5.tar.gz 7743446 SHA256 6213320b23c9f2bd38e197d0612e695d9677b84c1dd2b71f3c0f998caeb51408 SHA512 f8afaecf42585a46cbeb0457fff46e5c78cdceff437b52bd4009c351310bdc4efdee274031b6354c999308f3b8d376a3c45ebca13272ffc586212553d2f386cb WHIRLPOOL 81ed9d7758ebcd1e0856401dd3a7a37a6038ac69a7690f89082020ba1607bf8d9ca6566e9aa350253cc457789808c49c79f80b8a9cd5b6580df9a123df93086d
 DIST docker-1.13.0_rc6.tar.gz 7744500 SHA256 ee8166529a47e7aeb28b12e93161a24b71cc5382256aa7b0aac652853b563a8e SHA512 19ea7d4256f30e90d30eb8cf41ba6c76cba8900bbee85ec183686e365cbf0b7766768f3e7bdec18bcf86c93749ff51b36eba2074811ee9c6fddec455f0de8ebd WHIRLPOOL ba54e42ba5ef14b339b78f74ca88daab0f8ee230dca63175361d6b6133975479b7345d9849c983fdd3ae9d60addc9fb58bb2e0494112201b4d4604b0009ea66b
--- a/app-emulation/docker/docker-1.13.0_rc5.ebuild
+++ b/app-emulation/docker/docker-1.13.0_rc5.ebuild
@ -1,287 +0,0 @@
-# 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="43cc971"
-	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-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-shells/bash-completion/bash-completion-2.4-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.4-r1.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.ta

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

 RDEPEND=">=app-shells/bash-4.3_p30-r1
--- a/app-shells/fish/fish-2.4.0-r1.ebuild
+++ b/app-shells/fish/fish-2.4.0-r1.ebuild
@ -4,8 +4,6 @@

 EAPI=6

-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
 DESCRIPTION="fish is the Friendly Interactive SHell"
 HOMEPAGE="http://fishshell.com/"
 SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
@ -13,7 +11,7 @@ SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="X"
+IUSE=""

 RDEPEND="
 	>=dev-libs/libpcre2-10.21[pcre32]
@ -72,5 +70,8 @@ pkg_postinst() {
 	elog "  dev-python/backports-lzma"
 	elog "  >=dev-lang/python-3.3"
 	elog
+	elog "If you have issues with cut'n'paste in X-terminals, install the"
+	elog "x11-misc/xsel package."
+	elog
 	elog "Have fun!"
 }
--- a/app-shells/hstr/hstr-1.21-r1.ebuild
+++ b/app-shells/hstr/hstr-1.21-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$

@ -6,13 +6,13 @@ EAPI=6

 inherit autotools multilib-minimal

-DESCRIPTION="Shell history suggest box"
+DESCRIPTION="shell history suggest box"
 HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
 SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"

 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""

 RDEPEND="
--- a/app-text/dos2unix/dos2unix-7.3.4.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.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$

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

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

 RDEPEND="
--- a/app-text/htmldoc/htmldoc-1.8.29.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.29.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="http://www.msweet.org/projects.php?Z1"
 IUSE="fltk"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 sparc x86"

 DEPEND=">=media-libs/libpng-1.4:0=
 	virtual/jpeg:0
--- a/app-text/libmspub/libmspub-0.1.2.ebuild
+++ b/app-text/libmspub/libmspub-0.1.2.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$

@ -16,7 +16,7 @@ SLOT="0"

 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86"

 IUSE="doc static-libs"

--- a/dev-cpp/gccxml/gccxml-0.9.0_pre20131217.ebuild
+++ b/dev-cpp/gccxml/gccxml-0.9.0_pre20131217.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.xz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"

 src_prepare() {
 	# fix bug 549300 by restoring pre-GCC5 inline semantics
--- a/dev-db/redis/redis-3.0.7.ebuild
+++ b/dev-db/redis/redis-3.0.7.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 @@ HOMEPAGE="http://redis.io/"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"

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

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

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

--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@ -1,4 +1 @@
-DIST simgear-2016.3.1.tar.bz2 1199016 SHA256 ae46e1273673be41028ee912d1826e87185ab594053c493707f9dbdeea5159dd SHA512 5c0e260da8b09e815cd6607f3e977b5827f450e9fbe10bfaef019d7489506905fde56a5ab6748165431088bbae7fa61d4bccc27e4d7828c8bc6a05247b450716 WHIRLPOOL c349848d7e85166d7161272d722bebed7b387e6cd4c9db6cd405e3d042ee212b4448231eb92e0a86b8dc00c497af2c69455edd7d7d1cd4007d9ca09e91e575a7
-DIST simgear-2016.4.3.tar.bz2 1201326 SHA256 6933550215818c2043b84df01b6bf5f7adef218c8648b510b8202e394003d2bd SHA512 aaf56f195fed9957ba4bd8b17deb1985596ed793e131723a6f81f85a4d4f178a923c5f2df3d53dca88957fc46f887b086353b99500c3f56952a70ae34f734b5e WHIRLPOOL 190e642919fb3ac519f683743b090729be410f06b5f4129abe43e8c542aed68a34e186d612c3760552d658e52060cf33735e653014f8a5171d3c825904a148e0
 DIST simgear-2016.4.4.tar.bz2 1200320 SHA256 5514fd0006bbfcdbdc0e2dab7da41eae491ea03a6246cc6a009590032b2fc1dc SHA512 f7b9124e40dba347cd73304fc1b20a5b6d09eb476bc41949d5be615be968a6a66f64141b87819bfa357bd1fd376b2e1fc18334eb1d4df2d4f1e3f95ef4a1928d WHIRLPOOL 3fb4d580d84633a6a852f6a8ab5e708afde9616b636bb5b49d30b56ed232d9938606f602d473e51855605d2544b364691ae362ec974f56b34e32507a37752221
-DIST simgear-3.4.0.tar.bz2 1057455 SHA256 927d66fe72aacb9dacced4506430bd5fc7726bc8d3d07d6f1866bc4cb11a5894 SHA512 9ebf49ea2f024f0e52a4d18ba6f77361e7b9f51a0e7238661b4b2fd9db0176bdd948612d9b4aec3ae4d8210676e7533dfc0308b9c71bdeb22e99a68b90d81320 WHIRLPOOL bb48b6640409a96816ade77c22a91f88c452d339165dd0241354c26ff27572a14538ecfd91265c239def4621657be8766c081cffc237711a691d7ef54461b548
--- a/dev-games/simgear/files/simgear-3.4.0-osg340_fixes.patch
+++ b/dev-games/simgear/files/simgear-3.4.0-osg340_fixes.patch
@ -1,203 +0,0 @@
-commit 51ff30f386ac098f477ff16c71756bcd089dcfae
-Author: Tim Moore <timoore33@gmail.com>
-Date:   Sun Apr 19 17:11:49 2015 +0200
-
-    changes for OSG 3.3.4 and later
-    
-    The public interfaces to osgText and osg::GLExtensions changed.
-
-diff --git a/simgear/canvas/elements/CanvasText.cxx b/simgear/canvas/elements/CanvasText.cxx
-index 4b7600f..ead600b 100644
--- a/simgear/canvas/elements/CanvasText.cxx
-+++ b/simgear/canvas/elements/CanvasText.cxx
-@@ -159,8 +159,12 @@ namespace canvas
- 
-     if( empty() )
-       return pos;
-
-+#if OSG_VERSION_LESS_THAN(3,3,4)
-     GlyphQuads::Coords2 const& coords = _quads->_coords;
-+#else
-+    GlyphQuads::Coords2 refCoords = _quads->_coords;
-+    GlyphQuads::Coords2::element_type &coords = *refCoords.get();
-+#endif
-     size_t global_i = _begin + i;
- 
-     if( global_i == _begin )
-@@ -194,7 +198,12 @@ namespace canvas
-       return cursorPos(0);
- 
-     GlyphQuads::Glyphs const& glyphs = _quads->_glyphs;
-+    #if OSG_VERSION_LESS_THAN(3,3,4)
-     GlyphQuads::Coords2 const& coords = _quads->_coords;
-+#else
-+    GlyphQuads::Coords2 refCoords = _quads->_coords;
-+    GlyphQuads::Coords2::element_type &coords = *refCoords.get();
-+#endif
- 
-     float const HIT_FRACTION = 0.6;
-     float const character_width = _text->getCharacterHeight()
-@@ -627,7 +636,13 @@ namespace canvas
- 
-     const GlyphQuads& quads = _textureGlyphQuadMap.begin()->second;
-     const GlyphQuads::Glyphs& glyphs = quads._glyphs;
-    const GlyphQuads::Coords2& coords = quads._coords;
-+#if OSG_VERSION_LESS_THAN(3,3,4)
-+    GlyphQuads::Coords2 const& coords = quads._coords;
-+#else
-+    GlyphQuads::Coords2 refCoords = quads._coords;
-+    GlyphQuads::Coords2::element_type &coords = *refCoords.get();
-+#endif
-+
-     const GlyphQuads::LineNumbers& line_numbers = quads._lineNumbers;
- 
-     float wr = _characterHeight / getCharacterAspectRatio();
-diff --git a/simgear/scene/material/Technique.cxx b/simgear/scene/material/Technique.cxx
-index 93a17b8..96856cd 100644
--- a/simgear/scene/material/Technique.cxx
-+++ b/simgear/scene/material/Technique.cxx
-@@ -326,9 +326,15 @@ public:
-             = GL2Extensions::Get(static_cast<unsigned>(contextId), true);
-         if (!extensions)
-             return;
-+#if OSG_VERSION_LESS_THAN(3,3,3)
-         if (!extensions->isGlslSupported())
-             return;
-         value = extensions->getLanguageVersion();
-+#else
-+        if (!extensions->isGlslSupported)
-+            return;
-+        value = extensions->glslLanguageVersion;
-+#endif
-     }
- };
- 
-@@ -357,7 +363,11 @@ public:
-            = GL2Extensions::Get(static_cast<unsigned>(contextId), true);
-        if (!extensions)
-            return;
-+#if OSG_VERSION_LESS_THAN(3,3,3)
-        value = extensions->isGlslSupported();
-+#else
-+       value = extensions->isGlslSupported;
-+#endif
-    }
- };
- 
-diff --git a/simgear/scene/sky/CloudShaderGeometry.cxx b/simgear/scene/sky/CloudShaderGeometry.cxx
-index 8b4ea16..7800839 100644
--- a/simgear/scene/sky/CloudShaderGeometry.cxx
-+++ b/simgear/scene/sky/CloudShaderGeometry.cxx
-@@ -127,8 +127,12 @@ void CloudShaderGeometry::drawImplementation(RenderInfo& renderInfo) const
-         
-         sortData.frameSorted = frameNumber;
-     }
-    
-+
-+#if OSG_VERSION_LESS_THAN(3,3,3)
-     const Extensions* extensions = getExtensions(state.getContextID(),true);
-+#else
-+    const GLExtensions* extensions = GLExtensions::Get(state.getContextID(), true);
-+#endif
-     GLfloat ua1[3] = { (GLfloat) alpha_factor,
-                        (GLfloat) shade_factor,
-                        (GLfloat) cloud_height };
-diff --git a/simgear/scene/tgdb/ShaderGeometry.cxx b/simgear/scene/tgdb/ShaderGeometry.cxx
-index 5d286c3..ac9ec93 100644
--- a/simgear/scene/tgdb/ShaderGeometry.cxx
-+++ b/simgear/scene/tgdb/ShaderGeometry.cxx
-@@ -47,7 +47,11 @@ void ShaderGeometry::addObject(const Vec3& position, float scale,
- void ShaderGeometry::drawImplementation(osg::RenderInfo& renderInfo) const
- {
-     State& state = *renderInfo.getState();
-+#if OSG_VERSION_LESS_THAN(3,3,3)
-     const Extensions* extensions = getExtensions(state.getContextID(), true);
-+#else
-+    const GLExtensions* extensions = GLExtensions::Get(state.getContextID(), true);
-+#endif
-     Vec4Array::const_iterator citer = _posScaleArray->begin();
-     Vec4Array::const_iterator cend = _posScaleArray->end();
-     FloatArray::const_iterator viter = _vertexAttribArray->begin();
-diff --git a/simgear/scene/util/SGSceneFeatures.cxx b/simgear/scene/util/SGSceneFeatures.cxx
-index 4367e45..79f182f 100644
--- a/simgear/scene/util/SGSceneFeatures.cxx
-+++ b/simgear/scene/util/SGSceneFeatures.cxx
-@@ -25,11 +25,13 @@
- 
- #include "SGSceneFeatures.hxx"
- 
-+#include <osg/Version>
- #include <osg/FragmentProgram>
- #include <osg/VertexProgram>
- #include <osg/Point>
- #include <osg/PointSprite>
- #include <osg/Texture>
-+#include <osg/GLExtensions>
- 
- #include <OpenThreads/Mutex>
- #include <OpenThreads/ScopedLock>
-@@ -84,12 +86,18 @@ SGSceneFeatures::setTextureCompression(osg::Texture* texture) const
- bool
- SGSceneFeatures::getHavePointSprites(unsigned contextId) const
- {
-+#if OSG_VERSION_LESS_THAN(3,3,3)
-   return osg::PointSprite::isPointSpriteSupported(contextId);
-+#else
-+  const osg::GLExtensions* ex = osg::GLExtensions::Get(contextId, true);
-+  return ex && ex->isPointSpriteSupported;
-+#endif
- }
- 
- bool
- SGSceneFeatures::getHaveFragmentPrograms(unsigned contextId) const
- {
-+#if OSG_VERSION_LESS_THAN(3,3,3)
-   const osg::FragmentProgram::Extensions* fpe;
-   fpe = osg::FragmentProgram::getExtensions(contextId, true);
-   if (!fpe)
-@@ -98,11 +106,16 @@ SGSceneFeatures::getHaveFragmentPrograms(unsigned contextId) const
-     return false;
-   
-   return true;
-+#else
-+  const osg::GLExtensions* ex = osg::GLExtensions::Get(contextId, true);
-+  return ex && ex->isFragmentProgramSupported;
-+#endif
- }
- 
- bool
- SGSceneFeatures::getHaveVertexPrograms(unsigned contextId) const
- {
-+#if OSG_VERSION_LESS_THAN(3,3,3)
-   const osg::VertexProgram::Extensions* vpe;
-   vpe = osg::VertexProgram::getExtensions(contextId, true);
-   if (!vpe)
-@@ -111,6 +124,10 @@ SGSceneFeatures::getHaveVertexPrograms(unsigned contextId) const
-     return false;
-   
-   return true;
-+#else
-+  const osg::GLExtensions* ex = osg::GLExtensions::Get(contextId, true);
-+  return ex && ex->isVertexProgramSupported;
-+#endif
- }
- 
- bool
-@@ -124,6 +141,7 @@ SGSceneFeatures::getHaveShaderPrograms(unsigned contextId) const
- bool
- SGSceneFeatures::getHavePointParameters(unsigned contextId) const
- {
-+#if OSG_VERSION_LESS_THAN(3,3,3)
-   const osg::Point::Extensions* pe;
-   pe = osg::Point::getExtensions(contextId, true);
-   if (!pe)
-@@ -131,5 +149,9 @@ SGSceneFeatures::getHavePointParameters(unsigned contextId) const
-   if (!pe->isPointParametersSupported())
-     return false;
-   return true;
-+#else
-+  const osg::GLExtensions* ex = osg::GLExtensions::Get(contextId, true);
-+  return ex && ex->isPointParametersSupported;
-+#endif
- }
- 
--- a/dev-games/simgear/simgear-2016.3.1.ebuild
+++ b/dev-games/simgear/simgear-2016.3.1.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-SLOT="0"
-IUSE="+dns debug subversion test"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	>=dev-games/openscenegraph-3.2.0
-	media-libs/openal
-	net-misc/curl
-	sys-libs/zlib
-	virtual/opengl
-	dns? ( net-libs/udns )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.44
-"
-RDEPEND="${COMMON_DEPEND}
-	subversion? ( dev-vcs/subversion )
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DNS=$(usex dns)
-		-DENABLE_PKGUTIL=ON
-		-DENABLE_RTI=OFF
-		-DENABLE_SOUND=ON
-		-DENABLE_TESTS=$(usex test)
-		-DSIMGEAR_HEADLESS=OFF
-		-DSIMGEAR_SHARED=ON
-		-DSYSTEM_EXPAT=ON
-		-DSYSTEM_UDNS=ON
-		-DUSE_AEONWAVE=OFF
-		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
-	)
-	cmake-utils_src_configure
-}
--- a/dev-games/simgear/simgear-2016.4.3.ebuild
+++ b/dev-games/simgear/simgear-2016.4.3.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="+dns debug subversion test"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	>=dev-games/openscenegraph-3.2.0
-	media-libs/openal
-	net-misc/curl
-	sys-libs/zlib
-	virtual/opengl
-	dns? ( net-libs/udns )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.44
-"
-RDEPEND="${COMMON_DEPEND}
-	subversion? ( dev-vcs/subversion )
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DNS=$(usex dns)
-		-DENABLE_PKGUTIL=ON
-		-DENABLE_RTI=OFF
-		-DENABLE_SOUND=ON
-		-DENABLE_TESTS=$(usex test)
-		-DSIMGEAR_HEADLESS=OFF
-		-DSIMGEAR_SHARED=ON
-		-DSYSTEM_EXPAT=ON
-		-DSYSTEM_UDNS=ON
-		-DUSE_AEONWAVE=OFF
-		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
-	)
-	cmake-utils_src_configure
-}
--- a/dev-games/simgear/simgear-2016.4.4.ebuild
+++ b/dev-games/simgear/simgear-2016.4.4.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="http://www.simgear.org/"
 SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"

 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 SLOT="0"
 IUSE="+dns debug subversion test"

--- a/dev-games/simgear/simgear-3.4.0.ebuild
+++ b/dev-games/simgear/simgear-3.4.0.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
-SRC_URI="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-SLOT="0"
-IUSE="debug subversion test"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	>=dev-games/openscenegraph-3.2.0
-	media-libs/openal
-	sys-libs/zlib
-	virtual/opengl
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.44
-"
-RDEPEND="${COMMON_DEPEND}
-	subversion? ( dev-vcs/subversion )
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-PATCHES=( "${FILESDIR}/${P}-osg340_fixes.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PKGUTIL=ON
-		-DENABLE_RTI=OFF
-		-DENABLE_SOUND=ON
-		-DSIMGEAR_HEADLESS=OFF
-		-DSIMGEAR_SHARED=ON
-		-DSYSTEM_EXPAT=ON
-		$(cmake-utils_use_enable test TESTS)
-	)
-	cmake-utils_src_configure
-}
--- a/dev-lang/lua/lua-5.1.5-r4.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r4.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~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 ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+deprecated emacs readline static"

 RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )"
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@ -1,7 +1,5 @@
-DIST ocaml-3.12.1.tar.bz2 2949124 SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7 WHIRLPOOL b7bf4844452ab52027e6b785159df6e4defc548d2f3d31eb73dc0dc05214e7c19ed654c8b3ff234a85691599df0be568ba02fafe257856be7f603177584a7ca0
 DIST ocaml-4.02.3.tar.xz 2058552 SHA256 83c6697e135b599a196fd7936eaf8a53dd6b8f3155a796d18407b56f91df9ce3 SHA512 a815421f6a320b18e7f351bd66884024ad4a33525ba161a198ea356892ce331be6c1ddf4cd07d120ebe9a902bcf815ce1b17e45f405e4e0b2d55ce1b6d2adada WHIRLPOOL 1104cdcf23b773ebf0c0ef8d8ee36b2b4b58b1fab10a41ff7f2d522c34ae6161bc6cba28b279eea03ac183a111fc332557084b017d0c2ad6f9c969204e309597
 DIST ocaml-4.03.0.tar.xz 2289296 SHA256 695caf381105183f9d37bcfb63f863f782352b070e5d7ff3ca269712398fe326 SHA512 9a7f4b17d459373334fb04f8a0d42732243245bf16bc35c935fb2119c7990d0c85549b2e11adea68a98a0a0171a461ccfbb2e249b59eedf90349f087a18ce243 WHIRLPOOL 9c822f7c66494a6e7fc30e565e7c8d120808a15b42cd64ccad0946f8413da44b50ec84dfd658e8f394dce4effe7eda380a0a203db14df9dfc24c7b54f7681cea
 DIST ocaml-4.04.0.tar.gz 4057711 SHA256 03e49d09d5a509216ca0cc8fccd10df3ad9dd441d7633e89974a74e149be3c51 SHA512 288c514e7ccfe29fe9a65239d04f000b3b05df71f15bc05b3e5af50cb233544b4fec22baad69f60de587e8f0f8f65ee023a5b709896a1a68f9fd6fe30b81344d WHIRLPOOL 91fea4195ed84fb97f2ae68e30f47ce60a2404bc47ca809f6e0d182dd755833ea16a2e033ee0a02fab008f5905a2a9b6fa8dc2194c75b8d9daa353eb6b1d70e9
-DIST ocaml-patches-3.tar.bz2 4101 SHA256 c4ceb604f4480c78d1cf4f848b0903c8d37798d9761f582d8d1643d4e38b8658 SHA512 8be5c44de5a6b0b7c14723e41d92fe807b881b218cc5eee38ea7519c0f971415cb7fe30035303da275089dcb8a61c4f334c4a88e0bdbced3953503794b8308a7 WHIRLPOOL f1920606785702c44dead01b1426145653bc1931acba2d614c6818baddc051e4f74ca0322cae66ade63ba0cd0df5651cfd67f511fca5f12973b67a0c50ebab6d
 DIST ocaml-patches-7.tar.bz2 2194 SHA256 71e9496af89ded9852d8e1f32be18a5f0d7e11270958fb4bc8c588420b1e9156 SHA512 63bca96f009e2de24ff6f7a4b37b97c5b7655d5ad6196f06cc2b18ca213e87878a310d169378c341c00aaac698530e458e301620bcc21284bc8b9ea143f642dd WHIRLPOOL 02d17436f901c70b2fa8a104d8b7a6526c65ab9b40408b549c4f4dfe7a1eeae8213620d151fb181833782504e4d7cb6fa3ff7ddebe77efcb88d32fe057cbd8cc
 DIST ocaml-patches-8.tar.bz2 1803 SHA256 bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512 fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411 WHIRLPOOL ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
--- a/dev-lang/ocaml/ocaml-3.12.1.ebuild
+++ b/dev-lang/ocaml/ocaml-3.12.1.ebuild
@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="1"
-
-inherit flag-o-matic eutils multilib versionator toolchain-funcs
-
-PATCHLEVEL="3"
-MY_P="${P/_/+}"
-DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
-HOMEPAGE="http://www.ocaml.org/"
-SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.bz2
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="emacs gdbm latex ncurses +ocamlopt tk X xemacs"
-
-RDEPEND="tk? ( >=dev-lang/tk-3.3.3 )
-	ncurses? ( sys-libs/ncurses )
-	X? ( x11-libs/libX11 x11-proto/xproto )
-	gdbm? ( sys-libs/gdbm )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
-	xemacs? ( app-xemacs/ocaml )"
-
-S="${WORKDIR}/${MY_P}"
-pkg_setup() {
-	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
-	# results in relocations if gcc wants to create a PIE executable
-	if gcc-specs-pie ; then
-		append-ldflags -nopie
-		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
-		ewarn "We have appended -nopie to ocaml build options"
-		ewarn "because linking an executable with pie while the objects are not pic will not work"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	# Bug #459512
-	epatch "${FILESDIR}/${PN}-4.01.0-pkg-config-ncurses.patch"
-}
-
-src_compile() {
-	export LC_ALL=C
-	local myconf=""
-
-	# Causes build failures because it builds some programs with -pg,
-	# bug #270920
-	filter-flags -fomit-frame-pointer
-	# Bug #285993
-	filter-mfpmath sse
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	use tk || myconf="${myconf} -no-tk"
-	use ncurses || myconf="${myconf} -no-curses"
-	use X || myconf="${myconf} -no-graph"
-	use gdbm || myconf="${myconf} -no-dbm"
-
-	# ocaml uses a home-brewn configure script, preventing it to use econf.
-	RAW_LDFLAGS="$(raw-ldflags)" ./configure -prefix /usr \
-		--bindir /usr/bin \
-		--libdir /usr/$(get_libdir)/ocaml \
-		--mandir /usr/share/man \
-		-host "${CHOST}" \
-		-cc "$(tc-getCC)" \
-		-as "$(tc-getAS)" \
-		-aspp "$(tc-getCC) -c" \
-		-partialld "$(tc-getLD) -r" \
-		--with-pthread ${myconf} || die "configure failed!"
-
-	emake -j1 world || die "make world failed!"
-
-	# Native code generation can be disabled now
-	if use ocamlopt ; then
-		# bug #279968
-		emake -j1 opt || die "make opt failed!"
-		emake -j1 opt.opt || die "make opt.opt failed!"
-	fi
-}
-
-src_install() {
-	make BINDIR="${D}"/usr/bin \
-		LIBDIR="${D}"/usr/$(get_libdir)/ocaml \
-		MANDIR="${D}"/usr/share/man \
-		install || die "make install failed!"
-
-	# Install the compiler libs
-	dodir /usr/$(get_libdir)/ocaml/compiler-libs
-	insinto /usr/$(get_libdir)/ocaml/compiler-libs
-	doins {utils,typing,parsing}/*.{mli,cmi,cmo}
-	use ocamlopt && doins {utils,typing,parsing}/*.{cmx,o}
-
-	# Symlink the headers to the right place
-	dodir /usr/include
-	dosym /usr/$(get_libdir)/ocaml/caml /usr/include/
-
-	# Remove ${D} from ld.conf, as the buildsystem isn't $(DESTDIR) aware
-	dosed "s:${D}::g" /usr/$(get_libdir)/ocaml/ld.conf
-
-	dodoc Changes INSTALL README Upgrading
-
-	# Create and envd entry for latex input files (this definitely belongs into
-	# CONTENT and not in pkg_postinst.
-	if use latex ; then
-		echo "TEXINPUTS=/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
-		doenvd "${T}"/99ocamldoc
-	fi
-
-	# Install ocaml-rebuild portage set
-	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/ocaml.conf" || die
-}
-
-pkg_postinst() {
-	echo
-	ewarn "OCaml is not binary compatible from version to version, so you"
-	ewarn "need to rebuild all packages depending on it, that are actually"
-	ewarn "installed on your system. To do so, you can run:"
-	ewarn "emerge @ocaml-rebuild"
-	ewarn "Or, (almost) equivalently: emerge -1 /usr/$(get_libdir)/ocaml"
-	echo
-}
--- a/dev-lang/ocaml/ocaml-4.02.3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.02.3.ebuild
@ -17,7 +17,7 @@ LICENSE="QPL-1.0 LGPL-2"
 # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
 # so here we go with the subslot.
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="emacs latex ncurses +ocamlopt X xemacs"

 RDEPEND="
--- a/dev-lang/php/php-5.6.29.ebuild
+++ b/dev-lang/php/php-5.6.29.ebuild
@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"

 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
--- a/dev-lang/tcl/tcl-8.6.6.ebuild
+++ b/dev-lang/tcl/tcl-8.6.6.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"

 LICENSE="tcltk"
 SLOT="0/8.6"
-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 ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug +threads"

 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
--- a/dev-lang/tk/tk-8.6.6.ebuild
+++ b/dev-lang/tk/tk-8.6.6.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"

 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug +threads truetype aqua xscreensaver"

 RDEPEND="
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@ -0,0 +1 @@
+DIST appstream-0.10.5.tar.gz 1797978 SHA256 b3f17f49c4ad7a503954f7baee16f47ba0f845c5e684798b1109db881bba2a06 SHA512 c427234049c8e8e158a7d64dc2dab6c3ea155dfe6fc0df1c2a5cd5ab611c65e36bf86ac57de69eb3dcff5ed5f71f37aef5d239e356e8e0a7a4fa763f246efb14 WHIRLPOOL bc127f66a20df1a946cdf64e66c6e4e3ea4c50653f174d6afc6f7eaa136d55352c7df2bb178ce452100ba95ab59304009546f5515f11221145b5be4274eb6841
--- a/dev-libs/appstream/appstream-0.10.5.ebuild
+++ b/dev-libs/appstream/appstream-0.10.5.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_TEST="true"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = live ]]; then
+	EGIT_REPO_URI="https://github.com/ximion/${PN}"
+else
+	inherit versionator
+	MY_PV="$(replace_all_version_separators '_')"
+	MY_P="APPSTREAM_${MY_PV}"
+	SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_P}"
+fi
+
+DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
+HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
+
+LICENSE="LGPL-2.1+ GPL-2+"
+# check APPSTREAM_LIB_API_LEVEL
+SLOT="0/4"
+IUSE="apt doc qt5"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	dev-libs/libyaml
+	dev-libs/snowball-stemmer
+	qt5? ( dev-qt/qtcore:5 )
+"
+DEPEND="${RDEPEND}
+	dev-util/itstool
+	sys-devel/gettext
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSTEMMING=ON
+		-DL18N=ON
+		-DVAPI=OFF
+		-DMAINTAINER=OFF
+		-DSANITIZERS=OFF
+		-DDOCUMENTATION=OFF
+		-DAPT_SUPPORT=$(usex apt)
+		-DINSTALL_PREBUILT_DOCS=$(usex doc)
+		-DQT=$(usex qt5)
+	)
+
+	kde5_src_configure
+}
--- a/dev-libs/appstream/metadata.xml
+++ b/dev-libs/appstream/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="apt">Enables Debians APT support</flag>
+	</use>
+</pkgmetadata>
--- a/dev-libs/botan/botan-1.10.14.ebuild
+++ b/dev-libs/botan/botan-1.10.14.ebuild
@ -13,7 +13,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="http://botan.randombit.net/"
 SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz"

-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm hppa ~ia64 ~ppc ~ppc64 sparc x86 ~ppc-macos"
 SLOT="0"
 LICENSE="BSD"
 IUSE="bindist doc python bzip2 gmp ssl static-libs threads zlib"
--- a/dev-libs/crossguid/crossguid-0_pre20150817.ebuild
+++ b/dev-libs/crossguid/crossguid-0_pre20150817.ebuild
@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/graeme-hill/crossguid"

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

 # We use libuuid from util-linux.
--- a/dev-libs/fstrm/fstrm-0.2.0-r1.ebuild
+++ b/dev-libs/fstrm/fstrm-0.2.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,7 @@ SRC_URI="https://github.com/farsightsec/${PN}/releases/download/v${PV}/${P}.tar.

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 x86"
 IUSE="static-libs utils"

 RDEPEND="utils? ( dev-libs/libevent[${MULTILIB_USEDEP}] )"
--- a/dev-libs/hiredis/hiredis-0.13.3.ebuild
+++ b/dev-libs/hiredis/hiredis-0.13.3.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0/0.13"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-solaris"
 IUSE="examples static-libs test"

 DEPEND="test? ( dev-db/redis )"
--- a/dev-libs/libdbh/libdbh-5.0.19.ebuild
+++ b/dev-libs/libdbh/libdbh-5.0.19.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/dbh/dbh/${PV}/${MY_P}.tar.gz"

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

 RDEPEND=""
--- a/dev-libs/libfastjson/libfastjson-0.99.4.ebuild
+++ b/dev-libs/libfastjson/libfastjson-0.99.4.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="http://www.rsyslog.com/tag/libfastjson/"
 SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/4.0.0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
 IUSE="static-libs"

 DEPEND=">=sys-devel/autoconf-archive-2015.02.04"
--- a/dev-libs/liblognorm/liblognorm-2.0.2.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.2.ebuild
@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~hppa ~x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm ~hppa x86 ~amd64-linux"
 fi

 LICENSE="LGPL-2.1 Apache-2.0"
--- a/dev-libs/libmcrypt/metadata.xml
+++ b/dev-libs/libmcrypt/metadata.xml
@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>robbat2@gentoo.org</email>
-		<name>Robin H. Johnson</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">mcrypt</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">mcrypt</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-libs/libtubo/libtubo-5.0.15.ebuild
+++ b/dev-libs/libtubo/libtubo-5.0.15.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/xffm/${PN}/${MY_P}.tar.bz2"

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

 RDEPEND=""
--- a/dev-libs/nspr/nspr-4.13.1.ebuild
+++ b/dev-libs/nspr/nspr-4.13.1.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"

 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"

 RDEPEND="
--- a/dev-libs/nss/nss-3.28.1.ebuild
+++ b/dev-libs/nss/nss-3.28.1.ebuild
@ -20,7 +20,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$

 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert +nss-pem utils"
 CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@ -2,3 +2,4 @@ DIST serd-0.18.2.tar.bz2 291053 SHA256 8e3d8402c33fa217572d3ee936919037420fb237f
 DIST serd-0.20.0.tar.bz2 363807 SHA256 64515f4f5eb27ba2ba151027a72a77672f6ee8a2a3b58991ad5c045135feabbf SHA512 d313abb6423b0b1dd30b5c4f7ede45a5e51b3c8676b49215e106a75d73280e07c48b3895f2d88aeac2117eaf9c82cdb58bfc530895ad17a34d810c256868d1ef WHIRLPOOL 0cb4e6b9c870cc2bf5a34eb5c25a4a5fbcc90737ac646688338b9529baa774da29cd9f8659cdcc8f13e714949ea0ed840af28ed81a869465f8902b3e24cbeb27
 DIST serd-0.22.0.tar.bz2 340371 SHA256 7b030287b4b75f35e6212b145648bec0be6580cc5434caa6d2fe64a38562afd2 SHA512 532f9bcf1edafb4fb74c521c11e3582133096068c883ecdfb97483c1344de6c2effc7cef8efa0c5d919667d5ef51e3f62af0a02faf0d518216e0746933a859d3 WHIRLPOOL 11e3757a322b578ee648e53774d0390de4b295f5f8c187a8f7dc6bc59249845d890548324107b7c9dbf03ab851a61e9e71f5997e1fdefafeaf5610350292d58f
 DIST serd-0.24.0.tar.bz2 346615 SHA256 8cfb8ade8d9a6f784da6e00ac05a28b7de440df5d2513796cd34aaa2754f6a6c SHA512 c62e869c584340ea5ea9f2f52a279281f792770ae4ccdde5a5355b23f428e5f8a32e29c3bd521d2a846d62e17b691758764dbd814b9b67203e264be2fe5a81ed WHIRLPOOL 7e1c171726c814b1546c95521de49295ea468fdc31534f556eada6edd9596d83b147d18b9eb1cfa07e42f508982a93962ecfd5bbd140abdc1bfe6cf0cfb7da42
+DIST serd-0.26.0.tar.bz2 369280 SHA256 e3e44a88f90a9971d55e6cbd59a7b9cfa97cfc17c512fed7166a4252d5209298 SHA512 749bf161d38cb8489f196ece2bf2b7c22e9113d05b38452592d92f9ffdec25d340e680e697e9531dab80d2ef04600690f9333208a4ef22307b8ed8e238d5c7b8 WHIRLPOOL 04d79bf1ae348690fcb96dc8adee4cc32b48c3163d08684acdc6f70704228af5138f1718d9b5a26ce6b8c8e1d134ecdce6694266e3e6f6517973f36db90996c3
--- a/dev-libs/serd/serd-0.26.0.ebuild
+++ b/dev-libs/serd/serd-0.26.0.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils
+
+DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
+HOMEPAGE="http://drobilla.net/software/serd/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(use test && echo "--test") \
+		$(use doc && echo "--docs") \
+		$(use static-libs && echo "--static")
+}
+
+src_test() {
+	./waf test || die
+}
--- a/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild
+++ b/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/ocaml/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"

 DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@ -1,3 +1,2 @@
-DIST findlib-1.4.tar.gz 231526 SHA256 6e4065e5d79d31176ec213ff94599c4eae17c3904c2896e845d0379a99f1bdf8 SHA512 7ee5bee74f6fc14c8d85496e673d42b63e056d35a724fe4f78fd1010a5af4506a9a962c0403fd96d5bf51f2278bfbe98a60aad65a171803cbde935cc3889157b WHIRLPOOL 31f1d0b9f1605a9a536ae996fb4abe5e1d5c47012759cb7bb45185d58a81e827d80285628b113f79d51b8b260cdff181c3eb05596adeea9a87070994058fce17
 DIST findlib-1.5.6.tar.gz 250865 SHA256 7743b3dcaf8a344c882e89f61601f7f086d46c0f2ea4fcc3e54069236825e3f8 SHA512 18d23861a25b1508cb419af4cdd6e3cd83d51bef259f162c86b91460cf3dad75d6c2fc11173f60fe36b61ce3f81b78e69344f093adb9a82c36256d95180e93d8 WHIRLPOOL eb374e60c3f2fcc6172ec08803fbc5b0e83ea0d38644b4c13cb3d27b3dc13c7240a4f49a9ee51f9465ac6ff6075140c3e98b3eb0ea48690f260f139f37dfb63c
 DIST findlib-1.7.1.tar.gz 256883 SHA256 5d4b9a79e9abf8be0b509f6b8cf5696221cbe14fa2fbb2bb352342755fd15eef SHA512 1c8002dc2ed1804afc78c2aa92ab55d2b6501fbb021a7ca46698b4de0dea8ad6485a64f7bf9ec5f3df888da1a420ab270efb5e26f1e408cc8b78fa3ccb981ba4 WHIRLPOOL e58d4939277a2b37fbf0ea4055281494d6b163ba806249d8019e4f3dc8c6ca079d9e904a5de6e86fe0d8bc59ed3894c962f86d6d87512f5b80757b8a59458dd1
--- a/dev-ml/findlib/findlib-1.4.ebuild
+++ b/dev-ml/findlib/findlib-1.4.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="OCaml tool to find/use non-standard packages"
-HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
-SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-IUSE="doc +ocamlopt tk"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?,tk?]"
-RDEPEND="${DEPEND}"
-
-ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
-stublibs="${ocamlfind_destdir}/stublibs"
-
-src_configure() {
-	local myconf
-	use tk && myconf="-with-toolbox"
-	./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
-		-sitelib ${ocamlfind_destdir} \
-		-config ${ocamlfind_destdir}/findlib/findlib.conf \
-		-no-custom \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake all
-	if use ocamlopt; then
-		emake opt # optimized code
-	fi
-}
-
-src_install() {
-	emake prefix="${D}" install
-
-	dodir "${stublibs#${EPREFIX}}"
-
-	cd "${S}/doc"
-	dodoc QUICKSTART README DOCINFO
-	use doc && dohtml -r ref-html guide-html
-}
-
-check_stublibs() {
-	local ocaml_stdlib=`ocamlc -where`
-	local ldconf="${ocaml_stdlib}/ld.conf"
-
-	if [ ! -e ${ldconf} ]
-	then
-		echo "${ocaml_stdlib}" > ${ldconf}
-		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
-	fi
-
-	if [ -z `grep -e ${stublibs} ${ldconf}` ]
-	then
-		echo ${stublibs} >> ${ldconf}
-	fi
-}
-
-pkg_postinst() {
-	check_stublibs
-}
--- a/dev-ml/findlib/findlib-1.5.6.ebuild
+++ b/dev-ml/findlib/findlib-1.5.6.ebuild
@ -14,7 +14,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"

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

 DEPEND=">=dev-lang/ocaml-4.02.1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
--- a/dev-ml/gen_js_api/Manifest
+++ b/dev-ml/gen_js_api/Manifest
@ -0,0 +1 @@
+DIST gen_js_api-1.0.3.tar.gz 39575 SHA256 5c9b5036f96e1d82db4206bc97bbfcc8c8f432acc9d702579673fd5117041ce2 SHA512 90526bc6cee02de9eed3110b4311f9cae52e61f2973f9127dc436c44016e663c195b571186eb260a261babe5f401ae8574c7683e431d3734820642299fc6ef82 WHIRLPOOL d9b9d176cb4062147cd4a7546ba27af269e080ed0dd98be00eab5f14383878c3dd6c314ef09d7a09daaa0244b19b8acd138c29d10e56bf31d4deba8079134964
--- a/dev-ml/gen_js_api/gen_js_api-1.0.3.ebuild
+++ b/dev-ml/gen_js_api/gen_js_api-1.0.3.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="Easy OCaml bindings for Javascript libraries"
+HOMEPAGE="https://github.com/LexiFi/gen_js_api"
+SRC_URI="https://github.com/LexiFi/gen_js_api/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-lang/ocaml:="
+RDEPEND="${DEPEND}"
+
+src_install () {
+	findlib_src_install
+	dodoc CLASSES.md IMPLGEN.md LOW_LEVEL_BINDING.md NAMING.md PPX.md README.md TODO.md TYPES.md VALUES.md
+}
--- a/dev-ml/gen_js_api/metadata.xml
+++ b/dev-ml/gen_js_api/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
--- a/dev-ml/jsonm/jsonm-1.0.0.ebuild
+++ b/dev-ml/jsonm/jsonm-1.0.0.ebuild
@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE=""

-RDEPEND="dev-ml/uutf:=
+RDEPEND=">=dev-ml/uutf-1.0.0:=
 	dev-lang/ocaml:=
 	dev-ml/uchar:="
 DEPEND="${RDEPEND}
--- a/dev-ml/lablgl/lablgl-1.05-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05-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$

@ -32,7 +32,7 @@ DEPEND="${RDEPEND}"

 SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"

 src_configure() {
 	# make configuration file
--- a/dev-ml/lablgl/lablgl-1.05.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05.ebuild
@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit multilib eutils toolchain-funcs
-
-IUSE="doc glut +ocamlopt tk"
-
-DESCRIPTION="Objective CAML interface for OpenGL"
-HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
-LICENSE="BSD"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libX11
-	virtual/opengl
-	virtual/glu
-	<dev-lang/ocaml-4.02.0
-	glut? ( media-libs/freeglut )
-	tk? (
-		>=dev-lang/tcl-8.3:0=
-		>=dev-lang/tk-8.3:0=
-		<dev-lang/ocaml-4.02[tk]
-	)
-	"
-
-DEPEND="${RDEPEND}"
-
-SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-src_configure() {
-	# make configuration file
-	echo "BINDIR=/usr/bin" > Makefile.config
-	echo "GLLIBS = -lGL -lGLU" >> Makefile.config
-	if use glut; then
-		echo "GLUTLIBS = -lglut" >> Makefile.config
-	else
-		echo "GLUTLIBS = " >> Makefile.config
-	fi
-	echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config
-	echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config
-	echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config
-	echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config
-}
-
-src_compile() {
-	if use tk; then
-		emake togl
-		if use ocamlopt; then
-			emake toglopt
-		fi
-	fi
-
-	emake lib
-	if use ocamlopt; then
-		emake libopt
-	fi
-
-	if use glut; then
-		emake glut
-		if use ocamlopt; then
-			emake glutopt
-		fi
-	fi
-}
-
-src_install () {
-	# Makefile do not use mkdir so the library is not installed
-	# but copied as a 'stublibs' file.
-	dodir /usr/$(get_libdir)/ocaml/stublibs
-
-	# Same for lablglut's toplevel
-	dodir /usr/bin
-
-	BINDIR=${ED}/usr/bin
-	BASE=${ED}/usr/$(get_libdir)/ocaml
-	emake BINDIR="${BINDIR}" INSTALLDIR="${BASE}/lablGL" DLLDIR="${BASE}/stublibs" install
-
-	dodoc README CHANGES
-
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		mv Togl/examples{,.togl}
-		doins -r Togl/examples.togl
-
-		mv LablGlut/examples{,.glut}
-		doins -r LablGlut/examples.glut
-	fi
-}
--- a/dev-ml/lablgtk/lablgtk-2.18.3-r1.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.3-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 SLOT="2/${PV}"
-KEYWORDS="alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"

 src_configure() {
 	econf $(use_enable debug) \
--- a/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib findlib
-
-IUSE="debug examples glade gnomecanvas sourceview +ocamlopt opengl spell svg"
-
-DESCRIPTION="Objective CAML interface for Gtk+2"
-HOMEPAGE="http://lablgtk.forge.ocamlcore.org/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/1479/${P}.tar.gz"
-LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
-
-RDEPEND=">=x11-libs/gtk+-2.10:2
-	>=dev-lang/ocaml-3.10:=[ocamlopt?]
-	svg? ( >=gnome-base/librsvg-2.2:2 )
-	glade? ( >=gnome-base/libglade-2.0.1 )
-	gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 )
-	opengl? ( >=dev-ml/lablgl-0.98:=
-		>=x11-libs/gtkglarea-1.9:2 )
-	spell? ( app-text/gtkspell:2 )
-	sourceview? ( x11-libs/gtksourceview:2.0 )
-	<dev-lang/ocaml-4.02.0
-	"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-SLOT="2/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-src_configure() {
-	econf $(use_enable debug) \
-		$(use_with svg rsvg) \
-		$(use_with glade) \
-		--without-gnomeui \
-		--without-panel \
-		$(use_with opengl gl) \
-		$(use_with spell gtkspell) \
-		--without-gtksourceview \
-		$(use_with sourceview gtksourceview2) \
-		$(use_with gnomecanvas)
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
-
-install_examples() {
-	insinto /usr/share/doc/${P}/examples
-	doins examples/*.ml examples/*.rgb examples/*.png examples/*.xpm
-
-	# Install examples for optional components
-	use gnomecanvas && insinto /usr/share/doc/${PF}/examples/canvas && doins examples/canvas/*.ml examples/canvas/*.png
-	use svg && insinto /usr/share/doc/${PF}/examples/rsvg && doins examples/rsvg/*.ml examples/rsvg/*.svg
-	use glade && insinto /usr/share/doc/${PF}/examples/glade && doins examples/glade/*.ml examples/glade/*.glade*
-	use sourceview && insinto /usr/share/doc/${PF}/examples/sourceview && doins examples/sourceview/*.ml examples/sourceview/*.lang
-	use opengl && insinto /usr/share/doc/${PF}/examples/GL && doins examples/GL/*.ml
-
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-src_install () {
-	findlib_src_preinst
-	export OCAMLPATH="${OCAMLFIND_DESTDIR}"
-	emake install DESTDIR="${D}"
-
-	rm -f "${ED}/usr/$(get_libdir)/ocaml/ld.conf"
-
-	dodoc CHANGES README CHANGES.API
-	use examples && install_examples
-}
-
-pkg_postinst () {
-	if use examples; then
-		elog "To run the examples you can use the lablgtk2 toplevel."
-		elog "e.g: lablgtk2 /usr/share/doc/${PF}/examples/testgtk.ml"
-	fi
-}
--- a/dev-ml/lablgtk/lablgtk-2.18.4-r1.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.4-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$

@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 SLOT="2/${PV}"
-KEYWORDS="alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"

 src_configure() {
 	econf $(use_enable debug) \
--- a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 SLOT="2/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"

 src_configure() {
 	econf $(use_enable debug) \
--- a/dev-ml/labltk/labltk-8.06.0.ebuild
+++ b/dev-ml/labltk/labltk-8.06.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://forge.ocamlcore.org/frs/download.php/1455/${P}.tar.gz"

 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt X"

 RDEPEND=">=dev-lang/tk-8.0.3
--- a/dev-ml/qcheck/Manifest
+++ b/dev-ml/qcheck/Manifest
@ -1,2 +1,3 @@
 DIST qcheck-0.5.1.tar.gz 128381 SHA256 205ae6ffe7d5357d2a7edc6535a385edd138c078ad000f11e892eba9c85b0c66 SHA512 3ec31ca26d5e271606a09e7ba2df5d38efe6bc872d4818fd7a3f00117d6890959c5229d6506da10623d975122f2bcdbb33fb6806ca61aae0ed781fca9628a80c WHIRLPOOL ac02fe9789968ecdc7f2b2c972ca32bd81813c955dc7cb5a7e9dd5569951c5a2a56874f4efa2d630b48faa111ea0e1cafa4c72ff1a7b8333fc794af05895adb7
+DIST qcheck-0.5.2.tar.gz 154637 SHA256 4ec34a0b3a241d41f9af2d7f4fb3947dba3646856b8db252c66c7380d7f3e316 SHA512 35350914bb37f677b029293922fcc6cd9dfb2e6871665dfaace17c61f468c9dd052870d62b0cdb80912430142f80625b89c615dbd7e572c0dce5754217900883 WHIRLPOOL 3b7f8a51335bdad443ca65f690ce39e9cd9e9c2c8cf14c52c9a836bab1fcda4bb26853f6703a4c58e08e0ff3690816683bd880a18f753607fb5df2d55c00b12a
 DIST qcheck-0.5.tar.gz 101731 SHA256 930d035981b91617c7f7104228c51741d2b9116094d47ea2a8260091fd80bb3f SHA512 449a73298eacd1348058f8307af3d702007049d4516e2a86214c07968b9b77fec5fa7006bfc681ec6ae6cb8561ee9f6353649b97c698ef338576026af340d5fa WHIRLPOOL 01db048a5db094c51640514b723a752a542535243b613b7877c0095ada9dff9442a03d60e804f3a2e4fed592dda269151f4f8698e2d4a3bfda9f68cfe0bbf5eb
--- a/dev-ml/qcheck/qcheck-0.5.2.ebuild
+++ b/dev-ml/qcheck/qcheck-0.5.2.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit oasis
+
+DESCRIPTION="QuickCheck inspired property-based testing for OCaml"
+HOMEPAGE="https://github.com/c-cube/qcheck/"
+SRC_URI="https://github.com/c-cube/qcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-ml/ounit:=
+	!<dev-ml/iTeML-2.5"
+DEPEND="${RDEPEND}
+	dev-ml/ocamlbuild"
--- a/dev-ml/uutf/uutf-1.0.0-r1.ebuild
+++ b/dev-ml/uutf/uutf-1.0.0-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$

@ -32,8 +32,13 @@ src_compile() {
 src_test() {
 	if use ocamlopt ; then
 		ocamlbuild -use-ocamlfind tests.otarget || die
-		cd _build/test || die
+		pushd _build/test || die
 		./test.native || die
+		#Rebuild to avoid mismatches between installed files, bug #604674
+		popd || die
+		ocaml pkg/pkg.ml build \
+			--with-cmdliner "$(usex utftrip true false)" \
+			|| die
 	else
 		ewarn "Sorry, ${PN} tests require native support (ocamlopt)"
 	fi
--- a/dev-perl/AnyEvent-HTTPD/AnyEvent-HTTPD-0.930.0.ebuild
+++ b/dev-perl/AnyEvent-HTTPD/AnyEvent-HTTPD-0.930.0.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=6
+DIST_AUTHOR=ELMEX
+DIST_VERSION=0.93
+inherit perl-module
+
+DESCRIPTION="A simple lightweight event based web (application) server"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/AnyEvent
+	dev-perl/AnyEvent-HTTP
+	dev-perl/common-sense
+	virtual/perl-IO-Compress
+	dev-perl/Object-Event
+	virtual/perl-Time-Local
+	dev-perl/URI
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Carp
+	test? ( virtual/perl-Test-Simple )
+"
+
+DIST_TEST=do
--- a/dev-perl/AnyEvent-HTTPD/Manifest
+++ b/dev-perl/AnyEvent-HTTPD/Manifest
@ -0,0 +1 @@
+DIST AnyEvent-HTTPD-0.93.tar.gz 40226 SHA256 08c2d6584fb104c2ef2079fd1c317ec4a2159a4cbae066dc28ed12e55ab959a3 SHA512 a76a8406615878f885b83bb23fa27dc6ea7d5f6f729cda7b8d7759d7770f24a2b041cf9a6417a6173758ce14849990e720eea9ac3f4356aaa470c0ae3aae661f WHIRLPOOL 4f12487719466b1e8cdebe7be990a4f46b2c9ad5c9620c401448530ae1efcc1a81b46cd536433afd917dbd2a70aec6b63b0209c668b9c42aa2a7eb45dd7319a4
--- a/dev-perl/AnyEvent-HTTPD/metadata.xml
+++ b/dev-perl/AnyEvent-HTTPD/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>perl@gentoo.org</email>
+  <name>Gentoo Perl Project</name>
+</maintainer>
+</pkgmetadata>
--- a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
+++ b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Extract data from Macintosh BinHex files"

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

 RDEPEND="
--- a/dev-perl/MIME-Lite-HTML/MIME-Lite-HTML-1.240.0.ebuild
+++ b/dev-perl/MIME-Lite-HTML/MIME-Lite-HTML-1.240.0.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=ALIAN
+DIST_VERSION=1.24
+inherit perl-module
+
+DESCRIPTION="Provide routine to transform a HTML page in a MIME-Lite mail"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/HTML-Parser
+	dev-perl/libwww-perl
+	dev-perl/MIME-Lite
+	dev-perl/URI
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-tests1.patch"
+	"${FILESDIR}/${P}-tests2.patch"
+)
+
+DIST_TEST=do
--- a/dev-perl/MIME-Lite-HTML/Manifest
+++ b/dev-perl/MIME-Lite-HTML/Manifest
@ -0,0 +1 @@
+DIST MIME-Lite-HTML-1.24.tar.gz 63640 SHA256 db603ccbf6653bcd28cfa824d72e511ead019fc8afb9f1854ec872db2d3cd8da SHA512 06d0392c5ef7628e10d47be979edbd431f04850e8bfdde6deb8507fd962cab27feaeb119b542faf13a2f1849df751afc8cbabd3cba17ac3aec4dc4042fb83960 WHIRLPOOL 2d8691c3b7abeb958dec881e952a9495800d1334a1c5066f264464cad3b167c4b4e68f29bcac8327904a5739b5d03eaef9b6f7c3531e071d30ee7f6260bb732f
--- a/dev-perl/MIME-Lite-HTML/files/MIME-Lite-HTML-1.240.0-tests1.patch
+++ b/dev-perl/MIME-Lite-HTML/files/MIME-Lite-HTML-1.240.0-tests1.patch
@ -0,0 +1,96 @@
+From 0a67f501c8af5585af7fec08cbe0964b1a235b93 Mon Sep 17 00:00:00 2001
+From: Peter Mottram <peter@sysnix.com>
+Date: Thu, 12 May 2016 16:48:38 +0200
+Subject: [PATCH] force header ordering in tests and ignore blank lines in
+ diffs
+
+This fixes effects of hash randomisation and line-break changes in
+MIME::Lite.
+---
+ t/20create_image_part.t |  7 +++++++
+ t/50generic.t           | 20 +++++++++++++-------
+ 2 files changed, 20 insertions(+), 7 deletions(-)
+
+diff --git a/t/20create_image_part.t b/t/20create_image_part.t
+index 0df935f..4de4440 100644
+--- a/t/20create_image_part.t
+++ b/t/20create_image_part.t
+@@ -8,6 +8,13 @@ use Cwd;
+ 
+ # For create ref file, use perl -Iblib/lib t/20create_image_part.t 1
+ 
+MIME::Lite->field_order(
+    'mime-version',     'content-id',
+    'content-location', 'content-transfer-encoding',
+    'content-type',     'subject',
+    'to',               'from'
+);
+
+ my $t = "/var/tmp/mime-lite-html-tests";
+ my $p = cwd;
+ my $o = (system("ln -s $p/t $t")==0);
+diff --git a/t/50generic.t b/t/50generic.t
+index 5ba7895..76b879d 100644
+--- a/t/50generic.t
+++ b/t/50generic.t
+@@ -10,6 +10,12 @@ use Cwd;
+   URI::URL->strict(1);
+ }
+ 
+MIME::Lite->field_order(
+    'mime-version',     'content-id',
+    'content-location', 'content-transfer-encoding',
+    'content-type',     'subject',
+    'to',               'from'
+);
+ 
+ # For create ref file, use perl -Iblib/lib t/50generic.t 1
+ 
+@@ -47,11 +53,11 @@ foreach my $it ('cid', 'location', 'extern') {
+ 	or die "Can't create $f.created_by_test:$!";
+       print PROD $rep;
+       close(PROD);
+-    my $r = `diff $ref $f.created_by_test`;
+    my $r = `diff -B $ref $f.created_by_test`;
+       cmp_ok($mailHTML->size, ">", (stat($ref))[7], "Same size");
+       cmp_ok($mailHTML->size*0.945, "<", (stat($ref))[7], "Same size");
+       is($r, "", $ref);
+-      unlink("$f.created_by_test");
+      #unlink("$f.created_by_test");
+     }
+     # for create ref file
+     elsif ($ARGV[0]) {
+@@ -88,11 +94,11 @@ foreach my $it ('cid', 'location', 'extern') {
+ 	or die "Can't create $f.created_by_test:$!";
+       print PROD $rep;
+       close(PROD);
+-    my $r = `diff $ref $f.created_by_test`;
+    my $r = `diff -B $ref $f.created_by_test`;
+       cmp_ok($mailHTML->size, ">", (stat($ref))[7], "Same size");
+       cmp_ok($mailHTML->size*0.945, "<", (stat($ref))[7], "Same size");
+       is($r, "", $ref);
+-      unlink("$f.created_by_test");
+      #unlink("$f.created_by_test");
+     }
+     # for create ref file
+     elsif ($ARGV[0]) {
+@@ -130,11 +136,11 @@ foreach my $it ('cid', 'location', 'extern') {
+ 	or die "Can't create $f.created_by_test:$!";
+       print PROD $rep;
+       close(PROD);
+-    my $r = `diff $ref $f.created_by_test`;
+    my $r = `diff -B $ref $f.created_by_test`;
+       cmp_ok($mailHTML->size, ">", (stat($ref))[7], "Same size");
+       cmp_ok($mailHTML->size*0.945, "<", (stat($ref))[7], "Same size");
+       is($r, "", $ref);
+-      unlink("$f.created_by_test");
+      #unlink("$f.created_by_test");
+     }
+     # for create ref file
+     elsif ($ARGV[0]) {
+@@ -156,4 +162,4 @@ my $mailHTML = new MIME::Lite::HTML
+ my %vars = ( 'perl' => 'fast', 'lng' => 'Ruby');
+ cmp_ok($mailHTML->fill_template('Perl is <? $perl ?>, <? $lng ?> suck',\%vars),
+        'eq', 'Perl is fast, Ruby suck',"Call of fill_template do his job");
+-unlink($t);
+#unlink($t);
--- a/dev-perl/MIME-Lite-HTML/files/MIME-Lite-HTML-1.240.0-tests2.patch
+++ b/dev-perl/MIME-Lite-HTML/files/MIME-Lite-HTML-1.240.0-tests2.patch
@ -0,0 +1,54 @@
+Paths fixed in the patch- dilfridge@gentoo.org
+
+From 770933ee2c194160a9ab3320468d3b672973d3d8 Mon Sep 17 00:00:00 2001
+From: Peter Mottram <peter@sysnix.com>
+Date: Thu, 12 May 2016 16:50:35 +0200
+Subject: [PATCH] fix breakage introduced in MIME::Lite v3.029
+
+See commit:
+
+https://github.com/rjbs/MIME-Lite/commit/4608623af9126f53f38b723c4e9f38bbcd07d866
+
+and original ticket:
+
+https://rt.cpan.org/Public/Bug/Display.html?id=35979
+---
+ lib/MIME/Lite/HTML.pm | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/lib/MIME/Lite/HTML.pm b/lib/MIME/Lite/HTML.pm
+index bc06640..6839bf4 100755
+--- a/HTML.pm
+++ b/HTML.pm
+@@ -463,7 +463,6 @@ sub build_mime_object {
+ 			  'Data'     => $html);
+     $part->attr("content-type"=> "text/html; charset=".$self->{_htmlcharset});
+     # Remove some header for Eudora client in HTML and related part
+-    $part->replace("MIME-Version" => "");
+     $part->replace('X-Mailer' =>"");
+     $part->replace('Content-Disposition' =>"");
+     # only html, no images & no txt
+@@ -480,7 +479,6 @@ sub build_mime_object {
+     $txt_part->attr("content-type" => 
+ 		    "text/plain; charset=".$self->{_textcharset});
+     # Remove some header for Eudora client
+-    $txt_part->replace("MIME-Version" => "");
+     $txt_part->replace("X-Mailer" => "");
+     $txt_part->replace("Content-Disposition" => "");
+     # only text, no html
+@@ -516,7 +514,6 @@ sub build_mime_object {
+     # Create related part
+     my $rel = new MIME::Lite ('Type'=>'multipart/related');
+     $rel->replace("Content-transfer-encoding" => "");
+-    $rel->replace("MIME-Version" => "");
+     $rel->replace("X-Mailer" => "");
+     # Attach text part to alternative part
+     $mail->attach($txt_part);
+@@ -656,7 +653,6 @@ sub create_image_part {
+ 
+   # Remove header for Eudora client
+   $mail->replace("X-Mailer" => "");
+-  $mail->replace("MIME-Version" => "");
+   $mail->replace("Content-Disposition" => "");
+   return $mail;
+ }
--- a/dev-perl/MIME-Lite-HTML/metadata.xml
+++ b/dev-perl/MIME-Lite-HTML/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+</pkgmetadata>
--- a/dev-perl/Object-Event/Manifest
+++ b/dev-perl/Object-Event/Manifest
@ -0,0 +1 @@
+DIST Object-Event-1.23.tar.gz 15740 SHA256 ab6bb80508f4fddaf2d51b20ca876aab038582a86b5228e6435411348af53c82 SHA512 f2a877e66b00cf095c1b1ea1447b7aedb2c4c24a19b46e870894811bf707616bb2c59edc31b2d9b7157ff430cf2610facd201c9fdd8254bfb945900b70c79918 WHIRLPOOL 88a97cfa6e3be2f62b41059308b8d0409c21c72baeee10771874ea39f7f64510b77f4602884fde83406efcc83e32743a47fbb432842d01451cf252287c521486
--- a/dev-perl/Object-Event/Object-Event-1.230.0.ebuild
+++ b/dev-perl/Object-Event/Object-Event-1.230.0.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=ELMEX
+DIST_VERSION=1.23
+inherit perl-module
+
+DESCRIPTION="A class that provides an event callback interface"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/AnyEvent-3.500.0
+	dev-perl/common-sense
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST appstream-0.10.5.tar.gz 1797978 SHA256 b3f17f49c4ad7a503954f7baee16f47ba0f845c5e684798b1109db881bba2a06 SHA512 c427234049c8e8e158a7d64dc2dab6c3ea155dfe6fc0df1c2a5cd5ab611c65e36bf86ac57de69eb3dcff5ed5f71f37aef5d239e356e8e0a7a4fa763f246efb14 WHIRLPOOL bc127f66a20df1a946cdf64e66c6e4e3ea4c50653f174d6afc6f7eaa136d55352c7df2bb178ce452100ba95ab59304009546f5515f11221145b5be4274eb6841`
				`@ -0,0 +1 @@`
				`DIST gen_js_api-1.0.3.tar.gz 39575 SHA256 5c9b5036f96e1d82db4206bc97bbfcc8c8f432acc9d702579673fd5117041ce2 SHA512 90526bc6cee02de9eed3110b4311f9cae52e61f2973f9127dc436c44016e663c195b571186eb260a261babe5f401ae8574c7683e431d3734820642299fc6ef82 WHIRLPOOL d9b9d176cb4062147cd4a7546ba27af269e080ed0dd98be00eab5f14383878c3dd6c314ef09d7a09daaa0244b19b8acd138c29d10e56bf31d4deba8079134964`
				`@ -0,0 +1 @@`
				`DIST AnyEvent-HTTPD-0.93.tar.gz 40226 SHA256 08c2d6584fb104c2ef2079fd1c317ec4a2159a4cbae066dc28ed12e55ab959a3 SHA512 a76a8406615878f885b83bb23fa27dc6ea7d5f6f729cda7b8d7759d7770f24a2b041cf9a6417a6173758ce14849990e720eea9ac3f4356aaa470c0ae3aae661f WHIRLPOOL 4f12487719466b1e8cdebe7be990a4f46b2c9ad5c9620c401448530ae1efcc1a81b46cd536433afd917dbd2a70aec6b63b0209c668b9c42aa2a7eb45dd7319a4`
				`@ -0,0 +1 @@`
				`DIST MIME-Lite-HTML-1.24.tar.gz 63640 SHA256 db603ccbf6653bcd28cfa824d72e511ead019fc8afb9f1854ec872db2d3cd8da SHA512 06d0392c5ef7628e10d47be979edbd431f04850e8bfdde6deb8507fd962cab27feaeb119b542faf13a2f1849df751afc8cbabd3cba17ac3aec4dc4042fb83960 WHIRLPOOL 2d8691c3b7abeb958dec881e952a9495800d1334a1c5066f264464cad3b167c4b4e68f29bcac8327904a5739b5d03eaef9b6f7c3531e071d30ee7f6260bb732f`
				`@ -0,0 +1 @@`
				`DIST Object-Event-1.23.tar.gz 15740 SHA256 ab6bb80508f4fddaf2d51b20ca876aab038582a86b5228e6435411348af53c82 SHA512 f2a877e66b00cf095c1b1ea1447b7aedb2c4c24a19b46e870894811bf707616bb2c59edc31b2d9b7157ff430cf2610facd201c9fdd8254bfb945900b70c79918 WHIRLPOOL 88a97cfa6e3be2f62b41059308b8d0409c21c72baeee10771874ea39f7f64510b77f4602884fde83406efcc83e32743a47fbb432842d01451cf252287c521486`