Sync with portage [Sat Mar 19 14:00:45 MSK 2016].

8 years ago · f002c60ad4
parent 655c8da7cd
commit f002c60ad4
1660 changed files with 12291 additions and 3926 deletions
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@ -9,7 +9,6 @@
 		<maintainer>
 			<email>brenden@rty.ca</email>
 			<name>Brenden Matthews</name>
 			<description>Upstream author</description>
 		</maintainer>
 		<remote-id type="sourceforge">conky</remote-id>
 		<remote-id type="github">brndnmtthws/conky</remote-id>
--- a/app-admin/filebeat-bin/Manifest
+++ b/app-admin/filebeat-bin/Manifest
@ -1,4 +1,4 @@
 DIST filebeat-1.0.1-i686.tar.gz 3073413 SHA256 a9ccf9a4f1d3e2c840ad153ae4594a4cabccaa53c178c3ad585590e10994d7b8 SHA512 164835cb4dd98b6e897e004fdc0c099022be8e83ced89a0dbbbec119f32eaaf9f6ed5eaec41d3c86d5722df662577d83b9623b057ac7913038b04ee344ae5a85 WHIRLPOOL 9983b74569ff303cdfcff8968a0a93dab34e1f9c3d184f89e88e066106cd94a687e07a94e3ba6ac6019d786cad50a07ec8052043a5bdd3cbc095eaae64c50c0f
 DIST filebeat-1.0.1-x86_64.tar.gz 3265179 SHA256 662bceca18eabf9c81681b790776398a78fdf36604b5d0edc8abedd28980de52 SHA512 5ec0a0371790a425fac67ddb164fc4b347eb79468f85b8a64d78491a478aacfc2d3eaad62f654847c7381d4dc3686075e428ecc2271f415aa1cc83b5c84e72b7 WHIRLPOOL 58c86a41cdd2543d8de82e0572af27adac7d44d09c7866c984616c7dcb296087eaa25f6c7de234f27ed25698bad9d18a444bfd89166c5a415457a2f473fa6263
 DIST filebeat-1.1.1-i686.tar.gz 3421542 SHA256 c425223e0fd6fe2c768cf1982a5da997ec1ef183ebcbb3419d815c26851b4ff4 SHA512 e912407b1ebf265741fbeb2ecd742850f428e103a116773bf06e8835ef12179d10767d650f79342e440efe7786f88740787ff8c75cc0df0f7295de5d8f4b1eed WHIRLPOOL 2b937f428889e79c25bc80cbd499c02d42bc5583c681df6b1e6610a58d4ef5fa24254bfe1c51303b4b6dcfd05d6ff2bce4484c4d75fde0b2add47ae17da58b1f
 DIST filebeat-1.1.1-x86_64.tar.gz 3633191 SHA256 2df9ec1b4e0e78b1edfa678d70c1b4dde3c06f2f166accdb176617377061b583 SHA512 d9da1999302c5de476b7788102af0ab7786100f90cd957f2fe3e212b871d38c017aedfea7eaa32865dc0f3e21e256b6597a3575072e9320674d49fbc2f1ab1d8 WHIRLPOOL 1bf075c967a39a270cd37ae94d222fb0ec1cf2e7faf3e0bc74b1461093ea9547e67bb8969e5a4033e793653772de659ee39e20c06926ed44ce48228b915cc47d
 DIST filebeat-1.1.2-i686.tar.gz 3419775 SHA256 b740bb8f1849bc11554f27bbd300f10960b48ec206c250edbbf51579ef30c720 SHA512 24c12c85ce4f3e650ce2cf71a2ba4cd82969958d6e440f0c5f4c3984419dc0016af547ce3b0cbbd5071b87d86f24b619f6ba8d55bb9dc842fadbbd8ae21320d6 WHIRLPOOL 402f7c27aab938c99e00ca42635acb96c53b690f85b180da9dba762cd6b1030838f7bbc60a48e3e5c529888076edf674816276da45cb5ee45d815171a1379a45
 DIST filebeat-1.1.2-x86_64.tar.gz 3631167 SHA256 5b15ea8eb9f784fa530e8ddaccb545906a105f808233a36169d3419b7e8044d5 SHA512 95a76c5057e3c271cf4ed373870d2e6e9c68752ee79488d8e489c3260cc0e752311f90364267efd3e6f5fa1100685fb70a8da1c7ccf1b08b9b9382196c01fa1e WHIRLPOOL d2cc82f124b1add3db52062206f58581e3320f391da20da78d9e8ab2d5c469e8f82da3015b7c28cf9b72fec70ffeafc650eb57a744843054a135b175d2778776
--- a/app-admin/filebeat-bin/filebeat-bin-1.1.2.ebuild
+++ b/app-admin/filebeat-bin/filebeat-bin-1.1.2.ebuild
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@ -4,3 +4,5 @@ DIST puppet-agent_1.3.4-1wheezy_amd64.deb 20088688 SHA256 d98026bc27d680c6d67488
 DIST puppet-agent_1.3.4-1wheezy_i386.deb 19864590 SHA256 7eaf2264fc0ce048fd1fc604f384df8d601e8571e9f92fb1432bc2be73a24874 SHA512 2640a6b0daaa2a9c913a9411a7eb56914bb127610d2bf56100f9029dc94727f3c42df7c858924b22fc5ad03a9151d98a136c0c6d369501f3e38a9c179333d2ff WHIRLPOOL 88dbebd7c5217d7efc85c877bc1977c574e17ca544a59424b805cebcad637ed5762ebe37c13d82dc01cebcd1ef1259383143adff7a748c82241124b2007d5513
 DIST puppet-agent_1.3.6-1wheezy_amd64.deb 20097384 SHA256 47f04c848eff486660ba5ab4cc6c9340193ae0f9d703e0aba6094ccc7d15ec4f SHA512 a079f66bd0ff0b9535e037712ff4306ec16cc5303e1a19016a7ebb2d19f39eea1d91d758996d37e6d848cd0c1d8f047bcfad64550647de99de248071626a0845 WHIRLPOOL 42013e4abf062548b0349db3ebd628bfd887877462b3f24dbd47058bda59828c0f13f2f3bb8a7aace5d835faf3be0fbbaeb097c55c665aa71eec6d78881d71b7
 DIST puppet-agent_1.3.6-1wheezy_i386.deb 19873296 SHA256 aaf16cffcf33070eda0979025b72c87d1528bf017f65dadc333defe623190065 SHA512 4d6390c6f9fd3464029ae8bde02e5f7536de7ecb701bc50a7a4a24f50102fcd542448729259148bb62343ed44e4e5b41ced670aed7a8aa3897fa2f7729fff9db WHIRLPOOL 17f7231cd5c546aa8a104aadec07457abebb71cccc1f8f718e7e0e5544b46502979b3079e1d3931f58d3d2d4232eb2ac82e5ee2c49c0ed54e280ef515575b45f
 DIST puppet-agent_1.4.0-1wheezy_amd64.deb 21367140 SHA256 322f3db0e1c2cebe675f6162411eecc9aec4e6a9d20daba4416ad914a7d562f0 SHA512 9d40ca518dfe5086f9fb738c971fed06b6f634f2069a0a10ae4ea4c1595db6c7122323dcbe1f871faed114acd1a3405146fb834fce964312391159b6e66edae5 WHIRLPOOL cf5f1649083e3224cffa5c1b16164e8cdb2a7fdc4756b97e12dfd6857e74e5923e04282d885ac963ef4fc386843e1014c489346836798eec1db5ed70d187a15e
 DIST puppet-agent_1.4.0-1wheezy_i386.deb 21107662 SHA256 88adf39e5fd7dba87f497c348797207df1f3192228d8601de9cbd155d481c31f SHA512 6651bb55b7ab4db5ce738dfa8ff555d385c7ea5c3806e5e3a961afaf58fc8923e44264bbd33b920871a84ebaa8b7003374a269467fe13454f7f498c18ba3afec WHIRLPOOL bffdcf7cffc6bf6dcce925728ac032c2fd7e2e19641eef200b60b5ec3fd1e0b87b44a6fd43c001cec0b69d96f050243252a0a954240568344ddcdb481010a700
--- a/app-admin/puppet-agent/puppet-agent-1.4.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.4.0.ebuild
@ -0,0 +1,99 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils systemd unpacker user
 DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
 HOMEPAGE="https://puppetlabs.com/"
 SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
 SRC_URI="
 	amd64? ( ${SRC_BASE}_amd64.deb )
 	x86?   ( ${SRC_BASE}_i386.deb )
 "
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 CDEPEND="!app-admin/augeas
 	!app-admin/mcollective
 	!app-admin/puppet
 	!dev-ruby/hiera
 	!dev-ruby/facter
 	!app-emulation/virt-what"
 DEPEND="
 	${CDEPEND}"
 RDEPEND="${CDEPEND}
 	sys-apps/dmidecode
 	selinux? (
 		sys-libs/libselinux[ruby]
 		sec-policy/selinux-puppet
 	)
 	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
 S=${WORKDIR}
 QA_PREBUILT="
 	/opt/puppetlabs/puppet
 	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
 	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
 	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
 	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
 	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
 	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
 	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
 	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
 	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
 	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
 	/opt/puppetlabs/puppet/lib/engines/*
 	/opt/puppetlabs/puppet/lib/virt-what/*
 	/opt/puppetlabs/puppet/lib/*
 	/opt/puppetlabs/puppet/bin/*"
 pkg_setup() {
 	enewgroup puppet
 	enewuser puppet -1 -1 /var/run/puppet puppet
 }
 src_install() {
 	# conf.d
 	doconfd etc/default/puppet
 	doconfd etc/default/mcollective
 	# logrotate.d
 	insinto /etc/logrotate.d
 	doins etc/logrotate.d/mcollective
 	# puppet itself
 	insinto /etc/puppetlabs
 	doins -r etc/puppetlabs/*
 	# logdir for systemd
 	dodir var/log/puppetlabs/puppet/
 	fperms 0750 var/log/puppetlabs/puppet/
 	# the rest
 	insinto /opt
 	dodir opt/puppetlabs/puppet/cache
 	doins -r opt/*
 	fperms 0750 /opt/puppetlabs/puppet/cache
 	# init
 	newinitd "${FILESDIR}/puppet.initd" puppet
 	newinitd "${FILESDIR}/mcollective.initd" mcollective
 	systemd_dounit "${FILESDIR}/puppet.service"
 	systemd_dounit "${FILESDIR}/mcollective.service"
 	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
 	# symlinks
 	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
 	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
 	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
 	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
 	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
 	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
 	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
 	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
 	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
 	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
 	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
 }
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@ -9,3 +9,4 @@ DIST puppet-4.0.0.tar.gz 2498445 SHA256 c02a5cceb68d6c26228c242a312d68cf05423384
 DIST puppet-4.1.0.tar.gz 2532579 SHA256 a168ac45a7b25932dfc78bd5da3efe41363e239c7361dd5c4f91615dc17bb275 SHA512 85ba32fb3a7e9f3413f201263943411fbb6b57a4aa13461954b32c1095b06d04f26288a216c5624290cf89d09183bc86bb5f57769fe2ccadc44bf57cd601f5d3 WHIRLPOOL 5288b3204a5c5b96da4eabdee19c1156e71b3a76662d8d28fc8e43988e76ca52618d423c207c1a25d5d92638c559db76ee3c8ce336286d3a5e875c1dc538f8b8
 DIST puppet-4.2.1.tar.gz 2546267 SHA256 519842dfa03ff78c94e77fb28867aef12933691b9e2ce41788f80c5c2865fe7e SHA512 d4ce3f6cd0fbca4270a9121671c27985c9aaa5360a1a317afcc8f79cd81d285e1661cc77d50dda47abd8e50309762d5931545ea4d675b9fb6c32b612e570fd3d WHIRLPOOL 492294158f7f5eb78b93098c759c97ca53a09fc7b24a8350dfd76220a1d578f78375ba3bd9d618b97299931001af83cc5475c4f6ad9bbb1c3d9744fa07585bfd
 DIST puppet-4.2.2.tar.gz 2550591 SHA256 2d34cda2c65c885ba16e6644edd7733d55e6a0e1011a1f0f7fe80b411affc348 SHA512 63fdbce7839fe1638c22129d22bf2aeef29838adceb6c53aaaf54acc7c9d2957ed559e3625a13dfa1f35b556791de0232868f5ecdc439be95b0b64bea097d217 WHIRLPOOL e2f579efbfc3fbab35ee3a23f40a396b0326484c935eaacead503848abc8406fe705701a2ab7eaf28e070feedef7ac4467d4bbf3412f5999091c809c88550c4c
 DIST puppet-4.4.0.tar.gz 2672781 SHA256 489931ec65273764ab506a1cbd4c3189997098a9c9c4791bf019e81c572ca5c8 SHA512 cf9309db57ea06689eb9233624479e87249ef8cd9736a6426efd78227916bd7bd741bd019bab29694f660d7f0b31c1c8d69d7f9307e63d5df2bad6e3c2c19f47 WHIRLPOOL 49fddc4acfa284fbfc7a1d5b38864fc86614f599955033f638e78bb3a7abe11c6363e8f6f1129267e16074cd151ec7b632d75c9f7237615530c0c58b6a3282fe
--- a/app-admin/puppet/puppet-4.4.0.ebuild
+++ b/app-admin/puppet/puppet-4.4.0.ebuild
@ -0,0 +1,175 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="5"
 USE_RUBY="ruby20 ruby21"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
 DESCRIPTION="A system automation and configuration management software."
 HOMEPAGE="http://puppetlabs.com/"
 SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
 RESTRICT="test"
 ruby_add_rdepend "
 	dev-ruby/hiera
 	>=dev-ruby/rgen-0.6.5
 	dev-ruby/json
 	>=dev-ruby/facter-3.0.0
 	augeas? ( dev-ruby/ruby-augeas )
 	diff? ( dev-ruby/diff-lcs )
 	doc? ( dev-ruby/rdoc )
 	ldap? ( dev-ruby/ruby-ldap )
 	shadow? ( dev-ruby/ruby-shadow )
 	sqlite? ( dev-ruby/sqlite3 )
 	virtual/ruby-ssl"
 ruby_add_bdepend "
 	test? (
 		dev-ruby/mocha
 		dev-ruby/rack
 		dev-ruby/rspec-its
 	)"
 # this should go in the above lists, but isn't because of test deps not being keyworded
 #		dev-ruby/rspec-collection_matchers
 DEPEND+=" ${DEPEND}
 	emacs? ( virtual/emacs )
 	xemacs? ( app-editors/xemacs )"
 RDEPEND+=" ${RDEPEND}
 	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
 	selinux? (
 		sys-libs/libselinux[ruby]
 		sec-policy/selinux-puppet
 	)
 	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
 	>=app-portage/eix-0.18.0"
 SITEFILE="50${PN}-mode-gentoo.el"
 pkg_setup() {
 	enewgroup puppet
 	enewuser puppet -1 -1 /var/lib/puppet puppet
 }
 all_ruby_prepare() {
 	# Avoid spec that require unpackaged json-schema.
 	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
 	# can't be run within portage.
 	epatch "${FILESDIR}/puppet-fix-tests-4.x.patch"
 	# Avoid specs that can only run in the puppet.git repository. This
 	# should be narrowed down to the specific specs.
 	rm spec/integration/parser/compiler_spec.rb || die
 	# Avoid failing spec that need further investigation.
 	rm spec/unit/module_tool/metadata_spec.rb || die
 }
 all_ruby_compile() {
 	if use emacs ; then
 		elisp-compile ext/emacs/puppet-mode.el
 	fi
 	if use xemacs ; then
 		# Create a separate version for xemacs to be able to install
 		# emacs and xemacs in parallel.
 		mkdir ext/xemacs
 		cp ext/emacs/* ext/xemacs/
 		xemacs-elisp-compile ext/xemacs/puppet-mode.el
 	fi
 }
 each_ruby_install() {
 	each_fakegem_install
 #	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
 }
 all_ruby_install() {
 	all_fakegem_install
 	# systemd stuffs
 	insinto /usr/lib/systemd/system
 	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
 	# tmpfiles stuff
 	insinto /usr/lib/tmpfiles.d
 	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
 	# openrc init stuff
 	newinitd "${FILESDIR}"/puppet.init-4.x puppet
 	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
 	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
 	keepdir /etc/puppetlabs/puppet/ssl
 	keepdir /var/lib/puppet/facts
 	keepdir /var/lib/puppet/files
 	fowners -R puppet:puppet /var/lib/puppet
 	fperms 0750 /var/lib/puppet
 	fperms 0750 /etc/puppetlabs
 	fperms 0750 /etc/puppetlabs/puppet
 	fperms 0750 /etc/puppetlabs/puppet/ssl
 	fowners -R :puppet /etc/puppetlabs
 	fowners -R :puppet /var/lib/puppet
 	if use emacs ; then
 		elisp-install ${PN} ext/emacs/puppet-mode.el*
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 	if use xemacs ; then
 		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
 		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 	if use ldap ; then
 		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
 	fi
 	# ext and examples files
 	for f in $(find ext examples -type f) ; do
 		docinto "$(dirname ${f})"; dodoc "${f}"
 	done
 }
 pkg_postinst() {
 	elog
 	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
 	elog "cause puppet to hang while installing packages."
 	elog
 	elog "Portage Puppet module with Gentoo-specific resources:"
 	elog "http://forge.puppetlabs.com/gentoo/portage"
 	elog
 	if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then
 		elog
 		elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
 		elog "/etc/puppetlabs/puppet"
 		elog "Also, puppet now uses config directories for modules and manifests."
 		elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
 		elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
 		elog "for more information."
 		elog
 	fi
 	use emacs && elisp-site-regen
 	use xemacs && xemacs-elisp-site-regen
 }
 pkg_postrm() {
 	use emacs && elisp-site-regen
 	use xemacs && xemacs-elisp-site-regen
 }
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@ -1,2 +1,3 @@
 DIST puppetdb-3.2.3.tar.gz 25469315 SHA256 3b9d121e54da1511834d708437c9c9ca15db2818314f442511bbb2e576a7afaa SHA512 d15a497bce10e1af989e1deaba99794929916362e13393814d2c5545f80ee4fb0976758c3bd0ae41466bd0364ba5df417fa69afde8bf24e6573119cdbe814aa9 WHIRLPOOL 031c14df0df52320926030e32290fb8ab5115e800711d90b2c5acdc712fa7bbcefbc83afc380bbeff4f1b30654d724a8db01c9b5ace3f6bc0deeeb31127e4443
 DIST puppetdb-3.2.4.tar.gz 25695565 SHA256 580d25ace29b61d7504dfc2650fd7e1c6a14e77421cbfafed14703d857996d84 SHA512 ff9214a4bcf2815ee4feecae91c697dc409a28acd934a82d56cdbae875fe95b5a0928a302749df2219bbc9db723402739abb2d9dc7fb70ab0934da8534a683b1 WHIRLPOOL bfecad13e578700c271fdaf403163d0c43af9affc826e7b6c0dab54b3457cd10851559ffacf53852cea1e9215c7eeba248c4e2b4260942ee5039252817f28033
 DIST puppetdb-4.0.0.tar.gz 22121324 SHA256 e28d898e1912a43cb3f2555c5bacf4cb03d819579ad5c018b70b5f73af52fc33 SHA512 d2b06f470bb30ff7b6d6d02cd1d40ae6a9f1456baa7e15aac0ed51c6fae1f5b9b4c06d97896bd7c509302c8e26353d286c26e6a11fcb983ebf2569edf84bbf4d WHIRLPOOL c9c94cb9e2db49a3e0760a19ce7b714ee0e382087acba017a5392abbc3bd8ae12449aa7008dd4ab58cec18027fb6a5091b892d157c8562db0c1c6bed9993a31c
--- a/app-admin/puppetdb/files/puppetdb.initd
+++ b/app-admin/puppetdb/files/puppetdb.initd
@ -17,7 +17,7 @@ checkconfig() {
        eerror "Missing INSTALL_DIR."
        eend 1
    fi
-    if [ ! -a $BOOTSTRAP_CONFIG ]; then
+    if [ ! -e $BOOTSTRAP_CONFIG ]; then
        eerror "Missing BOOTSTRAP_CONFIG."
        eend 1
    fi
--- a/app-admin/puppetdb/puppetdb-4.0.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-4.0.0.ebuild
@ -0,0 +1,91 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit multilib systemd user
 DESCRIPTION="PuppetDB collects data generated by Puppet."
 HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
 SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
 KEYWORDS="~amd64 ~x86"
 RDEPEND+=">=virtual/jdk-1.7.0"
 DEPEND+=""
 pkg_setup() {
 	enewgroup puppetdb
 	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
 }
 src_prepare() {
 	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
 	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
 	sed -i 's/sysconfig/conf\.d/g' install.sh || die
 	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
 	sed -i 's/var\/run/run/g' install.sh || die
 }
 src_compile() {
 		einfo "not compiling"
 }
 src_install() {
 	dodir /opt/puppetlabs/server/data/puppetdb
 	insinto /opt/puppetlabs/server/apps/puppetdb
 	insopts -m0744
 	doins ext/ezbake-functions.sh
 	insopts -m0644
 	doins ext/ezbake.manifest
 	doins puppetdb.jar
 	insinto /etc/puppetlabs/puppetdb
 	doins ext/config/logback.xml
 	doins ext/config/bootstrap.cfg
 	doins ext/config/request-logging.xml
 	insinto /etc/puppetlabs/puppetdb/conf.d
 	doins ext/config/conf.d/jetty.ini
 	doins ext/config/conf.d/repl.ini
 	doins ext/config/conf.d/database.ini
 	doins ext/config/conf.d/config.ini
 	insopts -m0755
 	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
 	doins install.sh
 	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
 	doins ext/cli/foreground
 	doins ext/cli/ssl-setup
 	doins ext/cli/export
 	doins ext/cli/config-migration
 	doins ext/cli/foreground
 	doins ext/cli/anonymize
 	doins ext/cli/import
 	insinto /opt/puppetlabs/server/apps/puppetdb/bin
 	doins ext/bin/puppetdb
 	insopts -m0644
 	dodir /opt/puppetlabs/server/bin
 	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
 	dodir /opt/puppetlabs/bin
 	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
 	dosym /opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
 	# init type tasks
 	newconfd ext/default puppetdb
 	systemd_dounit ext/redhat/puppetdb.service
 	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
 	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
 	# misc
 	insinto /etc/logrotate.d
 	newins ext/puppetdb.logrotate.conf puppetdb
 	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
 	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
 }
 pkg_postinst() {
 	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
 	elog
 	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
 }
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@ -1 +1,2 @@
 DIST puppetserver-2.2.1.tar.gz 42665674 SHA256 583662380b161fc35e0f0c5e7e2964892ec4b7e0cb848cadcd76b29684a85843 SHA512 9b7036d886467a41d0d62d4651a91676d885dfa684aa757d9e27ce5ef5f8183f188f490e1594b6b936219a3dd9bee8f609df6229d5d26fd331677fcf1f61d034 WHIRLPOOL f0f15512be55fd49da80b2e839cef9bd9684ef23eab5e872d331b0802f790451c0fb16320b97d25d0bbb8e9bad08cd66c788c0a47643c8da4d973d6649f0da2c
 DIST puppetserver-2.3.0.tar.gz 33655096 SHA256 b8bb77ae4684a57a00b8fd41782034718e3d53e09fe3bb6470b4aef2e3da15a4 SHA512 364d9af1eb138db814b45310f9c0bc67976a0a1a3d1d36ddf6cbb547ab85088e5efc0149dfbb1cd662966b61aef9d95709d4b9c7ffe615ede8b7a8ff35b0deff WHIRLPOOL 77c4a245bcb8125b8c8d4e50994c3ff05233a6337a98f60e7d0d8fbe1e0ea4635fffca8de755bbe9c10a5c3f4d6c41b77eaf10d967fd6b82209907ff6464ae85
--- a/app-admin/puppetserver/files/puppetserver.initd
+++ b/app-admin/puppetserver/files/puppetserver.initd
@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-extra_commands="checkconfig"
+extra_commands="checkconfig reload"
 LOGDIR="/var/log/puppetlabs/puppetserver"
 RUNDIR="/run/puppetlabs/puppetserver"
@ -17,7 +17,7 @@ checkconfig() {
        eerror "Missing INSTALL_DIR."
        eend 1
    fi
-    if [ ! -a $BOOTSTRAP_CONFIG ]; then
+    if [ ! -e $BOOTSTRAP_CONFIG ]; then
        eerror "Missing BOOTSTRAP_CONFIG."
        eend 1
    fi
@ -63,3 +63,10 @@ stop() {
    start-stop-daemon --stop --pidfile "${RUNDIR}/puppetserver.pid"
    eend $?
 }
 reload() {
    ebegin "Reloading Puppet Server"
    start-stop-daemon --signal HUP --pidfile "${RUNDIR}/puppetserver.pid"
    eend $?
 }
--- a/app-admin/puppetserver/puppetserver-2.3.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-2.3.0.ebuild
@ -0,0 +1,107 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit multilib systemd user
 DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
 HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
 SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
 KEYWORDS="~amd64 ~x86"
 RDEPEND+="
 		>=virtual/jdk-1.7.0
 		app-admin/puppet-agent[puppetdb?]"
 DEPEND+=""
 pkg_setup() {
 	enewgroup puppet
 	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
 }
 src_prepare() {
 	sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die
 	sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die
 	sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die
 	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
 	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
 	sed -i 's/var\/run/run/g' install.sh || die
 }
 src_compile() {
 		einfo "not compiling"
 }
 src_install() {
 	insinto /opt/puppetlabs/server/apps/puppetserver
 	insopts -m0774
 	doins ext/ezbake-functions.sh
 	insopts -m0644
 	doins ext/ezbake.manifest
 	doins puppet-server-release.jar
 	insinto /etc/puppetlabs/puppetserver
 	doins ext/config/logback.xml
 	doins ext/config/bootstrap.cfg
 	doins ext/config/request-logging.xml
 	insinto /etc/puppetlabs/puppetserver/conf.d
 	doins ext/config/conf.d/puppetserver.conf
 	doins ext/config/conf.d/auth.conf
 	doins ext/config/conf.d/global.conf
 	doins ext/config/conf.d/web-routes.conf
 	doins ext/config/conf.d/webserver.conf
 	insopts -m0755
 	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
 	doins install.sh
 	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
 	doins ext/cli/irb
 	doins ext/cli/foreground
 	doins ext/cli/gem
 	doins ext/cli/ruby
 	insinto /opt/puppetlabs/server/apps/puppetserver/bin
 	doins ext/bin/puppetserver
 	insopts -m0644
 	dodir /opt/puppetlabs/server/bin
 	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
 	dodir /opt/puppetlabs/bin
 	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
 	dosym /opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
 	# other sys stuff
 	dodir /etc/puppetlabs/code
 	# needed for systemd
 	dodir /var/log/puppetlabs/puppetserver
 	dodir /etc/puppetlabs/puppet/ssl
 	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
 	fperms -R 771 /etc/puppetlabs/puppet/ssl
 	# init type tasks
 	newconfd ext/default puppetserver
 	newinitd "${FILESDIR}/puppetserver.initd" puppetserver
 	# systemd type things
 	insinto /etc/systemd/system/puppetserver.service.d/
 	newins ext/default gentoo.conf
 	systemd_dounit ext/redhat/puppetserver.service
 	# misc
 	insinto /etc/logrotate.d
 	newins ext/puppetserver.logrotate.conf puppetserver
 	# cleanup
 	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
 	fowners -R puppet:puppet /opt/puppetlabs/server/data
 	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
 	fperms -R 700 /var/log/puppetlabs/puppetserver
 }
 pkg_postinst() {
 	elog "to install you may want to run the following:"
 	elog
 	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
 	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
 	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
 	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
 	elog "puppet config set --section master codedir /etc/puppetlabs/code"
 }
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@ -1,5 +1,5 @@
 DIST sysstat-11.0.2.tar.xz 291256 SHA256 acd87fdfbe7c796480f14fc26119d8f785d26827d74a0f5bced6c492a91f1b96 SHA512 4bb5f2ee14346d83c59bd4da36ae8fc6c13197eabb808b1b5db84b593f07d8b366b1f6329abed8d43e2a8497a89de0f89a398b741d4ca23b4a3a95973b5f0f54 WHIRLPOOL 98daee288e22f803f19bbe423eb999f527e8997f2ffd3fe1fe784363260365ee833dd33b755f44d6bfcc685f70b47cb8fd70fdd9a3fa679829c1e608bd65f8e2
 DIST sysstat-11.0.8.tar.xz 294828 SHA256 d073b0e95820254a3fbf53ae3fb27db91d5b11778875034cd39c4d56d8e23695 SHA512 bae205b90d3b908de14d568a7872cca1fe0b2a6e423b74d4f837ebd9f9892abc742f8dc746dde559763c982cf0fd73fafc9ad116ea827ff1189c92488fc8696e WHIRLPOOL 375c3e9af3634c151605f89f1debea3148e2d890f9c43cf4dcb834977c093d2622832c0f0773ef05330f6d9dacb3abfd74acc10ae56251b812a7c6c528007232
 DIST sysstat-11.2.0.tar.xz 322660 SHA256 9806b9a662568796d3fb93ecd01ecea10d815e668337a646494953bff4bc4155 SHA512 0759d2df158b909a2f2f87cee9966041acb50093dbbd364bff9471b87143b31cd6bd83d085346a5a3e985b7b3cb29bcb1145739ac0b57804afcc5577c8f8c35f WHIRLPOOL 35b34f6f4e77a70a544d636e5dca4642cf1ec76dc16709ed0daab2c1b0741ba7d7e80f3290c47fbc16d25f89217b765c059bdea4677f26aad1406c7e4b6ae000
 DIST sysstat-11.2.1.1.tar.xz 322936 SHA256 19c4d435ffaf3e53ab2f5ca0f63b5c86ebd8f2595e9c34ece30f0966df2d483a SHA512 2c2a26d35ff7cf02332c54780b97de181cdca589da59aa85103619843edeed16c8a2a050585a201687a7d6e928fcb0546a2f2980d8e65203323572aada0ff691 WHIRLPOOL 372d55c332d7446dfc5c475d9ce839db46dab3622cb6131d986366d4da9c2d81eaaa8cabb9704639890866b30b0477e2d3ea4efd7e1602e0522cb4e72b16a14d
-DIST sysstat-11.3.1.tar.xz 329704 SHA256 ccb1b7c6569dd5ba17b41b7bcae2551cffe2aa8a8bd5293ac2f2b5c35f8e705d SHA512 5a977ff6048a971b513d0e59c3361bf9754dd3cbcfeacd367df26af075bd3249f32bff28075da4c13c996a6416cd1fe94397786eebedc4ec706454b40bd58afb WHIRLPOOL 44a39a11a33c94ee41ab4dedbef39e89c5c6b8a65392016c3fb79d16630de7fa9d2e87f53b1857d8c318c5e93e83e0db68454d1d73bb893aa506b6fdf8514e37
+DIST sysstat-11.2.2.tar.xz 323376 SHA256 e92c9980c6dde7e7faa3b91eb56c82de37139dc4d07eb69ca137eed44d161f5a SHA512 c7cf8134db3366588de58d64c6f852b23974ef99737960d8ec44f93d986690da8f83126132deaee4e02e565518d48678e32e969fa0ad9de36d9ccddfe4639506 WHIRLPOOL 7ab889d9d00ea5e54b0eecc312fc1f080b05151c2bed3cc648b5e301753e53cc348f34b1f2d0a5dec7d07083da7623acaa439f6c295b9b748812f6cce6065d8d
 DIST sysstat-11.3.2.tar.xz 332940 SHA256 87100f18d30ef2f9b2a8cabd0daf1800c48f5961983d03003ada816af129db56 SHA512 ff06e0cb5aa13f09bcd86d98ad139efb9edf5189e29b01615f124a73864bfeb14fdfa6f22ea21c0cc234a4282ace323991fc4b613bc3990ab2be72c679df3bf2 WHIRLPOOL bbc1a1acf8abbd8a80147efcb8563804c7cd3c9ab999db08bd4cb947cc43c74b41c88e2ebf7171ec400e52cf7dd438895de25b341f08e150f2608efc525f67f7
--- a/app-admin/sysstat/sysstat-11.2.2.ebuild
+++ b/app-admin/sysstat/sysstat-11.2.2.ebuild
--- a/app-admin/sysstat/sysstat-11.3.2.ebuild
+++ b/app-admin/sysstat/sysstat-11.3.2.ebuild
--- a/app-backup/kfoldersync/Manifest
+++ b/app-backup/kfoldersync/Manifest
@ -0,0 +1 @@
 DIST kfoldersync-3.1.3.tar.xz 34152 SHA256 138b546e8976e6f78e1f68f3f2b2754bd17cefab847c4aba9173bf1bd8450bf1 SHA512 e0ac9337a266621a7500dbfd28e69d496eb3f11ddbf6f59fbade156578dd22b5a11eadf7068fe358461fc5c0d8a34aea225628bc69794b6d9e341bf43ad18638 WHIRLPOOL ad63cfecdec0b97bd28e249f8393810b09fff899168e17fa6e23baa3ad91ca7494f871b53495f363e7a7422dc1bffccc6a628b08920ba76cc716ccc83d463d30
--- a/app-backup/kfoldersync/kfoldersync-3.1.3.ebuild
+++ b/app-backup/kfoldersync/kfoldersync-3.1.3.ebuild
@ -0,0 +1,35 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 KDE_GCC_MINIMAL="4.9"
 inherit kde5
 DESCRIPTION="Folder synchronization and backup tool for KDE"
 HOMEPAGE="http://kde-apps.org/content/show.php/KFolderSync?content=164092"
 SRC_URI="http://kde-apps.org/CONTENT/content-files/164092-${PN}-${PV}.tar.xz -> ${P}.tar.xz"
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
--- a/app-backup/kfoldersync/metadata.xml
+++ b/app-backup/kfoldersync/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>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 </pkgmetadata>
--- a/app-backup/tsm/Manifest
+++ b/app-backup/tsm/Manifest
@ -70,3 +70,4 @@ DIST 7.1.2.3-TIVsm-msg.ZH_CN.x86_64.rpm 3430325 SHA256 ab741203f42010448b5d1e050
 DIST 7.1.2.3-TIVsm-msg.ZH_TW.x86_64.rpm 3527076 SHA256 3499e674dc8990bbeca15c07f93b7e3bf65349b38ada66d31a057229b908124b SHA512 e81ea92d6ab15f70812475e506da15912842e31fff98de7048e620a7b56349fbbfc897cb52e7a307e2deb9978a05a051e1be8dd594ef82a13b0d81d467af4f34 WHIRLPOOL b613b13f594713c4a139b28f7f6778c3302c99e0f1484d7ffc2931de595a22f4353125428d4a2adad1f44c1b1375ec32442096a2c8ada69b5999f996abe7a47f
 DIST 7.1.3.1-TIV-TSMBAC-LinuxX86.tar 220323840 SHA256 488284bc46da88b62046cb3878dcbc93772f12f5201118a951f64535c407ac6b SHA512 9ec074d4e1417b02f51b884b775338f1df205001c073f88a8fa249c77d3b7f6b80aea97d43fb635ba8385227f2502e39ee70dbb66ff80c10225085272afd430e WHIRLPOOL 2d2c43b4ac88aa3e49ce3d0f002385a9227664847eeee5ede29eb774ed203e8700d036476d98c4b97579d25616f8745dbf9bf6c6ddb48cc57b5ae4280917144e
 DIST 7.1.3.2-TIV-TSMBAC-LinuxX86.tar 220262400 SHA256 33b74f3e38e732fd5d029ffe44ada86d118478e542cbca1b83496460818feccb SHA512 451280deabae62c6c2acd281165cbcdec7421aed17531bcc387e46be57fcbb85960fb0a6c8686e5d65d24a732c2778ce8610407f0c1fba21cd5bfce1c2c29fef WHIRLPOOL b818673a1e8dd96f91a61ac06bca002cb4d1b5e68789fb9e3ece3b778f12d42fffcdc9b20fe5786da54cd91bfc4abe7cf7b6173ec88270c116a70db79111044c
 DIST 7.1.4.4-TIV-TSMBAC-LinuxX86.tar 220456960 SHA256 0b0c4c6537e96a73e4c528490509c9a5696251c871f9e31bb3f690e78337667c SHA512 5f0b0262ad4b8f1dc6d9763735c3390a9ea0d559a3efd08593c6aa81e89978387906ff728a5dee575725da7d0b7e4f4e6d207111b79625c6487b6e8d56d767de WHIRLPOOL 0990653b96d9d2e6357c98a8ba8bbe7407e629063ea48ae834d8f51abf0cbaba78ca0e51479c3f192c467972f3da2c3dab10dd7b5f1f3c54bc11c02be81856d7
--- a/app-backup/tsm/tsm-7.1.4.4.ebuild
+++ b/app-backup/tsm/tsm-7.1.4.4.ebuild
@ -0,0 +1,228 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit versionator multilib eutils readme.gentoo rpm systemd user pax-utils
 DESCRIPTION="Tivoli Storage Manager (TSM) Backup/Archive (B/A) Client and API"
 HOMEPAGE="http://www.tivoli.com/"
 MY_PV_MAJOR=$(get_major_version)
 MY_PV_MINOR=$(get_version_component_range 2)
 MY_PV_TINY=$(get_version_component_range 3)
 MY_PV_PATCH=$(get_version_component_range 4)
 MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
 MY_PVR_ALLDOTS=${PV}
 if [[ ${MY_PV_PATCH} == 0 ]]; then
 	MY_RELEASE_PATH=maintenance
 else
 	MY_RELEASE_PATH=patches
 fi
 BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
 BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
 BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/"
 SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
 SRC_URI="${BASE_URI}${SRC_TAR}"
 RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
 LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
 	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a
 	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
 	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
 SLOT="0"
 KEYWORDS="~amd64 -*"
 IUSE="acl java +tsm_cit +tsm_hw"
 QA_PREBUILT="*"
 # not available (yet?)
 #MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT
 #	ja:JA_JP ko:KO_KR pl:PL_PL pt:PT_BR ru:RU_RU zh:ZH_CN zh_TW:ZH_TW"
 MY_LANG_PV="${MY_PVR_ALLDOTS}-"
 for lang in ${MY_LANGS}; do
 	IUSE="${IUSE} linguas_${lang%:*}"
 	SRC_URI="${SRC_URI} linguas_${lang%:*}? ( \
 ${BASE_URI}TIVsm-msg.${lang#*:}.x86_64.rpm -> \
 ${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
 done
 unset lang
 DEPEND=""
 RDEPEND="
 	dev-libs/expat
 	dev-libs/libxml2
 	=sys-fs/fuse-2*
 	acl? ( sys-apps/acl )
 	java? ( virtual/jre:1.7 )
 "
 S="${WORKDIR}/bacli"
 pkg_setup() {
 	enewgroup tsm
 	DOC_CONTENTS="
 		Note that you have to be either root or member of the group tsm to
 		be able to use the Tivoli Storage Manager client."
 }
 src_unpack() {
 	local rpm rpms lang
 	unpack ${SRC_TAR}
 	cd "${S}"
 	for rpm in *.rpm; do
 		case ${rpm} in
 			TIVsm-APIcit.*|TIVsm-BAcit.*)
 				use tsm_cit && rpms="${rpms} ./${rpm}"
 				;;
 			TIVsm-BAhdw.*)
 				use tsm_hw && rpms="${rpms} ./${rpm}"
 				;;
 			TIVsm-JBB.*|*-filepath-*)
 				# "journal based backup" for all filesystems
 				# requires a kernel module.
 				# "Linux Filepath source code" available
 				# by request from vendor
 				;;
 			*)
 				rpms="${rpms} ./${rpm}"
 				;;
 		esac
 	done
 	for rpm in ${A}; do
 		case ${rpm} in
 			*.rpm)
 				rpms="${rpms} ${rpm}"
 				;;
 		esac
 	done
 	rpm_unpack ${rpms}
 	# Avoid strange error messages caused by read-only files
 	chmod -R u+w "${S}" || die
 }
 src_install(){
 	cp -a opt "${D}" || die
 	cp -a usr "${D}" || die
 	# The RPM files contain postinstall scripts which can be extracted
 	# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
 	# Below we try to mimic the behaviour of these scripts.
 	# We don't deal with SELinux compliance (yet), though.
 	local RPM_INSTALL_PREFIX CLIENTDIR i
 	RPM_INSTALL_PREFIX=/opt
 	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
 	# Create links for messages; this is spread over several postin scripts.
 	#for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do
 	#	dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i}
 	#	dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i}
 	#done
 	# Mimic TIVsm-API64 postinstall script
 	for i in libgpfs.so libdmapi.so; do
 		dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i}
 	done
 	# The TIVsm-BA postinstall script only does messages and ancient upgrades
 	# The gscrypt64 postinstall script only deals with s390[x] SELinux
 	# and the symlink for the iccs library which we handle in the loop below.
 	# Move stuff from /usr/local to /opt, #452332
 	mv "${D}"/usr/local/ibm "${D}"/opt/ || die
 	rmdir "${D}"/usr/local || die
 	# Mimic gskssl64 postinstall script
 	for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do
 		dosym ../../opt/ibm/gsk8_64/lib64/libgsk8${i}_64.so \
 			/usr/lib64/libgsk8${i}_64.so
 	done
 	for i in capicmd ver; do
 		dosym ../../opt/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/gsk${i}_64
 	done
 	# Done with the postinstall scripts as the RPMs contain them.
 	# Now on to some more Gentoo-specific installation.
 	[[ -d "${D}usr/lib" ]] && die "Using 32bit lib dir in 64bit only system"
 	# Avoid "QA Notice: Found an absolute symlink in a library directory"
 	local target
 	find "${D}"usr/lib* -lname '/*' | while read i; do
 		target=$(readlink "${i}")
 		rm -v "${i}" || die
 		dosym "../..${target}" "${i#${D}}"
 	done
 	fowners :tsm /opt/tivoli/tsm/client/ba/bin/dsmtca
 	fperms 4710 /opt/tivoli/tsm/client/ba/bin/dsmtca
 	keepdir /var/log/tsm
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/tsm.logrotate" tsm
 	keepdir /etc/tivoli
 	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
 	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
 	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
 	# Added the hostname to be more friendly, the admin will need to edit this file anyway
 	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
 	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
 	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
 	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
 	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
 	dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
 	# Setup the env
 	dodir /etc/env.d
 	ENV_FILE="${D}/etc/env.d/80tivoli"
 	echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
 	echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
 	echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
 	echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
 	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
 	newinitd "${FILESDIR}/dsmc.init.d" dsmc
 	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
 	# Need this for hardened, otherwise a cryptic "connection to server lost" message appears
 	pax-mark -m "${D}/opt/tivoli/tsm/client/ba/bin/dsmc"
 	systemd_dounit "${FILESDIR}/dsmc.service"
 	systemd_dounit "${FILESDIR}/dsmcad.service"
 	readme.gentoo_create_doc
 }
 pkg_postinst() {
 	local i dirs
 	for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
 		if [[ ! -e $i ]]; then
 			touch $i || die
 			chown :tsm $i || die
 			chmod 0660 $i || die
 		fi
 	done
 	# Bug #375041: the log directory itself should not be world writable.
 	# Have to do this in postinst due to bug #141619
 	chown root:tsm /var/log/tsm || die
 	chmod 0750 /var/log/tsm || die
 	# Bug 508052: directories used to be too restrictive, have to widen perms.
 	dirs=( /opt/tivoli $(find /opt/tivoli/tsm -type d) )
 	chown root:root "${dirs[@]}" || die
 	chmod 0755 "${dirs[@]}" || die
 	readme.gentoo_print_elog
 }
--- a/app-cdr/bashburn/metadata.xml
+++ b/app-cdr/bashburn/metadata.xml
@ -10,7 +10,7 @@
 		with broad format support including WAV, MP3, Vorbis, and FLAC.
 	</longdescription>
 	<upstream>
-		<maintainer status="inactive" type="person">
+		<maintainer status="inactive">
 			<email>anders.linden@gmail.com</email>
 			<name>Anders Lindén</name>
 		</maintainer>
--- a/app-cdr/xfburn/metadata.xml
+++ b/app-cdr/xfburn/metadata.xml
@ -9,8 +9,6 @@
    <maintainer>
      <email>mario@xfce.org</email>
    </maintainer>
  </upstream>
  <upstream>
    <maintainer>
      <email>bugs@da.mcbf.net</email>
      <name>David Mohr</name>
--- a/app-dicts/gwaei/metadata.xml
+++ b/app-dicts/gwaei/metadata.xml
@ -16,13 +16,9 @@
      Enable single instance support using
      <pkg>dev-libs/libunique</pkg>.
    </flag>
 	</use>
 	<use>
 		<flag name="mecab">
 	  Enable <pkg>app-text/mecab</pkg> support
 	</flag>
 	</use>
 	<use>
 		<flag name="hunspell">
 	  Enable <pkg>app-text/hunspell</pkg> spellchecking and morphological analysis
 	</flag>
--- a/app-emacs/ebuild-mode/metadata.xml
+++ b/app-emacs/ebuild-mode/metadata.xml
@ -6,7 +6,7 @@
  <name>Gentoo GNU Emacs project</name>
 </maintainer>
 <upstream>
-  <maintainer type="project" status="active">
+  <maintainer status="active">
    <email>emacs@gentoo.org</email>
    <name>Gentoo Emacs project</name>
  </maintainer>
--- a/app-emacs/eselect-mode/metadata.xml
+++ b/app-emacs/eselect-mode/metadata.xml
@ -6,7 +6,7 @@
  <name>Gentoo GNU Emacs project</name>
 </maintainer>
 <upstream>
-  <maintainer type="project" status="active">
+  <maintainer status="active">
    <email>eselect@gentoo.org</email>
    <name>eselect configuration and management tool</name>
  </maintainer>
--- a/app-emulation/bochs/metadata.xml
+++ b/app-emulation/bochs/metadata.xml
@ -6,7 +6,6 @@
 	</maintainer>
 	<use>
 		<flag name="3dnow">Enable support for emulating 3DNow! instructions (incomplete)</flag>
 		<flag name="debugger">Enable the bochs debugger</flag>
 		<flag name="avx">Enable support for emulating Advanced Vector Extensions (AVX)</flag>
 		<flag name="debugger">Enable debugger (slows down emulation)</flag>
 		<flag name="gdb">Enable support for the remote GDB stub</flag>
--- a/app-emulation/docker/metadata.xml
+++ b/app-emulation/docker/metadata.xml
@ -8,7 +8,7 @@
 		scale, in production, on VMs, bare metal, OpenStack clusters, public
 		clouds and more.
 	</longdescription>
-	<maintainer status="active" type="person">
+	<maintainer type="person">
 		<email>admwiggin@gmail.com</email>
 		<name>Tianon</name>
 	</maintainer>
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer status="active" type="person">
+	<maintainer type="person">
 		<email>stasibear@gentoo.org</email>
 		<name>Erik Mackdanz</name>
 	</maintainer>
--- a/app-emulation/vmware-modules/files/304-4.2-00-inode_op.patch
+++ b/app-emulation/vmware-modules/files/304-4.2-00-inode_op.patch
@ -0,0 +1,45 @@
 diff -rupN vmblock-only/linux/inode.c vmblock-only.new/linux/inode.c
 --- vmblock-only/linux/inode.c	2016-03-16 21:24:25.771034759 -0400
 +++ vmblock-only.new/linux/inode.c	2016-03-16 21:26:22.697036311 -0400
@@ -44,7 +44,9 @@ static struct dentry *InodeOpLookup(stru
 static int InodeOpReadlink(struct dentry *, char __user *, int);
 #endif
 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 +static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
 static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
 #else
 static int InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
@@ -220,7 +222,9 @@ InodeOpReadlink(struct dentry *dentry,
  *
  *----------------------------------------------------------------------------
  */
 -
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 +static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie)
 +#else
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
 static void *
 #else
@@ -228,6 +232,7 @@ static int
 #endif
 InodeOpFollowlink(struct dentry *dentry,  // IN : dentry of symlink
                   struct nameidata *nd)   // OUT: stores result
 +#endif
 {
    int ret;
    VMBlockInodeInfo *iinfo;
@@ -244,7 +249,11 @@ InodeOpFollowlink(struct dentry *dentry,
       goto out;
    }
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 +   return *cookie = (char *)(iinfo->name);  
 +#else
    nd_set_link(nd, iinfo->name);
 +#endif
 out:
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
--- a/app-emulation/vmware-modules/files/304-4.2-01-vmci_vmalloc.patch
+++ b/app-emulation/vmware-modules/files/304-4.2-01-vmci_vmalloc.patch
@ -0,0 +1,13 @@
 diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c
 --- vmci-only/linux/driver.c	2015-11-03 19:27:55.000000000 -0500
 +++ vmci-only.new/linux/driver.c	2016-03-16 21:30:47.646039829 -0400
@@ -26,6 +26,9 @@
 #include <linux/file.h>
 #include <linux/fs.h>
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 +#include <linux/vmalloc.h>
 +#endif
 #include <linux/init.h>
 #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
 #   include <linux/ioctl32.h>
--- a/app-emulation/vmware-modules/files/304-4.2-02-vsock.patch
+++ b/app-emulation/vmware-modules/files/304-4.2-02-vsock.patch
@ -0,0 +1,77 @@
 diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
 --- vsock-only/linux/af_vsock.c	2016-03-16 21:31:24.582040320 -0400
 +++ vsock-only.new/linux/af_vsock.c	2016-03-16 21:37:22.140045067 -0400
@@ -231,7 +231,16 @@ static int VSockVmciStreamSetsockopt(str
 static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname,
                                      char __user *optval, int __user * optlen);
 -
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 +static int VSockVmciDgramSendmsg(
 +                                 struct socket *sock, struct msghdr *msg, size_t len);
 +static int VSockVmciDgramRecvmsg(struct socket *sock,
 +                                 struct msghdr *msg, size_t len, int flags);
 +static int VSockVmciStreamSendmsg(
 +                                 struct socket *sock, struct msghdr *msg, size_t len);
 +static int VSockVmciStreamRecvmsg(struct socket *sock,
 +                                 struct msghdr *msg, size_t len, int flags);
 +#else
 static int VSockVmciDgramSendmsg(struct kiocb *kiocb,
                                  struct socket *sock, struct msghdr *msg, size_t len);
 static int VSockVmciDgramRecvmsg(struct kiocb *kiocb, struct socket *sock,
@@ -240,6 +249,7 @@ static int VSockVmciStreamSendmsg(struct
                                  struct socket *sock, struct msghdr *msg, size_t len);
 static int VSockVmciStreamRecvmsg(struct kiocb *kiocb, struct socket *sock,
                                  struct msghdr *msg, size_t len, int flags);
 +#endif
 static int VSockVmciCreate(
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
@@ -4210,7 +4220,11 @@ VSockVmciShutdown(struct socket *sock,
  */
 static int
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 +VSockVmciDgramSendmsg(
 +#else
 VSockVmciDgramSendmsg(struct kiocb *kiocb,          // UNUSED
 +#endif
                       struct socket *sock,          // IN: socket to send on
                       struct msghdr *msg,           // IN: message to send
                       size_t len)                   // IN: length of message
@@ -4540,7 +4554,11 @@ VSockVmciStreamGetsockopt(struct socket
  */
 static int
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 +VSockVmciStreamSendmsg(
 +#else
 VSockVmciStreamSendmsg(struct kiocb *kiocb,          // UNUSED
 +#endif
                        struct socket *sock,          // IN: socket to send on
                        struct msghdr *msg,           // IN: message to send
                        size_t len)                   // IN: length of message
@@ -4709,7 +4727,11 @@ out:
  */
 static int
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 +VSockVmciDgramRecvmsg(
 +#else
 VSockVmciDgramRecvmsg(struct kiocb *kiocb,          // UNUSED
 +#endif
                       struct socket *sock,          // IN: socket to receive from
                       struct msghdr *msg,           // IN/OUT: message to receive into
                       size_t len,                   // IN: length of receive buffer
@@ -4804,7 +4826,11 @@ out:
  */
 static int
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 +VSockVmciStreamRecvmsg(
 +#else
 VSockVmciStreamRecvmsg(struct kiocb *kiocb,          // UNUSED
 +#endif
                        struct socket *sock,          // IN: socket to receive from
                        struct msghdr *msg,           // IN/OUT: message to receive into
                        size_t len,                   // IN: length of receive buffer
--- a/app-emulation/vmware-modules/files/304-4.2-03-vsock.patch
+++ b/app-emulation/vmware-modules/files/304-4.2-03-vsock.patch
@ -0,0 +1,14 @@
 diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
 --- vsock-only/linux/af_vsock.c	2016-03-16 21:38:01.401045589 -0400
 +++ vsock-only.new/linux/af_vsock.c	2016-03-16 21:39:32.529046799 -0400
@@ -2836,7 +2836,9 @@ __VSockVmciCreate(struct net *net,
     * network namespace, and the option to zero the sock was dropped.
     *
     */
 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 +   sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto, 1);
 +#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
    sk = sk_alloc(vsockVmciFamilyOps.family, priority,
                  vsockVmciProto.slab_obj_size, vsockVmciProto.slab);
 #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
--- a/app-emulation/vmware-modules/files/304-4.3-00-misc_deregister.patch
+++ b/app-emulation/vmware-modules/files/304-4.3-00-misc_deregister.patch
@ -0,0 +1,34 @@
 diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c
 --- vmci-only/linux/driver.c	2016-03-16 21:59:30.229062702 -0400
 +++ vmci-only.new/linux/driver.c	2016-03-16 21:58:35.452061974 -0400
@@ -2469,7 +2469,9 @@ vmci_init(void)
 static void __exit
 vmci_exit(void)
 {
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
    int retval;
 +#endif
    if (guestDeviceInit) {
       pci_unregister_driver(&vmci_driver);
 diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c
 --- vmci-only/linux/driver.c	2016-03-16 21:53:24.184057841 -0400
 +++ vmci-only.new/linux/driver.c	2016-03-16 21:54:37.558058816 -0400
@@ -2482,12 +2482,16 @@ vmci_exit(void)
       VMCI_HostCleanup();
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 +      misc_deregister(&linuxState.misc);
 +#else
       retval = misc_deregister(&linuxState.misc);
       if (retval) {
          Warning(LGPFX "Module %s: error unregistering\n", VMCI_MODULE_NAME);
       } else {
          Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
       }
 +#endif
       hostDeviceInit = FALSE;
    }
--- a/app-emulation/vmware-modules/files/304-4.5-00-get_link.patch
+++ b/app-emulation/vmware-modules/files/304-4.5-00-get_link.patch
@ -0,0 +1,67 @@
 diff -rupN vmblock-only/linux/inode.c vmblock-only.new/linux/inode.c
 --- vmblock-only/linux/inode.c	2016-03-16 22:22:00.470080630 -0400
 +++ vmblock-only.new/linux/inode.c	2016-03-16 22:23:33.016081859 -0400
@@ -44,7 +44,9 @@ static struct dentry *InodeOpLookup(stru
 static int InodeOpReadlink(struct dentry *, char __user *, int);
 #endif
 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
 +const char *InodeOpGetLink(struct dentry *dentry, struct inode *inode, struct delayed_call *done);
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
 static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
@@ -63,7 +65,11 @@ static struct inode_operations LinkInode
 struct inode_operations LinkInodeOps = {
 #endif
    .readlink    = InodeOpReadlink,
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
 +   .get_link = InodeOpGetLink,
 +#else
    .follow_link = InodeOpFollowlink,
 +#endif
 };
 /*
@@ -222,7 +228,9 @@ InodeOpReadlink(struct dentry *dentry,
  *
  *----------------------------------------------------------------------------
  */
 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
 +const char *InodeOpGetLink(struct dentry *dentry, struct inode *inode, struct delayed_call *done)
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie)
 #else
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
@@ -238,18 +246,28 @@ InodeOpFollowlink(struct dentry *dentry,
    VMBlockInodeInfo *iinfo;
    if (!dentry) {
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
 +      ret = -ECHILD;
 +#else
       Warning("InodeOpReadlink: invalid args from kernel\n");
       ret = -EINVAL;
 +#endif
       goto out;
    }
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
 +   iinfo = INODE_TO_IINFO(inode);
 +#else
    iinfo = INODE_TO_IINFO(dentry->d_inode);
 +#endif
    if (!iinfo) {
       ret = -EINVAL;
       goto out;
    }
 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
 +   return (char *)(iinfo->name);  
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
    return *cookie = (char *)(iinfo->name);  
 #else
    nd_set_link(nd, iinfo->name);
--- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
@ -0,0 +1,119 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils flag-o-matic linux-info linux-mod user versionator udev
 PV_MAJOR=$(get_major_version)
 PV_MINOR=$(get_version_component_range 2)
 DESCRIPTION="VMware kernel modules"
 HOMEPAGE="http://www.vmware.com/"
 SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64"
 IUSE="pax_kernel +vmci +vsock"
 RDEPEND=""
 DEPEND="${RDEPEND}
 	|| ( =app-emulation/vmware-player-7.1.${PV_MINOR}*
 	=app-emulation/vmware-workstation-11.1.${PV_MINOR}* )"
 S=${WORKDIR}
 pkg_setup() {
 	CONFIG_CHECK="~HIGH_RES_TIMERS"
 	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
 		CONFIG_CHECK="${CONFIG_CHECK} BKL"
 	fi
 	if use vmci ; then
 		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
 	else
 		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
 	fi
 	if use vsock ; then
 		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
 	else
 		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
 	fi
 	linux-info_pkg_setup
 	linux-mod_pkg_setup
 	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
 	VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
 	VMWARE_MODULE_LIST="vmblock vmmon vmnet"
 	use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
 	use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
 	VMWARE_MOD_DIR="${PN}-${PVR}"
 	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
 	enewgroup "${VMWARE_GROUP}"
 	filter-flags -mfpmath=sse
 	for mod in ${VMWARE_MODULE_LIST}; do
 		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
 	done
 }
 src_unpack() {
 	cd "${S}"
 	for mod in ${VMWARE_MODULE_LIST_ALL}; do
 		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
 	done
 }
 src_prepare() {
 	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
 	use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch"
 	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch"
 	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
 	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
 	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch"
 	kernel_is ge 3 18 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
 	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
 	#kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-01-dentry.patch"
 	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
 	#kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-03-iovec.patch"
 	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
 	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
 	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
 	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
 	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-00-inode_op.patch"
 	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-01-vmci_vmalloc.patch"
 	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-02-vsock.patch"
 	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-03-vsock.patch"
 	kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.3-00-misc_deregister.patch"
 	kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.5-00-get_link.patch"
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user
 }
 src_install() {
 	linux-mod_src_install
 	local udevrules="${T}/60-vmware.rules"
 	cat > "${udevrules}" <<-EOF
 		KERNEL=="vmci",  GROUP="vmware", MODE="660"
 		KERNEL=="vmw_vmci",  GROUP="vmware", MODE="660"
 		KERNEL=="vmmon", GROUP="vmware", MODE="660"
 		KERNEL=="vsock", GROUP="vmware", MODE="660"
 	EOF
 	udev_dorules "${udevrules}"
 }
--- a/app-emulation/vmware-tools/Manifest
+++ b/app-emulation/vmware-tools/Manifest
@ -1,60 +1,36 @@
 DIST vmware-tools-freebsd-9.2.3-1031769.i386.component.tar 15216640 SHA256 a54e3fa823495b18dca3635dde7f37c5c15a6374ec6a863bfccaf02bcb75fd9b SHA512 9d0eb0699ba3d36ed7a1810e553632fdc1ae0339848de2e4c2123222e3063da1164c73d2aca38bfd82b3825f1a8940fe76a461f9bdb9280f0f3473587824d890 WHIRLPOOL aa2309ef38995e301059ce9dbbe0c680aa74aa95b2cb07cf930e71a6c9f620be777b83ef3ad8e93f53760a7b266ffa08b77c34f137fe01d3b51d5ba68ffb4686
 DIST vmware-tools-freebsd-9.2.3-1031769.x86_64.component.tar 15216640 SHA256 4d4047a0ffaa13aa546f065a50e345d23128746fefa4e6f7ad7b54dc947b1276 SHA512 741b55b32a04957efe42684288447faf346c6a13cbb67819984c8efcf18995f75979f7db2ce7e37f4bfcc9b2a3c867c851e2d5e4db9ddf81209ea296813a8e44 WHIRLPOOL b44274d75a76214e1b4581143825f246a0345da4199d4692a3a0d6bceb360c8402bb0d6fc6594d2e20c0532cc40a27a03f1e1e98071be7ec67c4640b504936b8
 DIST vmware-tools-freebsd-9.6.1-1379776.i386.component.tar 15155200 SHA256 a3be78504eff68c089599ff4989bb4fc3cbc829495ef6dca8f9d2c86437bd355 SHA512 d6f62180756df7f7aedbbbd7cd828ed417446f90f718216d5b113c9bbb069486ec0fc8e9a8d7856f6dc2e81bae28650992513380994f4fcce95c130b92c558f0 WHIRLPOOL c4ee83d9227771494cb2c651ddf77b6cf39321209886741e14528a6f333c55bb2f499d01ed7168adfeb0fcb1bd55a4b7e597e8b3330dd014914945d6ef6eab6e
 DIST vmware-tools-freebsd-9.6.1-1379776.x86_64.component.tar 15155200 SHA256 941e58d81e00a11b4f611475e5ecb4257c78380ceef42bd9a3f2341b6bbad43e SHA512 3a1d3e49c6ccbb174868925b5d980e9676e61c61b6df67352cad6f96a004902466ba26e18ef4919ae5afdfd0e7b213ce9754fd97e39bd0873a0da695f11f046e WHIRLPOOL b37985ac5017d3bf306a10b5414d04c206b6f657b012609b0278aa79ab238535782913e5f31918e6906e6b48a95e26bd0cabe3433b380f4c472fd57c58308942
 DIST vmware-tools-freebsd-9.6.2-1744117.i386.component.tar 15144960 SHA256 a9c7c25f829db43005c14bd416a08ae8a30b8096dcc5b924e17ebbaacfcb595c SHA512 e9c1049cc639464532927d5d2f0e16141e114ca8fa68eb6acb0297748036c4d810a57001ab782efaa38cd1d8e3976e70ecc9687f36be0963cd3aab9edc5aa7e9 WHIRLPOOL ec49dfaa540f0f7233a6950d01f8c7bfde6e10a292561a6b81bcd2e0c90de529f33316298c6db6dae49c53f67fe06d1ec335a36c005e0602c1ebff90193a14b2
 DIST vmware-tools-freebsd-9.6.2-1744117.x86_64.component.tar 15144960 SHA256 1c6d4d21aa4ae8ba0c56f4b24fc8c73da07a4e8bfaf421b4db7c25012328fde1 SHA512 3306ccba195ed0373cf94e810fbb75f74f1b4238ed5be9bc50141222c2a5b687f79b794729ab40e192bba1c861670867abc792e54b01445b1bae8553eace2437 WHIRLPOOL 4556ea97c83ab3708316bd96e9e525fcf1a67c46bb2dd55c005e89102b2d4b8992d5a4376d79cc1c2faf20e65e08b8c3c79e26d9c9fd4c30d680a6ed184b9974
 DIST vmware-tools-freebsd-9.6.5-2700073.i386.component.tar 15216640 SHA256 d900d0ee4f9f185f1914f80cb9b0a7df8fcf027e1009def7c2b81a7ac15e5d0b SHA512 5e070544e85137b7f032e2c1e4567233adadac274abc727b4dcfdfdddd455bc5f080499b306c6bdf7e5bbe17f6610fdece1c2ef541d5b89081ec5d342145071e WHIRLPOOL 1cc29331cefb25628425553707b8c8572eddc1b208856eac409d0123901918677d95fe82cc6028f0debcd7b28a8d524e1f29357b399629c30653eced80d12a7b
 DIST vmware-tools-freebsd-9.6.5-2700073.x86_64.component.tar 15216640 SHA256 7a2435330281b039727ab8a10736a95393bc143e6b3bfea6e9b7d18a7bf4ba15 SHA512 e78b1d85bcff951d4661374eb687c388d0b299d3d1cd6e4344d3a0439219f82a1e59f335cd5284fb371304223038ef358b59006504b061d702981bec7afa3408 WHIRLPOOL 42ea166a2b5ec8986d4d7b04dc2d13c76fb2509d6f9993d1dcceb7479332de0032589acfc749996a255b5487173f8ec03dc859b897a5f894fd2dde964db45220
 DIST vmware-tools-freebsd-9.9.2-2496824.x86_64.component.tar 15267840 SHA256 92331cc0c1b6340e23c7f06f36fef6d2945385527f9f49f06c1d9099bbec03d9 SHA512 d58ddaa59b8c939484aa60fe27f2ae857564cb3e607ec76163aec9c02b11115c0d592cb77dfe123397b0700ca7617c2a69e624a6279b6e4fb99101e5ced43bbd WHIRLPOOL e02783002ab5b862c69de1f5d68ec7690b2c6cd9013cdffd2df6b7337bc8e2b532438568cfa503d5b9d23af8c1d35512097522ccc2e4a92dca71e04225d4ff8f
 DIST vmware-tools-freebsd-9.9.3-2780323.x86_64.component.tar 15267840 SHA256 9f0c62ff9ec11b6920b7eed08a60f445b2e39f98408d74e290789ff405f7a8cf SHA512 ab0a97ae7ab5b6762fdba067606725f00eaa0917e209a5f84852c6ea154e24639cc488f9c9bd6e215d2b0048fdff8ee1adbd1292015eb3712811f54459d7c316 WHIRLPOOL db81fb392d8800c8e2a0fe5f883fd88810ea88b927f9e66a17758d0c864059dcac1f1a0bcaa1a135e0d9b300798185710ab3fffa4cd82e264a73d6e0bba21d1e
 DIST vmware-tools-freebsd-9.9.4-3206955.x86_64.component.tar 15267840 SHA256 83206e70e79749f7fa50a26930046c58061b538e3b912d2270a93ee400c5a365 SHA512 3112c0cb5ff2cd6a2309f6bdf51bfccee5e1a8dc01910239a30adbdd516c7f9838133d245a3fd0c95eb909e9fe9b8df0b89135adeb90d5bd4843ddc2db7782ff WHIRLPOOL 29f36ad06ecd4cb7f9faa91924cb7a756cea9c18faf8fff67c0bbc1be10a8a1145724375f09467fefa1a41bd7f6f9196698806833ee105c6a86dd49910260b40
 DIST vmware-tools-linux-9.2.3-1031769.i386.component.tar 66211840 SHA256 0383d632139dbb463bba02c3f6770c877b2fc254710b05167b1d0d4213fbc11c SHA512 076d952a70bec0be1dcdc22534a57631faa1e74136cd1baac479d6f98d924a8d870958aa02aaaa9eef98e23609470ab85bde5ab7afacbc15516a5d7ad7b023c2 WHIRLPOOL 4429145db5528b8160115a7c55bc895e8b52745c9c3b08024a096e3bdefbb0e11ef6fdad976178e96fa32320711f30c2889c8830535dc6f6dfb8f6cbb214be03
 DIST vmware-tools-linux-9.2.3-1031769.x86_64.component.tar 66211840 SHA256 be5fa35af317058bffe98979b3b1f77eed416f17c7f6ee265a4717bbe3c9e718 SHA512 1f26d724e8e50df9d34333e44831d002ecd1a8af43cfed575c092316c4328ef3f34ac52b32c81ad6eb01dd362947ed462b09af080ee5e19cfd8aa89fbf83cd1d WHIRLPOOL 7292d3d69a46ad97b6decd5dff6c9c5dc19f76545965c6b95a904a14755072bc061742c458eecf974e8ca910af5d6464ccc6708c00c647095c3e98856ab628b0
 DIST vmware-tools-linux-9.6.1-1379776.i386.component.tar 60518400 SHA256 88ef45021e7dcc2197bbbb2021703000065c7aee0df35706b6c0927e06b9a8eb SHA512 1047b481d20fc3ab2818bb540ba0af16e8bc0f703af95e7f78449a688324d73f32af8650a6325400c38dace5ce582c71e1079c08605db69c45c0476dbe98997e WHIRLPOOL 70ab1d8730f95c2c628d397951f922e3022fc938676e330446ba3bc357eba9c1b0157c319bbd3857d46694e0296e280f88f5334af4ed6acde98207c260cad4eb
 DIST vmware-tools-linux-9.6.1-1379776.x86_64.component.tar 60518400 SHA256 b9d453f210891c1f76d70a45c6e463465940af27826006ebba090bd71e7d9590 SHA512 99b941fc7ce87d122f9b66d19d0d9406ba6d479f7b4ee782f261939694768c42bc31fb60974e4e854fe86964ff24f4a9ea7dfa1f8ed42ae697640d19834b89c6 WHIRLPOOL ab6892d084be06d753b1e452316ac30c38cfd1fc2607181159fe5d3ef5f2c9b2466145cae5f2f93c95be1010bc5484d1a39b4ececc9e9fdb3439a4fe64229521
 DIST vmware-tools-linux-9.6.2-1744117.i386.component.tar 61143040 SHA256 d84a4db83b1feb991b1a382b0936b864fc231dcc73c39304a16c34bb343e9f50 SHA512 7338a83330a62212559062e1c75f0540b7eb7f1037b7a32a9b8aba1750c9f53f2bb2c82c79147df93d93f9113b6902b3318ccd29d67d21ecb523f638d541c1e5 WHIRLPOOL 93213e870e99b71fc1dad344bd81acd61dd29a9fe853c37fa44408105d2be68e48ff044c56ad9dde8905ce7d42a614d585ab106ad1f9c5fea07f37fc2ba92526
 DIST vmware-tools-linux-9.6.2-1744117.x86_64.component.tar 61143040 SHA256 ce07d8afe9c63dc8018979528d252413ea49f9330006fca7b9d9d1fb394dd2e4 SHA512 e5078b84a10ab0b6962ca175ae95475e89cda3f2cf94c0e077e012b7163f46f54a418f34439224b5cb41428f809359e053e36926e85cf17d2ef7a9dbed868b80 WHIRLPOOL 51186181d1ee9bf371e3d042d11baa16bf6627922ef9c967ab1a6c731763d50782787d0028978c5640ec7792f48072de3b2ece78bdfc30ad23a49352a4ea11d2
 DIST vmware-tools-linux-9.6.5-2700073.i386.component.tar 61337600 SHA256 aad21f54da7bb37169dc85fd84062f3976618ce63034c6785235bd6d5aa580f4 SHA512 133c4958d904755ef9a4fdc13ea686aa69b325301c435a8cf7ea77a246a072099864c3b3654d5ad35bfda2b849d3c0e31afdc8654959f0ca2df07c9d822bf9f7 WHIRLPOOL 66ceb444996985f264892d7bbee5ab8a7122796691fedf321e108e1bc81c54646ca3fe325688f4824ef781e7f9ae7058d4f440e2f0219bd58c985195eb9332b2
 DIST vmware-tools-linux-9.6.5-2700073.x86_64.component.tar 61337600 SHA256 dd1fea6f4e99f676cef89d6ad1f9880e28d324f5051a95a6216cb48045c39ea8 SHA512 a607713f410a405ff8364adc7a300223ffa26d5cfd8f0612ec39c371057d6a65744de5e4a2eb552e488cdcb9dbc9ae6ddff7e89b533a9cbe531969453eefe291 WHIRLPOOL 5d851d3a3b9e7ab3b5ff48fa43f40330e88c6cdf083b9a975032b9d2868e9ad3e6e73d9c64db5fba0838eebcf182d9406434abf20d4fe76f74b136a00948684c
 DIST vmware-tools-linux-9.9.2-2496824.x86_64.component.tar 62044160 SHA256 3b08dc7dedb9312ddb465c96435120f87053cd1e456e42dc60fba9e0367044f1 SHA512 8bf3022715f40440838225b1ab2e0fb265c7920da3445a252898d3a4d845e93cbd1af34829e470da0bf9427342adeefd2e5b3df915ec63417fa33d9fa995b783 WHIRLPOOL ba49c9e645528ffb59187937a1b1dc01026da9386ddbcf489b25a3ff7d0b1d799c60beb7c820e5472b6b001c56f7b1bdbf6af1e22f8d78fc1ec4c6d32b7aa9d4
 DIST vmware-tools-linux-9.9.3-2780323.x86_64.component.tar 62095360 SHA256 6ed266ef888c8fd9a9f0d49083767f525b03bb2725d241c048308e8660b67254 SHA512 af12a60a70727db6ff98bfcc1693eda8c78fc09f3c5769eb42cd2ddfc36b6ae411309414d922d6fbcbfddab7875822a57d1bbe4afe2e00afd6afc09c8d959d89 WHIRLPOOL b46ef6bd824758bd2c4fdf8b3934a99baa23a4c2c6b9728a9ff464363c8c31050ffbe1392470191514f50d2f1ac208092f5d789e8cde1681d317636cce87d1b3
 DIST vmware-tools-linux-9.9.4-3206955.x86_64.component.tar 62085120 SHA256 d1482b6c78f5a7bf5820b174fe5fdd6f0fcaa3ed66c12eefa32e6b59358c376c SHA512 4c2b64b399a802fc1f7ef13878d0c8772507c971d5f515c6323e29a65b6d6fcb27ed48996ad5c6db0ff4d9a19db597b6d8b2eb1c3292cacd47cba9db5c65ef5f WHIRLPOOL 2ee2ad16b108aedf106f5dc017a08859505229734e4b87f81714c436f2fe43469acf6e41bd88473325d67c8396ea4330e7eb4141581da988bd2636ee153eadb8
 DIST vmware-tools-netware-9.2.3-1031769.i386.component.tar 81920 SHA256 906680d060a59414fa1726ef71b29f90f3923b823d4a123d72f345f6c35bab97 SHA512 892b0e9e18a80ab33dc6113447d281e31eb1925fea67ad9d90bfe6af808f855c8efaef6800540037062c4062bacc575fd638b7a49b34998006f5a49696558623 WHIRLPOOL b97bb7314868b1600a349d3b6af0b516aa3bd17124f3cf6bc309f1cdc21617b4c0abbbf74bb080aaaa64f31dc6ebb57905851678600cb6fce48e235428a5099c
 DIST vmware-tools-netware-9.2.3-1031769.x86_64.component.tar 81920 SHA256 e1279aeb2d402fa87c643fb5bcdda695fa39c93495b9a2b75b4e80a713176817 SHA512 542c350d1052a9bad0930138042424a0c91f55f861511e10ce4b81327a40dc1c8a339606b9118ae1e37a3d4171b0617d0205f74e03c2e28b398b2663575206cc WHIRLPOOL 5b146c80e1537f30c8051266994e44d366cd5964539ab1f2d51e82e0e9c10802f78de38bfdcfd83a0f0f91299381aada5f77dc3a19a759bf69b932a9718a0900
 DIST vmware-tools-netware-9.6.1-1379776.i386.component.tar 81920 SHA256 c5c2e4870bf8e9b36a997018b2b40b736ee445b23ac0ee6cf21983cddf67747c SHA512 33e94dbe2c7817703219a00a8dc14af97cd827ab1602c2a17c959dbed072185a2f8c3ede2e075318b67d457f35599054d88e78bf0af190c97e8b5e9039a9c9a1 WHIRLPOOL 96ac4f31879489d9615e5dcaeee876b471a30b7caf54cddc8291143dec66ec9a23664ea527e42249ae44dc46d631b376ea32518335d55e615cde6cd0022640c6
 DIST vmware-tools-netware-9.6.1-1379776.x86_64.component.tar 81920 SHA256 4dbc8ebfecceb0d281db4f75a535e7648f6fbb921202dd5d9dace8e6e8e3db8f SHA512 2497bfc1d1c31a2e7cc787bbf11254aa5d953e19e16f9fa99548a1b05424a6713106f63e3e1981d46d8c5045ca095ab6070b7e03fc934a064f91323b5b224a44 WHIRLPOOL c628730b5a8e1750babdd3d8bd97d25869fc01751cb2f9532d0024865455b7d89b334f5b34894ffa2262838a740d6c51e61e6000b673532a1014e5ad9028f7f7
 DIST vmware-tools-netware-9.6.2-1744117.i386.component.tar 81920 SHA256 1bcf7439f957d07fd84a56e6ab1bf88818759cf9f9a11df50ae5d0d65f0fd466 SHA512 9579e36b667af282ac3901ff4b836ba3fb1e74af81d19ac82fac94deb51d3bcf074e97ccb27bcab0cf8b9e319404c4cc305cea03ce08c6695191f89461c9de4a WHIRLPOOL 34bb18ee5facaebc273e8a2e8212dd4aa946af0c873a822d5704b0dd5bbbfa3225fc6c7629ae1a21ca55608f41df6c1f1a3d80140d6f8a4c3f9566caf04dcd85
 DIST vmware-tools-netware-9.6.2-1744117.x86_64.component.tar 81920 SHA256 ba9d0f84db9d1acf2c53574f411cf9c287b5905fddeaca703c5b503ba400e19d SHA512 72d1d8c8a2339e83a1feb206e8597dae8a922d5c99dbadf3f1c29662e34c3ac409783336e06b12f1885cff9a1f90840410478c7240770864564ff73e7ec5bfee WHIRLPOOL 2d9bede35a1b10648307405fce67dfd2e2dbbf5f5c34b017ef620b1f30680d7442abc785f5685edfcaf85c4cba9eb8d560aafd59d0962f87e3c17e6c6c9a3194
 DIST vmware-tools-netware-9.6.5-2700073.i386.component.tar 81920 SHA256 5ec311062c98a8bd86fa86d2b762b89ad2642c0ba7d95f8d42734c43f3dc7139 SHA512 d5ad09faee4fc5e4d3e9f5ab0423dc4a28cd316b70193277dfc4e26b8daef372af4ba3e9994ed488a6a051ab4f0e2980f6e8a1ab0b911f7f93d29556d3826617 WHIRLPOOL a911c63efece39e149f4086cfdd8e5c29adce1f2553481328988bc946ab6c6653033f967b7f8970c3b859bb245c57e4d70a432bda3a618da9c5b740f8303e24b
 DIST vmware-tools-netware-9.6.5-2700073.x86_64.component.tar 81920 SHA256 78d3a8e66efeeb831658e50fe012e1d1d6bc4cfdf426008c6a21456757e5238c SHA512 bb6a37252beb66c6843ee851dbb71d169f1eace25f2874ec6c577d32ba1df5791e046fb5039e09ee11f536cb0078685665070d2399756130c3bdd6bad2a43e20 WHIRLPOOL 05c41c61715f9cddc89cadf1d2891be9bc13933a1649761087022b592e28b08db5a12b69ea3055750bb7f19688be1f18df4422ebb0650133e2711a30a7bafec6
 DIST vmware-tools-netware-9.9.2-2496824.x86_64.component.tar 81920 SHA256 a590932c3b0294b14ea16c93c76547f2ff7a552019ca79646422d0f5025fd20f SHA512 df18e77a2cb6be56d0009f75d4fb040d5275191456c6dbe44d1d69f741edbabd48cefc0ac6c0a29a8b624bd635accc1665c79c3b7c185d0f4cb3047c5839b7f1 WHIRLPOOL 56f11f4e98bc186519338ff31fd742d0ab16790f1cdf9d8a739fedf53fc88acbe15500c04df892a64b19b042ae20a302ec9326a835ab072b4d51da0cd1ffea04
 DIST vmware-tools-netware-9.9.3-2780323.x86_64.component.tar 81920 SHA256 51ae6356bf0e28ef074f3e64363e1a360018f9be44f33ab6928e532f8f90af9a SHA512 9eadd29b6329eceaa4d90084d80bb635a46f0830420e947398391735935b626bef8d20dd8ec473c18d423c06cf4cf7a51ac77e2a2c95f9f417c7c73b08e100c6 WHIRLPOOL ce3d82023b378acf48efe3073e79ee272a8e3e36ff5cdee742870b7230ecfbcb8b3b2db7d8a7081e547176aae16f1e2df914593bdc2be4bb29e5ac1301158eae
 DIST vmware-tools-netware-9.9.4-3206955.x86_64.component.tar 81920 SHA256 b95be3085178f75eb8b3f69a4c5ca8e4418615e72f42f3b254b3571f8b8e72d5 SHA512 758496e9cae854d02badec3474edeb7e53b4604edd5f1c84216d3488d8f65763a97840a4db023bb7513c91bb3c44d03a8fa67d4435cf6ccb16679ab995ee4159 WHIRLPOOL 4974e17b438633afd5a8046369dd1d935b6587a40d1e1e4bd378606a13914310f8f4e60d084a3ab735b510d8b13403afb41e078235227ce269786d54d0fabc64
 DIST vmware-tools-solaris-9.2.3-1031769.i386.component.tar 13096960 SHA256 bb38d98351c0bb7f1c268a5ec1140bf2023276fd82dc31895fc6039f983ce964 SHA512 5abbb8e7e31753301a02dc411ca41a4857fb41b0c97a1264e954a53a5f15869dec7e01f8b65190aaf20e86c04e929beb88d6f14261761801480f453ce6b3107b WHIRLPOOL 3ebfa56078c49d53bc17215124a901931fcc3fdcd660ad55f72ea0c8cb81a31463bc83ecc480d7e7cccba602c3a37157e560a99231edae3b8e2c1e26242ce252
 DIST vmware-tools-solaris-9.2.3-1031769.x86_64.component.tar 13096960 SHA256 94ed550543096d9e03326a5adea93928f24f69349e5bc6a995e1fefead7112d9 SHA512 04724855a497aefcbd1ccf6ddd1e793eb6fd4bc65960f59f0e0dc95096434d8fa1a5a12b49a20f7e293427a794e4c16df06e4a844042fd21537b2513992bae41 WHIRLPOOL 223977e8ff88601f58752b7a2fda99a15212858d8045504aefe181b18ca29ca4b09dd2b07ddc4091533fd07da5062777000dcbd1e557a789688dbec70fae9069
 DIST vmware-tools-solaris-9.6.1-1379776.i386.component.tar 13096960 SHA256 f6057b82bfc070e506b51503c4c7e3dd66565dcc06a2f7fbddeaaa87d76283d6 SHA512 aee20ebff38ac19f7d4512fde2cac6b152af61b5b669eedb152530a9bbbad32136aba9747e4f8c57e78c27b6a24b08c026503b6e7f86fcb427f03e4d5ef28b00 WHIRLPOOL 97c5aed51529a8a38f75ce602cdf88821241388d1ff1a3abeaa7ebad041c047233645b020f2ba6719bc5a3cdda24bdf06ffbd43672dc17ae22fc794a8dfa3b10
 DIST vmware-tools-solaris-9.6.1-1379776.x86_64.component.tar 13096960 SHA256 96ad456174dd66acf25dee3fd4f8ecae718120b0d21296fe21bf22d0fd24ec17 SHA512 c41a707e8c68c8e1fff32cd962e9f8d0d30044346e823e2171bf3dc8392c536de97a8b8466af5088869625dfb96c8746e74f1d6080c62183b51c5e0f94fd885a WHIRLPOOL ec4900bfc58325bf4719c4783f42e590a83032529dd8694d912ee586584a49cbec68f8945a25666d8dee94ea7fb50d8e28c33fca454ab68e501cde0c6fb8e497
 DIST vmware-tools-solaris-9.6.2-1744117.i386.component.tar 13086720 SHA256 07b51c4fff9c4ee67f1d45215da0c2c1258620cbd5d8d24c0cae118b48af4ad4 SHA512 3e9aae368556e335b8915f90921caebb6e95d629a1bdf56125bead32ef6a7bcaafca03768e9d8779f530e808b70c23e7ef59bb4563bfb3693e6c0fa008b553f0 WHIRLPOOL 82cdf434c9700dd633fda1a259934617bf8175370690ce3549b3edee109997b2b0cd0108b28c127a744db4c271391de040efda11df68f4ce341e35414e6d94b9
 DIST vmware-tools-solaris-9.6.2-1744117.x86_64.component.tar 13086720 SHA256 6845e98fdd41ed190d6f5b7ae5d2713be7028172297607aee778cf955505e038 SHA512 9a3796cf5102423506c0375d4f1702f1074adb8a818309084a1f7b6de99cf424c4833cfb39bdb8062dde729ddfb62325c2763730af04d8cfdabd1ab3f14fc19f WHIRLPOOL bd23daac15397bf148156f109af1c6bea819ddf70d6de2f98f943880aac64de0c9647ca40dd909ce6395354d169239d7b1e95041531d89c0d5893401a6e6ce35
 DIST vmware-tools-solaris-9.6.5-2700073.i386.component.tar 12830720 SHA256 dfff56bd05aea2f732d893be9bd7b52d5b0a3f4f993bb8a275a429fabedd03d5 SHA512 e5c51665119fce5655cc24cc6ff5815250cd291ab7216eaa5eba6056b70e31734c111ae33189c4cb78c9f95336141f012c35c61cbf1ac2887dd264af8e5d7823 WHIRLPOOL 6429b2ed61a1ecba0ab290a9e37c642350782f257364b984abdda3b448e0b11996c0c1c909811620074b1b18a1206cc5f7a6872765766b3d0dcb2d1a978cc784
 DIST vmware-tools-solaris-9.6.5-2700073.x86_64.component.tar 12830720 SHA256 4995ee79f2aa8093fd8caa9bf5e9d2085f3b9a5b6de6b105069c68a97a01ef11 SHA512 f36aa070959bfe94dca921f7c776f878a56a116b5ab7a0da6a55acd34943b7b9631a4184d3aaa773387aed303922aa8d7e9f5b3f24c5d8d9eafbf3d02fb9bf88 WHIRLPOOL 558aa2a21da94b4741d3dc6195ee705e918947511408560ca836937ca094fe66efd2582e967e7fac941dabbaee86b4727f7010782eded8abdcfc05d66fe779a7
 DIST vmware-tools-solaris-9.9.2-2496824.x86_64.component.tar 13015040 SHA256 af2974298a6149a869532fe9c2fa1afff68565340d50a3712d72326c29a40f08 SHA512 2c399b37e539b4cd4419e4c34b8af22baf621bd45fb39640936b0c30724719f45ac49ff470121a1453ff4dac9f4ce06192c653a75dc12fb49e3122f6692ce046 WHIRLPOOL b950ecf772d902dea333270dc65d44fbbb3c4b388ffcf7b7e5f6f00c23b8ae7ea2bef567563d14f8236418b1af5c5800ce4797d0e486d0deba295bdcb71868d2
 DIST vmware-tools-solaris-9.9.3-2780323.x86_64.component.tar 13015040 SHA256 5ab7c353c8d73be85f756d34deaf5da7aa30a15a4d60f8c22565826d97d3f401 SHA512 8d9b1fe9f02a28da0cefc79d96accb0617a08928bed4189d00abe9f9424e83a28e06ca772c50ea7e4d14ac7f4d6a51b9e3e017b8d9cb5400811d8e2a05d470ea WHIRLPOOL addf9abb4cb07e2e015cdb5c2209dbc9b2371b712772dd337c577e3a7c83c2bc2fcbe468395b551c8b44d2366d0c12be74d76a513f4f690643dd0cbc6a74e57c
 DIST vmware-tools-solaris-9.9.4-3206955.x86_64.component.tar 13015040 SHA256 3dfb5754640c100ae7047573be1b20f83e395e99592313e0f168f62a9a947163 SHA512 d56f859037aa5c9081ae036c719dd97e4ae2c20b65bd9d0670b189b030778058999f90656bc6ebe752ef2f22d43458752764cace8441bbfbb1086187dcaa2be3 WHIRLPOOL bd4464dc630ea0c2f310200a80d54171f60fc872fc83007672c4cd5d912db090a535ef46cb0c86931da9dfd44929850a0f8aee14f909d5b5512278cf90e8f27e
 DIST vmware-tools-winPre2k-9.2.3-1031769.i386.component.tar 11253760 SHA256 a83173fbed35fd6484740fa1c3899ef18c84f0e2728e8db2cca442c809bafe1f SHA512 466625a1e342afae65203b1f04568c4d6c57eee2022890ca463a750d67c6fbbd1f9e5c557515298db0566d9297ffcb32183ff476a5e9368fa05b63b073ade467 WHIRLPOOL a5192928c6fc5c198e818bcf5f623660ae4741017a25cf4e691005ff8284666afb3d5e1dbc037a4caa5889e1bf102e91e4a9f06b630c041674cb0d53d8c0d0f4
 DIST vmware-tools-winPre2k-9.2.3-1031769.x86_64.component.tar 11253760 SHA256 9b51d31ca911ccf95db641834ae79220db44df53c2fd5a91d6b6e382cffdd39e SHA512 60f99dcb92794d3b798334c91966658f8bbb5cd11a435672094e0a0ccd0b070c0be277d38a9dfac9df77db6d7b91da806fa50a13e67b30d19c33fe153ff63a2e WHIRLPOOL 8426b651f35902f1ac87d556b330100f68ca1c615011301e6ab0dffb160fb4dab4f205f293ffd83ad74c67e9776d54c354f9fe98d70c596cec165929c5a1ba5c
 DIST vmware-tools-winPre2k-9.6.1-1379776.i386.component.tar 11458560 SHA256 9d46fa6842684d099f8eaf3459aac8973644193ebb4c663164c04b3f69536872 SHA512 6ecb3726235d1cb156898f6887508f7540a5e93437bde43e86740bce15cb8db4a9c9bb4e2d89ef1f5670f37ac11a457410551ff70d8e096d881b51630fd0b40a WHIRLPOOL ed4a441ceb6eac141ea009d871e4a2315e63a1f4f086fb93055b6c2de97e2d06fa98a772a4fda4582cd2e2511a0ace85b2ed52127f1c7343e3e46e122808602d
 DIST vmware-tools-winPre2k-9.6.1-1379776.x86_64.component.tar 11458560 SHA256 99d603372e69bea2e57e62c3c78dff5ac8119de3e89b438a8cf83a22b0f9774a SHA512 0f4ef0bb79cac357cbdb62d918d22f63a6f1ced51a3d15c10c32dd25dc97474858c85ce9dd080210e07e0b5f7c40741fb7695f1cacf84f5c29c8f8abae15f2c8 WHIRLPOOL f523815ad06bca65719ab99bc54da850a9c67568aa9e6e3ac567ec9669a81d6b554b91ddefe774387cadb014e418b33bb47cc3651caa897bca330a9ec1f22df8
 DIST vmware-tools-winPre2k-9.6.2-1744117.i386.component.tar 11458560 SHA256 24f197f2d20d44f052f97d206cd904cb8cb6943a165a43188a6ab616e3d9346d SHA512 c1b9272097d83bc645cdce8d5e477053d9c68f3216440c31f7ad3d6e0acbb0cf6daa294584d3c381075fe9ccc8489e21d94040a6f47c06c4d8984ba4d0910551 WHIRLPOOL e9d4c6a77a926cbbe035babb6b6a0c28338cc6bfff6a791da2fab73bcc917b69642e7cd8963f228370cda0d508f7e9b7ef15c9d8378c09397b33fc46ea0032ac
 DIST vmware-tools-winPre2k-9.6.2-1744117.x86_64.component.tar 11458560 SHA256 9b32f4f4fccdc6e40f36544ea5cc21f77fd2a517dace8dd672b5ca5e25604b6e SHA512 51259807b2e4e0267a4c7bd2ea294ab504b1681e91101813e5bb16ac155d7b0f065a3fabb692dc0108d44024fc373398aa891cb64eaa96244c5c644c08123159 WHIRLPOOL 07c963e0e821df31b60677769fb46fa836f552b3b41af4c133b0bc7ce76cd6011808fbd6a678c8e38e1c07dfb9221e46caee0923d22844cb399ac2831015e47b
 DIST vmware-tools-winPre2k-9.6.5-2700073.i386.component.tar 11458560 SHA256 8b381b1c787466a96bf0f9536df05f58aa62c5c10d6fdeaedd136c6a49e09b8c SHA512 17bcbc4aa84e5e212732860cf34d4c4d8b4c806bd137b497e6dab9f023cf26af5a43a83f6f4d30f9d6e7df87f85b7a33e8ab0626c56450ea024b17e45ab1e1db WHIRLPOOL c3b45bbf5cc49f8b9dd64517dbd9e258ae60de59ea6beeed0b88745f7ba8beef1da9cba577d7829fa25dccf2c51ca919f36db5e7c141e7a4e1d62abe5b9fd187
 DIST vmware-tools-winPre2k-9.6.5-2700073.x86_64.component.tar 11458560 SHA256 55e856f7a701174c3f1f0257d2a8054b836b5e14b328cadcd21e792db03afd3f SHA512 bbc80f18ec0e08d26850220124d0e9187fe9d80472dbd55269c63d05b51ecc7374d7e6066aa5e9fc9bcd027b218925084fb30ddd48dc3828df9c09a9c3579699 WHIRLPOOL f01ad51f8944a167e19abc876f31a6e08f85920d1e17272edff44e4c4871090694e87749cdbd83ffab6deba8569cfec4b600b9de5f930e57405e831dc73a0cd9
 DIST vmware-tools-winPre2k-9.9.2-2496824.x86_64.component.tar 11530240 SHA256 af08bcc956943bc0ed09e37e03bf2005f32cabdd5697d0398f32b6c1943677c3 SHA512 bdce5073ee5937f7e6cf0944360fda5c5e136f7f19f00bbc5fffb7c6e8ce328494309697e4dfabeece73380421f9e6fa34dadaf3c6d540e676a491245de79d36 WHIRLPOOL b59a72c2d63368119998e3d26267f032f8923f792e0031cbd4805911cf65e0a3d39be3d5bb1489b5fac84fba50554d212b9fcaabec726810ed35f1c36e94defe
 DIST vmware-tools-winPre2k-9.9.3-2780323.x86_64.component.tar 11530240 SHA256 5615f563e42b090a87e30423d5e930fc39712bd9bcf597a83b8df85341e0f563 SHA512 904c9323903f25fc1ffec2e0e7c21c7af9928b408a26e0d4e800597b134643e838a312f44b6600244cb3a855f025912384e10b4bc8f362ae7732216ea8ce642f WHIRLPOOL effa090a63d488738f0a17bf164b0594a33a7a5905d317d08589e1e3467783ac674b07b294a8678c3dbbb0ec6e8c784da74b3e3dd61b9b55e4a1bc4794cbdd8a
 DIST vmware-tools-winPre2k-9.9.4-3206955.x86_64.component.tar 11530240 SHA256 58956405bda8c1eeda43dc22b5bbd9e077cc653f6b4bc2ff1bf0dc071152b2a6 SHA512 6394d73f0258bb831d52e4202ddded8173d3c0dbba3a5686f0eae362196a59b5fd7e9d40403483f7bffa90ab3d6daee340a86d69e9a9b5beb278e17b1c98f8e0 WHIRLPOOL a0620f05d8f6b9acdfdaf462a2718888e31e738c332aa189c367f277403c9a6e038eea0386f1ec4b8a9e9e5671a3e51bb67c7dc80d42f2f05b5244ed5ae79e04
 DIST vmware-tools-windows-9.2.3-1031769.i386.component.tar 61777920 SHA256 0fa4f7aac30b589292b6064c23702e6a257ac27ce1342c96755352f6f39e3b04 SHA512 776c834b49ad8f4bbe84ba800aa866e740e1dd236496065ebd46ddafa35621d4356f99a6f0bb45dfb1fe337bc75452236b5d5c87ec8c5ab6b5a1b6c18bc8d542 WHIRLPOOL 787725514f0ee1a48b64cc2f3b25f706290e386f9762857290ca2a84baea4a21205900b37df197976205baf27606023ea7626337b580299d4f6d63288c8ba39b
 DIST vmware-tools-windows-9.2.3-1031769.x86_64.component.tar 61777920 SHA256 dbb7f6dbbcf9e44263193e40ad89944a45ef860f4f3b4b51d00ae1602f863f8c SHA512 818e2895c57be6792e82362c9616e2e6e8638997bde65ecea1416f71ccfa9681fc5cd44cd3356780ab35345e6b19ac8054a05eb8424dff1bcd779c9b686455a9 WHIRLPOOL ab847bddd07b029ba7a75fb6ae96133211d5a412fbe2059f851ae249854357dd0e25ab28df98fc2a3ee33f5aae08587a8b4bbfd6a60a2313f77fe6f98a1a3a3d
 DIST vmware-tools-windows-9.6.1-1379776.i386.component.tar 69232640 SHA256 cb09c083adec2bd6a10f9cb75e4570fc19019ddd98320e7cf1ddf311737f75bd SHA512 a1caf8095e8ec56cf15c55e6c0081e16dc3b25e035f1a50eb9f6636a5879b5bbadb4dd079d822b6b1c27f2279c4214eefe004e460f1c1ae70f28242d0aafd400 WHIRLPOOL e61f9df173f83e8844dafd9e226d4b8cd0530df18b4104d1229d18a8c4e8757adc35ac1085602baeb35ba4896273070739c4d783679f18085583124bd856a715
 DIST vmware-tools-windows-9.6.1-1379776.x86_64.component.tar 69232640 SHA256 4034d5f0fe06a7fb4d2dcd7159f59223f0886d2be5ea4dd1ae685cf5ff0c535d SHA512 8a1be0aae39bf7abe5c76d74f26f7f936dda2d6d169d3e5256479251cb961753abcb519647fcc6a026da11d57f45fa626d1c4a7d91a985ffd2361b2468ab601c WHIRLPOOL 2faccc4a8c04fb52bc0749dd69e887b3ad6f8e9776623f7e583590c5e1612de50bb3355372a60e850104f13f8c9ecd613e5f43ebccffe86661838b757110b57c
 DIST vmware-tools-windows-9.6.2-1744117.i386.component.tar 69283840 SHA256 f5f43a1a8d39b16d74953a6ffd36f8b56a4e20808918e7358047080f961c7367 SHA512 9fd041f13d250665ea4adb5d9af7c07e1f3eb48708e1744e88ab7378844632e7da2c42c283b87d0b58af3afc456b9b6cd2eebfc28af1ccca3a53b7968eaadb7f WHIRLPOOL 12ccfd6c5d947caaceb7319359ccf70185ed4fe2d0bd60c39e1f4f6200d7ef89bd1a2c7fbeec5eb7b675fc23cd30aa8339fedfed1350f23745640a768fa9df07
 DIST vmware-tools-windows-9.6.2-1744117.x86_64.component.tar 69283840 SHA256 d4fe4f1d5137c577dd2b82eae8eeee55fe4fc021506eeaa8eaf77ef45f309331 SHA512 c3e40d7e2b10e6c318776d7fcef151c140fd20848de6d48d4a380ff8596b0c4889f8c46816bcacd6e3cdd815d0d8b868283714dba9e9095d94a7cd64da79dc80 WHIRLPOOL 0b1670d8ce585333755fccc72fa55bed6919645c5756917dfd96ccfd6a1eca9d9cd17c74f6458b38e8b9db0632668a33ff9b6d6724e4b01d185eaceff9f14e41
 DIST vmware-tools-windows-9.6.5-2700073.i386.component.tar 69294080 SHA256 6aba23b1bd9f7877c7fd54102f634dbf6d0d61fe2640d2e56f280395ad595f45 SHA512 fb63d93dd2ca26aeae42f27ce4b0dcda4991f10e0077a8384b8c7bbc3dbf73fa1f62f986a6c5661b70aed59e3841dc9a63b0de76c637ef62d919f9b667149dae WHIRLPOOL 8969ab16cc660b39626f40af69563bd85f40547d4656e156c4ef79221b6d71f8c9cd1b9ec6e0657f1c61f7104748cf84c356a5ff50339462f998d677a762eee5
 DIST vmware-tools-windows-9.6.5-2700073.x86_64.component.tar 69294080 SHA256 effeb7d57c0c916de4b18f80df4cd8d9fcf00d0dda886b2ba0ce23179b3ad0fa SHA512 bcf036d3fa54b1b0ae98370a54f0e5d95ba68a6476fc79f60615d5754f370b8724d0ccaa6c826f843ebb3e1eb1afceb03701214774ff0b1e40742be5e9adad3f WHIRLPOOL 595918763b0b31ab07725b19c9642730bfb4ed14cec44ed4920bed0aed38b3d71ffab9a931b2923aef63514ff180f4f2221e1b6694418578ca1d2960531e4438
 DIST vmware-tools-windows-9.9.2-2496824.x86_64.component.tar 71485440 SHA256 3ef86f0bfce6f9396b4868d2fc067baa425cf9d1db2c4361dad81adb8fb02b69 SHA512 0c1df24026f96d160c3e3f4afac127d82f5ba1a4aabff4ca8fa64a60cde4b67b648601144d54a97bc760636bea1f9e71229b05bdc1c6d2959b3be93c1dc421eb WHIRLPOOL 090e49c1452987a77010e20f23f24f747e3158d4cc7ab6604d3fada16bb42410b34631c82d1580611bb7364faa1174108cce037ec4cc873821fe68e3d745cb3c
 DIST vmware-tools-windows-9.9.3-2780323.x86_64.component.tar 71495680 SHA256 fa53a1cb525876a5e809dd5429b4572091642ddc2d731ef3b9a242378c972696 SHA512 9e9db19c116f02e0885e07dd6803b6353439125331deb5722a949a10f023dcc694431599e2dd9a4f7a51dfd48510317854ce513684112444443f63e77e0d2c5d WHIRLPOOL dc32f12d603db31e0ec0853ab936c478f1eb0c04cf669e3b7e48ad058bc035e35ad8ba0783616f6370acb1d3c3ef777673d39c663f889998a62593e814aa93eb
 DIST vmware-tools-windows-9.9.4-3206955.x86_64.component.tar 71516160 SHA256 1cce945c3d0678a3dda897685f658c585d6e7b085182b475bfc25f682e7e1530 SHA512 1aeac6144a33ad63d6020397af64966bc35e7cdfdaa434177058386c8466c24a95c2a9386da84f9973d65caa32126f89e422ae5cf8c63813310f1896781fc364 WHIRLPOOL 7cb6c351ab79edda774c101e66df7819c0d1e9a62585ffde4597189d5151669cafe23215c46230e2ed33c3f61e8c081e25141f549631a75eb2a20393a344416d
--- a/app-emulation/vmware-tools/vmware-tools-9.6.1.1379776.ebuild
+++ b/app-emulation/vmware-tools/vmware-tools-9.6.1.1379776.ebuild
@ -1,55 +0,0 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 inherit versionator vmware-bundle
 MY_PV="$(replace_version_separator 3 - $PV)"
 BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.$(get_version_component_range 3)/$(get_version_component_range 4)/linux/packages/"
 DESCRIPTION="VMware Tools for guest operating systems"
 HOMEPAGE="http://www.vmware.com/products/player/"
 LICENSE="vmware"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="mirror"
 IUSE=""
 DEPEND=""
 RDEPEND=""
 IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k"
 VM_INSTALL_DIR="/opt/vmware"
 for guest in ${IUSE_VMWARE_GUEST} ; do
 	SRC_URI+=" vmware_guest_${guest}? (
 		amd64? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.x86_64.component.tar )
 		x86? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.i386.component.tar )
 		)"
 	IUSE+=" vmware_guest_${guest}"
 done ; unset guest
 src_unpack() {
 	local arch
 	if use x86 ; then arch='i386'
 	elif use amd64 ; then arch='x86_64'
 	fi
 	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
 		if use "vmware_guest_${guest}" ; then
 			local component="vmware-tools-${guest}-${MY_PV}.${arch}.component"
 			unpack "${component}.tar"
 			vmware-bundle_extract-component "${component}"
 		fi
 	done
 }
 src_install() {
 	insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages
 	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
 		if use "vmware_guest_${guest}" ; then
 			doins "${guest}".iso{,.sig}
 		fi
 	done
 }
--- a/app-emulation/vmware-tools/vmware-tools-9.6.2.1744117.ebuild
+++ b/app-emulation/vmware-tools/vmware-tools-9.6.2.1744117.ebuild
@ -1,55 +0,0 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 inherit versionator vmware-bundle
 MY_PV="$(replace_version_separator 3 - $PV)"
 BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.$(get_version_component_range 3)/$(get_version_component_range 4)/linux/packages/"
 DESCRIPTION="VMware Tools for guest operating systems"
 HOMEPAGE="http://www.vmware.com/products/player/"
 LICENSE="vmware"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="mirror"
 IUSE=""
 DEPEND=""
 RDEPEND=""
 IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k"
 VM_INSTALL_DIR="/opt/vmware"
 for guest in ${IUSE_VMWARE_GUEST} ; do
 	SRC_URI+=" vmware_guest_${guest}? (
 		amd64? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.x86_64.component.tar )
 		x86? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.i386.component.tar )
 		)"
 	IUSE+=" vmware_guest_${guest}"
 done ; unset guest
 src_unpack() {
 	local arch
 	if use x86 ; then arch='i386'
 	elif use amd64 ; then arch='x86_64'
 	fi
 	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
 		if use "vmware_guest_${guest}" ; then
 			local component="vmware-tools-${guest}-${MY_PV}.${arch}.component"
 			unpack "${component}.tar"
 			vmware-bundle_extract-component "${component}"
 		fi
 	done
 }
 src_install() {
 	insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages
 	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
 		if use "vmware_guest_${guest}" ; then
 			doins "${guest}".iso{,.sig}
 		fi
 	done
 }
--- a/app-emulation/vmware-tools/vmware-tools-9.9.4.3206955.ebuild
+++ b/app-emulation/vmware-tools/vmware-tools-9.9.4.3206955.ebuild
@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 inherit versionator vmware-bundle
 MY_PV="$(replace_version_separator 3 - $PV)"
-BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/7.1.0/$(get_version_component_range 4)/linux/packages/"
+BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/7.1.3/$(get_version_component_range 4)/linux/packages/"
 DESCRIPTION="VMware Tools for guest operating systems"
 HOMEPAGE="http://www.vmware.com/products/player/"
@ -46,9 +46,13 @@ src_unpack() {
 src_install() {
 	insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages
 	local somethingdone;
 	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
 		if use "vmware_guest_${guest}" ; then
 			doins "${guest}".iso{,.sig}
 			somethingdone=yes
 		fi
 	done
 	[ -n "${somethingdone}" ] || ewarn  "You should set VMWARE_GUEST in make.conf to specify which operating systems you need."
 }
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@ -1,6 +1,7 @@
 DIST VMware-Workstation-10.0.6-2700073.i386.bundle.tar 281272320 SHA256 02b6c26ba33027344a943734e48cac03ed522a9cf09131837758af3ebd27ea60 SHA512 f65ce16784c9fccb0a6f09abe52bbbe1cc1567d366d03cfe0f79fdfbf4b9d5fef8238a6f62e969b8415112bf063f3d6a5e66239aa89159172520c80efd90c7e9 WHIRLPOOL 11ffae3b8a7e059e63afd2a8a19f9a07d8d63d2ef8f83c623b37e315750b09cb9a31537125614610fc988184017fe45b3ae5408670257c1dc9531dd6b6b17717
 DIST VMware-Workstation-10.0.6-2700073.x86_64.bundle.tar 252610560 SHA256 e29edcb0638f32bff81d372c9eaf54e663e3376cd1d89dbd4cfe4cab533398b2 SHA512 072de1da92cbef890707a6c4e3d5223fdc60e50a5166bb72b1ebc098d28c1a75b83ed65a29fdf1311e119e590560546e376909e1384f1eab05918500ec80ede4 WHIRLPOOL 3f4252abb6c87424b88fa34adc29e1927d1e6458beca65d9b290ff0c8ad4ccaf2945e2209670f8f8d4e84548d806c18fb23dc8380ec65452841e2c0bbcce89aa
 DIST VMware-Workstation-11.1.2-2780323.x86_64.bundle.tar 259133440 SHA256 085b50175b253647d8b2cb188286d3cf9265ed246cc0deb3b142b0438ef5725f SHA512 1c43ebaa4f8b228ec00f24a263eddcbbad5c0c940cd67040e6e2275c3a4aab6c9e2e5ee96996ca4f007ff786ece978c5789214ad92479720182fc3153d7edbde WHIRLPOOL 60e359a1dcfe1178652d8c6be705dda4f2f31b109bf01d5b5b16dc03e26a649e8f1af2ffa03d68e9108646c98e9cad41c10a9452ea14950883f9162e57ac20ca
 DIST VMware-Workstation-11.1.3-3206955.x86_64.bundle.tar 259594240 SHA256 a8d333d6f6677eb1d70b3572e5bf8f34ebb6cb77bdee4b94d6ea8033f579ed5d SHA512 8cb4781dc388bcaeb82f19d18e0bf2608d393f18c4e255a1c89c9090954bbee5e78ebde5cec6df06d9c037ed4f0595a7a801d76b3a8e2b960f6822bbf1094d1b WHIRLPOOL 5ba631502ff4dbf0e480e932e9a21cbb06d25d68b9ac412beb41680d3d0e678c630ba692e7e52cda2399574b28698ca5deb6a6c54b4614ab752159b6036a0094
 DIST VMware-Workstation-9.0.3-1410761.i386.bundle.tar 264908800 SHA256 dfe9aaa75987793eac096c0fbdb364f94e354ab668213774ea3e90d5ddcecdc0 SHA512 5d0943400cb1fefca20f1a81d3989bf5cdda5e123d1a70b09ebc20a56498d36f597ed7a0730d2f6f752c3c4baad2c86d5ef7691e8d245147d944c6f7e4e708b0 WHIRLPOOL 14a950f2deb03c3b7a088d4fb50378c7109330d89903965c28ead0be1e2223dbce05a628b1ea859215d31a8978f497bd8f807652cf266667d67893eaf2d7372b
 DIST VMware-Workstation-9.0.3-1410761.x86_64.bundle.tar 232724480 SHA256 2612f8a523c9f23164d7557c105520bc6e010af82b3e6d4a3ada04d8ff03cbf0 SHA512 07923231e481550cb0348e40ef341c2d0682ac0daf6c8e0ada130c03113f43a37bf322e64fb9dc73511dea0fd2851f3cb4f5e755bbad4beba9e3cc4e69566070 WHIRLPOOL d979f2d9ef8888be89d5747c16e0db7ca45609cd9d77d84baf8485b4956f9e9f99bf46c33a2690b7b1fea851c0495ed0a06b36e3e69b51abfc11604d9a62fe4d
 DIST gentoo-01.tar.gz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513
--- a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r2.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -14,32 +14,88 @@ MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
 SYSTEMD_UNITS_TAG="gentoo-01"
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators"
 HOMEPAGE="http://www.vmware.com/products/workstation/"
 BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
 SRC_URI="
 	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
-	https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz
+	https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz
 	"
 LICENSE="vmware GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="cups doc ovftool server vix vmware-tools"
+IUSE="cups bundled-libs doc ovftool server vix vmware-tools"
-RESTRICT="mirror strip"
+RESTRICT="mirror strip preserve-libs"
 BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
 BUNDLED_LIBS="
 	libXau.so.6
 	libXcomposite.so.1
 	libXcursor.so.1
 	libXdamage.so.1
 	libXdmcp.so.6
 	libXfixes.so.3
 	libXft.so.2
 	libXinerama.so.1
 	libXrandr.so.2
 	libXrender.so.1
 	libaio.so.1
 	libatk-1.0.so.0
 	libatkmm-1.6.so.1
 	libatspi.so.0
 	libcairo.so.2
 	libcairomm-1.0.so.1
 	libcurl.so.4
 	libdbus-1.so.3
 	libfontconfig.so.1
 	libfreetype.so.6
 	libfuse.so.2
 	libgailutil.so.18
 	libgdk-x11-2.0.so.0
 	libgcrypt.so.11
 	libgdk_pixbuf-2.0.so.0
 	libgdkmm-2.4.so.1
 	libgio-2.0.so.0
 	libgiomm-2.4.so.1
 "
 BUNDLED_LIB_DEPENDS="
 	x11-libs/libXau
 	x11-libs/libXcomposite
 	x11-libs/libXcursor
 	x11-libs/libXdamage
 	x11-libs/libXdmcp
 	x11-libs/libXfixes
 	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	dev-libs/libaio
 	dev-libs/atk
 	dev-cpp/atkmm
 	app-accessibility/at-spi2-core
 	x11-libs/cairo
 	dev-cpp/cairomm
 	net-misc/curl
 	media-libs/fontconfig
 	media-libs/freetype
 	sys-fs/fuse
 	x11-libs/gtk+:2
 	=dev-libs/libgcrypt-1.5*
 	x11-libs/gdk-pixbuf:2
 	dev-cpp/gtkmm:2.4
 	dev-libs/glib:2
 	dev-cpp/glibmm:2
 "
 # vmware-workstation should not use virtual/libc as this is a
 # precompiled binary package thats linked to glibc.
-RDEPEND="dev-cpp/cairomm
+RDEPEND="
 	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:2.4
 	dev-cpp/libgnomecanvasmm
 	dev-cpp/pangomm
 	dev-libs/atk
 	dev-libs/glib:2
 	dev-libs/icu
 	dev-libs/expat
 	dev-libs/libaio
 	=dev-libs/libgcrypt-1.5*
 	dev-libs/libsigc++:2
 	dev-libs/libxml2
 	dev-libs/openssl:0.9.8
@ -48,43 +104,30 @@ RDEPEND="dev-cpp/cairomm
 	gnome-base/libgtop:2
 	gnome-base/librsvg:2
 	gnome-base/orbit
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/libart_lgpl
 	media-libs/libpng:1.2
 	media-libs/libpng
 	media-libs/tiff:3
 	net-misc/curl
 	cups? ( net-print/cups )
 	sys-devel/gcc
 	sys-fs/fuse
 	sys-libs/glibc
 	sys-libs/zlib
 	x11-libs/cairo
 	x11-libs/gtk+:2
 	x11-libs/libgksu
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXau
 	x11-libs/libxcb
 	x11-libs/libXcomposite
 	x11-libs/libXcursor
 	x11-libs/libXdamage
 	x11-libs/libXdmcp
 	x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXft
 	x11-libs/libXi
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-libs/pango
 	x11-libs/pangox-compat
 	x11-libs/startup-notification
 	x11-themes/hicolor-icon-theme
-	!app-emulation/vmware-player"
+	!app-emulation/vmware-player
 	!bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
 	sys-apps/dbus
 "
 PDEPEND="~app-emulation/vmware-modules-304.${PV_MINOR}
 	vmware-tools? ( app-emulation/vmware-tools )"
@ -95,7 +138,7 @@ VM_HOSTD_USER="root"
 QA_PREBUILT="/opt/*"
-QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx"
+QA_WX_LOAD="/opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 /opt/vmware/lib/vmware/bin/vmware-vmx-stats /opt/vmware/lib/vmware/bin/vmware-vmx-debug /opt/vmware/lib/vmware/bin/vmware-vmx"
 src_unpack() {
 	default
@ -127,6 +170,13 @@ src_unpack() {
 	fi
 }
 clean_bundled_libs() {
 	einfo Removing bundled libraries
 	for libname in ${BUNDLED_LIBS} ; do
 		rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}"
 	done
 }
 src_prepare() {
 	rm -f  bin/vmware-modconfig
 	rm -rf lib/modules/binary
@ -139,14 +189,17 @@ src_prepare() {
 	find "${S}" -name '*.a' -delete
-#	clean_bundled_libs
+	if ! use bundled-libs ; then
 		clean_bundled_libs
 	fi
 	DOC_CONTENTS="
 /etc/env.d is updated during ${PN} installation. Please run:\n
 env-update && source /etc/profile\n
 Before you can use vmware workstation, you must configure a default network setup.
 You can do this by running 'emerge --config ${PN}'.\n
-To be able to run ${PN} your user must be in the vmware group.
+To be able to run ${PN} your user must be in the vmware group.\n
 You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start.
 "
 }
@ -316,6 +369,9 @@ src_install() {
 		PATH='${VM_INSTALL_DIR}/bin'
 		ROOTPATH='${VM_INSTALL_DIR}/bin'
 	EOF
 	use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
 	doenvd "${envd}"
 	# create the configuration
--- a/app-i18n/scim-input-pad/metadata.xml
+++ b/app-i18n/scim-input-pad/metadata.xml
@ -5,7 +5,7 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
-	<longdescription lang="EN">
+	<longdescription lang="en">
 		The Smart Common Input Method (SCIM) input pad is a tool used to
 		input special characters, in an easy way. You select the text
 		zone you wish to write in, and just click on the wanted character
@ -16,7 +16,7 @@
 		elements, etc. You may also add new characters (see
 		documentation).
 	</longdescription>
-	<longdescription lang="FR">
+	<longdescription lang="fr">
 		L'outils SCIM (Smart Common Input Method, "méthode commune et
 		intelligente de saisie de caractères", en français) Input Pad
 		("tableau d'entrée de caractère", en français), est utilisé pour
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@ -1,3 +1,2 @@
 DIST homebank-4.6.3.tar.gz 1899045 SHA256 f6e31bb789d626b507c2af9d176a0bac0cbaec770ede73048ba7a6df113a6948 SHA512 aab7374d90ffc52a40188eb334fc9b3461c299014d6134f236488991400fffe9f6dcb69247501857fe4caafbb08f0c5d729211b13551203f1231d136e99e024d WHIRLPOOL e8f6a421c64eb1bf6f2d97910e4687b00cf794fd27c8aff83ce9d39e18393cccca1984e73a44110ff5e87427fd0ed74963dcb997490d97614116800100daca5b
 DIST homebank-5.0.5.tar.gz 2554967 SHA256 67c47709517d325fc8d601bb8552e3c8a1ad3b820a2c0a403ed20f00c795903c SHA512 9e23565041de9a4b4f7cf6374618022d89b99119d54a6375a17880e4cb284f7af7e83bef7d58b943c107d28ac56751987960a17e2bf2cc0a3e0c10d6442a40ed WHIRLPOOL 8423d22687bc7851c4d51ccc88a1a4ade53eb813875beae7bf2137a209c57b3d08c63eebceed963f91db78f07cbba9a46dcb3fce68999b62fbbd55c826ddc1b5
 DIST homebank-5.0.6.tar.gz 2578726 SHA256 4a52ef7a20accd50f8cead0d0564042912573c7d60887ef5e4d462fb28b239e4 SHA512 48cb3c4b306804a5cc6dea3083fc84d64a8936bb9c7dfb357838abb05d3f2ce1080eba73be1bb7c37ffeb3ed10d14f15d0f7121d7e4f34c543f8807f8747f289 WHIRLPOOL 7052e27f7d9d38eae13a5ed3af0d7f284bcbdfbff9cb9282bc773f26a7fb5a0af305b81ba82cc2f21339aa3589bb5a6a4b9323f48c637d8418e4767197b4b314
--- a/app-office/homebank/homebank-5.0.5.ebuild
+++ b/app-office/homebank/homebank-5.0.5.ebuild
@ -1,50 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="5"
 inherit fdo-mime eutils gnome2-utils
 DESCRIPTION="Free, easy, personal accounting for everyone"
 HOMEPAGE="http://homebank.free.fr/index.php"
 SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+ofx"
 KEYWORDS="~amd64 ~ppc ~x86"
 RDEPEND=">=dev-libs/glib-2.28
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
 	>=x11-libs/gtk+-3.6.4:3
 	x11-libs/pango
 	ofx? ( >=dev-libs/libofx-0.8.3 )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5.8.1
 	dev-perl/XML-Parser
 	>=dev-util/intltool-0.40.5
 	sys-devel/gettext
 	virtual/pkgconfig"
 DOCS=( AUTHORS ChangeLog README )
 src_configure() {
 	econf $(use_with ofx)
 }
 pkg_preinst() {
 	gnome2_icon_savelist
 }
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
 }
 pkg_postrm() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
 }
--- a/app-text/cb2bib/metadata.xml
+++ b/app-text/cb2bib/metadata.xml
@ -6,6 +6,6 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>webmaster@molspaces.com</bugs-to>
+		<bugs-to>mailto:webmaster@molspaces.com</bugs-to>
 	</upstream>
 </pkgmetadata>
--- a/app-xemacs/ebuild-mode/metadata.xml
+++ b/app-xemacs/ebuild-mode/metadata.xml
@ -6,7 +6,7 @@
    <name>Gentoo XEmacs project</name>
  </maintainer>
  <upstream>
-    <maintainer type="project" status="active">
+    <maintainer status="active">
      <email>emacs@gentoo.org</email>
      <name>Gentoo Emacs project</name>
    </maintainer>
--- a/dev-java/cofoja/cofoja-1.2.ebuild
+++ b/dev-java/cofoja/cofoja-1.2.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
-JAVA_PKG_IUSE="source"
+JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
@ -27,6 +27,7 @@ DEPEND="
 RDEPEND="
 	${CDEPEND}
 	source? ( app-arch/zip )
 	>=virtual/jre-1.6"
 S="${WORKDIR}/${P}"
--- a/dev-java/jsr67/Manifest
+++ b/dev-java/jsr67/Manifest
@ -1 +1,2 @@
 DIST jsr67-1.3.jar 327033 SHA256 fe2b95887477f7f39c8d3a33211c0d96cf73872364a0b0478bdaf24500be6225 SHA512 c4145e5870af677542a09a17b7b57d9e5501f6354b26743b9eb9946dbd263114eb705c023af996ddcb256961df28a7ac2420a54fcdd69f73c8595901ee21760a WHIRLPOOL 25dcffa1eb5166867158211ae209e2b24f648d6806e392b80527b8c34f4ebdec181125f80443c1b6956856b1b9c14e83a9df9a72781d14c4fb366bd3a7ae9479
 DIST saaj-api.jar 18817 SHA256 d36278c49c50f1fe41c264414a1f572a6578d544b8ca89053597ecb9ca87f63e SHA512 b130ff18fcc3ab04c095ad454c82d83b2c383d4f8eb950291796d41f0f0ee7a15434de282864e778c3692cc3bdf4ab5213050a43ae10a6e308d613f9d477a813 WHIRLPOOL c5596415d9dec81e20b8c5d515388c049820e24467f40f7c0259e9d4169149f36367b1501c227adc738aebcd01ab0875925073c2467a7a6c8bc0d87a44470216
--- a/dev-java/jsr67/jsr67-1.3-r1.ebuild
+++ b/dev-java/jsr67/jsr67-1.3-r1.ebuild
@ -0,0 +1,28 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 JAVA_PKG_IUSE="doc source"
 MY_PN="saaj-impl"
 MY_P="${MY_PN}-${PV}"
 inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="SAAJ 1.3 (AKA JSR-67 MR3) API"
 HOMEPAGE="https://jcp.org/en/jsr/detail?id=67"
 SRC_URI="https://repo1.maven.org/maven2/com/sun/xml/messaging/${MY_PN%%-*}/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
 LICENSE="sun-jsr67"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND="
 	>=virtual/jre-1.6"
 DEPEND="
 	source? ( app-arch/zip )
 	>=virtual/jdk-1.6"
--- a/dev-java/nachocalendar/Manifest
+++ b/dev-java/nachocalendar/Manifest
@ -1 +1 @@
-DIST nachocalendar-src-0.23.tar.bz2 412489 SHA256 e276b0e7bd7abdeb37feebfc72343f48b617dde3644b20ca5f18ad72dac226c0 SHA512 a7b34d1caab2fb26856bd668a80b7f5c57f192be0729f4f9063600866160c26a4163389bf0136c3f101911f4547c5f474800c8e3d96cc77de6febd589564e98b WHIRLPOOL 1657f1c6c47ef7cd7476ce30b033311e2e56f041e2676ec256f81e9b5381716235a3cec45fd6aee98cef769d5ccc18e1fb356414d2bf901218673a17082cfabe
+DIST nachocalendar-0.23.tar.bz2 412489 SHA256 e276b0e7bd7abdeb37feebfc72343f48b617dde3644b20ca5f18ad72dac226c0 SHA512 a7b34d1caab2fb26856bd668a80b7f5c57f192be0729f4f9063600866160c26a4163389bf0136c3f101911f4547c5f474800c8e3d96cc77de6febd589564e98b WHIRLPOOL 1657f1c6c47ef7cd7476ce30b033311e2e56f041e2676ec256f81e9b5381716235a3cec45fd6aee98cef769d5ccc18e1fb356414d2bf901218673a17082cfabe
--- a/dev-java/nachocalendar/nachocalendar-0.23-r1.ebuild
+++ b/dev-java/nachocalendar/nachocalendar-0.23-r1.ebuild
@ -0,0 +1,40 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 JAVA_PKG_IUSE="doc source test"
 inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Flexible Calendar component to the Java Platform"
 HOMEPAGE="http://nachocalendar.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.bz2 -> ${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 RDEPEND="
 	>=virtual/jre-1.6"
 DEPEND="
 	source? ( app-arch/zip )
 	>=virtual/jdk-1.6"
 S="${WORKDIR}/${P}"
 JAVA_SRC_DIR="src"
 java_prepare() {
 	java-pkg_clean
 	rm -rf src/test || die
 }
 src_compile() {
 	java-pkg-simple_src_compile
 	java-pkg_addres "${PN}.jar" resources
 }
--- a/dev-java/nachocalendar/nachocalendar-0.23.ebuild
+++ b/dev-java/nachocalendar/nachocalendar-0.23.ebuild
@ -1,47 +0,0 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 JAVA_PKG_IUSE="doc source test"
 inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Flexible Calendar component to the Java Platform"
 HOMEPAGE="http://nachocalendar.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=">=virtual/jre-1.4"
 DEPEND=">=virtual/jdk-1.4
 	test? ( dev-java/junit )"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	rm -r doc || die
 	rm -v lib/* || die
 }
 src_install() {
 	java-pkg_newjar lib/${P}.jar ${PN}.jar
 	java-pkg_newjar lib/${P}-demo.jar ${PN}-demo.jar
 	java-pkg_dolauncher nachocalendar-demo --main net.sf.nachocalendar.demo.CalendarDemo
 	dodoc {CHANGELOG,README,TODO}.txt || die
 	use doc && java-pkg_dojavadoc doc
 	use source && java-pkg_dosrc src/java/net
 }
 src_test() {
 	cd src/test || die
 	ejavac -cp \
 		"${S}/lib/${P}.jar:$(java-pkg_getjars --build-only junit)" \
 		./net/sf/nachocalendar/model/DefaultDataModelTest.java
 	ejavac -cp \
 		"${S}/lib/${P}.jar:$(java-pkg_getjars --build-only junit)" \
 		./net/sf/nachocalendar/model/DefaultDateSelectionModelTest.java
 	ejunit -cp ".:${S}/lib/${P}.jar" \
 		net.sf.nachocalendar.model.DefaultDataModelTest \
 		net.sf.nachocalendar.model.DefaultDateSelectionModelTest
 }
--- a/dev-java/xsom/Manifest
+++ b/dev-java/xsom/Manifest
@ -1,2 +1 @@
 DIST xsom-20140925.jar 371238 SHA256 1f4273ee9620bfd20ba81fd53f29c72ffedf49b9ad5f0af8862fccf76c31f26c SHA512 a1e2a9879deb3c92ed94fa0a9ac4f59debd8914cefe94149d74cde844c1f0519e35e00e87bf523b761fab50c8a69585b72d23fe28f30bdbf1f074de903438ee7 WHIRLPOOL ceffa427428f60302e1f925e3e7de13847277d7f92095e82554955061e0092d1ec254e08556f59a432a25882909b10ecdc948f341c4dc57ac2a8a4c3be0a15b1
 DIST xsom-src-20060901.tar.bz2 105215 SHA256 98e3cf0dce95f4ad21524461a50696544a4e60a07e0691202211b12271dd8aee SHA512 e49e83d0b6ef2d2f368d89119bb833217a2e527a661b8e3ee7f1a58a8769637bbeeb388edc452284305f3754abebfc732a39f7f12a6ce520080f34f125411ffe WHIRLPOOL db5449cb1110e5e705f736321df78786929eafa408c6154670cf05b29df734798d89d32ab2df27ebcf5930cc27bccebdd566e5ccc5174957f17d0a6407d3367f
--- a/dev-java/xsom/xsom-20060901.ebuild
+++ b/dev-java/xsom/xsom-20060901.ebuild
@ -1,52 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
 DESCRIPTION="XML Schema Object Model (XSOM) allows Java apps to easy parse and inspect XML Schema docs"
 HOMEPAGE="https://xsom.dev.java.net/"
 # Upstream does not have versioned source bundles :|
 SRC_URI="mirror://gentoo/xsom-src-${PV}.tar.bz2"
 LICENSE="CDDL"
 SLOT="0"
 KEYWORDS="amd64 x86 ~x86-fbsd"
 COMMON_DEP="
 	dev-java/relaxng-datatype
 	dev-java/relaxngcc"
 RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.5
 	${COMMON_DEP}"
 S="${WORKDIR}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}/lib"
 	java-pkg_jarfrom relaxng-datatype
 	java-pkg_jarfrom relaxngcc
 	cd "${S}"
 	sed -i \
 		-e 's/target name="compile" depends="ngcc,javacc"/target name="compile"/g' \
 		-e 's/target name="jar" depends="clean,compile"/target name="jar" depends="compile"/g' \
 		build.xml || die "sed failed"
 }
 src_test() { :; }
 src_install() {
 	java-pkg_dojar build/xsom.jar
 	use doc && java-pkg_dojavadoc build/javadoc
 	use source && java-pkg_dosrc src/* build/src/*
 }
--- a/dev-java/xsom/xsom-20140925.ebuild
+++ b/dev-java/xsom/xsom-20140925.ebuild
@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
-DESCRIPTION="XSOM allows Java apps to easily parse and inspect XML schema docs"
+DESCRIPTION="XSOM is a Java library allows to easily parse and inspect XML schema docs"
 HOMEPAGE="https://xsom.dev.java.net/"
 SRC_URI="https://repo1.maven.org/maven2/com/sun/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@ -1 +1,2 @@
 DIST gdl-0.9.5.tar.gz 2341992 SHA256 cc9635e836b5ea456cad93f8a07d589aed8649668fbd14c4aad22091991137e2 SHA512 10f004956fedc1ae5a99a9398f82e64982267a59637fc8823591b9573df9ce136b303a0fcebd774475b9bea266a640e2b66cd590c85b57b6cf505f40448e0d3a WHIRLPOOL 6ef59fc574ce26e798d30e9b4fdec9f49b82933b500901c8013c60de884ed6601d99c58ecd17221191cea121914dffce4c59211ce86b2c43fb40d43ce7ce033b
 DIST gdl-0.9.6v2.tgz 1777167 SHA256 cfb005ee1d9c843b26cc474618225ce68a1f0bfaeddcd45bf63a0a8fb62eedb4 SHA512 a816ee2e3822af380a1131a6138263c33560db7286cd699b864da305a1103d5afc881a1cd3574d2e243bfb7e65e759e46322c5e55c66ec15620d9c514565c2c5 WHIRLPOOL 1437816b807b8414b423c777ad0a3af4088a885548526741a5cf31f2ad802087efc52d1db6555d3a09c9e94baec526443e55182b6a1088f58d2843d8ffb47df6
--- a/dev-lang/gdl/files/0.9.6-disable-tests-hanging-under-xvfb-run.patch
+++ b/dev-lang/gdl/files/0.9.6-disable-tests-hanging-under-xvfb-run.patch
@ -0,0 +1,80 @@
 Description: Disable tests which work fine with local X but hang under xvfb-run
 Author: Axel Beckert <abe@debian.org>
 Last-Update: 2014-10-10
 --- a/testsuite/Makefile.am
 +++ b/testsuite/Makefile.am
@@ -18,7 +18,6 @@
   test_bug_2876372.pro \
   test_bug_2892631.pro \
   test_bug_2949487.pro \
 -  test_bug_2974380.pro \
   test_bug_3033108.pro \
   test_bug_3054361.pro \
   test_bug_3055720.pro \
@@ -43,7 +42,6 @@
   test_bug_3152899.pro \
   test_bug_3189072.pro \
   test_bug_3199465.pro \
 -  test_bug_3275334.pro \
   test_bug_3285659.pro \
   test_bug_3286031.pro \
   test_bug_3288652.pro \
@@ -74,16 +72,12 @@
   test_ce.pro \
   test_clip.pro \
   test_common.pro \
 -  test_congrid.pro \
   test_constants.pro \
   test_convert_coord.pro \
   test_correlate.pro \
   test_deriv.pro \
 -  test_device.pro \
   test_dicom.pro \
   test_erfinv.pro \
 -  test_execute.pro \
 -  test_extra_keywords.pro \
   test_fft.pro \
   test_fft_dim.pro \
   test_fft_leak.pro \
@@ -122,7 +116,6 @@
   test_memory.pro \
   test_message.pro \
   test_modulo.pro \
 -  test_moment.pro \
   test_mpfit.pro \
   test_multiroots.pro \
   test_nans_in_sort_and_median.pro \
@@ -130,10 +123,8 @@
   test_netcdf.pro \
   test_null.pro \
   test_obj_new.pro \
 -  test_plot_oo.pro \
   test_plotting_ranges.pro \
   test_pmulti.pro \
 -  test_pmulti_basic.pro \
   test_postscript.pro \
   test_product.pro \
   test_ps_decomposed.pro \
@@ -144,7 +135,6 @@
   test_python_module_2.pro \
   test_qromb.pro \
   test_qromo.pro \
 -  test_random.pro \
   test_readf.pro \
   test_reads.pro \
   test_rebin.pro \
@@ -167,13 +157,11 @@
   test_suite.pro \
   test_systime.pro \
   test_trisol.pro \
 -  test_tv.pro \
   test_typename.pro \
   test_url.pro \
   test_voigt.pro \
   test_wait.pro \
   test_wavelet.pro \
 -  test_window_background.pro \
   test_where.pro \
   test_zeropoly.pro \
   test_zip.pro \
--- a/dev-lang/gdl/files/0.9.6-fix-file-move.patch
+++ b/dev-lang/gdl/files/0.9.6-fix-file-move.patch
@ -0,0 +1,14 @@
 Author: Ole Streicher <olebole@debian.org>
 Description: Remove trailing slash at the end of dir when moving files specified by wildcard
 Forwarded: https://sourceforge.net/p/gnudatalanguage/patches/97/
 --- a/src/pro/file_move.pro
 +++ b/src/pro/file_move.pro
@@ -31,7 +31,7 @@
         res=FILE_SEARCH(dir, FILE_BASENAME(source[ii]), /fully)
         for jj=0,N_ELEMENTS(res)-1 do begin
 -            if(FILE_DIRNAME(res[jj], /MARK_DIRECTORY) eq dir) then flist=[flist, res[jj]] ;
 +            if(FILE_DIRNAME(res[jj]) eq dir) then flist=[flist, res[jj]] ;
             ;print, 'dir ', dir, ' res ', FILE_DIRNAME(res[jj])
         endfor
--- a/dev-lang/gdl/files/0.9.6-fix-python-function-call.patch
+++ b/dev-lang/gdl/files/0.9.6-fix-python-function-call.patch
@ -0,0 +1,30 @@
 Author: Ole Streicher <olebole@debian.org>
 Bug: https://sourceforge.net/p/gnudatalanguage/bugs/377
 Bug: https://sourceforge.net/p/gnudatalanguage/bugs/679
 Forwarded: https://sourceforge.net/p/gnudatalanguage/patches/91
 https://sourceforge.net/p/gnudatalanguage/patches/92
 Description: Fix Python calling GDL functions
 * user defined functions crash
 * data arrays of 64 bit element size are not completely converted to Python
 --- a/src/pythongdl.cpp
 +++ b/src/pythongdl.cpp
@@ -329,7 +329,7 @@
 		  }
 	      }
 -	    sub = proList[ proIx];
 +	    sub = funList[ proIx];
 	  }
       }
     else
 --- a/src/topython.cpp
 +++ b/src/topython.cpp
@@ -67,7 +67,7 @@
     // TODO: free the memory:  PyArray_Free(PyObject* op, void* ptr) ?
     throw GDLException("Failed to convert array to python.");
   }
 -  memcpy(PyArray_DATA(ret), DataAddr(), this->N_Elements() * sizeof(Sp::t));
 +  memcpy(PyArray_DATA(ret), DataAddr(), this->N_Elements() * Data_<Sp>::Sizeof());
   return ret;
 }
--- a/dev-lang/gdl/files/0.9.6-formats.patch
+++ b/dev-lang/gdl/files/0.9.6-formats.patch
@ -0,0 +1,111 @@
 diff -up gdl-0.9.6/testsuite/test_formats.pro.formats gdl-0.9.6/testsuite/test_formats.pro
 --- gdl-0.9.6/testsuite/test_formats.pro.formats	2015-09-06 13:15:01.000000000 -0600
 +++ gdl-0.9.6/testsuite/test_formats.pro	2016-01-12 14:26:18.811283030 -0700
@@ -13,6 +13,10 @@
 ;    is OK for negative input, wrong for positive one !!
 ; -- extra "\ ^J" added in GDL between the Re/Im parts for (D)Complex
 ;
 +; Changes: 
 +; 2016-01612 : AC various changes for better managing paths,
 +;              expecially for Cmake automatic tests !
 +;
 ; md5sum of current version of "formats.idl" (-1 et 12 ...)
 ; 5d1cfbc31312a833f62033e297f986a2  formats.idl
 ;
@@ -53,7 +57,10 @@ end
 pro GENERATE_FORMATS_FILE, nb_cases, verbose=verbose, test=test
 ;
 filename='formats.'+GDL_IDL_FL()
 -;
 +if FILE_TEST(filename) then begin
 +    FILE_MOVE, filename, filename+'_old', /overwrite
 +    MESSAGE,/cont, 'Copy of old file <<'+filename+'_old'+'>> done.'
 +endif
 ; value to be write : one negative, one positive
 ;
 struct_neg = {BYTE:-1b,short:-1us,ushort:-1us, $
@@ -104,17 +111,53 @@ soft=GDL_IDL_FL(/verbose)
 ;
 GENERATE_FORMATS_FILE, nb_cases, verbose=verbose
 ;
 -if (soft NE 'idl') AND ~FILE_TEST("formats.idl") then MESSAGE, "missing reference file <<formats.idl>>"
 +; locating then read back the reference idl.xdr:
 +;
 +; we need to add the current dir. into the path because new file(s)
 +; are writtent in it. Do we have a simple way to check whether a dir
 +; is already in !PATH ?
 +;
 +CD, current=current
 +new_path=!path+PATH_SEP(/SEARCH_PATH)+current
 +list_of_dirs=STRSPLIT(new_path, PATH_SEP(/SEARCH_PATH), /EXTRACT)
 +;
 +; only this reference file is mandatory !
 +;
 +filename='formats.idl'
 +file_fmt_idl=FILE_SEARCH(list_of_dirs+PATH_SEP()+filename)
 +;
 +if (soft NE 'idl') AND (STRLEN(file_fmt_idl) EQ 0) then begin
 +    MESSAGE, 'reference file <<'+filename+'>> not found in the !PATH', /continue
 +    if KEYWORD_SET(no_exit) OR KEYWORD_SET(test) then STOP
 +    EXIT, status=1
 +endif
 +if N_ELEMENTS(file_fmt_idl) GT 1 then print, 'multiple reference file <<'+filename+'>> found !'
 +file_fmt_idl=file_fmt_idl[0]
 +;
 +filename='formats.gdl'
 +file_fmt_gdl=FILE_SEARCH(list_of_dirs+PATH_SEP()+filename)
 +if N_ELEMENTS(file_fmt_gdl) GT 1 then begin
 +    print, 'multiple reference file <<'+filename+'>> found ! First used !!'
 +    print, TRANSPOSE(file_fmt_gdl)
 +    file_fmt_gdl=file_fmt_gdl[0]
 +endif
 +;
 +filename='formats.fl'
 +file_fmt_fl=FILE_SEARCH(list_of_dirs+PATH_SEP()+filename)
 +if N_ELEMENTS(file_fmt_fl) GT 1 then begin
 +    print, 'multiple reference file <<'+filename+'>> found !'
 +    print, TRANSPOSE(file_fmt_fl)
 +    file_fmt_fl=file_fmt_fl[0]
 +endif
 ;
 if (soft EQ 'idl') then begin
 -   if ~FILE_TEST("formats.gdl") then MESSAGE, /cont, "missing file <<formats.gdl>>"
 -   if ~FILE_TEST("formats.fl") then MESSAGE, /cont, "missing file <<formats.fl>>"
 -   if ~FILE_TEST("formats.gdl") AND ~FILE_TEST("formats.fl") then begin
 -      MESSAGE, /cont, "No useful file found for comparison. Just Reference file written."
 -   endif
 -   if FILE_TEST("formats.gdl") then soft='gdl' else begin
 -         if FILE_TEST("formats.fl") then soft='fl'
 -   endelse
 +    soft=''
 +    if ~FILE_TEST(file_fmt_fl) then MESSAGE, /cont, "missing file <<formats.fl>>" else soft='fl'
 +    if ~FILE_TEST(file_fmt_gdl) then MESSAGE, /cont, "missing file <<formats.gdl>>" else soft='gdl'
 +    if (soft EQ '') then begin
 +        MESSAGE, /cont, "No useful file found for comparison. Just Reference file written."
 +        return
 +    endif
 endif
 ;
 ; reading back the 2 files : one created ("formats.gdl" or
@@ -123,9 +166,10 @@ endif
 print, "Files to be compared : formats.idl, formats."+soft
 ;
 GET_LUN, lun1
 -OPENR, lun1, "formats.idl"
 +OPENR, lun1, file_fmt_idl
 GET_LUN, lun2
 -OPENR, lun2, "formats."+soft
 +if (soft EQ 'gdl') then OPENR, lun2, file_fmt_gdl
 +if (soft EQ 'fl') then OPENR, lun2, file_fmt_fl
 ;
 ref=STRING("")
 val=STRING("")
@@ -155,7 +199,7 @@ CLOSE, lun1, lun2
 FREE_LUN, lun1, lun2
 ;
 if (nb_errors GT 0) then begin
 -   MESSAGE, /continue, 'Using a "diff formats.idl formats.gdl" in a shell'
 +   MESSAGE, /continue, 'Using a "diff formats.idl formats.{gdl|fl}" in a shell'
    MESSAGE, /continue, 'should help to debug !'
 endif
 ;
--- a/dev-lang/gdl/files/0.9.6-fun-fix.patch
+++ b/dev-lang/gdl/files/0.9.6-fun-fix.patch
@ -0,0 +1,56 @@
 Author: Vitaliy Tomin <highwaystar@users.sf.net>
 Description: Fix direct calling of direct function calls from Python
 Bug: http://sourceforge.net/p/gnudatalanguage/bugs/678
 --- a/src/pythongdl.cpp
 +++ b/src/pythongdl.cpp
@@ -392,25 +392,31 @@
     BaseGDL* retValGDL = NULL;
     Guard<BaseGDL> retValGDL_guard;
 -    if( functionCall)
 -      {
 -	if( libCall) 
 -	  retValGDL = static_cast<DLibFun*>(static_cast<EnvT*>(e)->
 -					    GetPro())->Fun()( static_cast<EnvT*>(e));
 -	else
 -	  retValGDL = interpreter->call_fun(static_cast<DSubUD*>
 -					    (static_cast<EnvUDT*>(e)
 -					     ->GetPro())->GetTree());
 -	retValGDL_guard.Reset( retValGDL);
 -      }
 -    else
 -      {
 -	if( libCall) 
 -	  static_cast<DLibPro*>(e->GetPro())->Pro()(static_cast<EnvT*>(e)); // throws
 -	else
 -	  interpreter->call_pro(static_cast<DSubUD*>
 -				(e->GetPro())->GetTree()); //throws
 -      }
 +
 +    if (functionCall) {
 +        DLibFun* sub_fun_chk = dynamic_cast<DLibFun *>(static_cast<EnvT *>(e)->GetPro());
 +        if (sub_fun_chk) {
 +            //handle direct call function first
 +            if (sub_fun_chk->DirectCall()) {
 +                BaseGDL* directCallParameter = e->GetParDefined(0);
 +                retValGDL = static_cast<DLibFunDirect*>(sub_fun_chk)->FunDirect()(directCallParameter, true /*isReference*/);
 +            }
 +        } else if (libCall)
 +        retValGDL = static_cast<DLibFun *>(static_cast<EnvT *>(e)->GetPro())
 +                        ->Fun()(static_cast<EnvT *>(e));
 +      else
 +        retValGDL = interpreter->call_fun(
 +            static_cast<DSubUD *>(static_cast<EnvUDT *>(e)->GetPro())
 +                ->GetTree());
 +      retValGDL_guard.Reset(retValGDL);
 +    } else {
 +      if (libCall)
 +        static_cast<DLibPro *>(e->GetPro())
 +            ->Pro()(static_cast<EnvT *>(e)); // throws
 +      else
 +        interpreter->call_pro(
 +            static_cast<DSubUD *>(e->GetPro())->GetTree()); // throws
 +    }
     // copy back args and keywords
     success = CopyArgToPython( parRef, kwRef, *e, argTuple, kwDict);
--- a/dev-lang/gdl/files/0.9.6-gcc6.patch
+++ b/dev-lang/gdl/files/0.9.6-gcc6.patch
@ -0,0 +1,31 @@
 diff -up gdl-0.9.6/src/specializations.hpp.gcc6 gdl-0.9.6/src/specializations.hpp
 --- gdl-0.9.6/src/specializations.hpp.gcc6	2015-08-24 15:26:47.000000000 -0600
 +++ gdl-0.9.6/src/specializations.hpp	2016-03-03 16:30:46.694379312 -0700
@@ -534,16 +534,6 @@ void Data_<SpDString>::MinMax( DLong* mi
 // default_io.cpp
 template<>  
 -std::istream& operator>>(std::istream& i, Data_<SpDFloat>& data_); 
 -template<>  
 -std::istream& operator>>(std::istream& i, Data_<SpDDouble>& data_); 
 -template<>  
 -std::istream& operator>>(std::istream& i, Data_<SpDComplex>& data_); 
 -template<>  
 -std::istream& operator>>(std::istream& i, Data_<SpDComplexDbl>& data_); 
 -template<>  
 -std::istream& operator>>(std::istream& is, Data_<SpDString>& data_); 
 -template<>  
 std::ostream& Data_<SpDLong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr); 
 template<>  
 std::ostream& Data_<SpDULong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr); 
 --- gdl-0.9.6/src/typedefs.hpp.gcc6	2014/08/09 15:33:29	1.76
 +++ gdl-0.9.6/src/typedefs.hpp	2016/02/04 22:48:46	1.77
@@ -235,7 +235,7 @@
   Guard& operator=( Guard& r)
   {
 -    if( &r == this) return;
 +    if( &r == this) return *this;
     delete guarded;
     guarded = r.guarded;
     r.guarded = NULL;
--- a/dev-lang/gdl/files/0.9.6-python-use-path-and-startup.patch
+++ b/dev-lang/gdl/files/0.9.6-python-use-path-and-startup.patch
@ -0,0 +1,20 @@
 Author: Ole Streicher <olebole@debian.org>
 Description: Initialize GDL path if one is defined
 Forwarded: https://sourceforge.net/p/gnudatalanguage/patches/93/
 --- a/src/pythongdl.cpp
 +++ b/src/pythongdl.cpp
@@ -537,6 +537,14 @@
     // instantiate the interpreter (creates $MAIN$ environment)
     interpreter = new DInterpreter();
 +    string gdlPath=GetEnvString("GDL_PATH");
 +    if( gdlPath == "") gdlPath=GetEnvString("IDL_PATH");
 +    if( gdlPath == "")
 +      {
 +        gdlPath = "+" GDLDATADIR "/lib";
 +      }
 +    SysVar::SetGDLPath( gdlPath);
 +
     PyObject* m = Py_InitModule("GDL", GDLMethods);
     gdlError = PyErr_NewException((char*)"GDL.error", NULL, NULL);
--- a/dev-lang/gdl/gdl-0.9.6.ebuild
+++ b/dev-lang/gdl/gdl-0.9.6.ebuild
@ -0,0 +1,157 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 WX_GTK_VER="3.0"
 PYTHON_COMPAT=( python2_7 )
 inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx
 DESCRIPTION="GNU Data Language"
 HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gnudatalanguage/${P}v2.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+eigen fftw grib gshhs hdf hdf5 imagemagick netcdf openmp
 	  png proj postscript python static-libs udunits wxwidgets"
 RDEPEND="
 	dev-cpp/antlr-cpp:2=
 	sci-libs/gsl:0=
 	sci-libs/plplot:0=[-dynamic]
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
 	x11-libs/libX11:0=
 	fftw? ( sci-libs/fftw:3.0= )
 	grib? ( sci-libs/grib_api:0= )
 	gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= )
 	hdf? ( sci-libs/hdf:0= )
 	hdf5? ( sci-libs/hdf5:0= )
 	imagemagick? (
 		|| (
 			media-gfx/graphicsmagick[cxx]
 			media-gfx/imagemagick[cxx]
 			)
 	)
 	netcdf? ( sci-libs/netcdf )
 	proj? ( sci-libs/proj )
 	postscript? ( dev-libs/pslib )
 	python? (
 		${PYTHON_DEPS}
 		dev-python/numpy[${PYTHON_USEDEP}]
 	)
 	udunits? ( sci-libs/udunits )
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
 DEPEND="${RDEPEND}
 	dev-java/antlr:0[java(+),script(+)]
 	virtual/pkgconfig
 	eigen? ( dev-cpp/eigen:3 )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 PATCHES=(
 	"${FILESDIR}"/0.9.2-include.patch
 	"${FILESDIR}"/0.9.5-antlr.patch
 	"${FILESDIR}"/0.9.5-png.patch
 	"${FILESDIR}"/0.9.6-fix-file-move.patch
 	"${FILESDIR}"/0.9.6-fix-python-function-call.patch
 	"${FILESDIR}"/0.9.6-fun-fix.patch
 	"${FILESDIR}"/0.9.6-python-use-path-and-startup.patch
 	"${FILESDIR}"/0.9.6-disable-tests-hanging-under-xvfb-run.patch
 	"${FILESDIR}"/0.9.6-gcc6.patch
 	"${FILESDIR}"/0.9.6-formats.patch
 )
 pkg_pretend() {
 	use openmp && [[ $(tc-getCXX)$ == *g++* ]] && \
 		[[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp && \
 		die "You are using gcc but without OpenMP capabilities that you requested"
 }
 src_prepare() {
 	use wxwidgets && need-wxwidgets unicode
 	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
 	# make sure antlr includes are from system and rebuild the sources with it
 	# https://sourceforge.net/tracker/?func=detail&atid=618685&aid=3465878&group_id=97659
 	rm -r src/antlr || die
 	einfo "Regenerating grammar"
 	pushd src > /dev/null
 	local i
 	for i in *.g; do antlr ${i} || die ; done
 	popd > /dev/null
 	# gentoo: avoid install files in datadir directory
 	# and manually install them in src_install
 	sed -e '/AUTHORS/d' -i CMakeLists.txt || die
 	cmake-utils_src_prepare
 }
 src_configure() {
 	# MPI is still very buggy
 	# x11=off does not compile
 	local mycmakeargs=(
 		-DMPICH=OFF
 		-DBUNDLED_ANTLR=OFF
 		-DX11=ON
 		-DEIGEN3="(usex eigen)"
 		-DFFTW="(usex fftw)"
 		-DGRIB="(usex grib)"
 		-DGSHHS="(usex gshhs)"
 		-DHDF="(usex hdf)"
 		-DHDF5="(usex hdf5)"
 		-DLIBPROJ4="(usex proj)"
 		-DNETCDF="(usex netcdf)"
 		-DOPENMP="(usex openmp)"
 		-DPNGLIB="(usex png)"
 		-DPSLIB="(usex postscript)"
 		-DUDUNITS="(usex udunits)"
 		-DWXWIDGETS="(usex wxwidgets)"
 	)
 	if use imagemagick; then
 		if has_version media-gfx/graphicsmagick[cxx]; then
 			mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
 		else
 			mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
 		fi
 	else
 		mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
 	fi
 	configuration() {
 		mycmakeargs+=( $@ )
 		cmake-utils_src_configure
 	}
 	configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
 	use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
 }
 src_compile() {
 	cmake-utils_src_compile
 	use python && python_foreach_impl cmake-utils_src_make
 }
 src_test() {
 	# there is check target instead of the ctest to define some LDPATH
 	virtx emake -C "${BUILD_DIR}" check
 }
 src_install() {
 	cmake-utils_src_install
 	if use python; then
 		installation() {
 			mv src/libgdl.so GDL.so || die
 			python_domodule GDL.so
 		}
 		python_foreach_impl run_in_build_dir installation
 		dodoc PYTHON.txt
 	fi
 	#dodoc AUTHORS README
 	echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl
 	doenvd 50gdl
 }
--- a/dev-libs/geoip/geoip-1.6.9.ebuild
+++ b/dev-libs/geoip/geoip-1.6.9.ebuild
@ -14,7 +14,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 RESTRICT="test"
--- a/dev-libs/libgcrypt/metadata.xml
+++ b/dev-libs/libgcrypt/metadata.xml
@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer restrict="dev-libs/libgcrypt:11" type="project">
+	<maintainer type="project">
 		<email>multilib@gentoo.org</email>
 		<name>gx86-multilib project</name>
 		<description>Maintaining the binary compatibility slot.</description>
 	</maintainer>
 <maintainer type="project">
 		<email>crypto@gentoo.org</email>
 		<name>Crypto</name>
 	</maintainer>
--- a/dev-libs/libmaa/metadata.xml
+++ b/dev-libs/libmaa/metadata.xml
@ -3,9 +3,9 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription lang="en">
-  The <pkg>libmaa</pkg> library provides many low-level data structures which
+  The libmaa library provides many low-level data structures which
  are helpful for writing compilers, including hash tables, sets, lists,
-  debugging support, and memory management. Although <pkg>libmaa</pkg> was
+  debugging support, and memory management. Although libmaa was
  designed and implemented as a foundation for the KHEPERA Transformation
  System, the data structures are generally applicable to a wide range of
  programming problems. The memory management routines are especially helpful
--- a/dev-libs/mimetic/mimetic-0.9.8.ebuild
+++ b/dev-libs/mimetic/mimetic-0.9.8.ebuild
@ -10,7 +10,7 @@ SRC_URI="http://www.codesink.org/download/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 DEPEND="doc? ( app-doc/doxygen )"
--- a/dev-libs/nspr/nspr-4.12.ebuild
+++ b/dev-libs/nspr/nspr-4.12.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.22.2.ebuild
+++ b/dev-libs/nss/nss-3.22.2.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-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@ -26,3 +26,5 @@ DIST sbcl-1.3.0-source.tar.bz2 5722767 SHA256 d60caf6a0a495e41fc9e7f6a797e7c4188
 DIST sbcl-1.3.0-x86-64-linux-binary.tar.bz2 9830954 SHA256 e6e801f0cc31fd6a14cf20b983c6ef2be5750225fad221bf9621788c0a0a90c5 SHA512 916fdd1627903b7227a6d5962a2534fa2cd9003f832b975c96d0e11c301d73c7c3225cfd4121f10cbcdde87dcac9079b9a48e6737ba9a3d2c18c484bae3c371d WHIRLPOOL a4372dd59df03e0e0e8d2359799e0580b6829e001c219ef28504cc7db8b3a8ad7429ecdcd36bb72ed5196192d9f66b2854c5b6960cd5f97c31afd758a17c6a67
 DIST sbcl-1.3.2-source.tar.bz2 5739508 SHA256 d382f196ea7795c3541bcda433e0bb8b5610a62bb9f83309fe20629e6090afa2 SHA512 c0f34a5475707706f949ba5a4eca7097fc198ec973e729772b3c4a852b8a56508184f99e77c98db3bf6fdeaa2ebd3c01169c1c4b1d4750a81301ca2727b8e638 WHIRLPOOL 37ddcba9b782ee3677665c44cb8cf1c164125a48421529b6d5e3b46e0395be039610604809442a601471bf00bbe7916c3d27e9d90f9328e5fe1c70a7aa43c139
 DIST sbcl-1.3.2-x86-64-linux-binary.tar.bz2 9724466 SHA256 5331056a6c7cd638d3d815458180a457d098e85c1e3821af055b9998670fe2ed SHA512 192bc19d372d39049c93aff57ae07531264a3595c1cb4553511d69771010901dce25b1403825b75c147eb121f90aa7f230814861fd948f9b916d6254ecba2ad2 WHIRLPOOL 667e305844b6982b23f3c486dd1356731721f0a62da3c4ccb8fce538d43ed9044af150a1a4c0b507f511a5a85fde2efbecc80ba25b843b5c3859aa772b202bb6
 DIST sbcl-1.3.3-source.tar.bz2 5740904 SHA256 db38f600f2db5511566cbb53c3e6ac70b2576a09d5210ac44f9a9b14fee7fb4f SHA512 a8c6176089716cb1f84beca407e17f148a706991f6f74b51543295e6fdc9308a424933e69bd1beb7815d5c47d5ea735b9c8f717dc3934b4ab3a188f8cc1420a8 WHIRLPOOL 0ca1e1be4e16670daf80eb07dc9239ccf66c42b4b1b06bf1c9fd90f78f7bd0ea93c61964a8263f5a4e39b9a17900f2eea3daa0ad4ffaf3786bb0dd1591f13a77
 DIST sbcl-1.3.3-x86-64-linux-binary.tar.bz2 9475261 SHA256 e8b1730c42e4a702f9b4437d9842e91cb680b7246f88118c7443d7753e61da65 SHA512 00800945d736180a7fee6d693162add6c7dbab576bc9918ee4dfecbeaa5223a9ef6e34d20b1118851f450703350b5547250ad9cf55431a03d9299d09277e6306 WHIRLPOOL 51f3f5c7280788b303b783b583cd81a02ded60ef2b157cdd0fd951efbf470f4e4e8336eab69b25a96998c850d83b706806aaf9b76a25599df597c6df66ad92bf
--- a/dev-lisp/sbcl/sbcl-1.3.3.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.3.3.ebuild
@ -0,0 +1,239 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit multilib eutils flag-o-matic pax-utils
 #same order as http://www.sbcl.org/platform-table.html
 BV_X86=1.2.7
 BV_AMD64=1.3.3
 BV_PPC=1.2.7
 BV_SPARC=1.0.28
 BV_ALPHA=1.0.28
 BV_ARM=1.2.7
 BV_ARM64=1.3.3
 BV_PPC_MACOS=1.0.47
 BV_X86_MACOS=1.1.6
 BV_X64_MACOS=1.2.11
 BV_SPARC_SOLARIS=1.0.23
 BV_X86_SOLARIS=1.2.7
 BV_X64_SOLARIS=1.2.7
 DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
 HOMEPAGE="http://sbcl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
 	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
 	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
 	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
 	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
 	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
 	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
 	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
 	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
 	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
 	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
 	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc source +threads +unicode pax_kernel zlib"
 CDEPEND=">=dev-lisp/asdf-3.1:="
 DEPEND="${CDEPEND}
 		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
 		pax_kernel? ( sys-apps/elfix )"
 RDEPEND="${CDEPEND}
 		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
 # Disable warnings about executable stacks, as this won't be fixed soon by upstream
 QA_EXECSTACK="usr/bin/sbcl"
 CONFIG="${S}/customize-target-features.lisp"
 ENVD="${T}/50sbcl"
 # Prevent ASDF from using the system libraries
 CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
 ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
 usep() {
 	use ${1} && echo "true" || echo "false"
 }
 sbcl_feature() {
 	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
 }
 sbcl_apply_features() {
 	sed 's/^X//' > "${CONFIG}" <<-'EOF'
 	(lambda (list)
 	X  (flet ((enable  (x) (pushnew x list))
 	X         (disable (x) (setf list (remove x list))))
 	EOF
 	if use x86 || use amd64; then
 		sbcl_feature "$(usep threads)" ":sb-thread"
 	fi
 	sbcl_feature "true" ":sb-ldb"
 	sbcl_feature "false" ":sb-test"
 	sbcl_feature "$(usep unicode)" ":sb-unicode"
 	sbcl_feature "$(usep zlib)" ":sb-core-compression"
 	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
 	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
 	X    )
 	X  list)
 	EOF
 	cat "${CONFIG}"
 }
 src_unpack() {
 	unpack ${A}
 	mv sbcl-*-* sbcl-binary || die
 	cd "${S}"
 }
 src_prepare() {
 	epatch "${FILESDIR}"/gentoo-fix_install_man.patch
 	# bug #468482
 	epatch "${FILESDIR}"/concurrency-test-1.2.6.patch
 	# bugs #486552, #527666, #517004
 	epatch "${FILESDIR}"/bsd-sockets-test-1.2.11.patch
 	# bugs #560276, #561018
 	epatch "${FILESDIR}"/sb-posix-test-1.2.15.patch
 	epatch "${FILESDIR}"/${PN}-1.2.11-solaris.patch
 	epatch "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch
 	# To make the hardened compiler NOT compile with -fPIE -pie
 	if gcc-specs-pie ; then
 		einfo "Disabling PIE..."
 		epatch "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
 	fi
 	# bug #526194
 	sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \
 		-e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \
 		-i src/runtime/GNUmakefile || die
 	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
 		-i make-config.sh || die
 	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
 	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
 	# Some shells(such as dash) don't have "time" as builtin
 	# and we don't want to DEPEND on sys-process/time
 	sed "s,^time ,," -i make.sh || die
 	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
 	# #define SBCL_HOME ...
 	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
 	# change location of /etc/sbclrc ...
 	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
 	find . -type f -name .cvsignore -delete
 }
 src_configure() {
 	# customizing SBCL version as per
 	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
 	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
 	# applying customizations
 	sbcl_apply_features
 }
 src_compile() {
 	local bindir="${WORKDIR}"/sbcl-binary
 	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
 	if use pax_kernel ; then
 		# To disable PaX on hardened systems
 		pax-mark -mr "${bindir}"/src/runtime/sbcl
 		# Hack to disable PaX on second GENESIS stage
 		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
 			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
 	fi
 	# clear the environment to get rid of non-ASCII strings, see bug 174702
 	# set HOME for paludis
 	env - HOME="${T}" PATH="${PATH}" \
 		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
 		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
 		GNUMAKE=make ./make.sh \
 		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
 		|| die "make failed"
 	# need to set HOME because libpango(used by graphviz) complains about it
 	if use doc; then
 		env - HOME="${T}" PATH="${PATH}" \
 			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
 			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
 			make -C doc/manual info html || die "Cannot build manual"
 		env - HOME="${T}" PATH="${PATH}" \
 			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
 			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
 			make -C doc/internals info html || die "Cannot build internal docs"
 	fi
 }
 src_test() {
 	ewarn "Unfortunately, it is known that some tests fail eg."
 	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
 	ewarn "development and not of Gentoo's side. Please, before filing"
 	ewarn "any bug(s) search for older submissions. Thank you."
 	time ( cd tests && sh run-tests.sh )
 }
 src_install() {
 	# install system-wide initfile
 	dodir /etc/
 	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
 	;;; The following is required if you want source location functions to
 	;;; work in SLIME, for example.
 	X
 	(setf (logical-pathname-translations "SYS")
 	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
 	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
 	X
 	;;; Setup ASDF2
 	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
 	EOF
 	# Install documentation
 	unset SBCL_HOME
 	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
 		sh install.sh || die "install.sh failed"
 	# bug #517008
 	pax-mark -mr "${D}"/usr/bin/sbcl
 	# rm empty directories lest paludis complain about this
 	find "${ED}" -empty -type d -exec rmdir -v {} +
 	if use doc; then
 		dohtml -r doc/manual/
 		doinfo doc/manual/*.info*
 		dohtml -r doc/internals/sbcl-internals
 		doinfo doc/internals/sbcl-internals.info
 		docinto internals-notes && dodoc doc/internals-notes/*
 	else
 		rm -Rv "${ED}/usr/share/doc/${PF}" || die
 	fi
 	dodoc BUGS CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README TLA TODO
 	# install the SBCL source
 	if use source; then
 		./clean.sh
 		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
 	fi
 	# necessary for running newly-saved images
 	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
 	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
 	doenvd "${ENVD}"
 }
--- a/dev-python/astropy-helpers/Manifest
+++ b/dev-python/astropy-helpers/Manifest
@ -1,2 +1,3 @@
 DIST astropy-helpers-1.0.6.tar.gz 126274 SHA256 3651a854fafd0184252639775aab9776331f8ae1bbadd920169d6dc1914095e3 SHA512 c3fa2e329094c5e319b493d2c8889b1158dfdcb8845dc978274a4333167b5069228d9c9ac585e0759b1002776d4597b2a23cf5d276d9c971122919afddb8f277 WHIRLPOOL 83467c958a762fb3b045b6e8e168572012ef308b6aaac7f92c5992e5207cd26efb6cbb5ce617e5701ab2c8d23f169af939052dc2bd50195b9163f3a8db5d6b3f
 DIST astropy-helpers-1.1.1.tar.gz 132083 SHA256 2da74e8e6b08f3c378fc5f863460bc5c45f4f08e47ed2887cff0a26692aadd4b SHA512 432580de37583b6195b6827dae46516553ceba71bfc038bb609bd59f158f3eb082925dc03f7d9b8ef10d9da68e0d40ee0fa0dc915d72ee0391d58d851a7114bf WHIRLPOOL a64b950acb452307e2f43206c2ff6d102856c0c60a7d4058a59ab8c82338692fee4e432d7dea78b865dea2401536a101713615079c3a1eafbfb4b8c034f57047
 DIST astropy-helpers-1.1.2.tar.gz 132787 SHA256 d4ae269f7bb6f41f791334b524e788c37e07787b2a3efe9906da8d30f645824e SHA512 28fef972c92bd988ef9456292f5f02d12d27d64fa181985fec799ebe23c472cab61ce7bcebb758c46273c2a2e8098b15ae3242b5961bf84f5ffe8e5f91e13ff8 WHIRLPOOL ecbadad319cfb9e2afbb6120230ac24b59cb82e3489be54d63769681ecd22b841f5a1d58fa7ae7e4fd706b5eda761bd30b5a8b647e70205e5fab526384786e14
--- a/dev-python/astropy-helpers/astropy-helpers-1.1.2.ebuild
+++ b/dev-python/astropy-helpers/astropy-helpers-1.1.2.ebuild
@ -0,0 +1,23 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 inherit distutils-r1
 DESCRIPTION="Helpers for Astropy and Affiliated packages"
 HOMEPAGE="https://github.com/astropy/astropy-helpers"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 KEYWORDS="~amd64 ~x86 ~x86-linux"
 python_prepare_all() {
 	sed -e '/import ah_bootstrap/d' -i setup.py || die "Removing ah_bootstrap failed"
 	distutils-r1_python_prepare_all
 }
--- a/dev-python/astropy/Manifest
+++ b/dev-python/astropy/Manifest
@ -1,2 +1,3 @@
 DIST astropy-1.0.6.tar.gz 7632331 SHA256 1a0190ad420323b9bd8f7b29995a39580d7d59c5329c825bb5abb52e2f7b936d SHA512 84e02204bc55d3bd6e0e891dc56ab218d1deb65882d5d771b3f80c2a11790f77c103b0c0d5537f1842d98f0d3ded19039c82482c15147edadac89e9707537b40 WHIRLPOOL b20e5c2e3677485eaf22c71c7e3461443d4a92bf7b0e649f5e0153e0b1d46741958e983b743aa30bf07ad971a0c865e53211963653ddf814a5d4362f36f07b02
 DIST astropy-1.1.1.tar.gz 8157305 SHA256 4d2e7a8bd5191a66d7e1a52beefb4a0b6f496a1e9e8212422613219cb514769f SHA512 bc3c370da32d5f0098dbfc2808dba9d4d4424d3dcfba4d7ffd84b39569387b79ad93086e10678c259237f9cfe1229725501d0dc4eba51c9d01a4cd8a72024fb4 WHIRLPOOL 5b40955f56e6f080ad93b224eabd345565ef9f5e7f5ccb00e2737bd714117bc9b35922a044fe4ccaddb9d30fa72e13dd560577392120bfbd0a9d10c8aaa5aa01
 DIST astropy-1.1.2.tar.gz 8059713 SHA256 6f0d84cd7dfb304bb437dda666406a1d42208c16204043bc920308ff8ffdfad1 SHA512 b83c4a1415a3eb8c016507705d0d2f22971e4da937bb97953eec08f8f856933d8fa76ce8c536122235b19e7879b16add2e20fd2fee3e488f9b2b4bf1b9f4dbdb WHIRLPOOL 01cdfd33c29f7128e88be3f53b7ecdec37d95ba06acae6ceeba83746e0454aa220396fb00519b30639ac01b5b297fad004488d34856295735e04924d154c4eb9
--- a/dev-python/astropy/astropy-1.1.2.ebuild
+++ b/dev-python/astropy/astropy-1.1.2.ebuild
@ -0,0 +1,98 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 DESCRIPTION="Core functionality for performing astrophysics with Python"
 HOMEPAGE="http://astropy.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RDEPEND="
 	>=dev-libs/expat-2.1.0:0=
 	dev-python/configobj[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/ply[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	>=sci-astronomy/erfa-1.2:0=
 	>=sci-astronomy/wcslib-5:0=
 	sci-libs/cfitsio:0=
 	sys-libs/zlib:0="
 DEPEND="${RDEPEND}
 	>=dev-python/astropy-helpers-1.1[${PYTHON_USEDEP}]
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
 		media-gfx/graphviz
 		$(python_gen_cond_dep 'dev-libs/libxml2[${PYTHON_USEDEP}]' python2_7)
 		$(python_gen_cond_dep 'dev-python/h5py[${PYTHON_USEDEP}]' python2_7)
 		$(python_gen_cond_dep 'dev-python/matplotlib[${PYTHON_USEDEP}]' python2_7)
 		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]' python2_7)
 		$(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
 		$(python_gen_cond_dep 'dev-python/wcsaxes[${PYTHON_USEDEP}]' python2_7)
 		$(python_gen_cond_dep 'sci-libs/scipy[${PYTHON_USEDEP}]'python2_7)
 	)
 	test? (
 		dev-libs/libxml2[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/h5py[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		sci-libs/scipy[${PYTHON_USEDEP}]
 	)"
 REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.4-system-six.patch"
 	"${FILESDIR}/${PN}-1.0.4-system-configobj.patch"
 	"${FILESDIR}/${PN}-1.1.1-mark-kown-failures.patch"
 	"${FILESDIR}/${PN}-1.1.2-fix-for-pytest-28.patch"
 	"${FILESDIR}/${PN}-1.1.2-cfitsio-338.patch"
 )
 pkg_setup() {
 	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
 }
 python_prepare_all() {
 	export mydistutilsargs="--offline"
 	export ASTROPY_USE_SYSTEM_PYTEST=True
 	rm -r ${PN}_helpers || die
 	cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die
 	rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
 	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
 	cat >> setup.cfg <<-EOF
 	[build]
 	use_system_libraries=1
 	EOF
 	distutils-r1_python_prepare_all
 }
 python_compile_all() {
 	if use doc; then
 		python_setup "python2*"
 		VARTEXFONTS="${T}"/fonts \
 			MPLCONFIGDIR="${BUILD_DIR}" \
 			PYTHONPATH="${BUILD_DIR}"/lib \
 			esetup.py build_sphinx
 	fi
 }
 python_test() {
 	esetup.py test
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_python_install_all
 }
--- a/dev-python/astropy/files/astropy-1.1.2-cfitsio-338.patch
+++ b/dev-python/astropy/files/astropy-1.1.2-cfitsio-338.patch
@ -0,0 +1,35 @@
 Author: Ole Streicher <olebole@debian.org>
 Description: Make TFORMx check more flexible
 The maximal column length in cfitsio changed between version 3370 and 3380.
 This patch checks their syntax, without a specific length.
 Bug: https://github.com/astropy/astropy/issues/4646
 --- a/astropy/io/fits/tests/test_image.py
 +++ b/astropy/io/fits/tests/test_image.py
@@ -4,6 +4,7 @@
 import math
 import os
 +import re
 import time
 import warnings
@@ -1010,7 +1011,7 @@
         hdu.writeto(self.temp('test.fits'))
         with fits.open(self.temp('test.fits')) as hdul:
 -            assert (hdul['SCI'].data == cube).all()
 +            assert np.abs(hdul['SCI'].data - cube).max() < 1./15.
     def test_subtractive_dither_seed(self):
         """
@@ -1265,8 +1266,8 @@
         with fits.open(self.temp('test.fits'),
                        disable_image_compression=True) as h:
 -            assert h[1].header['TFORM1'] == '1PB(30)'
 -            assert h[1].header['TFORM2'] == '1PB(359)'
 +            assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM1'])
 +            assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM2'])
     def test_compression_update_header(self):
         """Regression test for
--- a/dev-python/astropy/files/astropy-1.1.2-fix-for-pytest-28.patch
+++ b/dev-python/astropy/files/astropy-1.1.2-fix-for-pytest-28.patch
@ -0,0 +1,37 @@
 From e904df784b91fd45e7dfcdec0713c471bb03efff Mon Sep 17 00:00:00 2001
 From: Thomas Robitaille <thomas.robitaille@gmail.com>
 Date: Fri, 1 Jan 2016 19:36:39 +0000
 Bug: https://bugs.debian.org/812648
 Bug: https://github.com/astropy/astropy/pull/4349
 Subject: [PATCH] Fixes to pytest plugins for pytest >= 2.8.0
 --- a/astropy/tests/pytest_plugins.py
 +++ b/astropy/tests/pytest_plugins.py
@@ -161,7 +161,10 @@
         # handling __doctest_skip__) doesn't happen.
         def collect(self):
             if self.fspath.basename == "conftest.py":
 -                module = self.config._conftest.importconftest(self.fspath)
 +                try:
 +                    module = self.config._conftest.importconftest(self.fspath)
 +                except AttributeError:  # pytest >= 2.8.0
 +                    module = self.config.pluginmanager._importconftest(self.fspath)
             else:
                 try:
                     module = self.fspath.pyimport()
@@ -191,8 +194,14 @@
         def runtest(self):
             # satisfy `FixtureRequest` constructor...
             self.funcargs = {}
 -            self._fixtureinfo = doctest_plugin.FuncFixtureInfo((), [], {})
 -            fixture_request = doctest_plugin.FixtureRequest(self)
 +            try:
 +                self._fixtureinfo = doctest_plugin.FuncFixtureInfo((), [], {})
 +                fixture_request = doctest_plugin.FixtureRequest(self)
 +            except AttributeError:  # pytest >= 2.8.0
 +                python_plugin = config.pluginmanager.getplugin('python')
 +                self._fixtureinfo = python_plugin.FuncFixtureInfo((), [], {})
 +                fixture_request = python_plugin.FixtureRequest(self)
 +
             failed, tot = doctest.testfile(
                 str(self.fspath), module_relative=False,
                 optionflags=opts, parser=DocTestParserPlus(),
--- a/dev-python/astroscrappy/Manifest
+++ b/dev-python/astroscrappy/Manifest
@ -0,0 +1 @@
 DIST astroscrappy-1.0.3.tar.gz 422209 SHA256 843af0ec1fb7439a886f05690a52d96342c3bd505dfdef42e922a66b67a89776 SHA512 2e96e8e62f81c770802a3c7699ca4455c640bb000aa4bffc22149745eed4e7e33cc4b297649020a601ff7fb242c0545cf9391c19ee2687adab26ac494d37dbb2 WHIRLPOOL 8ee318233639617608a4c4aea0a75227317f3ca695430c49882a1396178eb3655bd80169291de2631c752c81d41016dcda85653eb1caa372cfd7c0d49080fd67
--- a/dev-python/astroscrappy/astroscrappy-1.0.3.ebuild
+++ b/dev-python/astroscrappy/astroscrappy-1.0.3.ebuild
@ -0,0 +1,58 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1 toolchain-funcs flag-o-matic
 DESCRIPTION="Optimized cosmic ray annihilation astropy python module"
 HOMEPAGE="https://github.com/astropy/astroscrappy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc openmp test"
 RDEPEND="
 	dev-python/astropy[${PYTHON_USEDEP}]
 	dev-python/astropy-helpers[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 PATCHES=(
 	"${FILESDIR}/${P}-dont-install-binary.patch"
 	"${FILESDIR}/${P}-endian-fix-tests.patch"
 	"${FILESDIR}/${P}-numpy-fix-tests.patch"
 	"${FILESDIR}/${P}-respect-user-flag.patch"
 )
 DOCS=( CHANGES.rst )
 python_prepare_all() {
 	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
 	use openmp && tc-has-openmp && append-flags -fopenmp
 	distutils-r1_python_prepare_all
 }
 python_compile_all() {
 	use doc && esetup.py build_sphinx
 }
 python_test() {
 	esetup.py test
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_python_install_all
 }
--- a/dev-python/astroscrappy/files/astroscrappy-1.0.3-dont-install-binary.patch
+++ b/dev-python/astroscrappy/files/astroscrappy-1.0.3-dont-install-binary.patch
@ -0,0 +1,14 @@
 Author: Ole Streicher <olebole@debian.org>
 Description: Don't install example/template binary
 --- a/setup.py
 +++ b/setup.py
@@ -80,9 +80,6 @@
 # Define entry points for command-line scripts
 entry_points = {}
 -entry_points['console_scripts'] = [
 -    'astropy-package-template-example = packagename.example_mod:main',
 -]
 # Include all .c files, recursively, including those generated by
 # Cython, since we can not do this in MANIFEST.in with a "dynamic"
--- a/dev-python/astroscrappy/files/astroscrappy-1.0.3-endian-fix-tests.patch
+++ b/dev-python/astroscrappy/files/astroscrappy-1.0.3-endian-fix-tests.patch
@ -0,0 +1,100 @@
 From 5b5ce99c63d03e60b6027f09f72231db11a87bf2 Mon Sep 17 00:00:00 2001
 From: Curtis McCully <cmccully@lcogt.net>
 Date: Thu, 3 Dec 2015 12:02:38 -0800
 Subject: [PATCH] Made tests not endian specific.
 --- a/astroscrappy/tests/test_utils.py
 +++ b/astroscrappy/tests/test_utils.py
@@ -56,7 +56,7 @@
 def test_medfilt5():
 -    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
 +    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
     npmed5 = ndimage.filters.median_filter(a, size=(5, 5), mode='nearest')
     npmed5[:2, :] = a[:2, :]
     npmed5[-2:, :] = a[-2:, :]
@@ -68,7 +68,7 @@
 def test_medfilt7():
 -    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
 +    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
     npmed7 = ndimage.filters.median_filter(a, size=(7, 7), mode='nearest')
     npmed7[:3, :] = a[:3, :]
     npmed7[-3:, :] = a[-3:, :]
@@ -80,7 +80,7 @@
 def test_sepmedfilt3():
 -    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
 +    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
     npmed3 = ndimage.filters.median_filter(a, size=(1, 3), mode='nearest')
     npmed3[:, :1] = a[:, :1]
     npmed3[:, -1:] = a[:, -1:]
@@ -95,7 +95,7 @@
 def test_sepmedfilt5():
 -    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
 +    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
     npmed5 = ndimage.filters.median_filter(a, size=(1, 5), mode='nearest')
     npmed5[:, :2] = a[:, :2]
     npmed5[:, -2:] = a[:, -2:]
@@ -110,7 +110,7 @@
 def test_sepmedfilt7():
 -    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
 +    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
     npmed7 = ndimage.filters.median_filter(a, size=(1, 7), mode='nearest')
     npmed7[:, :3] = a[:, :3]
     npmed7[:, -3:] = a[:, -3:]
@@ -125,7 +125,7 @@
 def test_sepmedfilt9():
 -    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
 +    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
     npmed9 = ndimage.filters.median_filter(a, size=(1, 9), mode='nearest')
     npmed9[:, :4] = a[:, :4]
     npmed9[:, -4:] = a[:, -4:]
@@ -174,7 +174,7 @@
 def test_subsample():
 -    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
 +    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
     npsubsamp = np.zeros((a.shape[0] * 2, a.shape[1] * 2), dtype=np.float32)
     for i in range(a.shape[0]):
         for j in range(a.shape[1]):
@@ -189,8 +189,8 @@
 def test_rebin():
     a = np.ascontiguousarray(np.random.random((2002, 2002)), dtype=np.float32)
 -    a = a.astype('<f4')
 -    nprebin = np.zeros((1001, 1001), dtype=np.float32).astype('<f4')
 +    a = a.astype('f4')
 +    nprebin = np.zeros((1001, 1001), dtype=np.float32).astype('f4')
     for i in range(1001):
         for j in range(1001):
             nprebin[i, j] = (a[2 * i, 2 * j] + a[2 * i + 1, 2 * j] +
@@ -202,7 +202,7 @@
 def test_laplaceconvolve():
 -    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
 +    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
     k = np.array([[0.0, -1.0, 0.0], [-1.0, 4.0, -1.0], [0.0, -1.0, 0.0]])
     k = k.astype('<f4')
     npconv = ndimage.filters.convolve(a, k, mode='constant', cval=0.0)
@@ -211,8 +211,8 @@
 def test_convolve():
 -    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
 -    k = np.ascontiguousarray(np.random.random((5, 5))).astype('<f4')
 +    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
 +    k = np.ascontiguousarray(np.random.random((5, 5))).astype('f4')
     npconv = ndimage.filters.convolve(a, k, mode='constant', cval=0.0)
     cconv = convolve(a, k)
     assert_allclose(cconv, npconv, rtol=0, atol=1e-5)
--- a/dev-python/astroscrappy/files/astroscrappy-1.0.3-numpy-fix-tests.patch
+++ b/dev-python/astroscrappy/files/astroscrappy-1.0.3-numpy-fix-tests.patch
@ -0,0 +1,21 @@
 Author: Ole Streicher <olebole@debian.org>
 Description: Cast the numpy arrays in the test to the same data type
 Bug: https://ci.debian.net/data/packages/unstable/amd64/a/astroscrappy/20160112_151253.autopkgtest.log.gz
 --- a/astroscrappy/tests/test_astroscrappy.py
 +++ b/astroscrappy/tests/test_astroscrappy.py
@@ -36,7 +36,7 @@
     imdata += gaussian(imdata.shape, x, y, brightness, 3.5)
 # Add the poisson noise
 -imdata = np.random.poisson(imdata)
 +imdata = np.float32(np.random.poisson(imdata))
 # Add readnoise
 imdata += np.random.normal(0.0, 10.0, size=(1001, 1001))
@@ -60,4 +60,4 @@
     # contrast that we can turn our detection threshold up.
     mask, _clean = detect_cosmics(imdata, readnoise=10., gain=1.0,
                                   sigclip=6, sigfrac=1.0)
 -    assert (mask == expected_crmask).sum() == (1001 * 1001)
 \ No newline at end of file
 +    assert (mask == expected_crmask).sum() == (1001 * 1001)
--- a/dev-python/astroscrappy/files/astroscrappy-1.0.3-respect-user-flag.patch
+++ b/dev-python/astroscrappy/files/astroscrappy-1.0.3-respect-user-flag.patch
@ -0,0 +1,35 @@
 --- astroscrappy/astroscrappy/utils/setup_package.py.orig	2016-03-09 22:50:34.304043122 +0000
 +++ astroscrappy/astroscrappy/utils/setup_package.py	2016-03-09 22:54:53.560783823 +0000
@@ -43,30 +43,11 @@
                     sources=med_sources,
                     include_dirs=include_dirs,
                     libraries=libraries,
 -                    language="c",
 -                    extra_compile_args=['-g', '-O3', '-funroll-loops',
 -                                        '-ffast-math'])
 +                    language="c")
     ext_im = Extension(name=str("astroscrappy.utils.image_utils"),
                     sources=im_sources,
                     include_dirs=include_dirs,
                     libraries=libraries,
 -                    language="c",
 -                    extra_compile_args=['-g', '-O3', '-funroll-loops',
 -                                        '-ffast-math'])
 -
 -    has_openmp, outputs = check_openmp()
 -    if has_openmp:
 -        ext_med.extra_compile_args.append('-fopenmp')
 -        ext_im.extra_compile_args.append('-fopenmp')
 -        ext_med.extra_link_args = ['-g', '-fopenmp']
 -        ext_im.extra_link_args = ['-g', '-fopenmp']
 -    else:
 -        log.warn('OpenMP was not found. '
 -                 'astroscrappy will be compiled without OpenMP. '
 -                 '(Use the "-v" option of setup.py for more details.)')
 -        log.debug(('(Start of OpenMP info)\n'
 -                   'compiler stdout:\n{0}\n'
 -                   'compiler stderr:\n{1}\n'
 -                   '(End of OpenMP info)').format(*outputs))
 +                    language="c")
     return [ext_med, ext_im]
--- a/dev-python/astroscrappy/metadata.xml
+++ b/dev-python/astroscrappy/metadata.xml
@ -0,0 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
    <email>sci-astronomy@gentoo.org</email>
    <name>Gentoo Astronomy Project</name>
  </maintainer>
  <longdescription lang="en">
    ccdproc is a AstroPy-affliated package for the basic reduction of
    CCD images. It provides a framework for accounting for error propagation
    and bad pixel tracking through the reduction steps.
  </longdescription>
  <upstream>
    <remote-id type="pypi">ccdproc</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/ccdproc/Manifest
+++ b/dev-python/ccdproc/Manifest
@ -0,0 +1,2 @@
 DIST ccdproc-0.3.3.tar.gz 646341 SHA256 4b460deec77cd6d6f8997a544af5db091a6ab8a36383d3249dab38b0cbd2c837 SHA512 c4733409d20dcaa2513c4c40d5205a34c31be6868774f03cddc230957c52bad33232503277fbf33396c16c05ec435646a625a32dac9c6fba4063fc52141c6521 WHIRLPOOL bbad6ef6987f0bb3495271b8dd66c44492ed15a011aaf75193410d4a33df0061c507eb8b3cb7b30a050e2a7e151ad638c85f1d12ed159d219c3892d98e79e0e2
 DIST ccdproc-1.0.1.tar.gz 527849 SHA256 fc9ccf28b518847740a7b458335c4a380e8c496f678aed1e43e2a8a3bed7e251 SHA512 2f55bbae65aa7adbbf03e2982634a7523aed5e0afd8833a9f70783e5507683d3adb13a58e0fab9ede1a947e5e67bd5aaaa8116894ffb72bf52bc8160fb51ab77 WHIRLPOOL d3c17576e979f4ae5c0b1de7883e88c2da6623b61f26ea725912e2d46d1dc598192f6b5330ee1c92e88e992ba8bff8cdfd77dde2035701e4ffe01496ff2aa99a
--- a/dev-python/ccdproc/ccdproc-0.3.3.ebuild
+++ b/dev-python/ccdproc/ccdproc-0.3.3.ebuild
@ -0,0 +1,49 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 DESCRIPTION="Astropy affiliated package for reducing optical/IR CCD data"
 HOMEPAGE="https://github.com/astropy/ccdproc"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc test"
 DOCS=( README.rst )
 RDEPEND="
 	dev-python/astropy[${PYTHON_USEDEP}]
 	dev-python/astropy-helpers[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 python_prepare_all() {
 	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
 	distutils-r1_python_prepare_all
 }
 python_compile_all() {
 	use doc && esetup.py build_sphinx
 }
 python_test() {
 	esetup.py test
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_python_install_all
 }
--- a/dev-python/ccdproc/ccdproc-1.0.1.ebuild
+++ b/dev-python/ccdproc/ccdproc-1.0.1.ebuild
@ -0,0 +1,53 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 DESCRIPTION="Astropy affiliated package for reducing optical/IR CCD data"
 HOMEPAGE="https://github.com/astropy/ccdproc"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc test"
 DOCS=( README.rst )
 RDEPEND="
 	dev-python/astropy[${PYTHON_USEDEP}]
 	dev-python/astropy-helpers[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 			dev-python/astroscrappy[${PYTHON_USEDEP}]
 			dev-python/pytest[${PYTHON_USEDEP}]
 			dev-python/reproject[${PYTHON_USEDEP}]
 		  )"
 python_prepare_all() {
 	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
 	distutils-r1_python_prepare_all
 }
 python_compile_all() {
 	use doc && esetup.py build_sphinx
 }
 python_test() {
 	esetup.py test
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_python_install_all
 }
--- a/dev-python/ccdproc/metadata.xml
+++ b/dev-python/ccdproc/metadata.xml
@ -0,0 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
    <email>sci-astronomy@gentoo.org</email>
    <name>Gentoo Astronomy Project</name>
  </maintainer>
  <longdescription lang="en">
    ccdproc is a AstroPy-affliated package for the basic reduction of
    CCD images. It provides a framework for accounting for error propagation
    and bad pixel tracking through the reduction steps.
  </longdescription>
  <upstream>
    <remote-id type="pypi">ccdproc</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@ -1 +1,2 @@
 DIST cloudpickle-0.1.1.tar.gz 14479 SHA256 3418303f44c6c4daa184f1dc36c8c0b7ff8261c56d1f922ffd8d09e79caa4b74 SHA512 685972288689219e33bb655abb26fc509b3fc5bb26f5dc8715c3ce544835c7ceab79cb6cc3decfee75a5b846a7e283125c8040901038a25c9d55d965c74a7714 WHIRLPOOL 96ed0ef9112d25538a9a3516946067e6a1997592d246019593c2957b8dff093bf8593ed03289fd5e0b9dfe47a54e556aaed0c8558b65be57e4e263cb6105a371
 DIST cloudpickle-0.2.1.tar.gz 15514 SHA256 eea4b655e6aed3dba39b104ad1872226e3f9e23d8d202fc003f3e65f2d125c3b SHA512 ab098186c04db1947fb6c4c92bb4708b0c45122adf0435f5da70a0cb24c08cf6d36ce627ea112a8ad8d0107a28b12259435c3e1aa2ab7a6f8f4122e5ca756e2c WHIRLPOOL 66c3b735e592b05bdacb8fecc75a0d4e81751670f06eac2049a5d02b2a8dc1e1fbb66ef039d7de6f85175ff6dd7f6f635290f25937af02d6d640894a959778dc
--- a/dev-python/cloudpickle/cloudpickle-0.2.1.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-0.2.1.ebuild
@ -0,0 +1,26 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 inherit eutils distutils-r1
 DESCRIPTION="Extended pickling support for Python objects"
 HOMEPAGE="https://pypi.python.org/pypi/cloudpickle/"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RDEPEND=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 	  dev-python/mock[${PYTHON_USEDEP}]
 	  dev-python/pytest[${PYTHON_USEDEP}] )"
 python_test() {
 	PYTHONPATH='.:tests' py.test || die
 }
--- a/dev-python/cytoolz/cytoolz-0.7.5.ebuild
+++ b/dev-python/cytoolz/cytoolz-0.7.5.ebuild
@ -3,7 +3,7 @@
 # $Id$
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 inherit distutils-r1
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@ -0,0 +1 @@
 DIST dask-0.8.1.tar.gz 292047 SHA256 43deb1934cd033668e5e60b735f45c9c3ee2813f87bd51c243f975e55267fa43 SHA512 b75fca59ecf285bae2fe82cb635fbcb78e9eb1389dc764c36e20c2278b12ec41363f463adfeff33891cf0eaf9a03ef1586b90ea5189c03d955bc670ac416660b WHIRLPOOL 63bdfef96af56e82b72759c60546b9cc72fd67ec94ddff226d34ce8612e2c603729aaf2b31823971001701b01317c96ddf74a539ebab3cdc02a7e554ff8e8f37
--- a/dev-python/dask/dask-0.8.1.ebuild
+++ b/dev-python/dask/dask-0.8.1.ebuild
@ -0,0 +1,38 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
 HOMEPAGE="http://dask.pydata.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RDEPEND="
 	dev-python/bokeh[${PYTHON_USEDEP}]
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pandas[${PYTHON_USEDEP}]
 	dev-python/partd[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	dev-python/toolz[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/toolz[${PYTHON_USEDEP}]
 	test? (
 		 dev-python/pytest[${PYTHON_USEDEP}]
 		 dev-python/numexpr[${PYTHON_USEDEP}]
 		 sci-libs/scipy[${PYTHON_USEDEP}] )"
 python_test() {
 	py.test || die
 }
--- a/dev-python/dask/metadata.xml
+++ b/dev-python/dask/metadata.xml
@ -0,0 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
    <email>cluster@gentoo.org</email>
    <name>Gentoo Cluster Project</name>
  </maintainer>
  <maintainer type="project">
    <email>python@gentoo.org</email>
    <name>Python</name>
  </maintainer>
  <longdescription lang="en">
    Dask is a simple task scheduling system that uses directed acyclic
    graphs (DAGs) of tasks to break up large computations into many
    small ones.
 </longdescription>
  <upstream>
    <remote-id type="pypi">dask</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 inherit distutils-r1
--- a/dev-python/doctest-ignore-unicode/metadata.xml
+++ b/dev-python/doctest-ignore-unicode/metadata.xml
@ -6,7 +6,6 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">pxml</remote-id>
+		<remote-id type="pypi">doctest-ignore-unicode</remote-id>
 		<remote-id type="github">metagriffin/pxml</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@ -1,5 +1,6 @@
 DIST elasticsearch-1.7.3.tar.gz 28510917 SHA256 af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca SHA512 0cb6b2ebd77c3d1467f6a22f845bfbf9f4a7c9c9ddedae17aeb6bd2d2bc576171fc80e3a4963e7b890af574e9fd0b0faa152e7f2671a74254826e14fe2554c9f WHIRLPOOL c86de3076389a9b95cf4d424673edb3c3b1dae0b4470b18b15a5f2e9bde6669a61b8ffd5cc3f7fc3b52f99441915a84b0396a5673ebbc12fec0d83eb41a03c74
 DIST elasticsearch-2.2.0.tar.gz 29419005 SHA256 ed70cc81e1f55cd5f0032beea2907227b6ad8e7457dcb75ddc97a2cc6e054d30 SHA512 b1c9d10ba6c778fe1a440c058b4968bae1cfb81cff9e00508e406ce02ec5eb889b6d7caf8fb69ef132a2e681b127fbe3b71c6298ee0c9f047aeaeec29cdc1cc6 WHIRLPOOL 1e57b2cca97d90756d592ca96ceb4e1fc026e1c9deaeceb3df3a59937a9cd8710222d6c74ece2883dd425aeb1bfde034413d2f04ea0f4a4c276c0d7de3671cee
 DIST elasticsearch-2.2.1.tar.gz 29424648 SHA256 7d43d18a8ee8d715d827ed26b4ff3d939628f5a5b654c6e8de9d99bf3a9b2e03 SHA512 9254175afff5c002625465fb5f398e4e53d121925a656af13e65d90eb3b3ef7507ef094cf44002f104a84e5147a8677a05f4071248140d6b48179b9057867cb5 WHIRLPOOL a470a663b8ec1b8cb7a8daf6bfc02ed7d5d0f23caab063ac2e6c7456bda449bad3e81237699fa434f077d4f86ee09dac7d007b554acc6428f2b436cf8448b210
 DIST elasticsearch-curator-3.4.0.tar.gz 96741 SHA256 86e542886d83ad4c499437e42f4ff69d6602314a75c0c156d1c8dd838ab5e605 SHA512 23cab700acb8afe7967d3e024a293a765ba1823015006c2856c3967ba33ec8a21d214fe7e0b2840e9fc3adb4cc15c889dba955c849036850ed67d689285f9871 WHIRLPOOL 01828a116a11d41666fb21c967375055114ff050650ab329f5aded441aa98743b0c62bcbb98f7f5a2335b844d44e1f3020d6f36e0f2f24acbf357f69b056062e
 DIST elasticsearch-curator-3.4.1.tar.gz 91420 SHA256 38d3c576c1a714d3e4defd78c43d898908ac563aa93018afd47702b5ae1e01c1 SHA512 63cee7e7778cf9cc5484a5e2a5a7cb379c8ba84f194d44758bf6e7a468492c27f41dbf5df42d964c060761e61166d3eba056c59b4d44e0df6a75052c5f9b42d8 WHIRLPOOL 2aa54a725b5cf1b5db0e3a8b069bd9d0f6d791f7750311676d25bcb7fba233316d38980c68e2ad2bfd7ae7ea82cc69ccbc7746e40f95e6ce19562ed577e32228
 DIST elasticsearch-curator-3.5.0.tar.gz 92873 SHA256 b710da5cfb3c1355106762c697d02a590db0c620cebc32b3a8fa142719043e37 SHA512 0f1145dbf036388e40db0942d7cc878ba5117a03060b25d63127ae3fbfab18e1bc407ee064a0ae99d69a15723fd81bd3baf3674945d70671d099c839e441e278 WHIRLPOOL 3d16e7ab0e832929f1fc106ea4b4aff5f7eaa7d56e73ad24c20dec97ff48917e07947125f3ae8efd164504e5b9dec9d7dd5a9ccfe3b5a2a14b323a98bab6e21f
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild
@ -75,7 +75,7 @@ python_test() {
 	done
 	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
+	esetup.py test
 	pkill -F ${PID}
 }
--- a/Show More
+++ b/Show More
`@ -1 +1,2 @@`
	`DIST puppetserver-2.2.1.tar.gz 42665674 SHA256 583662380b161fc35e0f0c5e7e2964892ec4b7e0cb848cadcd76b29684a85843 SHA512 9b7036d886467a41d0d62d4651a91676d885dfa684aa757d9e27ce5ef5f8183f188f490e1594b6b936219a3dd9bee8f609df6229d5d26fd331677fcf1f61d034 WHIRLPOOL f0f15512be55fd49da80b2e839cef9bd9684ef23eab5e872d331b0802f790451c0fb16320b97d25d0bbb8e9bad08cd66c788c0a47643c8da4d973d6649f0da2c`	`DIST puppetserver-2.2.1.tar.gz 42665674 SHA256 583662380b161fc35e0f0c5e7e2964892ec4b7e0cb848cadcd76b29684a85843 SHA512 9b7036d886467a41d0d62d4651a91676d885dfa684aa757d9e27ce5ef5f8183f188f490e1594b6b936219a3dd9bee8f609df6229d5d26fd331677fcf1f61d034 WHIRLPOOL f0f15512be55fd49da80b2e839cef9bd9684ef23eab5e872d331b0802f790451c0fb16320b97d25d0bbb8e9bad08cd66c788c0a47643c8da4d973d6649f0da2c`
		`DIST puppetserver-2.3.0.tar.gz 33655096 SHA256 b8bb77ae4684a57a00b8fd41782034718e3d53e09fe3bb6470b4aef2e3da15a4 SHA512 364d9af1eb138db814b45310f9c0bc67976a0a1a3d1d36ddf6cbb547ab85088e5efc0149dfbb1cd662966b61aef9d95709d4b9c7ffe615ede8b7a8ff35b0deff WHIRLPOOL 77c4a245bcb8125b8c8d4e50994c3ff05233a6337a98f60e7d0d8fbe1e0ea4635fffca8de755bbe9c10a5c3f4d6c41b77eaf10d967fd6b82209907ff6464ae85`
		`@ -0,0 +1 @@`
							`DIST kfoldersync-3.1.3.tar.xz 34152 SHA256 138b546e8976e6f78e1f68f3f2b2754bd17cefab847c4aba9173bf1bd8450bf1 SHA512 e0ac9337a266621a7500dbfd28e69d496eb3f11ddbf6f59fbade156578dd22b5a11eadf7068fe358461fc5c0d8a34aea225628bc69794b6d9e341bf43ad18638 WHIRLPOOL ad63cfecdec0b97bd28e249f8393810b09fff899168e17fa6e23baa3ad91ca7494f871b53495f363e7a7422dc1bffccc6a628b08920ba76cc716ccc83d463d30`
`@ -1 +1,2 @@`
		`DIST jsr67-1.3.jar 327033 SHA256 fe2b95887477f7f39c8d3a33211c0d96cf73872364a0b0478bdaf24500be6225 SHA512 c4145e5870af677542a09a17b7b57d9e5501f6354b26743b9eb9946dbd263114eb705c023af996ddcb256961df28a7ac2420a54fcdd69f73c8595901ee21760a WHIRLPOOL 25dcffa1eb5166867158211ae209e2b24f648d6806e392b80527b8c34f4ebdec181125f80443c1b6956856b1b9c14e83a9df9a72781d14c4fb366bd3a7ae9479`
	`DIST saaj-api.jar 18817 SHA256 d36278c49c50f1fe41c264414a1f572a6578d544b8ca89053597ecb9ca87f63e SHA512 b130ff18fcc3ab04c095ad454c82d83b2c383d4f8eb950291796d41f0f0ee7a15434de282864e778c3692cc3bdf4ab5213050a43ae10a6e308d613f9d477a813 WHIRLPOOL c5596415d9dec81e20b8c5d515388c049820e24467f40f7c0259e9d4169149f36367b1501c227adc738aebcd01ab0875925073c2467a7a6c8bc0d87a44470216`	`DIST saaj-api.jar 18817 SHA256 d36278c49c50f1fe41c264414a1f572a6578d544b8ca89053597ecb9ca87f63e SHA512 b130ff18fcc3ab04c095ad454c82d83b2c383d4f8eb950291796d41f0f0ee7a15434de282864e778c3692cc3bdf4ab5213050a43ae10a6e308d613f9d477a813 WHIRLPOOL c5596415d9dec81e20b8c5d515388c049820e24467f40f7c0259e9d4169149f36367b1501c227adc738aebcd01ab0875925073c2467a7a6c8bc0d87a44470216`
`@ -1 +1 @@`
	`DIST nachocalendar-src-0.23.tar.bz2 412489 SHA256 e276b0e7bd7abdeb37feebfc72343f48b617dde3644b20ca5f18ad72dac226c0 SHA512 a7b34d1caab2fb26856bd668a80b7f5c57f192be0729f4f9063600866160c26a4163389bf0136c3f101911f4547c5f474800c8e3d96cc77de6febd589564e98b WHIRLPOOL 1657f1c6c47ef7cd7476ce30b033311e2e56f041e2676ec256f81e9b5381716235a3cec45fd6aee98cef769d5ccc18e1fb356414d2bf901218673a17082cfabe`	`DIST nachocalendar-0.23.tar.bz2 412489 SHA256 e276b0e7bd7abdeb37feebfc72343f48b617dde3644b20ca5f18ad72dac226c0 SHA512 a7b34d1caab2fb26856bd668a80b7f5c57f192be0729f4f9063600866160c26a4163389bf0136c3f101911f4547c5f474800c8e3d96cc77de6febd589564e98b WHIRLPOOL 1657f1c6c47ef7cd7476ce30b033311e2e56f041e2676ec256f81e9b5381716235a3cec45fd6aee98cef769d5ccc18e1fb356414d2bf901218673a17082cfabe`
`@ -1,2 +1 @@`
	`DIST xsom-20140925.jar 371238 SHA256 1f4273ee9620bfd20ba81fd53f29c72ffedf49b9ad5f0af8862fccf76c31f26c SHA512 a1e2a9879deb3c92ed94fa0a9ac4f59debd8914cefe94149d74cde844c1f0519e35e00e87bf523b761fab50c8a69585b72d23fe28f30bdbf1f074de903438ee7 WHIRLPOOL ceffa427428f60302e1f925e3e7de13847277d7f92095e82554955061e0092d1ec254e08556f59a432a25882909b10ecdc948f341c4dc57ac2a8a4c3be0a15b1`	`DIST xsom-20140925.jar 371238 SHA256 1f4273ee9620bfd20ba81fd53f29c72ffedf49b9ad5f0af8862fccf76c31f26c SHA512 a1e2a9879deb3c92ed94fa0a9ac4f59debd8914cefe94149d74cde844c1f0519e35e00e87bf523b761fab50c8a69585b72d23fe28f30bdbf1f074de903438ee7 WHIRLPOOL ceffa427428f60302e1f925e3e7de13847277d7f92095e82554955061e0092d1ec254e08556f59a432a25882909b10ecdc948f341c4dc57ac2a8a4c3be0a15b1`
	`DIST xsom-src-20060901.tar.bz2 105215 SHA256 98e3cf0dce95f4ad21524461a50696544a4e60a07e0691202211b12271dd8aee SHA512 e49e83d0b6ef2d2f368d89119bb833217a2e527a661b8e3ee7f1a58a8769637bbeeb388edc452284305f3754abebfc732a39f7f12a6ce520080f34f125411ffe WHIRLPOOL db5449cb1110e5e705f736321df78786929eafa408c6154670cf05b29df734798d89d32ab2df27ebcf5930cc27bccebdd566e5ccc5174957f17d0a6407d3367f`
`@ -1 +1,2 @@`
	`DIST gdl-0.9.5.tar.gz 2341992 SHA256 cc9635e836b5ea456cad93f8a07d589aed8649668fbd14c4aad22091991137e2 SHA512 10f004956fedc1ae5a99a9398f82e64982267a59637fc8823591b9573df9ce136b303a0fcebd774475b9bea266a640e2b66cd590c85b57b6cf505f40448e0d3a WHIRLPOOL 6ef59fc574ce26e798d30e9b4fdec9f49b82933b500901c8013c60de884ed6601d99c58ecd17221191cea121914dffce4c59211ce86b2c43fb40d43ce7ce033b`	`DIST gdl-0.9.5.tar.gz 2341992 SHA256 cc9635e836b5ea456cad93f8a07d589aed8649668fbd14c4aad22091991137e2 SHA512 10f004956fedc1ae5a99a9398f82e64982267a59637fc8823591b9573df9ce136b303a0fcebd774475b9bea266a640e2b66cd590c85b57b6cf505f40448e0d3a WHIRLPOOL 6ef59fc574ce26e798d30e9b4fdec9f49b82933b500901c8013c60de884ed6601d99c58ecd17221191cea121914dffce4c59211ce86b2c43fb40d43ce7ce033b`
		`DIST gdl-0.9.6v2.tgz 1777167 SHA256 cfb005ee1d9c843b26cc474618225ce68a1f0bfaeddcd45bf63a0a8fb62eedb4 SHA512 a816ee2e3822af380a1131a6138263c33560db7286cd699b864da305a1103d5afc881a1cd3574d2e243bfb7e65e759e46322c5e55c66ec15620d9c514565c2c5 WHIRLPOOL 1437816b807b8414b423c777ad0a3af4088a885548526741a5cf31f2ad802087efc52d1db6555d3a09c9e94baec526443e55182b6a1088f58d2843d8ffb47df6`
		`@ -0,0 +1 @@`
							`DIST astroscrappy-1.0.3.tar.gz 422209 SHA256 843af0ec1fb7439a886f05690a52d96342c3bd505dfdef42e922a66b67a89776 SHA512 2e96e8e62f81c770802a3c7699ca4455c640bb000aa4bffc22149745eed4e7e33cc4b297649020a601ff7fb242c0545cf9391c19ee2687adab26ac494d37dbb2 WHIRLPOOL 8ee318233639617608a4c4aea0a75227317f3ca695430c49882a1396178eb3655bd80169291de2631c752c81d41016dcda85653eb1caa372cfd7c0d49080fd67`
		`@ -0,0 +1,2 @@`
							`DIST ccdproc-0.3.3.tar.gz 646341 SHA256 4b460deec77cd6d6f8997a544af5db091a6ab8a36383d3249dab38b0cbd2c837 SHA512 c4733409d20dcaa2513c4c40d5205a34c31be6868774f03cddc230957c52bad33232503277fbf33396c16c05ec435646a625a32dac9c6fba4063fc52141c6521 WHIRLPOOL bbad6ef6987f0bb3495271b8dd66c44492ed15a011aaf75193410d4a33df0061c507eb8b3cb7b30a050e2a7e151ad638c85f1d12ed159d219c3892d98e79e0e2`
							`DIST ccdproc-1.0.1.tar.gz 527849 SHA256 fc9ccf28b518847740a7b458335c4a380e8c496f678aed1e43e2a8a3bed7e251 SHA512 2f55bbae65aa7adbbf03e2982634a7523aed5e0afd8833a9f70783e5507683d3adb13a58e0fab9ede1a947e5e67bd5aaaa8116894ffb72bf52bc8160fb51ab77 WHIRLPOOL d3c17576e979f4ae5c0b1de7883e88c2da6623b61f26ea725912e2d46d1dc598192f6b5330ee1c92e88e992ba8bff8cdfd77dde2035701e4ffe01496ff2aa99a`
`@ -1 +1,2 @@`
	`DIST cloudpickle-0.1.1.tar.gz 14479 SHA256 3418303f44c6c4daa184f1dc36c8c0b7ff8261c56d1f922ffd8d09e79caa4b74 SHA512 685972288689219e33bb655abb26fc509b3fc5bb26f5dc8715c3ce544835c7ceab79cb6cc3decfee75a5b846a7e283125c8040901038a25c9d55d965c74a7714 WHIRLPOOL 96ed0ef9112d25538a9a3516946067e6a1997592d246019593c2957b8dff093bf8593ed03289fd5e0b9dfe47a54e556aaed0c8558b65be57e4e263cb6105a371`	`DIST cloudpickle-0.1.1.tar.gz 14479 SHA256 3418303f44c6c4daa184f1dc36c8c0b7ff8261c56d1f922ffd8d09e79caa4b74 SHA512 685972288689219e33bb655abb26fc509b3fc5bb26f5dc8715c3ce544835c7ceab79cb6cc3decfee75a5b846a7e283125c8040901038a25c9d55d965c74a7714 WHIRLPOOL 96ed0ef9112d25538a9a3516946067e6a1997592d246019593c2957b8dff093bf8593ed03289fd5e0b9dfe47a54e556aaed0c8558b65be57e4e263cb6105a371`
		`DIST cloudpickle-0.2.1.tar.gz 15514 SHA256 eea4b655e6aed3dba39b104ad1872226e3f9e23d8d202fc003f3e65f2d125c3b SHA512 ab098186c04db1947fb6c4c92bb4708b0c45122adf0435f5da70a0cb24c08cf6d36ce627ea112a8ad8d0107a28b12259435c3e1aa2ab7a6f8f4122e5ca756e2c WHIRLPOOL 66c3b735e592b05bdacb8fecc75a0d4e81751670f06eac2049a5d02b2a8dc1e1fbb66ef039d7de6f85175ff6dd7f6f635290f25937af02d6d640894a959778dc`
		`@ -0,0 +1 @@`
							`DIST dask-0.8.1.tar.gz 292047 SHA256 43deb1934cd033668e5e60b735f45c9c3ee2813f87bd51c243f975e55267fa43 SHA512 b75fca59ecf285bae2fe82cb635fbcb78e9eb1389dc764c36e20c2278b12ec41363f463adfeff33891cf0eaf9a03ef1586b90ea5189c03d955bc670ac416660b WHIRLPOOL 63bdfef96af56e82b72759c60546b9cc72fd67ec94ddff226d34ce8612e2c603729aaf2b31823971001701b01317c96ddf74a539ebab3cdc02a7e554ff8e8f37`