Sync with portage [Thu May 4 11:50:33 MSK 2017].

7 years ago · 070b3b5e1c
parent 122293a30e
commit 070b3b5e1c
907 changed files with 4708 additions and 19050 deletions
--- a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r4.ebuild
+++ b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r4.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Ebuild for setting up a Gentoo rsync mirror"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Infrastructure/Rsync"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-src_install() {
-	dodir /opt/gentoo-rsync
-	cp "${FILESDIR}"/rsync-gentoo-portage.sh "${D}"/opt/gentoo-rsync
-	cp "${FILESDIR}"/rsynclogparse-extended.pl "${D}"/opt/gentoo-rsync
-	insinto etc/rsync
-	doins "${FILESDIR}"/rsyncd.conf
-	doins "${FILESDIR}"/rsyncd.motd
-	doins "${FILESDIR}"/gentoo-mirror.conf
-	dodir /opt/gentoo-rsync/portage
-}
-
-pkg_postinst() {
-	elog "The rsync-mirror is now installed into /opt/gentoo-rsync"
-	elog "The local portage copy resides in      /opt/gentoo-rsync/portage"
-	elog "Please change /opt/gentoo-rsync/rsync-gentoo-portage.sh for"
-	elog "configuration of your main rsync server and use it so sync."
-	elog "Change /etc/rsync/rsyncd.motd to display your correct alias."
-	elog
-	elog "RSYNC_OPTS="--config=/etc/rsync/rsyncd.conf" needs"
-	elog "to be set in /etc/conf.d/rsyncd to make allow syncing."
-	elog
-	elog "The service can be started using /etc/init.d/rsyncd start"
-	elog "If you are setting up an official mirror, don't forget to add"
-	elog "00,30 * * * *      root    /opt/gentoo-rsync/rsync-gentoo-portage.sh"
-	elog "to your /etc/crontab to sync your tree every 30 minutes."
-	elog
-	elog "If you are setting up a private (unofficial) mirror, you can add"
-	elog "0 3 * * *	root	/opt/gentoo-rsync/rsync-gentoo-portage.sh"
-	elog "to your /etc/crontab to sync your tree once per day."
-	elog
-	elog "****IMPORTANT****"
-	elog "If you are setting up a private mirror, DO NOT sync against the"
-	elog "gentoo.org official rotations more than once a day.  Doing so puts"
-	elog "you at risk of having your IP address banned from the rotations."
-	elog
-	elog "For more information visit: https://wiki.gentoo.org/wiki/Project:Infrastructure/Rsync"
-}
--- a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
+++ b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
@ -9,7 +9,7 @@ SRC_URI=""

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

 S="${WORKDIR}"
--- a/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
+++ b/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
@ -6,11 +6,12 @@ EAPI=6
 DESCRIPTION="Filesystem Integrity Checker"
 SRC_URI="mirror://sourceforge/petrovich/${P}.tar.gz"
 HOMEPAGE="https://sourceforge.net/projects/petrovich"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc ~sparc"

-DEPEND="virtual/perl-Digest-MD5"
+RDEPEND="virtual/perl-Digest-MD5"

 S="${WORKDIR}/${PN}"

--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -1,3 +1,3 @@
 DIST sudo-1.8.18p1.tar.gz 2822109 SHA256 e5a0471c721281a693025bbde33ebd9d3db43245d83ab8516bbfc23980379434 SHA512 8dceeb5024c4f94fcc15e75fa2fd164af5e0597734f95df43207738b3258c4d396e102faf2b6811e399f1cdbdbf617b87e5bfcc1e591ea6722f45d81d1098fe5 WHIRLPOOL 094c1232517706a6da4a0548f7ab5c0c7b9e12f8ce584db97d0c4793a38c4044538637f2834b9f3104326bd5b4b826d08ab79b1dc2c5b950de7d7f558685ef7b
 DIST sudo-1.8.19p2.tar.gz 2861855 SHA256 237e18e67c2ad59ecacfa4b7707198b09fcf84914621585a9bc670dcc31a52e0 SHA512 21c83403e7ff219a273b2c4873be0d858997558ca150bc8239379a9dfcc587fdd7c0c49cdf4cdc27dfd6dd45f9f089fa034b58bfcee07dceb4a481542251b3fc WHIRLPOOL 550ed115ea711d6ba9aa698cd988295b74327dd770d79b6852f9f3f00a1c0420bbdcce5cc7c49467e0cf8a57fc79dbcfc73edaf3ad697e06ba9fd48919fece0b
-DIST sudo-1.8.20rc1.tar.gz 2924556 SHA256 94e1aba09955f386ecc900263870aa06725b64e36af27acfa695ea70fdb1a5b2 SHA512 0fca3a7fc98d900481eb9ec6a058c13a44852e99558800699171c6c817b34878e3ddafb8641755f056fd775590466c41ca4ec4fcd9f5678d94ca914bcdf2a190 WHIRLPOOL fef57eda0b737962967e8647d8443551e25a12316a3e830c442514f0425128d69efb8bf0303e0ece974808489befb06f65c3c43d3a20e8655ba58fc7553718e5
+DIST sudo-1.8.20rc2.tar.gz 2924906 SHA256 1748abfde7a7fe34f571553e975c64baeb2c48c28ad95e35d64c8e7d56bf1cfe SHA512 dd24e09a39a0b4a179ac7e38d19c12959be8bf4ed32fc8c27d139c01f41680d1116d2905e54b539cfbda61b1530dbb8cfab8a4d82e6a4b03ac5d3ffbbf8b6690 WHIRLPOOL 9f93f43784a94bdbaf5ac2f69a4691bc775f34cef532a0913c568f673fb8507830fbaa395789ca7e2674f8a62e848fda9106f58f4513ca82f48d1a82be0bdda7
--- a/app-admin/sudo/sudo-1.8.20_rc2.ebuild
+++ b/app-admin/sudo/sudo-1.8.20_rc2.ebuild
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@ -1,2 +1,3 @@
 DIST heimdal-1.5.3.tar.gz 6798305 SHA256 aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5 SHA512 5c7890f60d6fe6b5034fca204eb7cdb33fdc397fe09b169212b6267310b83bb0b3b06a4c2888841be34c92cbd701bd95734b4019c33c147459c4a449861c4431 WHIRLPOOL 8202b1bdf76e84b4a0fea1aa89935dfb3fbcceca38c84ffb3e3e8454691398c9a7cecfad40c6661426be5e82f4e3f43b6d6494cf287900ff958e06603b602e19
 DIST heimdal-7.1.0.tar.gz 9925587 SHA256 cee58ab3a4ce79f243a3e73f465dac19fe2b93ef1c5ff244d6f1d689fedbde2d SHA512 5afc9d183ff0db6e82e83d47955cc77e775bc60569e2905f9106c31b8a33e8d67fbc042dd4836ebae094db38bf70ba858c224189fed8d55f277738ee6e76352e WHIRLPOOL cd6507c5f6a800e645a146d94fac41d1fbf4c3283c5c4ab4a40bd2229efa4f1a16be71aa74fc5d8f41023bdff8ff141419ce0b99f5cb7aaf09f22824db1d2df8
+DIST heimdal-7.3.0.tar.gz 9927966 SHA256 351df17c11f723681a4eab832e880af4a28693d1ed6996b02671d676dcb3b7b5 SHA512 2a2a76e073ce429086c6e673d83974ba57c7778500f9b007fba033a0e31aed4c4e060d123c10c6d54eda9cda35faabc3df5fa92b560531e92eb8f3dff4eb9dc2 WHIRLPOOL 2a60146a6ca0edcef6072cdbdb1a7a986da82a14b459062530b390ab5d895b0e671f4e46c9a707ea846bcbc832585b1a2e78a593f065c6929fdd2b4b41f49e95
--- a/app-crypt/heimdal/heimdal-7.3.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.3.0.ebuild
@ -0,0 +1,171 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+VIRTUALX_REQUIRED="manual"
+
+inherit autotools db-use eutils multilib multilib-minimal python-any-r1 virtualx flag-o-matic
+
+MY_P="${P}"
+DESCRIPTION="Kerberos 5 implementation from KTH"
+HOMEPAGE="http://www.h5l.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X"
+
+CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
+	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
+	caps? ( sys-libs/libcap-ng )
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	>=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
+	afs? ( net-fs/openafs )
+	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
+	X? ( x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXt )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+	!!app-crypt/mit-krb5
+	!!app-crypt/mit-krb5-appl"
+
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	>=sys-devel/autoconf-2.62
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/krb5-types.h
+	/usr/include/cms_asn1.h
+	/usr/include/digest_asn1.h
+	/usr/include/hdb_asn1.h
+	/usr/include/krb5_asn1.h
+	/usr/include/pkcs12_asn1.h
+	/usr/include/pkinit_asn1.h
+	/usr/include/rfc2459_asn1.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}/heimdal_disable-check-iprop.patch"
+	eapply "${FILESDIR}/heimdal_tinfo.patch"
+	eautoreconf
+	eapply_user
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+	if use berkdb; then
+		myconf+=(
+			--with-berkeley-db
+			--with-berkeley-db-include="$(db_includedir)"
+		)
+	else
+		myconf+=(
+			--without-berkeley-db
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-kcm \
+		--disable-osfc2 \
+		--enable-shared \
+		--with-libintl=/usr \
+		--with-readline=/usr \
+		--with-sqlite3=/usr \
+		--libexecdir=/usr/sbin \
+		--enable-pthread-support \
+		$(use_enable afs afs-support) \
+		$(use_enable otp) \
+		$(use_enable pkinit kx509) \
+		$(use_enable pkinit pk-init) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with caps capng) \
+		$(multilib_native_use_with hdb-ldap openldap /usr) \
+		$(use_with ipv6) \
+		$(use_with ssl openssl /usr) \
+		$(multilib_native_use_with X x) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake -j1
+	else
+		emake -C include -j1
+		emake -C lib -j1
+		emake -C kdc -j1
+		emake -C tools -j1
+		emake -C tests/plugin -j1
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
+	else
+		emake -C include DESTDIR="${D}" install
+		emake -C lib DESTDIR="${D}" install
+		emake -C kdc DESTDIR="${D}" install
+		emake -C tools DESTDIR="${D}" install
+		emake -C tests/plugin DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog* README NEWS TODO
+
+	# client rename
+	mv "${D}"/usr/share/man/man1/{,k}su.1
+	mv "${D}"/usr/bin/{,k}su
+
+	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
+	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
+	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
+	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
+
+	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
+	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
+	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
+	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
+
+	insinto /etc
+	newins "${S}"/krb5.conf krb5.conf.example
+
+	if use hdb-ldap; then
+		insinto /etc/openldap/schema
+		doins "${S}/lib/hdb/hdb.schema"
+	fi
+
+	prune_libtool_files
+
+	# default database dir
+	keepdir /var/heimdal
+}
--- a/app-emacs/yaml-mode/Manifest
+++ b/app-emacs/yaml-mode/Manifest
@ -1,2 +1,2 @@
-DIST yaml-mode-0.0.8.tar.gz 6271 SHA256 88695798a4df55e5d42e880b7d24b18d180cc0a9989f8057ea48ec66365586f5 SHA512 3239d834b1202058d3414130b6374301f502b57e852786396a8d4e4d83e7e6c6a89b845799a0fbfdb458a93a85d8a03a1574522be38f929d032de4bc06f2935b WHIRLPOOL 2ba200432a107f00470dbfec9d5c7ee6cd4c586bf83b5b350987f3c0e7f3cc41be8d9974e65dcec45e2247f2768da56d184826e19ee82f0152a154004b50a9a2
+DIST yaml-mode-0.0.13.tar.gz 14446 SHA256 c547b1ec62e6b39fd3e95e28b8d3918958d4f00391c471485532dbc6cc3dcab8 SHA512 10876dfe576045bde363f62880ab3c91894d965c9dc1b7ff2b86783d31c05ab844c0abd77bcb1f7b5346d99969d69833ff4e5dc1b5700f7856fbd3dc4eebd5ef WHIRLPOOL 03300816f056fbe3d3e590c0f81a3593370b53f5c49aefb166bdbcca6823ffe4e4dae61dd4a0f091bff56f86cd33f07c8e2443dae3ba12910e1dc6b82169369b
 DIST yaml-mode-0.0.9.tar.gz 6498 SHA256 5d65852d9d738fd1966125f8ae737760ae48e647030e1aa5a78fd703f54358fc SHA512 cdfb0694d2efe5bb86ab5280e78d577d5bdac906a7745c6e988128cbb001f1f78569199288e2c12e7977a35c35f9e47f3271747bf26fcdfab5d2a961295550ea WHIRLPOOL 58ee875ce20ab49595b4372a979417deb672c09647f5b0859d3dddf484302b8bf4b65243e18709d7d6edec757d6528a59814f4b9f56fe98178d4966fcba5018f
--- a/app-emacs/yaml-mode/files/50yaml-mode-gentoo.el
+++ b/app-emacs/yaml-mode/files/50yaml-mode-gentoo.el
@ -1,3 +1,3 @@
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'yaml-mode "yaml-mode" "Simple mode to edit YAML." t)
-(add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))
+(add-to-list 'auto-mode-alist '("\\.\\(e?ya?\\|ra\\)ml\\'" . yaml-mode))
--- a/app-emacs/yaml-mode/yaml-mode-0.0.13.ebuild
+++ b/app-emacs/yaml-mode/yaml-mode-0.0.13.ebuild
@ -1,17 +1,18 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=4
+EAPI=6

 inherit elisp

 DESCRIPTION="A major mode for GNU Emacs for editing YAML files"
 HOMEPAGE="https://github.com/yoshiki/yaml-mode"
-SRC_URI="mirror://github/yoshiki/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/yoshiki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"

+#S="${WORKDIR}/${PN}-release-${PV}"
 DOCS="README Changes"
 SITEFILE="50${PN}-gentoo.el"
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@ -1,5 +1,3 @@
-DIST docker-compose-1.10.0.tar.gz 165100 SHA256 3ff5179d9b2e39f1fc7216d1184e03044074c54b28a2d30ec08abe3da1177e08 SHA512 a3c7ac837ff036eb4f943a24c5b692654ea028e68306e60df675a7ac49e5099160b55e444fdf1d1f133d0da1270f199022f7cd3539e3b727fc81ea8711248f9e WHIRLPOOL 230614937a454b503609b8e5e2ca2768d61815f3d6dae53fde4b00308bb36767dd6b46c4d35e66661210b2a218f32915d1c93ca9f3702804aa353bdef55543db
-DIST docker-compose-1.10.1.tar.gz 182052 SHA256 610768fe21bd8606c1fbbde50a4d70604dcb498dc9dfeb8de0c41a4e8db84293 SHA512 20acb31e601687bca06e20f66415ae9a52e186a78a87952a0f9393a64476de9dc3fac01e72269ee50150be76a58187a37728769abe79efe07b2ea830ee557e80 WHIRLPOOL c7ee9b363a96f44a898d7cc8d251a192c33d2dfc555feeb246bae1b7653b66fdb9ece02fc02572d646c7a10f4b681b0ffbb8b2902d0e99f0a689860edfacae9f
-DIST docker-compose-1.11.1.tar.gz 185395 SHA256 509eeca9b95518fe9d3767ab0e0ffde5e33312fe02b2fec46e555078e7f07dd9 SHA512 4b1a5c54b28b1ba9546f78fbca153511e598d41b480aded12dde31691ec13e8253936ce5f0c608a726ad000d2ce0fde6a792e59b32013beb65b0f581eb8d4368 WHIRLPOOL 04cb53457fc93ac76a017efdfeb146716829cd9d35249bd93fafded305533b0eb5f60c37556a024b7eced26b4ec67b4a5d62c797ca3b1bed59b90173a1430d47
 DIST docker-compose-1.11.2.tar.gz 186465 SHA256 e6cb8862f867d2882a93dd5bdcd3bf21dad5740c1ec1f32132c9a3801506ba54 SHA512 0b7668ee16738d9a898117737c8fb3de298fc0db2127b1a66f29469ab30ada609900498bb2906b63edd0cf2c469dd1db1e71756b1e620c44fd1aece37f60796b WHIRLPOOL 64a3629908185fb278e6dd780438edb27ab463e1b66f801e36c2a7fcf0d3913c23fbf41df775a7a843327e8016dd8e506b9243cd07b811c92f419883d5c6b839
 DIST docker-compose-1.12.0.tar.gz 198453 SHA256 3da6f465eac5704393d8acd95b1923ce0bda3f0312883527c92dfab7de5b313e SHA512 7d454b9a4210e4ec708d9b1b0e0eff58465f68747bac282c4163ee3abeb32f9907f32ac86fde56fbccb6af9927a61b68dd671263b5ded13a78a37e2ac4db2669 WHIRLPOOL e2dff82aadd5b3be56485a8e7743d50b3e6eac7cf1873f392df05354ad6716476cb4606532630cd309a673c0355b7910c93456af70341e153f5df3bf486f4bf6
+DIST docker-compose-1.13.0.tar.gz 201429 SHA256 3c7b62cd0ab5f33d21db197d8a74739d320a6fe32e4ef8282c35d4dee5a7c77c SHA512 a435cd1634a66924e04b89ca8b3481bb0e4288b03a2e9acc50d01b56a40996e0d51a2d856da8ef6a6e784617b4cda85f7966c372e256dc8b7b0ab0f0ebf60a20 WHIRLPOOL 1e6652f97c55705a0e97f6a16f95a2659ef6ef5f53cc85bb6f8a416d711dca21eb3882912d528afbc68f1fb1d6f8d824273352e86b21e2168f9af812790bcbfc
--- a/app-emulation/docker-compose/docker-compose-1.10.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.10.0.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV//_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/cached-property-2[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	<dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.0.1[${PYTHON_USEDEP}]
-	<dev-python/docker-py-3.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	<dev-python/requests-2.12[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
--- a/app-emulation/docker-compose/docker-compose-1.10.1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.10.1.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV//_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/cached-property-2[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	<dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.0.2[${PYTHON_USEDEP}]
-	<dev-python/docker-py-3.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	<dev-python/requests-2.12[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
--- a/app-emulation/docker-compose/docker-compose-1.13.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.13.0.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )

 inherit bash-completion-r1 distutils-r1 vcs-snapshot

@ -25,7 +25,7 @@ CDEPEND="
 	<dev-python/colorama-0.4[${PYTHON_USEDEP}]
 	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
 	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.2.1[${PYTHON_USEDEP}]
 	<dev-python/docker-py-3.0[${PYTHON_USEDEP}]
 	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
 	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@ -1,5 +1,4 @@
 DIST docker-1.12.6.tar.gz 13694205 SHA256 0413f3513c2a6842ed9cf837154c8a722e9b34cb36b33430348489baa183707e SHA512 98e0fa0ec0dad4d392188b0d2cf42b2b564403463c369e1fe060f1abc2e97d97375a88587080671ef905e6a34b991d83265f43c3112575af019cf85eef0c2c25 WHIRLPOOL 55d10e4c4ab960320094637a847768ad85dc1fccaa6cc77ea0ca82f2d23b27e92e2f2c0cbc03f53676012c95883f65c6fa16d26970138fa129d37bf278fc8c0b
 DIST docker-17.03.1.tar.gz 7773296 SHA256 a8f1eefadf3966885ad0579facfc2017cca7dd3a0b20d086dfd798168716cb83 SHA512 51e2a9d6ca529ac67d63794b9fd257f962278019ae1a36a39ff635c742d6ca16286cc164470333ff6cd88d709ecf2cb90343b2dd94bb3939747550f74fb442d5 WHIRLPOOL 9178bdf5b13851650e31d95370a090a72c8c70b53416e83693ffbdbc549d3992f3004908c1db5b26c013552f02293dddf9f761b8b5b9d2e0f0bf7cfab5330ca9
 DIST docker-17.04.0.tar.gz 7023868 SHA256 b6ee0aa93ecea44e956d3627907e10557b3ec37d13ddfb40e436656e5037c640 SHA512 b84bf25ebbdf066ee61272b9bce4736f61c2605e17529088bea33f5a4de172c2297cf8e7bd3f48170d50de069f94343d2403f81b763e9677ca2e750192ba1519 WHIRLPOOL 30354c38ae07f8528fdcbcde866ccc0048d6ea9e4001dfcc04c535b169c7b6c7d87f1c621039f215466d5f1fba4f0c886e231c77f70fc9d7ea109398e8e0df26
-DIST docker-17.05.0_rc1.tar.gz 7164632 SHA256 b35975f1374313c1c0d034a0963296b55d0fbac726c156bcf7a8a9f91db286da SHA512 54a0152a00f3c8abcaad83318d736b58da7fdbbb76acd42cf94c834f9ffb6b43feaad68668cde778ef9d4adbdbb2ba958be6ec2cbde4e2b1097e7a92fc52ce1e WHIRLPOOL dfee6945db6beefa268fc1d9ebaa6bd5b2624b7e01f195e57518deb664172f222cc991e847d78e9b1ec051a69e164ff26f6d96ad1eabbf0328429d6f6f509f70
-DIST docker-17.05.0_rc2.tar.gz 7166976 SHA256 9a2930c95c2301ffb1ec04bd6fa5e81f6424128bb975ac4c2bd98ece33432a7e SHA512 b9f60a4d26fc35d75905b91bd193d0830424914b88bbb5f853674598475d82064bee98e50857318276f7c2a0ac8e5a43d349257602dacc2c43f4af59a4720925 WHIRLPOOL 0b7396f970a8faa3f3c4a4645930113d080f1a4c693598999575b1d3d7a814e5143605e73a8830f823d763777c79f1cabafd4c980ae4f813ea4bfed9a8ab510e
+DIST docker-17.05.0_rc3.tar.gz 7167106 SHA256 227bcbceda2c4d763f1ea18a31bfac1dad670ddd1a11462c05282fb81cecfa1a SHA512 e3bc4454f895cc04858e6ca23e907efe0336da4602bd36912a92dbbf8278d1c59b56e150930e41b59906df1a5684314d05331a286459d471bb57c6434b97e3cc WHIRLPOOL 8de0a72422f9f0f02f2606d6370611d6cbfa8e65a9b3e76016fab0447b25b3d4871e62dafce0e983caf700f6742bbfe91ac475d79dcc6ad0f301c112ad05cbfa
--- a/app-emulation/docker/docker-17.05.0_rc2.ebuild
+++ b/app-emulation/docker/docker-17.05.0_rc2.ebuild
@ -1,290 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker"
-
-if [[ ${PV} = *9999* ]]; then
-	# Docker cannot be fetched via "go get", thanks to autogenerated code
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
-else
-	inherit versionator
-	MY_PV="$(get_version_component_range 1-3)"
-	[[ -n "$(get_version_component_range 4)" ]] && MY_PVRC="-$(get_version_component_range 4)" || MY_PVRC=""
-	DOCKER_GITCOMMIT="c57fdb2"
-	EGIT_COMMIT="v${MY_PV}-ce${MY_PVRC}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-	inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev user
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://dockerproject.org"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-	>=dev-db/sqlite-3.7.9:3
-	device-mapper? (
-		>=sys-fs/lvm2-2.02.89[thin]
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-	${CDEPEND}
-
-	dev-go/go-md2man
-
-	btrfs? (
-		>=sys-fs/btrfs-progs-3.16.1
-	)
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-# Runc/Containerd: Unfortunately docker does not version the releases, in order to avoid 
-# 	incompatiblities we depend on snapshots
-RDEPEND="
-	${CDEPEND}
-
-	!app-emulation/docker-bin
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-
-	>=app-emulation/containerd-0.2.5_p20170329
-	~app-emulation/docker-runc-1.0.0_rc2_p20170310[apparmor?,seccomp?]
-	app-emulation/docker-proxy
-	container-init? ( >=sys-process/tini-0.13.1[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
-	~NF_NAT ~NF_NAT_NEEDED
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		ewarn ""
-		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
-	fi
-
-	# for where these kernel versions come from, see:
-	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
-	if ! {
-		kernel_is ge 3 16 \
-		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
-		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
-		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
-	}; then
-		ewarn ""
-		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
-		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
-		ewarn ""
-		ewarn "See also https://github.com/docker/docker/issues/2960"
-	fi
-
-	if kernel_is le 3 18; then
-		CONFIG_CHECK+="
-			~RESOURCE_COUNTERS
-		"
-	fi
-
-	if kernel_is le 3 13; then
-		CONFIG_CHECK+="
-			~NETPRIO_CGROUP
-		"
-	else
-		CONFIG_CHECK+="
-			~CGROUP_NET_PRIO
-		"
-	fi
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	if use overlay; then
-		CONFIG_CHECK+="
-			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
-		"
-	fi
-
-	linux-info_pkg_setup
-
-	# create docker group for the code checking for it in /etc/group
-	enewgroup docker
-}
-
-src_compile() {
-	export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a tarball, we need the GITCOMMIT value
-	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-client || die
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-		grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed'
-	fi
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor pkcs11 seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	# time to build!
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	# build the man pages too
-	./man/md2man-all.sh || die "unable to generate man pages"
-}
-
-src_install() {
-	VERSION="$(cat VERSION)"
-	newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker
-	newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-	doman man/man*/*
-
-	dobashcomp contrib/completion/bash/*
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-
-	insinto /usr/share/vim/vimfiles
-	doins -r contrib/syntax/vim/ftdetect
-	doins -r contrib/syntax/vim/syntax
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog
-}
--- a/app-emulation/docker/docker-17.05.0_rc3.ebuild
+++ b/app-emulation/docker/docker-17.05.0_rc3.ebuild
@ -14,7 +14,7 @@ else
 	inherit versionator
 	MY_PV="$(get_version_component_range 1-3)"
 	[[ -n "$(get_version_component_range 4)" ]] && MY_PVRC="-$(get_version_component_range 4)" || MY_PVRC=""
-	DOCKER_GITCOMMIT="2878a85"
+	DOCKER_GITCOMMIT="90d35ab"
 	EGIT_COMMIT="v${MY_PV}-ce${MY_PVRC}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@ -1,2 +1,4 @@
 DIST qemu-2.5.0.tar.bz2 25464996 SHA256 3443887401619fe33bfa5d900a4f2d6a79425ae2b7e43d5b8c36eb7a683772d4 SHA512 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3 WHIRLPOOL 8f5717989d8d234ecf1763ee386b2e1f20c3b17918de130c6dae255e4523a230b2b01a759eba25e4b9f604c680d9b868c56f58bd71b7c6c2c22a2e46804435ef
 DIST qemu-2.6.0.tar.bz2 25755267 SHA256 c9ac4a651b273233d21b8bec32e30507cb9cce7900841febc330956a1a8434ec SHA512 0d17075e52f7688cc05776ad7a76509d1f22ae8eda896fddb06c1fd6dea6da485422c8efb3ba118b054d9a413b7b02baba656a9131658dabdb71def50c92b215 WHIRLPOOL f9373bf66f67301787e7510ac161b0072ba7c7bc067e10215fb97a52524adaba0fcbc79a4c0cefac9c6e2b4e07380eb9d10f65ed6ce6867e43843043684231ed
+DIST qemu-2.8.1.tar.bz2 28366270 SHA256 018e4c7ed22c220395cf41f835d01505e49d0e579a548bd3d72b03809442bbcd SHA512 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88de14515f5a78bf2f41c5e865f37111529f567c85d2f1c4deefae47dde54f76eac79410e5b2bdda WHIRLPOOL c41f53f18fac44efd1c81ba9d95204d23e9a70dc9c21624177be2fe92a327428fd5704b25bc334229fa36ae395fb4c82ba3955db39719c4458343978a4d3141a
+DIST qemu-2.9.0.tar.bz2 28720490 SHA256 00bfb217b1bb03c7a6c3261b819cfccbfb5a58e3e2ceff546327d271773c6c14 SHA512 4b28966eec0ca44681e35fcfb64a4eaef7c280b8d65c91d03f2efa37f76278fd8c1680e5798c7a30dbfcc8f3c05f4a803f48b8a2dfec3a4181bac079b2a5e422 WHIRLPOOL d79fe89eb271a56aee0cbd328e5f96999176b711afb5683d164b7b99d91e6dd2bfaf6e2ff4cd820a941c94f28116765cb07ffd5809d75c2f9654a67d56bfc0c1
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.8.1.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.8.1.ebuild
@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd udev python-any-r1
+
+MY_PN="qemu"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-2
+else
+	SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="http://wiki.qemu.org/Features/QAPI/GuestAgent"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.22
+	!<app-emulation/qemu-1.1.1-r1
+	!<sys-apps/sysvinit-2.88-r5"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
+)
+
+src_configure() {
+	tc-export AR LD OBJCOPY
+
+	local myconf=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir="/usr/$(get_libdir)"
+		--localstatedir=/
+		--disable-bsd-user
+		--disable-linux-user
+		--disable-system
+		--disable-strip
+		--disable-werror
+		--enable-guest-agent
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+	)
+	echo "./configure ${myconf[*]}"
+	./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+	emake V=1 qemu-ga
+}
+
+src_install() {
+	dobin qemu-ga
+
+	# Normal init stuff
+	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+
+	# systemd stuff
+	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
+
+	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+		qemu-guest-agent.service
+}
+
+pkg_postinst() {
+	elog "You should add 'qemu-guest-agent' to the default runlevel."
+	elog "e.g. rc-update add qemu-guest-agent default"
+}
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.9.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.9.0.ebuild
@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd udev python-any-r1
+
+MY_PN="qemu"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-2
+else
+	SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="http://wiki.qemu.org/Features/QAPI/GuestAgent"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.22
+	!<app-emulation/qemu-1.1.1-r1
+	!<sys-apps/sysvinit-2.88-r5"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
+)
+
+src_configure() {
+	tc-export AR LD OBJCOPY
+
+	local myconf=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir="/usr/$(get_libdir)"
+		--localstatedir=/
+		--disable-bsd-user
+		--disable-linux-user
+		--disable-system
+		--disable-strip
+		--disable-werror
+		--enable-guest-agent
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+	)
+	echo "./configure ${myconf[*]}"
+	./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+	emake V=1 qemu-ga
+}
+
+src_install() {
+	dobin qemu-ga
+
+	# Normal init stuff
+	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+
+	# systemd stuff
+	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
+
+	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+		qemu-guest-agent.service
+}
+
+pkg_postinst() {
+	elog "You should add 'qemu-guest-agent' to the default runlevel."
+	elog "e.g. rc-update add qemu-guest-agent default"
+}
--- a/app-emulation/qemu/qemu-2.9.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.9.0-r1.ebuild
@ -50,6 +50,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	gtk2? ( gtk )
 	qemu_softmmu_targets_arm? ( fdt )
 	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
 	qemu_softmmu_targets_ppc? ( fdt )
 	qemu_softmmu_targets_ppc64? ( fdt )
 	sdl2? ( sdl )
--- a/app-emulation/qemu/qemu-2.9.0-r52.ebuild
+++ b/app-emulation/qemu/qemu-2.9.0-r52.ebuild
@ -8,7 +8,7 @@ PYTHON_REQ_USE="ncurses,readline"

 PLOCALES="bg de_DE fr_FR hu it tr zh_CN"

-FIRMWARE_ABI_VERSION="2.9.0-r50"
+FIRMWARE_ABI_VERSION="2.9.0-r52"

 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
 	user udev fcaps readme.gentoo-r1 pax-utils l10n
@ -53,6 +53,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	gtk2? ( gtk )
 	qemu_softmmu_targets_arm? ( fdt )
 	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
 	qemu_softmmu_targets_ppc? ( fdt )
 	qemu_softmmu_targets_ppc64? ( fdt )
 	sdl2? ( sdl )
@ -154,12 +155,12 @@ SOFTMMU_TOOLS_DEPEND="
 X86_FIRMWARE_DEPEND="
 	pin-upstream-blobs? (
 		~sys-firmware/ipxe-1.0.0_p20160620
-		~sys-firmware/seabios-1.10.1[binary,seavgabios]
+		~sys-firmware/seabios-1.10.2[binary,seavgabios]
 		~sys-firmware/sgabios-0.1_pre8
 	)
 	!pin-upstream-blobs? (
 		sys-firmware/ipxe
-		sys-firmware/seabios[seavgabios]
+		>=sys-firmware/seabios-1.10.2[seavgabios]
 		sys-firmware/sgabios
 	)"

@ -683,8 +684,10 @@ src_install() {
 	if [[ -n ${softmmu_targets} ]]; then
 		# Remove SeaBIOS since we're using the SeaBIOS packaged one
 		rm "${ED}/usr/share/qemu/bios.bin"
+		rm "${ED}/usr/share/qemu/bios-256k.bin"
 		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
 			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
 		fi

 		# Remove vgabios since we're using the seavgabios packaged one
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@ -52,6 +52,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	gtk2? ( gtk )
 	qemu_softmmu_targets_arm? ( fdt )
 	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
 	qemu_softmmu_targets_ppc? ( fdt )
 	qemu_softmmu_targets_ppc64? ( fdt )
 	sdl2? ( sdl )
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@ -5,6 +5,7 @@ DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf
 DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c
 DIST wine-2.5.tar.xz 18993176 SHA256 13f92b7ab483323aaabbc6519851e688ad4372ea30569961c831d40d6d3bccd2 SHA512 7b6faf6d8aa3d41465ad93ebae055581136f736c7eb8b4c61682e5a05589c83a0ff2c85e0f9abbca016f31b6f1c1435617c4994f1913f715a8707ebee3f28467 WHIRLPOOL 5acd2ac65df5dee1c860ddca72b8df8e021a0b95a3a1870d15468ce4591d569fa15bf8a0a6d341bcd3a624d13d0affe5b0263e67f9dfcbbf3ae7b59218dcded9
 DIST wine-2.6.tar.xz 19023352 SHA256 e6ff64758f437647e99a36c1275e41adf54f0432907172d3bba22b070a97aac0 SHA512 2aa55413ac090e011725566d004e42ee46323cd4c6961b9faa63e3de422ba60bb657bf224a4d7e8aa712a8e26e11977d07acb7c088ffeef8c37310e8cc698970 WHIRLPOOL 82e6a06cc342c7d6eace64a97bae10cc39c120c5776170b059700542b8b6fef56be9a697f05b3bc21ae82621f4bf50f3ab478311c9a3a55d86ed7c0a009766b0
+DIST wine-2.7.tar.xz 19101108 SHA256 e55a43088e313c45f7ab49272b7cb441c06f5659fb4220b2325dc060db0ee14c SHA512 1e61b9a4aa1f5f42fb27d11d5254a9ba90f348ad9c4d1ddd4b5da47cd7de638290a20accf7447db9c0e4ced4c2144497cdf5fc906a5eac60e923dabb61f65d3a WHIRLPOOL 133426a0313facc856eebad3d16d199948b780ce4c4561e5784845c119fe462b8942ed86fa5e823e729a997d704bd3c70f44a64ce3eef965b4f3eb92587dfa4d
 DIST wine-d3d9-2.0.tar.gz 48373 SHA256 7bfac23706723c6d51a7a95e416e47fb2678cd4d0945b990f74eba2b059e6206 SHA512 a9e2d1c9f2784128e4c53a8dc923070a5057b5ff3d83c2b536a2d2df0bc8433ac92b8ab1c3cdf34158c0e7bfe497ddb5974605fbc1736a92307639d59450c7a1 WHIRLPOOL 53044c0a4b7159c3af75fc935d1ac45030e80dbfd70d787f64885ddc025cfcd62f724c3256e389a7fde680670e594101955f52301cf6b9bbf23ebc64552790c2
 DIST wine-d3d9-2.1.tar.gz 48385 SHA256 9fd80e3e2ea905272c42dbc14679e94c8e2f955101ae098c84060d4c62ffc9c6 SHA512 9234d8227412d940a6befcf79433f1d5ab0634d5e829f3771ffeea235af05be29ffc40438818b1976c77d1e2e79da8a67c4dab2b7d2e822b502fb6e4a1a7f8b7 WHIRLPOOL 790e482850a13c5bf0967e900620c36d71c4d6673106f8f5c2848550ed574d326d3945d9906de88d847bb5644a520aab7fe6d460b3c3afd49a396798dd253392
 DIST wine-d3d9-2.2.tar.gz 48387 SHA256 203ed60980ec584c09b413266728e3a93e2d980dbff9b4f65375a4e9744b5042 SHA512 6e9e031b51afc8ec200bbd252ff0d768c29af23907f782409834de593f896afb128f86fe012c95dc18e5f3c7267f170eb343d2a2c53d639933a337f0c1e04fab WHIRLPOOL 6b32c0dfd3068e87d94bbcd83718dd75a14b36d69b151e9257e04793d2d3ae78ce7da10b80cbc824ccefb6c11666241593f91963ddee6a58301f95bbde35285d
@ -12,6 +13,7 @@ DIST wine-d3d9-2.3.tar.gz 48510 SHA256 fc17488a782def19fc02bf967128ab43236db4950
 DIST wine-d3d9-2.4.tar.gz 48502 SHA256 4c7084e733d95545b894b152b2c6c9564dfb8df594cfeb1512dad80743b39ae0 SHA512 623b1720b8cd79ab6ad2a177b9beb174f31e6fc402d6885fa2006223c855919c6f5d4267c64212ecf8cf1746430c9715c506343fb740828fc99910f916b10ebe WHIRLPOOL 9c0ea34dedc2e39ce36f1539a6d761ba07429b316a1f7fad49067eec5c28a5c60b33b3d2473cbf66b009d9772c1fb123414bfa201eb8df3e61f8efc38aa1f3fa
 DIST wine-d3d9-2.5.tar.gz 48692 SHA256 8b28c16701ec1cefab11d41d00954a92a5ced9a63f1ede81e96f247d2f498f94 SHA512 8b5ebec6341f70ec977aabee35decbe2d22fe43e111c1fd6015066a2b0e4fd259cd964fdb79306a489be4406078cb1e241d90ed636222174ed4abcc8026e7d03 WHIRLPOOL d5fcc5fbea4c4a4900235d33cb5de8f2a7cbf2b51b1a5c47d75ab765aa88ce1f8f81a61eefe0a742a55bb2ca210747b345589628fd1020430e4d962319b1c6fe
 DIST wine-d3d9-2.6.tar.gz 48702 SHA256 06ed18f2d5fff04613ea1401c37ad70e163135c159528745ff1063d617f31e2d SHA512 17df692df8ff3c1419258a3faf9ddacde67f185a797dce76cd07c07e6f4fa2040b981662d311329a80921c039bfba0da5fed3ee53f8c36e34eeaa92af1c7b755 WHIRLPOOL e614b4af0f3c92113617f533255fd67a4b322bdaf0939fb98e09bf77e3b0437cb2b813032e33300e45294a60d5c3586a302669c28c293e180c775666cddc2581
+DIST wine-d3d9-2.7.tar.gz 48708 SHA256 df6ed1e50d8af0624b8f4f658705f75102094f6e17fec53ec8461991ce5dca2a SHA512 d258e81a942f905255a637aa80dd647878691caa79adc52fd79f66ce1320d42d7d36ea776876d6a26a2c711a168da4c64f27fa8744ca6d8318c5526f8a8af75a WHIRLPOOL 2d62cab5e3b14eaf29ecc96ac97555f48845a78c751040a850750d3b19fbc64efb3f3589dd3475a03cb1e3dff3e200528dabd2952b1ee8d0520a5db0d7db154b
 DIST wine-desktop-common-20150204.tar.gz 99491 SHA256 444ad6b52b5290ec7d160e2cc40e4ba0910b4c4983dba1ceb054b81b09b24b5e SHA512 1f3d7022c5cff87ed3b8fd3b7cd14397c6f23b98fe6a7c583ac0d2f439ff29d943f57375f23687aa6519ff1d84ff07624a9a712d6f19fa207fd26d01edcb6688 WHIRLPOOL e9810b2952d25c05d831000e00e423de86809ec31b9a033fd4c64a70709da7338a9afc9e632e678f49c789a8a3702fbd0113226770cdb806623f2de371a16f54
 DIST wine-staging-2.0.tar.gz 10182575 SHA256 22a43cb50c1fff9c6f233a965247056e3321533aa73a6419aa34a22de7180039 SHA512 51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580 WHIRLPOOL 9879174bc3a7c8ece156c822b7a7b870908e51335702a78e6f04ea1496125a2018a879bfc53d1302e4825138d22af526308ba7f656d683a535be44d4515f1bac
 DIST wine-staging-2.1.tar.gz 10101781 SHA256 1d193be2734ea495df2cae1dc54ce89204ca68699979174b0bd726d2e5e0576b SHA512 c64c48b265f0779c621a643ddbd2d12aaa548e4bff3b2b728280cdb9613214989911ee8ba5e46c7770f5f6430014a5da1c98e95d5008c1174bd14bf9ce5250db WHIRLPOOL ecf970ef436089bbcd0088e1608b22e808d54560e905c7d8046b3e21508166a595c3ef7b69819c45e4b13183bd9134a2bd7016d29c4da52985701d392eb35a0a
@ -20,3 +22,4 @@ DIST wine-staging-2.3.tar.gz 10071742 SHA256 9a81be606836fab6203857f7937ff975759
 DIST wine-staging-2.4.tar.gz 10067020 SHA256 709cab12c0ebf7cf9504fd4a67eb851272309e00066ad81f184b0f55c63e9deb SHA512 55d11851697836b582ba54696cadc812ef6b14872440f5c3ed6fbe30a05abcb8abe2ab31a11ea4daeb354854c7c0e6549401d4b26b26621808bdeb89aeb206f9 WHIRLPOOL 8d344b7e6e89322c8dbbe6fd211851c90a45a33b514c182609cc60dc21939f791abc71d8665cd66e5c5161f159fe24c4772b99405833e3d11985a644e1335eaf
 DIST wine-staging-2.5.tar.gz 10062025 SHA256 b5cf6fa38151ff47ab6d725077693b02b37bb07b2ab7fda55290bb1f63ac54ad SHA512 6ab981886776f624c6478230aad18870f55b7252f1c6df90bfe1a248f7ea76cbb181f8e0780fdd4bb5e3c589a785baa7cf126a2c838adf65db2a67f873ed1698 WHIRLPOOL 7045b1642a3b14e5a507854cb8bf910c7cfb3c64ada4ee3534175c75b03cd604206617a55fb870e47fb248a4db8a9ca2abc0b4688005c1c0de0d542fec8cbc57
 DIST wine-staging-2.6.tar.gz 10034709 SHA256 ff86ddcceb7f6857bd415db3842ddf216a5cb301452e2a08053a9378cbf5580a SHA512 dc199b5345985d261b708ac811b02253ab9fbc4966889f2382ce518d991fe43b7c771c1d56d055c6234c9329d5c571cd9cf0b16587b77124b9c46917ddd066d2 WHIRLPOOL 375f484c6c50645c605994eb08c38c649ca6c8b47430e2f2f285a63fc24eca81588d0496a8c32074f90e4ea8f4330f76854bf8874f042e27581a7eee19aedf98
+DIST wine-staging-2.7.tar.gz 10018082 SHA256 3095f9c634f00b143c2407dce8c3f29c629ec95074cf14c8e8dc2e0cdba45b6d SHA512 0abc89af701ae1b95c0eb08e72894c7bc40bdfe792e05b8af9282eab8407bb90b7dfcd4eb3a193a88759ce5d6ea6c2aa9696cac2d744f543c92529bb0d2636ee WHIRLPOOL 6cc666f702ef1bd574ede54a7f6755e07d768c9fa549b9bdb9b5416288619347e0c1b9c70893b6300800d8e6c94e8d2396937f639d1e821945ba9fe144b32c95
--- a/app-emulation/wine-any/wine-any-2.7.ebuild
+++ b/app-emulation/wine-any/wine-any-2.7.ebuild
@ -0,0 +1,615 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+D3D9_P="wine-d3d9-${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
+WDC_V="20150204"
+WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+	D3D9_EGIT_REPO_URI="git://github.com/sarnex/wine-d3d9-patches.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
+	d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	s3tc? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	d3d9? (
+		media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libxcb[${MULTILIB_USEDEP}]
+	)
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.7.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use staging || use d3d9; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT."
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+		if use staging; then
+			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+
+			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+				einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+			fi
+		fi
+		if use d3d9; then
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
+		"${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
+		"${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
+	)
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE=""
+		STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+	fi
+	if use d3d9; then
+		if use staging; then
+			PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
+		else
+			PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
+		fi
+		PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
+	fi
+
+	default
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+	use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
+		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+	fi
+
+	# Failglob for bin and man loops
+	local glob_state=$(shopt -p failglob)
+	shopt -s failglob
+
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+
+	# respect LINGUAS when installing man pages, #469418
+	local l
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+	done
+
+	eval "${glob_state}"
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine register --staging ${P} || die
+		fi
+		if use d3d9; then
+			eselect wine register --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	fdo-mime_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine deregister --staging ${P} || die
+		fi
+		if use d3d9; then
+			eselect wine deregister --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@ -5,6 +5,7 @@ DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf
 DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c
 DIST wine-2.5.tar.xz 18993176 SHA256 13f92b7ab483323aaabbc6519851e688ad4372ea30569961c831d40d6d3bccd2 SHA512 7b6faf6d8aa3d41465ad93ebae055581136f736c7eb8b4c61682e5a05589c83a0ff2c85e0f9abbca016f31b6f1c1435617c4994f1913f715a8707ebee3f28467 WHIRLPOOL 5acd2ac65df5dee1c860ddca72b8df8e021a0b95a3a1870d15468ce4591d569fa15bf8a0a6d341bcd3a624d13d0affe5b0263e67f9dfcbbf3ae7b59218dcded9
 DIST wine-2.6.tar.xz 19023352 SHA256 e6ff64758f437647e99a36c1275e41adf54f0432907172d3bba22b070a97aac0 SHA512 2aa55413ac090e011725566d004e42ee46323cd4c6961b9faa63e3de422ba60bb657bf224a4d7e8aa712a8e26e11977d07acb7c088ffeef8c37310e8cc698970 WHIRLPOOL 82e6a06cc342c7d6eace64a97bae10cc39c120c5776170b059700542b8b6fef56be9a697f05b3bc21ae82621f4bf50f3ab478311c9a3a55d86ed7c0a009766b0
+DIST wine-2.7.tar.xz 19101108 SHA256 e55a43088e313c45f7ab49272b7cb441c06f5659fb4220b2325dc060db0ee14c SHA512 1e61b9a4aa1f5f42fb27d11d5254a9ba90f348ad9c4d1ddd4b5da47cd7de638290a20accf7447db9c0e4ced4c2144497cdf5fc906a5eac60e923dabb61f65d3a WHIRLPOOL 133426a0313facc856eebad3d16d199948b780ce4c4561e5784845c119fe462b8942ed86fa5e823e729a997d704bd3c70f44a64ce3eef965b4f3eb92587dfa4d
 DIST wine-d3d9-2.0.tar.gz 48373 SHA256 7bfac23706723c6d51a7a95e416e47fb2678cd4d0945b990f74eba2b059e6206 SHA512 a9e2d1c9f2784128e4c53a8dc923070a5057b5ff3d83c2b536a2d2df0bc8433ac92b8ab1c3cdf34158c0e7bfe497ddb5974605fbc1736a92307639d59450c7a1 WHIRLPOOL 53044c0a4b7159c3af75fc935d1ac45030e80dbfd70d787f64885ddc025cfcd62f724c3256e389a7fde680670e594101955f52301cf6b9bbf23ebc64552790c2
 DIST wine-d3d9-2.1.tar.gz 48385 SHA256 9fd80e3e2ea905272c42dbc14679e94c8e2f955101ae098c84060d4c62ffc9c6 SHA512 9234d8227412d940a6befcf79433f1d5ab0634d5e829f3771ffeea235af05be29ffc40438818b1976c77d1e2e79da8a67c4dab2b7d2e822b502fb6e4a1a7f8b7 WHIRLPOOL 790e482850a13c5bf0967e900620c36d71c4d6673106f8f5c2848550ed574d326d3945d9906de88d847bb5644a520aab7fe6d460b3c3afd49a396798dd253392
 DIST wine-d3d9-2.2.tar.gz 48387 SHA256 203ed60980ec584c09b413266728e3a93e2d980dbff9b4f65375a4e9744b5042 SHA512 6e9e031b51afc8ec200bbd252ff0d768c29af23907f782409834de593f896afb128f86fe012c95dc18e5f3c7267f170eb343d2a2c53d639933a337f0c1e04fab WHIRLPOOL 6b32c0dfd3068e87d94bbcd83718dd75a14b36d69b151e9257e04793d2d3ae78ce7da10b80cbc824ccefb6c11666241593f91963ddee6a58301f95bbde35285d
@ -12,4 +13,5 @@ DIST wine-d3d9-2.3.tar.gz 48510 SHA256 fc17488a782def19fc02bf967128ab43236db4950
 DIST wine-d3d9-2.4.tar.gz 48502 SHA256 4c7084e733d95545b894b152b2c6c9564dfb8df594cfeb1512dad80743b39ae0 SHA512 623b1720b8cd79ab6ad2a177b9beb174f31e6fc402d6885fa2006223c855919c6f5d4267c64212ecf8cf1746430c9715c506343fb740828fc99910f916b10ebe WHIRLPOOL 9c0ea34dedc2e39ce36f1539a6d761ba07429b316a1f7fad49067eec5c28a5c60b33b3d2473cbf66b009d9772c1fb123414bfa201eb8df3e61f8efc38aa1f3fa
 DIST wine-d3d9-2.5.tar.gz 48692 SHA256 8b28c16701ec1cefab11d41d00954a92a5ced9a63f1ede81e96f247d2f498f94 SHA512 8b5ebec6341f70ec977aabee35decbe2d22fe43e111c1fd6015066a2b0e4fd259cd964fdb79306a489be4406078cb1e241d90ed636222174ed4abcc8026e7d03 WHIRLPOOL d5fcc5fbea4c4a4900235d33cb5de8f2a7cbf2b51b1a5c47d75ab765aa88ce1f8f81a61eefe0a742a55bb2ca210747b345589628fd1020430e4d962319b1c6fe
 DIST wine-d3d9-2.6.tar.gz 48702 SHA256 06ed18f2d5fff04613ea1401c37ad70e163135c159528745ff1063d617f31e2d SHA512 17df692df8ff3c1419258a3faf9ddacde67f185a797dce76cd07c07e6f4fa2040b981662d311329a80921c039bfba0da5fed3ee53f8c36e34eeaa92af1c7b755 WHIRLPOOL e614b4af0f3c92113617f533255fd67a4b322bdaf0939fb98e09bf77e3b0437cb2b813032e33300e45294a60d5c3586a302669c28c293e180c775666cddc2581
+DIST wine-d3d9-2.7.tar.gz 48708 SHA256 df6ed1e50d8af0624b8f4f658705f75102094f6e17fec53ec8461991ce5dca2a SHA512 d258e81a942f905255a637aa80dd647878691caa79adc52fd79f66ce1320d42d7d36ea776876d6a26a2c711a168da4c64f27fa8744ca6d8318c5526f8a8af75a WHIRLPOOL 2d62cab5e3b14eaf29ecc96ac97555f48845a78c751040a850750d3b19fbc64efb3f3589dd3475a03cb1e3dff3e200528dabd2952b1ee8d0520a5db0d7db154b
 DIST wine-desktop-common-20150204.tar.gz 99491 SHA256 444ad6b52b5290ec7d160e2cc40e4ba0910b4c4983dba1ceb054b81b09b24b5e SHA512 1f3d7022c5cff87ed3b8fd3b7cd14397c6f23b98fe6a7c583ac0d2f439ff29d943f57375f23687aa6519ff1d84ff07624a9a712d6f19fa207fd26d01edcb6688 WHIRLPOOL e9810b2952d25c05d831000e00e423de86809ec31b9a033fd4c64a70709da7338a9afc9e632e678f49c789a8a3702fbd0113226770cdb806623f2de371a16f54
--- a/app-emulation/wine-d3d9/wine-d3d9-2.7.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.7.ebuild
@ -0,0 +1,549 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+D3D9_P="wine-d3d9-${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
+WDC_V="20150204"
+WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	D3D9_EGIT_REPO_URI="git://github.com/sarnex/wine-d3d9-patches.git"
+else
+	SRC_URI="${SRC_URI}
+	d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	d3d9? (
+		media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libxcb[${MULTILIB_USEDEP}]
+	)
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.7.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use d3d9; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT."
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT, and D3D9_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+		if use d3d9; then
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
+		"${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
+		"${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
+	)
+	if use d3d9; then
+		PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
+		PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
+	fi
+
+	default
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
+		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+	fi
+
+	# Failglob for bin and man loops
+	local glob_state=$(shopt -p failglob)
+	shopt -s failglob
+
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+
+	# respect LINGUAS when installing man pages, #469418
+	local l
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+	done
+
+	eval "${glob_state}"
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	else
+		if use d3d9; then
+			eselect wine register --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	fdo-mime_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	else
+		if use d3d9; then
+			eselect wine deregister --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/app-misc/rlwrap/rlwrap-0.42-r1.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.42-r1.ebuild
@ -13,15 +13,9 @@ KEYWORDS="~amd64 ~mips ~ppc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~p
 IUSE="debug"

 RDEPEND="sys-libs/readline:0="
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README )
+DEPEND="${RDEPEND}"

 src_configure() {
 	econf \
 		$(use_enable debug)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-}
--- a/app-portage/fetchcommandwrapper/Manifest
+++ b/app-portage/fetchcommandwrapper/Manifest
@ -1,2 +1,3 @@
 DIST fetchcommandwrapper-0.7.1.tar.gz 3187 SHA256 083eab79afadeadc00e9ad1dce77a54511df1a1e7b48c61c886012b565eba066 SHA512 be1e382180606d527f85c2f45888373286687c2b521c66cb11ed90f05e107bb54cbfe83b0509bf52e31108db3a52b9089259c83e63cae3a1d25dbca583faaf74 WHIRLPOOL dd9bda47ba066fc5ccab658b8914627ab14e0914ccc00541486910e7e2acc974016dacd7e40f86d6782adce45e9948cece74d09611ca965cceb110a491fc650e
 DIST fetchcommandwrapper-0.7.2.tar.gz 3134 SHA256 0ccab9876c6d2ed15c972aa5287069e2f2c503b9b36f6246b15be12eb7ec05b8 SHA512 f268cbef691320106b3f929b0ab3b63085ffdd3e1988fbada2d37c6abcdf7e417758055fff503bb70490840dfde7704e87bb7434faa1d1115cc42729ad10de61 WHIRLPOOL 1c9f2a5681a49a62e06003811a7903d58c816f34a38acf2c424238af58f32e48b0181d034c6ed2b44dcf3e4438ba1a45feb82315e263f5638a5c9fffe2f4b6a3
+DIST fetchcommandwrapper-0.7.3.tar.gz 3431 SHA256 c10659ff6e4c95102683be4848bdca44746ea9f500a081b01f9a1dd28d3a3faf SHA512 df314331b66b89842285a175be686fe800de4a93ad382b72659429a62de02c4fc708d8964f766c7203c3c2aa838a684e808442d410d37ab9f8b9af8328442a51 WHIRLPOOL d041ed86901ea03bbe7d3ef34837ed040088ec168671c82431d376cd3d82143ba54f4b71b73c79c33b55998542c229ae9544faaa027e3e6e79378c7127acc809
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.3.ebuild
+++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.3.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
+HOMEPAGE="https://github.com/gentoo/fetchcommandwrapper"
+SRC_URI="https://github.com/gentoo/fetchcommandwrapper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=net-misc/aria2-1.10.2"
+
+pkg_postinst() {
+	ewarn 'You need to append'
+	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
+	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
+}
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@ -1,6 +1,7 @@
 DIST mariadb-10.0.29.tar.gz 63385696 SHA256 f5f8da646f7df4b1fb21adb8d2b15e6dfbe1964ceb8cea53207d580a464350f4 SHA512 187c3563e8cb74221505e3e77dbe716a8f3fe53130b304c073105c59f0aededf7285b3fa0d0a60cc2d084323f7d2892dce14d60755c594b20c06864255c2dc9c WHIRLPOOL ef9b20fccf280da2bc65c64081f8b1fb7c1984fd8815da3ee40957fa6f977a415b983ba35cf57ddb0380e273e18039deba93007c2ce7496ec4f3ae2d5554397b
 DIST mariadb-10.0.30.tar.gz 63433598 SHA256 9a2cb7f06ecce1bb64dddc70c484e36507b50b756c110c1d37fa145a13a796bb SHA512 b9f4bdf2b19edc661c80b0c19b09979ad765e6a7f76e038436660d29bc05c2c9882c39f557aa407828ba2917632a9a0f6a96090279912e78f04b54ca2d9f14e7 WHIRLPOOL d109efc6599f457b0a270c62f32115bc0753a5357e88f40023944668c2cfece70f01050fe4773f2bb97ae58c76da15b22031a281aeebaf0512a64bc9ff3f4c37
 DIST mariadb-10.1.22.tar.gz 61542321 SHA256 bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce SHA512 cf02044b7531f83618eeb42bbddce7b761c6530d22fc69701b3efe7461a1e932510cee923aa59044dcf0bbb5a9edf7bc76d3568f300b648f4983848f5975f7b2 WHIRLPOOL b0637e3a267ef70a527f7b15da634158f6dd873c3f3f88f81d60855784325ced0557e76e8be71e24d0927cec4c081e4cbf816f0c465d8cc9d9ef0576572ab44e
+DIST mariadb-10.1.23.tar.gz 61772244 SHA256 54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf SHA512 338d016251038ef03d78744d93a2e21db6517e44f911512aaa3f34b52ddf6b2fc255783f8cacd63a7f89bc56eb728321c658b11f06718c83baf22109907149c6 WHIRLPOOL 2f1ae9e3dab858998cff8578b7ec8d1c0949a908a9872dc48c997ae2b233eba629d65594bf67ae145d911bb6bd8dcf3dab2778d3a0fbe74d8855805326ccee12
 DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff WHIRLPOOL cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31
 DIST mariadb-5.5.54.tar.gz 45765936 SHA256 54405ad9beff02339819eb73c59b4bf25f58a2c5abffbf17e81c4940a893538c SHA512 fe1ff7545989e542f777c201774eaeead906f864277bb1a98bcd06c50b97816a56cb70e83e6fd4517e8d8887ae237eb9cc75e27ab473a2e7a8f154882fc9e2a3 WHIRLPOOL 6f37cf5675eae31347c77d1444e17e70d35d91932251efb0f772de6d36f7b74c797d92be2fec99dc803b18f99ea8dc5a55170e76c91b72b20b74797e99092bfe
 DIST mariadb-5.5.55.tar.gz 45757922 SHA256 cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86 SHA512 6fe725c997600009a7bb3dd0e78a4a94c370a07760c26cb124eee68aa81f859be159618cab782595e33aefecaf0401a6a1229f9acd847b8e2425cee069a2bc4e WHIRLPOOL 6984b35add26a65844f036e11f9db1fc2663300b23c8d60510bda789753189a339da8dbf463699eeb2a145d05a803fac92a3ba729c6866139f7867b8eb69cfc7
--- a/dev-db/mariadb/mariadb-10.1.23.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.23.ebuild
@ -0,0 +1,227 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20170316-1355Z"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+PATCHES=(
+	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.16.patch
+	"${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
+	"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+	"${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
+)
+
+COMMON_DEPEND="
+	mroonga? ( app-text/groonga-normalizer-mysql )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:= )
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	server? (
+		backup? ( app-arch/libarchive:0= )
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+			sys-libs/zlib[minizip]
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( virtual/pam:0= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.35:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
+	${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+	galera? (
+		sys-apps/iproute2
+		=sys-cluster/galera-${WSREP_REVISION}*
+		sst-rsync? ( sys-process/lsof )
+		sst-xtrabackup? ( net-misc/socat[ssl] )
+	)
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
+"
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+	/usr/include/mysql/private/probes_mysql_nodtrace.h
+	/usr/include/mysql/private/probes_mysql_dtrace.h )
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	mysql-multilib-r1_pkg_setup
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+	mysql-multilib-r1_pkg_preinst
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+	mysql-multilib-r1_src_prepare
+}
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+			-DWITH_JEMALLOC=$(usex jemalloc system)
+			-DWITH_PCRE=system
+	)
+	local MYSQL_CMAKE_EXTRA_DEFINES=(
+			-DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
+	)
+	if use server ; then
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			MYSQL_CMAKE_NATIVE_DEFINES+=(
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO )
+		fi
+
+		MYSQL_CMAKE_NATIVE_DEFINES+=(
+			-DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga YES NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+			-DWITH_MARIABACKUP=$(usex backup ON OFF)
+			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
+		)
+	fi
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ $UID -eq 0 ]]; then
+		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake-utils_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+	# Enable parallel testing, auto will try to detect number of cores
+	# You may set this by hand.
+	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log}
+
+	# Run mysql tests
+	pushd "${TESTDIR}" || die
+
+	# These are failing in MariaDB 10.0 for now and are believed to be
+	# false positives:
+	#
+	# main.mysql_client_test, main.mysql_client_test_nonblock
+	# main.mysql_client_test_comp:
+	# segfaults at random under Portage only, suspect resource limits.
+
+	local t
+	for t in plugins.cracklib_password_check plugins.two_password_validations ; do
+		mysql-multilib-r1_disable_test  "$t" "False positive due to varying policies"
+	done
+
+	for t in main.mysql_client_test main.mysql_client_test_nonblock \
+		main.mysql_client_test_comp ; do
+			mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+	retstatus_tests=$?
+
+	popd || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || eerror "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@ -11,6 +11,7 @@ dev-db/mysql
 dev-db/mariadb
 -->
 <use>
+  <flag name="backup">Build mariadb-backup which supports SST and hot backup of InnoDB, Aria and MyISAM including compression and encryption</flag>
  <flag name="cluster">Add support for NDB clustering (deprecated)</flag>
  <flag name="community">Enables the community features from upstream.</flag>
  <flag name="embedded">Build embedded server (libmysqld)</flag>
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@ -1 +1,2 @@
 DIST gradle-3.3-all.zip 91388147 SHA256 71a787faed83c4ef21e8464cc8452b941b5fcd575043aa29d39d15d879be89f7 SHA512 4b852eaf4030c780516fe9214c289e49fc93fc62672da70b7fd6bbbcd128e6912dd196195ce32570984503ea53b48593a41fbf4ec69b0f18b5e32c2fe9e556b3 WHIRLPOOL d2058d046137b507aecae0ac8ebdc719dc1e1c253162be1975ff9daaca04178398b7621c142ed467a8608bf99d952c1046306aeb3b96626bf70899d7213ba91b
+DIST gradle-3.4.1-all.zip 91604607 SHA256 ed7e9c8bb41bd10d4c9339c95b2f8b122f5bf13188bd90504a26e0f00b123b0d SHA512 bdaabf747e60ae1cf2c9fedb0730a2e3deb914609db05ffc7e4cbd5402bc44e84d2c98154f14fdd7f944c2f49eb5dead0f44c119ac5a16bd7491c3369d784f5c WHIRLPOOL b2796d07b6d7f290bde18f46b36348fa6079d42647775e1d6c448c5ebfbb16fc38954da7083f1ce15d2beb7677308e783e4610d4c841e5dbfb49bff620126b24
--- a/dev-java/gradle-bin/gradle-bin-3.4.1.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-3.4.1.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
+HOMEPAGE="http://www.gradle.org/"
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.6"
+
+IUSE="source doc examples"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
+
+	dodoc docs/release-notes.html getting-started.html
+
+	insinto "${gradle_dir}"
+
+	# source
+	if use source ; then
+		java-pkg_dosrc src/*
+	fi
+
+	# docs
+	if use doc ; then
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	# examples
+	if use examples ; then
+		java-pkg_doexamples samples
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
+}
--- a/dev-lang/go/go-1.8.1.ebuild
+++ b/dev-lang/go/go-1.8.1.ebuild
@ -39,7 +39,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@ -3,6 +3,6 @@ DIST leatherman-0.10.2.tar.gz 423470 SHA256 eca6cf88a233bb6c21be2b2d3954763e523d
 DIST leatherman-0.11.0.tar.gz 423516 SHA256 b625b7e7c54495f60a9166e7da85d2fd70a877b3e4cd81bba9e67da51dd261cd SHA512 af1a985ad4fe84a38193282a35d01ba939a8e35854158083387829c45887a2cde6c15f426770771ad17c6088d405b29209b5e772b477803f1fc6537538581367 WHIRLPOOL 1c8dd17c8b093ff6425702b1f5757468f5f1d27006700d48a02295116cbf735ae10a006a260415a49a527773be2e7d2d4922a751a354edb741212ab62bf8ffb2
 DIST leatherman-0.11.1.tar.gz 423537 SHA256 3059ecd28ce8468e5d535a7e21eea4b0cdf6aabdaec71deab5e5d18b715ecf73 SHA512 aa46fdb18ec535e458ba9802792606dc6ff5aec47b22b25722ba2b11fcfcbb2bdeabc46d456fae3e106da435aca7b2f06197a0ea50845d9b190c1b7c088b5691 WHIRLPOOL 47a40c8f799f592fda3914ee0eb17b8888c583cf6f24add354257e765b7f9224726ffab0ddca9f47067641a20a324b5466cb7e25136e361bdaffa5c94aacd4cb
 DIST leatherman-0.11.2.tar.gz 423569 SHA256 a0d3b2308aaddfb31ed4d4bcccb52206c4ad7d5da332b5254d1a6c3223ae980b SHA512 eb73971661834beef49585d1f631523c03115d682ecaf3c18ff5f3004c604b1b3ca7e6533e2e8b69ad7222922cd9afb61cb6888e0db03474b43294f326e2d667 WHIRLPOOL 78c46bf0fd465f0b275707c64f15c959a62f98e48ccc4346e84a550c7e4162dcde057014a92e98cbdfef59a3170206b95ffd33f74ad27c0a20cabe18d5bae964
-DIST leatherman-0.12.0.tar.gz 423780 SHA256 e7c07546ecf1e43e9c1c2439b4dc904864771050fe8f00998ee9ac10ca333113 SHA512 f7bf0b0993ca5a444a4bd40a38d8cf9246721e9b9c574d8134d5cdbe5963794ae39d5881c930a74d22f17579bc129fcabf74b59cb1562b07b47542c5c23be8db WHIRLPOOL cac3171766d735f0558692b6a5911663474f88e34ec974a36b0ece7d55384281d0570b460eac63db19f20b2ec441637b6a66bd8259ea6e719a5c14f1e7559630
+DIST leatherman-0.12.1.tar.gz 423884 SHA256 656a49bdb1181932a8606b58dd19efd8cf428dd0ebbb4af619e3737f2131bdc0 SHA512 f93b6b0f1051507469bcb8d964cd38b238a269bf277f3b540d4b0e53700012aba3eefc8dc5656a4158ad55b8570ebdb09f528fb586621972b847e10305912ce4 WHIRLPOOL bb2ea8b025aa07b18c485e5d5b98cad035590cb2f13d59780b683a3c2003cfe676e160769e6293b185a8fb1c16c542e033fc10cb27ac6be705345d8c672b8e47
 DIST leatherman-0.9.0.tar.gz 392308 SHA256 8d79a998caa47047bfc52093e6a50618458b5c0aa502a6cf61f9fb7a6451c3bb SHA512 25c5edd58abad4e20d36ec7badb94aacc0f9a9e44200e710dcb3da116685396bba5b12ae806f9865e48d5d50c43a31486d8aa39fd853551ccf2c3eaa28859c8d WHIRLPOOL 492ae8971368a8c7e3527a875c8cb4a46d5a767b80b45d32b33fa2f1c66a7d2ea4825c923a6993b1147ac8e68bb111c682ef5315c13a11a68bd583b3423e6656
 DIST leatherman-0.9.4.tar.gz 418077 SHA256 a396514fef1ab5d14ebc745a9166ac4fcdf229e5378824302de751ef5ec2bee9 SHA512 c08401856f5afc1b9d48cf31fa3c037ee9f316f4356419785c021696dff4628bfde92318ad0e50faf83aa9b205ebd479bbb46379431811cfec1dcbd5c88021f7 WHIRLPOOL cdae73fc20e08603c81d98127f642e6720fae449f1f1fbb9ca591ffed051bb1efc5ba21ea93a041d9cc8c7c58844ed5fc7467f6e9107d325687609780e8e2a6d
--- a/dev-libs/leatherman/leatherman-0.12.1.ebuild
+++ b/dev-libs/leatherman/leatherman-0.12.1.ebuild
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@ -2,4 +2,4 @@ DIST libnl-1.1.4.tar.gz 1174974 SHA256 4f80c21fe5bbcdde6e72b59b4f98306063a41421f
 DIST libnl-3.2.28-in6.patch.xz 6368 SHA256 0cbb8dc4e3cdc90a4a0608a26af1971d7c1c397bb5f089de8c8d640e57b7b631 SHA512 de14f7540e514871db2058236a339192443423e56f2f5bd52e02ff06873c9e411029b12f3119e57eb01201ce3643ce78ca3e8d9ada4f6ba318df96288304bead WHIRLPOOL 1f1ebfc06a0cf516202cee3aaee92d7ed584ec9633d48c23e666d40bf48d658cc27a00c9f8881a7e976e21fc66fb867e10cadd8a6c0c8826ff4fab712cb20f3d
 DIST libnl-3.2.28.tar.gz 941954 SHA256 cd608992c656e8f6e3ab6c1391b162a5a51c49336b9219f7f390e61fc5437c41 SHA512 b5f145ecafb2625ed1c42594afd6063f112a601077de5c35884b3c3bc8c562b29b52a006ccebd795c127fe69692a82def425c8605afed7e6d441582943e803d9 WHIRLPOOL ff49346ddc31105a300ebffc0e4d4956ac85ade5e92e884c62e696d7d4234d40e63cf4839e6b6fd2d98d2122662d36d3f41666391686a83c8bf966e53e22ed25
 DIST libnl-3.2.29.tar.gz 963681 SHA256 0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922 SHA512 45e22b02368c479e01db7160345a0d3c73abf345e7b49bf350811243a17f307f5c6c3df639ec1e0c456707578aca8d69aad8afa697ac21449f521a3e39712670 WHIRLPOOL 1273dcaee79ecfdca947110c5e7ff70947703b1b0fda43fdb7c74edd78c6938f675e9a586aaff8feefce56a1f3137cbc50d3626ac336e6afa2ca8cbd8627e6eb
-DIST libnl-3.3.0-rc1.tar.gz 933271 SHA256 426f69373191760174cb40cb1f9a811248a56f8962fe66cf22156a71685fd110 SHA512 8084a54efac0256f6badd438fb79512cc53ee5f6635c4f301d1f7b3cfdf326387176949ac368903109dda02f55589ed09cb8f3218ebac973457c6f2740951488 WHIRLPOOL b8db1d4f589d32f0da830dc934765c67087665ac58366265fc2f5d649178c161cfc41e2faf139859c9547c5b20f28bfff5875db9c51cbfe93df3ecc01c3d7f3e
+DIST libnl-3.3.0.tar.gz 933390 SHA256 705468b5ae4cd1eb099d2d1c476d6a3abe519bc2810becf12fb1e32de1e074e4 SHA512 3fc5d95b875605ab6378d2d454020c1276a6772205fa11bbd22eba9fd9ef1deb8c75347e5d4602f0ab7bf13bd66b418f5ef73ed05f18134f08638ce06eef622c WHIRLPOOL a6f7c066c9d05af807ed17babe1f39107d24b4b5ef44ca94e487543a39b0a2f1298fbf6448356fa3701c033fbff0df392945666c125f16246398d47a8c828f5b
--- a/dev-libs/libnl/libnl-3.3.0_rc1.ebuild
+++ b/dev-libs/libnl/libnl-3.3.0_rc1.ebuild
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@ -1,8 +1,5 @@
 DIST libressl-2.3.10.tar.gz 3015911 SHA256 2d0b5aade0c5ed31a3c194fad5f8dd71cdd218b70205342739d24a625a54c4d3 SHA512 c783a1923a03a9c7c5d77a16dd4f9c798374c50e332ee7bc94ad6d5c2e112fb3db1de987ce84b3aaf822a1f68f4385270fafd687870bc8b275cc581619cb1d1e WHIRLPOOL cbfb31375b767f74e73ff04078cd2ef0b23501900269770e9b540d9ee58714e1f87068b8c11799e62d78edc22eeb4e535c61c6db4a63f3f3b30ae90871a2269c
-DIST libressl-2.3.9.tar.gz 3014155 SHA256 a6ff13664eb13af6dba00259cfb55a306b32b7688feef520a52fc0f60b8196fc SHA512 3b0f27d419bc6f69d6fbde8f3b6e6abcda86591c0400e49e2d4327b834a3996fd7838a2cfa3a999c4e949e29f7d1ee319e26ee4c2b1a25b3fb4f07fe15345810 WHIRLPOOL 26dd4c09f114bc533aad6845bc2110d1aa400032dc20f0f496bc049e8866acb6b5157973f62fcd4047c742247aedc9f28ea2ee346ab19a07395ef27202422e44
-DIST libressl-2.4.4.tar.gz 3014463 SHA256 6fcfaf6934733ea1dcb2f6a4d459d9600e2f488793e51c2daf49b70518eebfd1 SHA512 3999e1a61d3e5f14fbce72fdb0089eaf1481fb20f8675a56b2ce8b5388cf7e1ef7d2f66d9593960b708037537053b47f87b2a7f820504213a756b21c34584fe4 WHIRLPOOL 8c3f2b78a31243f49a2e44ad2e43db6637465886652d164e290344fbe207479913a20d857514fd88cf0429131fb64ef2d31eefb178c362d779c400110e9605f1
 DIST libressl-2.4.5.tar.gz 3016462 SHA256 d300c4e358aee951af6dfd1684ef0c034758b47171544230f3ccf6ce24fe4347 SHA512 bdbd0fcb868e77e5fba26da7653fe6e7f7b5017455e1beb13e11b42b8db0742b9ca6442f0949adc91ddc1f53fb93549a6c0529795cd34db2bf887cbca2d33070 WHIRLPOOL 1caa2e18304ec86f15f73e935a586d774aaa3c4248970596a7fa869f718ef9d12f6211e2abdbee90af4e4f83dfba77b45b3529dcc1077fe71e26e3beecf38bbf
 DIST libressl-2.5.0.tar.gz 3012855 SHA256 8652bf6b55ab51fb37b686a3f604a2643e0e8fde2c56e6a936027d12afda6eae SHA512 6372b27f1696e957389646a05b0572ad6936443b34fee0e57153b063831e00318fa1b434e3e0369f0c3df872e15ad3bee2f85db0851021444612f2a6f266a332 WHIRLPOOL 9b145915734a1914f0d36df04a8b35aa2ce2c91f7d6b3a978c5c6845314c56c61718fce6c471ba1a03f3d1ff052246c3db767adee99bc3d38a6bd692b9086ad0
-DIST libressl-2.5.1.tar.gz 3266271 SHA256 f71ae0a824b78fb1a47ffa23c9c26e9d96c5c9b29234eacedce6b4c7740287cd SHA512 44557c7c3e6bc9c0af9ae83b26765be9707d53708a32a5a945108a49ea20503afa4197919801830d27821c069b87e0e0edd284bd1b8a85340dbc0da2c162c2f9 WHIRLPOOL e31b487e9e88f372cd22db05e54e74900181120cf8c6105f5531658e7b467722680921f3630b8943ee0ec5f5777cb76a7ddc64e4d43f166903928aaa4f98509c
-DIST libressl-2.5.2.tar.gz 3277320 SHA256 0ffa7d70809284a4ac96e965918a61c1d7930bca865457a7db0ff0afc8201c82 SHA512 2c42b8bab40dfb517231d83456073c92a61210a83654f23bec1b5148bd7e3c0590f50244970ebf966e5e9582ea98289fe48c6f246d1d79e5d9facea2041e4faa WHIRLPOOL fc1dba52049779bf55a39a88abff8db8cfa3ba0d437dfacefa372d64e9859d7904848ba146a54064f70b79d0febea666757981ff4268699ac22a6cd8b5f3bc73
 DIST libressl-2.5.3.tar.gz 3285151 SHA256 14e34cc586ec4ce5763f76046dcf366c45104b2cc71d77b63be5505608e68a30 SHA512 e5ba2abb8a0835a025d2777d9c0e8e95813777af8167e322d8e5ae20485c32b628ced77141b156fd3619b65a5afae1a5bc90a7252166a9a54f7e3d23388b3bd0 WHIRLPOOL 687d2b0f2f4294bbc16022056cae7e9f1dd70f168aa087e5d12e4e0eb498b8df05de48c262e5c6b094ea4cbff68a3c74255f369029f377a91e0f34f23e2daf4a
+DIST libressl-2.5.4.tar.gz 3286042 SHA256 107a5b522fbb8318d4c3be668075e5e607296f0a9255d71674caa94571336efa SHA512 8ca86c14af0020c90bef4651892799864938dab9d898172269cb78bad5963314e064f2b4c46e6a04e0b85d1eddbd1840b734803c11ceec8fd6bb1290e0fe204c WHIRLPOOL f1cfb1b126759275172616eadbc40e20ae8bbc615bfa4e49e68b3c5a9f66e6503007531a2ff59df482ebf6902008b431ca5891d73e6c8887862f11e00f76b423
--- a/dev-libs/libressl/libressl-2.3.9.ebuild
+++ b/dev-libs/libressl/libressl-2.3.9.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="http://www.libressl.org/"
-SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/38"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="+asm static-libs"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
--- a/dev-libs/libressl/libressl-2.4.4.ebuild
+++ b/dev-libs/libressl/libressl-2.4.4.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="http://www.libressl.org/"
-SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/39"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="+asm static-libs"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
--- a/dev-libs/libressl/libressl-2.5.2.ebuild
+++ b/dev-libs/libressl/libressl-2.5.2.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="http://www.libressl.org/"
-SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/43"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="+asm static-libs"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-
-	eapply_user
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
--- a/dev-libs/libressl/libressl-2.5.4.ebuild
+++ b/dev-libs/libressl/libressl-2.5.4.ebuild
--- a/dev-perl/Class-Inspector/Class-Inspector-1.310.0.ebuild
+++ b/dev-perl/Class-Inspector/Class-Inspector-1.310.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provides information about Classes"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.70.0.ebuild
+++ b/dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.70.0.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SROMANOV
-MODULE_VERSION=1.07
-inherit perl-module
-
-DESCRIPTION="Pure-Perl OpenPGP-compatible PGP implementation"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-solaris"
-IUSE="test"
-
-# Core dependancies are:
-# >=Data-Buffer 0.04
-# MIME-Base64
-# Math-Pari
-# Compress-Zlib
-# LWP-UserAgent
-# URI-Escape
-
-RDEPEND="
-	>=dev-perl/Data-Buffer-0.04
-	virtual/perl-MIME-Base64
-	virtual/perl-Math-BigInt
-	virtual/perl-IO-Compress
-	dev-perl/libwww-perl
-	dev-perl/URI
-	dev-perl/Crypt-DSA
-	dev-perl/Crypt-RSA
-	dev-perl/File-HomeDir
-
-	dev-perl/Crypt-IDEA
-	virtual/perl-Digest-MD5
-
-	dev-perl/Crypt-DES_EDE3
-	dev-perl/Digest-SHA1
-
-	dev-perl/Crypt-Rijndael
-	dev-perl/Crypt-CAST5_PP
-	dev-perl/Crypt-RIPEMD160
-
-	dev-perl/Crypt-Blowfish
-	>=dev-perl/Crypt-Twofish-2.00
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/Test-Exception
-	)"
-
-SRC_TEST="do"
--- a/dev-perl/Crypt-OpenPGP/Manifest
+++ b/dev-perl/Crypt-OpenPGP/Manifest
@ -1,2 +1 @@
-DIST Crypt-OpenPGP-1.07.tar.gz 141752 SHA256 57ba790d4833a3270b683ee7e76fd2ab45319859ba36ed6247db3d9a9536291b SHA512 ee18a38327d92dab0ade4d8cb3ef3b6f018f66eae133d4287e863593031280dc97551a25d47cd6c82a4ef5be361aa8701eaf673e63c3bcf25c33dd21a89ce420 WHIRLPOOL 8d4656b9da1077eeb2efb5869a007e6917808e35a33dcdef4382f4d4ba4dd7dd67608a12e739d2d17ee20ebedc2cbba5e4c92d1169ac31687cd684a00b1892cd
 DIST Crypt-OpenPGP-1.12.tar.gz 103125 SHA256 e8a7ff2a993b76a69ad6dffdbe55755be5678b84e6ec494dcd9ab966f766f50e SHA512 7cbdd1e125d686aea6e6de66572e3d2d03f08d048481b757b9fa51f7d3d0b39dce1f4105a18600b4d546001bf39baeefb199c25449be21d038685cb21174caf6 WHIRLPOOL edeb59c53591b53d578b36b235595f3781be15e1836a5a8c62dd7049b81053a089aa07bcfed06dbb9bd2735be27543be5bbeafbfbfe1096ed2959f292fc70584
--- a/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0.ebuild
+++ b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lightweight HTTP Server"

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

 RDEPEND="
--- a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.418.0.ebuild
+++ b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.418.0.ebuild
@ -9,7 +9,7 @@ inherit perl-module

 DESCRIPTION="Compiled List::MoreUtils functions"
 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 # See XS.pm/LICENSE
 LICENSE="Apache-2.0 || ( Artistic GPL-1+ )"
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide the missing functionality from List::Util"

 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test +xs"
 # See MoreUtils.pm/LICENSE
 LICENSE="Apache-2.0 || ( Artistic GPL-1+ )"
--- a/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild
+++ b/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lets you build groups of accessors"

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

 RDEPEND="
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for using OpenSSL"

 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl test minimal examples"

 RDEPEND="
--- a/dev-perl/Test-Deep/Test-Deep-1.126.0.ebuild
+++ b/dev-perl/Test-Deep/Test-Deep-1.126.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extremely flexible deep comparison testing"

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

 RDEPEND="
--- a/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild
+++ b/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl module that offers a simple to process namespaced XML names"

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

 DEPEND="
--- a/dev-php/phpunit/files/autoload.php
+++ b/dev-php/phpunit/files/autoload.php
@ -1,8 +1,10 @@
 <?php
 /* Autoloader for dev-php/phpunit and its dependencies */

+$include_dir = '/usr/share/php';
+
 if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+    require_once "${include_dir}/Fedora/Autoloader/autoload.php";
 }

 \Fedora\Autoloader\Autoload::addClassMap(
@ -144,24 +146,25 @@ if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
 	'phpunit_util_type' => '/Util/Type.php',
 	'phpunit_util_xml' => '/Util/XML.php',
 ),
-  '/usr/share/php/PHPUnit'
+  "${include_dir}/PHPUnit"
 );

 // Dependencies
 \Fedora\Autoloader\Dependencies::required(array(
-  '/usr/share/php/File/Iterator/autoload.php',
-  '/usr/share/php/PHP/CodeCoverage/autoload.php',
-  '/usr/share/php/PHP/Timer/autoload.php',
-  '/usr/share/php/SebastianBergmann/Version/autoload.php',
-  '/usr/share/php/SebastianBergmann/Diff/autoload.php',
-  '/usr/share/php/SebastianBergmann/Environment/autoload.php',
-  '/usr/share/php/SebastianBergmann/Exporter/autoload.php',
-  '/usr/share/php/SebastianBergmann/GlobalState/autoload.php',
-  '/usr/share/php/SebastianBergmann/Comparator/autoload.php',
-  '/usr/share/php/SebastianBergmann/ResourceOperations/autoload.php',
-  '/usr/share/php/Symfony/Component/Yaml/autoload.php',
-  '/usr/share/php/Text/Template/autoload.php',
-  '/usr/share/php/myclabs/DeepCopy/autoload.php',
-  '/usr/share/php/PHPUnit/Framework/MockObject/autoload.php',
-  '/usr/share/php/phpspec/Prophecy/autoload.php',
+  "${include_dir}/File/Iterator/autoload.php",
+  "${include_dir}/PHP/CodeCoverage/autoload.php",
+  "${include_dir}/PHP/Timer/autoload.php",
+  "${include_dir}/SebastianBergmann/Version/autoload.php",
+  "${include_dir}/SebastianBergmann/Diff/autoload.php",
+  "${include_dir}/SebastianBergmann/Environment/autoload.php",
+  "${include_dir}/SebastianBergmann/Exporter/autoload.php",
+  "${include_dir}/SebastianBergmann/GlobalState/autoload.php",
+  "${include_dir}/SebastianBergmann/Comparator/autoload.php",
+  "${include_dir}/SebastianBergmann/ObjectEnumerator/autoload.php",
+  "${include_dir}/SebastianBergmann/ResourceOperations/autoload.php",
+  "${include_dir}/Symfony/Component/Yaml/autoload.php",
+  "${include_dir}/Text/Template/autoload.php",
+  "${include_dir}/myclabs/DeepCopy/autoload.php",
+  "${include_dir}/PHPUnit/Framework/MockObject/autoload.php",
+  "${include_dir}/phpspec/Prophecy/autoload.php",
 ));
--- a/dev-php/phpunit/phpunit-5.7.15-r1.ebuild
+++ b/dev-php/phpunit/phpunit-5.7.15-r1.ebuild
--- a/dev-php/symfony-config/Manifest
+++ b/dev-php/symfony-config/Manifest
@ -1 +1 @@
-DIST symfony-config-2.8.19.tar.gz 52568 SHA256 0804dde6ea36afe5f428f838288e22bb8e02e123b970f2ae2f3fef1f18f0f294 SHA512 00d89ec1c78245429652ed48639fe54188c9cafcb7d3cc7978054d26d2e6be44addc738750575a134644b7b9735e805e95cb2890e9c4063dc7359e3b12da6942 WHIRLPOOL eae0fae487163864017097c3172ae151617818ed363618f0df66b12e4d371240609e39ed4446cf5a94da99a08ed8d0120677fd71d3e49a7f55502a41ad055bfb
+DIST symfony-config-2.8.20.tar.gz 52587 SHA256 19f54b4fc33666872ef1e66c0b3269cfc5b634808b61984d791ec399ef1d815e SHA512 f515f9886be8daa85a3cfe70935b4586ee749a62c3c73c6f2c934af16d4a81f9e49445bdae85329f88fa4dacaf87c56b9b599793d7926e712242bd1fc9dc0675 WHIRLPOOL 61ed346ae004c0ce8037e5c4ceb4d519af9fda6f09e2d533672ee0040c13fa15c53b2abe49f3fba32b827af058b6047200b5c812a2dccf56b7bece812bdeb0ed
--- a/dev-php/symfony-config/files/autoload.php
+++ b/dev-php/symfony-config/files/autoload.php
@ -9,7 +9,12 @@ if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {

 \Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Config\\', __DIR__);

-// Dependencies
+// Required dependencies.
 \Fedora\Autoloader\Dependencies::required(array(
  "${vendor_dir}/Symfony/Component/Filesystem/autoload.php"
 ));
+
+// Optional dependencies.
+\Fedora\Autoloader\Dependencies::optional(array(
+  "${vendor_dir}/PHPUnit/vendor/autoload.php"
+));
--- a/dev-php/symfony-config/symfony-config-2.8.20.ebuild
+++ b/dev-php/symfony-config/symfony-config-2.8.20.ebuild
@ -5,29 +5,25 @@ EAPI=6

 DESCRIPTION="Symfony Config Component"
 HOMEPAGE="https://github.com/symfony/config"
-SRC_URI="https://github.com/symfony/config/archive/v${PV}.tar.gz -> symfony-config-${PV}.tar.gz"
+SRC_URI="https://github.com/symfony/config/archive/v${PV}.tar.gz
+	-> symfony-config-${PV}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"

-# This needs a newer phpunit and a modified autoload.php but should work.
-RESTRICT=test
-
 RDEPEND="
 	dev-lang/php:*
 	dev-php/fedora-autoloader
 	dev-php/symfony-filesystem"
-DEPEND="test? (	${RDEPEND} dev-php/phpunit )"
+DEPEND="test? (	${RDEPEND} >=dev-php/phpunit-5.7.15 )"

 S="${WORKDIR}/config-${PV}"

 src_prepare() {
 	default
 	if use test; then
-		# Not quite right: we need to include PHPUnit's autoload.php as
-		# part of ours for the test suite to work.
 		cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
 	fi
 }
@ -39,5 +35,5 @@ src_install() {
 }

 src_test() {
-	phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+	phpunit --bootstrap "${S}/autoload-test.php" || die 'test suite failed'
 }
--- a/dev-python/APScheduler/APScheduler-3.3.1.ebuild
+++ b/dev-python/APScheduler/APScheduler-3.3.1.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="In-process task scheduler with Cron-like capabilities"
+HOMEPAGE="https://bitbucket.org/agronholm/apscheduler"
+SRC_URI="mirror://pypi/A/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.2[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i -e /setuptools_scm/d setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# 3 known failures due to caplog.set_level not existing
+	py.test || die "Testing failed with ${EPYTHON}"
+}
--- a/dev-python/APScheduler/Manifest
+++ b/dev-python/APScheduler/Manifest
@ -1,2 +1,3 @@
 DIST APScheduler-3.1.0.tar.gz 79124 SHA256 96a7ca40dbfb16502b44740c31c935943532f5a13be114e75419ca86fa264486 SHA512 8f8b1a997dffd8ebc090113f3edd6ba1c18514e2583e1bca52ed54b28c7965d146e082fa64de968f44b18b39aa5ead7e3114e3e049102aaab35c52245f37497c WHIRLPOOL d18137ad77485e4ae9439c344b7c53c03b9d3e474aa813891e48005c1e5784b7c85d358561dbc31e5be3cbc583ba56694f726ad4e2f80b3039c9b1ad231b4964
 DIST APScheduler-3.2.0.tar.gz 80946 SHA256 5baa1195ba711868fae257612cf80372ff1124014ca896884bf132f75636f638 SHA512 451e03e01a5b01126c8ab21acb6b053099271056372a5a66cf302a6aac02f5d4d9b033a0551d1029d82dee32b74db01518fc21c8bc718bbd38cf6417f68234e0 WHIRLPOOL 6effe49733a384b9e020f74ed7882972022a97c66584c56da87e769d34770705e9db5df2c51b8d90b5e45b5c90ee5a4b4483803526e2f90f03c60dd175f3bac5
+DIST APScheduler-3.3.1.tar.gz 84198 SHA256 f68874dff1bdffcc6ce3adb7840c1e4d162c609a3e3f831351df30b75732767b SHA512 af861bff47f881200d97551d60a6d3210c9bf864fa83a37da7fbff31d24e9fce5d64d965ffefe6f8678320ad6dcf86dbdc65b611991b14fd8edd18efbf7e6bbd WHIRLPOOL 7e0f9b20722956f1982393fcf65b89f03a563893406878ecead33b09a034f1bbff6f9073ca4db52433504b4acbfc7dd7d27118531e506db2eae9614d472039ce
--- a/dev-python/Babel/Babel-2.0.ebuild
+++ b/dev-python/Babel/Babel-2.0.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Make the tests use implementation-specific datadir,
-	# because they try to write in it.
-	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
-		-i tests/messages/test_frontend.py || die
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Create implementation-specific datadir for tests.
-	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
-	export BUILD_DIR
-	py.test || die
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/Babel/Babel-2.2.0.ebuild
+++ b/dev-python/Babel/Babel-2.2.0.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Make the tests use implementation-specific datadir,
-	# because they try to write in it.
-	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
-		-i tests/messages/test_frontend.py || die
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Create implementation-specific datadir for tests.
-	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
-	export BUILD_DIR
-	py.test || die
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@ -1,4 +1,2 @@
-DIST Babel-2.0.tar.gz 3415906 SHA256 44988df191123065af9857eca68e9151526a931c12659ca29904e4f11de7ec1b SHA512 9f12573d97f688baf0d1fc0f61055e34b67964054e70c8a6c286a8b0e42ce58da4d9c8cf54f94e51b47a5256cc4504a14bea497bd626cfad8c860d952e7a5e18 WHIRLPOOL e08b0d2d6192321f653200b9e4e96d898c12ea8176f7e0fb7c2144d3dfb6c4b6c12b85833b05b1a5e2d9ed8cec3712d09c3b0a1822ca9cc7ea4bf1cb24dac3f3
 DIST Babel-2.1.1.tar.gz 3437647 SHA256 7fb6d50effe88a087feb2036cb972fd7a893bf338361516f1a55a820bf7b5248 SHA512 ec7ebb8648101588eecc72913adc45c0593ed6ee5f10874edcd4b932959f9552edcecc8e2ec966dae6ef5e8adb23341f1a4f87ea2d9e6cbba57a9b8b0a352a94 WHIRLPOOL 812badf14a74fa391851aaae048ec5d815d6d8f7abce8b918f036243cc45d91ca97281614c2ef139797719077ef4880cfafce88e9d718b3cd633ed7303e4cfd7
-DIST Babel-2.2.0.tar.gz 6334150 SHA256 d8cb4c0e78148aee89560f9fe21587aa57739c975bb89ff66b1e842cc697428f SHA512 99771f8d34303f977858926ae70f4f3a5e0a0cd7e223a7f9e64364bfd2837356daf0676b06edf7cc11913f41d973bd41e7dcf5afac0f34aca0bf7558acf93802 WHIRLPOOL 7e0c8e2e78fbae776519ea8fd802806c66d7a13426a3de9b6bd1c16c07358fe7c8dd3991c88912570e27337ec8a192a753f9ef687524a398a376a401b286fd81
 DIST Babel-2.3.4.tar.gz 6866920 SHA256 c535c4403802f6eb38173cd4863e419e2274921a01a8aad8a5b497c131c62875 SHA512 1fdba01946e7a8ebe3fef23843e23707cd060b0a179d775e29f938318d824e8779df2852fb8bbd18f61fc47de33af5d988c509dc67f54ea4cb3a4a66767869a5 WHIRLPOOL ea265abb1a9f6de890c6fa8e78ef49eab2adbd47916f30d19d3d807220c6598c14a93527ba85b92b8e6fbc40571c706cf233d17d7ee65448e3270ead38b7c71a
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@ -1,3 +1,2 @@
 DIST PyContracts-1.7.15.tar.gz 89602 SHA256 24bf3ab5cfd61d0e296af82fb8b73ba875ea09733a8ca562f53016cf980dc469 SHA512 db52b0de04e28913068b072eb9bcd2913b121c65a975a2d5b27cb093f1c131aecb0c36360b4e1a34ec16890dc1055a4bd64f1a88e8f581b804d65536d878e717 WHIRLPOOL 268726b54025833e2667377de06d137bda671b777c29c35339ee6c71a8adc2cd8152c1dadd782a210fb89cc7529b84a80c7a3ffc39144462bc4949197226c6e1
-DIST PyContracts-1.7.6.tar.gz 58711 SHA256 94814b376b168483edeee33fdf1a04d892065d0bdfe0638d281c285d1f3e42bf SHA512 6c76e9f04e3553b2212749bb135351860d8a6e35e13f4a35f65bf7acfa14e031fec005b1f462f9948162cfcd60f4dce7d11d7fa30cb800ce199a0bf4f3b1c472 WHIRLPOOL 52da995c03bc1cb0c2dbdeaa00cbcb35e621b69a16ee0f5630207a62cca0a058d26d90acde4db6c22e785e60f9f4387caf935fac2af2e8e305d016e52a77f507
 DIST PyContracts-1.7.9.tar.gz 61033 SHA256 0ebb8c434700d1a990bd4f53dbbf1caec297b3a783c9af26de052104fe4dac65 SHA512 1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50 WHIRLPOOL 520a0836e1f65e389e1c09f74e52ddf2ab42c315de25cda34cb31332de245309fd38649fd30a6ee737a6e3ec189d3241340747ed111e3b84b92325bc5d22a9cf
--- a/dev-python/PyContracts/PyContracts-1.7.6.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.7.6.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Declare constraints on function parameters and return values"
-HOMEPAGE="http://andreacensi.github.com/contracts/ https://pypi.python.org/pypi/PyContracts/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-# Upstream allows tests to fail
-RESTRICT=test
-
-python_test() {
-	nosetests \
-		$(python_is_python3 || echo "--ignore-files=test_py3k_annotations.py") \
-		|| die
-}
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@ -1,6 +1,2 @@
 DIST PySocks-1.5.6.tar.gz 9189 SHA256 a62b35b13968ba3642a973d115ae6a11be886b5f5ae0841a3ecad4b4f1d7deb1 SHA512 3255591864c532f9ce3c0304d7b33165bb09c0a332fb0d126f61315e98f50e1af0f792517533166558fe457dce2d08f2b320adf9dd87b58618e0941d72daee49 WHIRLPOOL fd2b797c863aef1258b7f3e9f8e1abfa83df8d9387274f084cf731e5ae7b5d01230eb793d5d0f60734bdf178761eaec47a6c87634943c90f6a1fab7cca9d82df
-DIST PySocks-1.5.7.tar.gz 32480 SHA256 e51c7694b10288e6fd9a28e15c0bcce9aca0327e7b32ebcd9af05fcd56f38b88 SHA512 adcb504b938dacb3c5bd5bd28a9f2cd8311bb188dea1a1b65de13ef0b2b00af498a0e44280fff1ceaca4fed95281c070a13866cf13ee898cb564b4ef215ac4a4 WHIRLPOOL 57c9ebc6577b6fdcf883fed8cc5957330eb6848ec7c1bf164a34829832e17492bb9df433bacd9852ea4003d509c19108d5b540db918cf30322e2511fc567b336
-DIST PySocks-1.6.4.tar.gz 17172 SHA256 07f25f0720983462d5992c44a8288b54261e0055317535fbd8d96fe0c391817e SHA512 54992bb489ea8b559a3a844da1bd0a2b772ab84361f9f466e5b7cc8bc566ae9a01e8c9c0cc6ce914fb63b24d822aab8842cf10ad51d4c6233a5433d4a353b335 WHIRLPOOL 0f5d0255df3a1fa8a330f87fea0d546fc0b6d2554a9f5061dad349e5029ed4f1d4608860433bc353df07632467a298474cdf2418839b68d59376ec22a3c91176
-DIST PySocks-1.6.5.tar.gz 17212 SHA256 7962f4d7c76e8414ae168c677a77f19cf8926143911f7e8d37a5d4c4eb910c6f SHA512 19f0822afba1635d68cce327e1cd13203e3a2c39f92ae3817759de22ce3154899b97abe4760a3f0315b6af7757e116c8f7717b7948de179b16c065f743c845e2 WHIRLPOOL dea78f04e04006b691ad7f31af593076489c929fffeb5d6d631bfd69dd8e848936bb006eac1e32655bcbc84ec7ef18036d26716011552865abe279ae5b56ea9d
-DIST PySocks-1.6.6.tar.gz 282014 SHA256 02419a225ff5dcfc3c9695ef8fc9b4d8cc99658e650c6d4718d4c8f451e63f41 SHA512 f2989cb006cf804b713b29b7a317c54fff3ee4ed4b3dec81630f10e7bd26d41b2fe10058f3fcbf2ffff9888a3f7c0bd718e268dfd79e096c93a3bae355649f79 WHIRLPOOL 36db6d0335fc5ac96fece0d9bff282ea927304642155c93819be1d63fa46b638f9ec7a7bb67a1305c1a1560f82c7da9f0606ecd3a7214dd2f3bb20cd5935daf2
 DIST PySocks-1.6.7.tar.gz 282874 SHA256 d00329f27efa157db7efe3ca26fcd69033cd61f83822461ee3f8a353b48e33cf SHA512 e49ce2f4ce23fd84ce30a62a5585af3c63980db46e7d427571d8fb8f6b85f4b6aeb37066863491496dd322555a5ce261123d613b8e5819dbdcef8a4e17e5dca0 WHIRLPOOL c9c63030b90fce42cb9f3d5478d3fa201926c89258c1c6c1bb5b5077fcb799a8f7ed5c0246235b0b92304e831d3b7f4e50f94c0f19e1a025cb16015c8dc24811
--- a/dev-python/PySocks/PySocks-1.5.7.ebuild
+++ b/dev-python/PySocks/PySocks-1.5.7.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS client module"
-HOMEPAGE="https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
--- a/dev-python/PySocks/PySocks-1.6.4.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.4.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS client module"
-HOMEPAGE="https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
--- a/dev-python/PySocks/PySocks-1.6.5.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.5.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS client module"
-HOMEPAGE="https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
--- a/dev-python/PySocks/PySocks-1.6.6.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.6.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS client module"
-HOMEPAGE="https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE=""
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@ -1,3 +1 @@
-DIST alabaster-0.7.6.tar.gz 16598 SHA256 309d33e0282c8209f792f3527f41ec04e508ff837c61fc1906dde988a256deeb SHA512 90058e56365c59a4eed6034273ea83132fcf77ee26e3dfd2d9aa0233657192e1f32d8f40cd6477e307d063d0136ea5e18b94c6c0874a378d6386874dceccfdc8 WHIRLPOOL 2249f055772ce7a389df88a4a659a9a2b0b7c45992d9e225f93ecc79c9038c89474554fdf3557c78ff645242cffa0f1c4822f1b08831f1943140244931b7c812
-DIST alabaster-0.7.8.tar.gz 21030 SHA256 a1cb1b94fcc192ff74ca212d6ef5cb543bb169cfe7991c2b9df256bb354c1fff SHA512 43f159cfe5657b7b22dd9faed106ed8c9dca54d56a6cd850570a798cdc4919eba734457f75ecac293cd44efba83b2dd264fa903bbd8cbbe4939a7a211613dcd9 WHIRLPOOL 8dae4e88abef6b7e39fe0ea8aafdec5abf6345389d8d466011cd5454c8fce292b8a3d2d9cc58523632519abd9a69af600072f5a44ec75410f137a190edd64ce5
 DIST alabaster-0.7.9.tar.gz 10485 SHA256 47afd43b08a4ecaa45e3496e139a193ce364571e7e10c6a87ca1a4c57eb7ea08 SHA512 b1286c4d5d17d172baaacbc40ba6a435d433f0880e31416c37ac88df8787bf522f1c28b6903fe92c88414f54286734508860eab86ff7f12da72315bf9ae0e6c8 WHIRLPOOL 01e49ebeedde34be62d4bea18da669120cae07ea803aee9c8d4eca8f8718ee60b20576475898859cd6bf82d75cb8207d4d3a7cc7dbe5e6809d75176dd8e8b681
--- a/dev-python/alabaster/alabaster-0.7.6.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.6.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
-HOMEPAGE="https://github.com/bitprophet/alabaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/alabaster/alabaster-0.7.8.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.8.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
-HOMEPAGE="https://github.com/bitprophet/alabaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@ -1,2 +1 @@
-DIST apipkg-1.2.zip 12842 SHA256 ea86c4660e83015b6a3faad106cdf5a8d640688a93b84b93e8b64c60815789d4 SHA512 abd00a7c36914b9f79d5a54e1d0facc89fd6673f86d774784cd9a3a0e8e913cf3ef575914bcbbe4d17464b09e8b57d94c761453b2b19466e7dc408f321d22603 WHIRLPOOL 5693c8f1422d96e702eb929c2b3fe3f1a33b7d731ba4f6dced2b42229b941ca87848a31d19c2e79b0ce6fc0db98e24e6c81775c68374ca7f7bed59cf9682d049
 DIST apipkg-1.4.tar.gz 11224 SHA256 2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6 SHA512 118f806706944513f50d3cdef596b32f8ce585cfaf94d2531a6d260f90a0e2147177161aaa6f5d6823150e6182d0f73be3dc01259b8a2f8d710733a22ea54789 WHIRLPOOL b0162094ee5209fb06727b5ad6d346e5738af9999f4fa21081cfedd4607d6025dd1d20621fe6c2e7801e5b405757987a6c0d63f698d74497401053847a9109bd
--- a/dev-python/apipkg/apipkg-1.2-r1.ebuild
+++ b/dev-python/apipkg/apipkg-1.2-r1.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="namespace control and lazy-import mechanism"
-HOMEPAGE="https://pypi.python.org/pypi/apipkg"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# https://bitbucket.org/hpk42/apipkg/issue/5/test-failure-with-python-34
-	sed -e 's:test_initpkg_not_transfers_not_existing_attrs:_&:' -i test_apipkg.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Bug 530388. The test requires patching to match py3.4; trivial.
-	py.test || die "Tests fail under ${EPYTHON}"
-}
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@ -1,3 +1,2 @@
 DIST appdirs-1.4.0.tar.gz 14358 SHA256 8fc245efb4387a4e3e0ac8ebcc704582df7d72ff6a42a53f5600bbb18fdaadc5 SHA512 a16fbad419e593acf1b58a3f8f893d206b3fc1a269757213a34d129e6fc39aa041efacb7964d326b82376373315357c93e85b272f374a096d9a63e73e3ce1dac WHIRLPOOL 0e12bf1875e489fbfb2ed48b125917bb6e176b90051a0afe2b64f431bbd1f5be499b7c0631302513387c440a05b2eb067fefaf54141424c260834cba854b7e6f
-DIST appdirs-1.4.1.tar.gz 9486 SHA256 b45f2af7f028906134ad368d401bf51952554bcfa389e3c4feee50739dbc1642 SHA512 e228c2e6b7e09ec82997a7b2bf53137ac32d4dc9d085950b84fa03dbcf29b2ddb175fcb93fde7e65629dccd1f1d74c0e77d4b435563a79a7aa5f15ebb276c3bf WHIRLPOOL 38c092b5dbbcc999631ba88107a3321f4a6220c5890c6f8b9e491d8680eb3bc6492f3423133dedcde41990935901ae79edcaad2666207a6560a788a0518e6eaf
 DIST appdirs-1.4.3.tar.gz 9641 SHA256 5ce44e43c3fd537ce1aaf72141c525aa67032a5af0a14dcf755621e69d72414b SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc WHIRLPOOL 4e88de235789556a220134c9b6cc1741d6fb65070c62e278c94585e3adc464562e3dc259340a8147b33de417e9533b7bc40cc66eb558d04ec3b197f5a092980e
--- a/dev-python/appdirs/appdirs-1.4.0-r1.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.0-r1.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for determining appropriate platform-specific dirs"
-HOMEPAGE="https://github.com/ActiveState/appdirs"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# api.doctests is missing in the dist zipfile
-# and the 'internal' doctest does nothing
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}"/${P}-distutils.patch )
-
-python_test() {
-	cd test || die
-	"${PYTHON}" test.py \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-[[ ${PV} == 1.4.0 ]] || die "Please remove pkg_preinst from the ebuild"
-pkg_preinst() {
-	_remove_egg_info() {
-		local pyver="$("${PYTHON}" -c 'import sys; print(sys.version[:3])')"
-		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			einfo "Removing ${egginfo}"
-			rm -r "${egginfo}" || die
-		fi
-	}
-	python_foreach_impl _remove_egg_info
-}
--- a/dev-python/appdirs/appdirs-1.4.1.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.1.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for determining appropriate platform-specific dirs"
-HOMEPAGE="https://github.com/ActiveState/appdirs"
-SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4.0-distutils.patch )
-
-python_test() {
-	"${PYTHON}" test/test_api.py || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/appdirs/files/appdirs-1.4.0-distutils.patch
+++ b/dev-python/appdirs/files/appdirs-1.4.0-distutils.patch
@ -1,22 +0,0 @@
-Force setup.py to use distutils in order to break setuptools cyclic dependency.
-
--- appdirs-1.4.0/setup.py
-+++ appdirs-1.4.0/setup.py
-@@ -2,7 +2,7 @@
- import sys
- import os
- import os.path
-from setuptools import setup
-+from distutils.core import setup
- import appdirs
- 
- tests_require = []
-@@ -38,8 +38,6 @@
-         Programming Language :: Python :: 3.2
-         Topic :: Software Development :: Libraries :: Python Modules
-         """.split('\n') if c.strip()],
-    test_suite='test.test_api',
-    tests_require=tests_require,
-     keywords='application directory log cache user',
-     author='Trent Mick',
-     author_email='trentm@gmail.com',
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@ -1,5 +1,4 @@
 DIST BeautifulSoup-3.1.0.1.tar.gz 71460 SHA256 820a80f473240d9d30047f36c959d530a699a732500662dd8b03e1d3ccad12a8 SHA512 812969faf454a58d849921836ed07ec9a950f34fb31e29e118cdf1a75a533370e430f417402b5a5016d23b2d3a1c44a1cf5fde5b3bfd1bc98c50036edd51c0d6 WHIRLPOOL a199585817dcabcc6327c3836a66128605ebf92a6663b5c660125061a797485a504d300791bcd43e0e94e4f08ca59c01f65f42481da07b1240350cbfc6ea6b0c
 DIST BeautifulSoup-3.2.1.tar.gz 31224 SHA256 f5ba85e907e7dfd78e44e4000b3eaef3a650aefc57831e8a645702db2e5b50db SHA512 365b7b045a2069cf437877543577bc0aa99256a6dc4c9743670b46bfceab5494a06628012d6eccecfe99c25d5c9e0c65814964b47026f15ba1a538444cfb7789 WHIRLPOOL c2f84b29421d0153fb1fecc87d63e00a61182e03bc0683132babca5d6c94143b4875a60a19124a36e4e6e78ce80bff9e1e81b37335700efc14084da933307e26
-DIST beautifulsoup4-4.3.2.tar.gz 143356 SHA256 a2b29bd048ca2fe54a046b29770964738872a9747003a371344a93eedf7ad58e SHA512 3d55e553a1a2109378e2961a0feb23a8f038f4ff7bd335a21a26d588d39761f6735888e6ca2d001587e9a6a3b8259a1a09b92b310aa17e9b76fd85601a1ca592 WHIRLPOOL 3570395aa0fae03edc1de10b1c41e82efefa4753c306d2619032b124536a72b6db696c7f85c6a7c32b18c0506ec33d4c8a2fb73660264ad5afd92aba76f32884
 DIST beautifulsoup4-4.5.1.tar.gz 158039 SHA256 3c9474036afda9136aac6463def733f81017bf9ef3510d25634f335b0c87f5e1 SHA512 d560d7f743507084ec546708d29bb3764512f5b2c380004280dde813350bf48d1697fddce3bd3f95186407bf5142941d7adc7d0de8e7962eb5ca1278dbc7e93f WHIRLPOOL bf971596707c2ff69e93528164be01254258aa45601763c543246b67c5d31024b0e4de618382775a3cf313d255d8d1d6268a47542773531aacee9a2643412661
 DIST beautifulsoup4-4.5.3.tar.gz 159185 SHA256 b21ca09366fa596043578fd4188b052b46634d22059e68dd0077d9ee77e08a3e SHA512 d31db0e3bb778a78c37882fcd55dc580eb5eeadfd48744eae6e2e0d0ef5983b216a4682af84a4971611b05fb99c45012ce094475f2d7c39a5b90dad99906ec84 WHIRLPOOL f8dbffd8e4a1dbee0a7ad8a4bcbe22a984f524474f0241a4c03ef5c37b291f9834a6ff1d076421c0cf1087588df1e49f5b99cd9afd7e81591c9063d92d4d097d
--- a/dev-python/beautifulsoup/beautifulsoup-4.3.2.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.3.2.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
-HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/
-	https://pypi.python.org/pypi/beautifulsoup4"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-# new html5 awaits keywording of html5lib in Bug 471002
-IUSE="doc test"
-# pending Bug 471002; html5? ( dev-python/html5lib[$(python_gen_usedep 'python{2_6,2_7}' pypy pypy2_0)] )
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/lxml[$(python_gen_usedep 'python{2_6,2_7}' 'python3*')] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc html
-	fi
-}
-
-python_test() {
-	nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=doc/build/html/.
-	distutils-r1_python_install_all
-}
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@ -1,2 +1 @@
-DIST bleach-1.4.3.tar.gz 18094 SHA256 1293061adb5a9eebb7b260516e691785ac08cc1646c8976aeda7db9dbb1c6f4b SHA512 316450f6325c4fba78de97ba755c185d59aa4d112f303d9f630918f02e613170c2e6bc6ce2de73ce3b0000572de673ab0e0dddbe41da59de5f4cebbfa1348a14 WHIRLPOOL 48a591bdd5b2b91ccc9fa1efe3eb59215d06aa9fa8cb2efeaa352afd5f62e0002185ad99745814c7622e3e7f9645c159267f12e43752df7eed5726a3d01de2f6
 DIST bleach-1.5.0.tar.gz 36502 SHA256 978e758599b54cd3caa2e160d74102879b230ea8dc93871d0783721eef58bc65 SHA512 572a089691af61f096716d96517a96755fe674cc471bdbcff80615ae903eaeff72c47b918ee28a1db60ee5c0253c0c52ba02544f8535ae4f283a3a87a3061124 WHIRLPOOL 9003f026686cd4fbff6c12c16359114df7414ca7e9363ed16197137aea8da43aa8374ddd6f0f26258ac89d4edcb7a82b2a252cde031432e6770781116c2f8e4e
--- a/dev-python/bleach/bleach-1.4.3.ebuild
+++ b/dev-python/bleach/bleach-1.4.3.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/jsocol/bleach https://pypi.python.org/pypi/bleach"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/html5lib-0.999[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/nose-1.3[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	esetup.py test
-}
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@ -1 +1,2 @@
 DIST cachetools-1.1.5.tar.gz 13378 SHA256 9810dd6afaec9e9eaae5ec33f2aa7117214a7a3f8427e70ab23939fe4d1bf279 SHA512 2565fa8666dffe5cbc349f80e719e0ae0df3ec36de3843f368fa67777b4e957c81f8c32f7d6eb704ea1fda5c2851bf57d68e563afa63ed0f7664d3615671f998 WHIRLPOOL 6118a940e3eea2b13a8c0544da87089cdb548b85de5c176f1449bb17e335b7fd975be66e6a33c2b5eb8cd04ad0f15f8e84810c3431dcfeab61627d28158780a7
+DIST cachetools-2.0.0.tar.gz 18592 SHA256 715a7202240dc20dbe83abdb2d804d543e2d4f07af146f53c82166bd75f3a628 SHA512 b1e7a6ed87a82a981f6c9b27bc96f26fdae241a12db85ff890538935e957d7ea88688e20a000691466bdb7db053f8c2145385dfcec6f5f4d84dd812ca419752d WHIRLPOOL 1ea550d341b6586381b83b672eac41411b041a04ee579d5424215d69d0a3ac603f79b98165d97100abf64ee1e15aab100cbb0c50082a0ad65446e5b552d34e23
--- a/dev-python/cachetools/cachetools-2.0.0.ebuild
+++ b/dev-python/cachetools/cachetools-2.0.0.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.python.org/pypi/cachetools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
--- a/dev-python/capturer/Manifest
+++ b/dev-python/capturer/Manifest
@ -1,3 +1 @@
-DIST capturer-2.1.1.tar.gz 17404 SHA256 6d892baca28c32ba912d96dfc5d40972090437d7d8d1738453969a0700a272e4 SHA512 44442da3cfffaff0b5bf4ec71c189d8a5f3436d5e13f2b20a3c26ff02f740144cabf7c7de7a2dd606f056a262f71d7092cdb677062e2ea912f542da2011f00f7 WHIRLPOOL b50ccc40be42508255390bcd0a52e610ffcc9ce7d59a39c426937e81d85e3c1c009b4f0ddc057a44e0b591d54d0c55e70c35740f095f514313b3bd3f414d15b5
-DIST capturer-2.1.tar.gz 17380 SHA256 6837c34651d50615e20281a1cc73a2b363bb7b7c9451003d08ea481a58a6bbb8 SHA512 30325a4908b63cdc63439fe2dab360f37db1f335d44ba10cf03294513cf2ffd6688843659d16b6c96bca44440fbbf607b8b20c5031ee99b8973a26460e37ff72 WHIRLPOOL 47a3f37e200c4c7100baba4acc0dd3bf443e634b4d85d25e50e09a7db28477966a0247c85e0365d0b53d74c5247d4d0fcfc455ca77e5d0c743f410e61d6c588f
 DIST capturer-2.3.tar.gz 18380 SHA256 3e4a1edbe96275e33bdf5836fe5c244202bc7acbc675dce73b0f082240cacb69 SHA512 267c6238ab143894f3d74002334b99e3d1a59a3bf30f5ad04d6f1a81c9439b1369fe161859f86924280e3b9e47536e53a0a80045acda9ae471ded7d751e01470 WHIRLPOOL 59d84da0b34740381ff138d8179a75f025b3ecb2714ff1255a4cef294d8ec42fea81fd02d392874d0b09bd1d0ed00186fbb9db1e7a431c7a4d5d4ebdabbc8a38
--- a/dev-python/capturer/capturer-2.1.1.ebuild
+++ b/dev-python/capturer/capturer-2.1.1.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily capture stdout/stderr of the current process and subprocesses"
-HOMEPAGE="https://capturer.readthedocs.org/ https://pypi.python.org/pypi/capturer https://github.com/xolox/python-capturer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-# Test fails only ebuild, but works manually
-# Can't find out what it is
-RESTRICT=test
-
-python_test() {
-	esetup.py test
-}
--- a/dev-python/capturer/capturer-2.1.ebuild
+++ b/dev-python/capturer/capturer-2.1.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily capture stdout/stderr of the current process and subprocesses"
-HOMEPAGE="https://capturer.readthedocs.org/ https://pypi.python.org/pypi/capturer https://github.com/xolox/python-capturer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-# Test fails only ebuild, but works manually
-# Can't find out what it is
-RESTRICT=test
-
-python_test() {
-	esetup.py test
-}
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@ -1,7 +1,3 @@
 DIST cffi-1.10.0.tar.gz 418131 SHA256 b3b02911eb1f6ada203b0763ba924234629b51586f72a21faacc638269f4ced5 SHA512 02c9987c44698708dcb7e0aa17637df6b15f81732dc25b03e54563ca5664a817863b87daf7a782a62c7b6150388cdca858ef496a975ab289c86f05e5492465ef WHIRLPOOL 577cd975c6937537184b19432d185461964e5b66e851b1e3c4a8a3cc4a6a3329689dc15da717fb1921380af7479ca4dc9cb98c92a3763fe982abc582c012f474
-DIST cffi-1.2.1.tar.gz 335778 SHA256 eab571deb0a152e2f53c404c08a94870a131526896cad08cd43bf86ce3771e3d SHA512 26ab695d34ef1895f38c735b2c6400cbf6325d622ce93799513130791365bb71d656288e991b86861ac8e899872504c1f4368d27104c4ac9b881c83c7f8dad88 WHIRLPOOL a8bbe3c24be660946c1f31fbb8b1f50810f78b9485a32aadfb091a624b5386641bde71981c58792f8e95e8e77cfce7d9959eb197c417464cf5351e568aa6336d
 DIST cffi-1.5.2.tar.gz 388793 SHA256 da9bde99872e46f7bb5cff40a9b1cc08406765efafb583c704de108b6cb821dd SHA512 3c707db85032bc13287beec0211d85a7b9f9dfcb87844adba3a86b23211acd495e88072ec23f22e7c7626d25cadd5b9843c34255d4080eefb171020ad0a2d552 WHIRLPOOL 35cfd86d06dcc2bb2a0e8e196f06d5df0eeaa6dd65d13dc4489284108fa596a88f46918c5b70e38584965290d141f5cbf0e2bcb469c3316cd1962109d77889dd
-DIST cffi-1.6.0.tar.gz 397024 SHA256 a7f75c4ef2362c0a0e54657add0a6c509fecbfa3b3807bc0925f5cb1c9f927db SHA512 95dc7fbca624b5474ff0182ff6e1d1c6b8b34ad19c4c22cabf847f7be6c47dc32a96b23165da1c28438a46a1e9f681341fe8b7304ba5618744c595c4ae364466 WHIRLPOOL a4faef6dfaa078a09abadbe2af6d589dcd36d94bcf07eb47cda1e18ae1d60a3d62d0d66240f717f09564b97565b495e71b77390fe4278afb978fa2c62d341684
-DIST cffi-1.7.0.tar.gz 400251 SHA256 6ed5dd6afd8361f34819c68aaebf9e8fc12b5a5893f91f50c9e50c8886bb60df SHA512 ce9439a219248b06a6f2d019324f4150576b5e4d853025d61d470105f95af2a6c2387080bfd0308c063ad756f34feead9a5958187d626524594dfe9a3adf7462 WHIRLPOOL 1d10ba1d5fe2dadfe239c2111e9eb08beeddb7b796e966dae642fbfef0d590737018e27e3036817a1b2f43d76d2526642022b0d2ebe97ce8fcf4a49c8006ea26
-DIST cffi-1.8.3.tar.gz 403766 SHA256 c321bd46faa7847261b89c0469569530cad5a41976bb6dba8202c0159f476568 SHA512 a5a5f62c9d8607a8477abc2c2c53dcbe2aa4cf964b0592d4db349cd35a199e69a84d6cf160973fb5ee736607fa6a41314e8ff0d84bef2ffe16c08f6071c15222 WHIRLPOOL 9ab2f3bf534f4c7b925f3617a109c31ed6591500c551e0c1cae2443b506fa5aea8a1b91b9c378646354effba3d12f0002727be0560359ed40eb3c8751a352c03
 DIST cffi-1.9.1.tar.gz 407108 SHA256 563e0bd53fda03c151573217b3a49b3abad8813de9dd0632e10090f6190fdaf8 SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3 WHIRLPOOL 12f9c044b7552520e5fe373fe85b0437734cee79a3f9a7eb1ec107ee877c85830e7f5d327d4a4a9504176cdb207a44e169ab52896a78459f00af285fd660c106
--- a/dev-python/cffi/cffi-1.2.1.ebuild
+++ b/dev-python/cffi/cffi-1.2.1.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc test"
-
-RDEPEND="
-	virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	py.test -x -v --ignore testing/test_zintegration.py c/ testing/ || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/cffi/cffi-1.6.0.ebuild
+++ b/dev-python/cffi/cffi-1.6.0.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc test"
-
-RDEPEND="
-	virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	einfo "$PYTHONPATH"
-	$PYTHON -c "import _cffi_backend as backend" || die
-	PYTHONPATH="${PYTHONPATH}" \
-	py.test -x -v \
-		--ignore testing/test_zintegration.py \
-		--ignore testing/embedding \
-		c/ testing/ \
-		|| die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/cffi/cffi-1.7.0.ebuild
+++ b/dev-python/cffi/cffi-1.7.0.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc test"
-
-RDEPEND="
-	virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	einfo "$PYTHONPATH"
-	$PYTHON -c "import _cffi_backend as backend" || die
-	PYTHONPATH="${PYTHONPATH}" \
-	py.test -x -v \
-		--ignore testing/test_zintegration.py \
-		--ignore testing/embedding \
-		c/ testing/ \
-		|| die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/cffi/cffi-1.8.3.ebuild
+++ b/dev-python/cffi/cffi-1.8.3.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc test"
-
-RDEPEND="
-	virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	einfo "$PYTHONPATH"
-	$PYTHON -c "import _cffi_backend as backend" || die
-	PYTHONPATH="${PYTHONPATH}" \
-	py.test -x -v \
-		--ignore testing/test_zintegration.py \
-		--ignore testing/embedding \
-		c/ testing/ \
-		|| die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@ -1,3 +1,2 @@
-DIST chardet-2.2.1.tar.gz 180319 SHA256 f1964f73f5ee9b7e0309098b9512d587fbba6dd5d1f3797b1c95529e5241bf09 SHA512 87059b77b14c39fded7f1287f8eeab6a880e21f4b49a3aa103daf537bbb1e237069347e1953ebaa9a393bd4dee01993873c84aad3c00536ae34784686aecfe68 WHIRLPOOL 1cd6838823f8effd502c3049d13966ac0888bdb91b34489caea8666f9802967fe6f86565ed827e609cb614c920cc9f983bdecc27c30bb2abcf4420731a0a620e
 DIST chardet-2.3.0.tar.gz 164346 SHA256 e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa SHA512 d554c9b4564905a2b6c6971aaea2a812174d86b58137c6a2f9d54e2abd2395e6529968b2ce3ca2d97c717d2bd0bd80ab5b98cae9afac1a4add9ea305145030dd WHIRLPOOL af17bac2778a86d6fe9643a512a307cbcf92e4b43238b2d3d2bae53e646fccbdf40f31f41f9452e7d4f4c84d1ee637199af841a828d49f3452190749fee284c1
 DIST chardet-3.0.2.tar.gz 1872630 SHA256 3b92afd82ddea09d30832fac141840d6569c34f27633e4ad273c66172246116f SHA512 9466e8bdd4d49ca51664fefa170e2887bebf17d017d49056a0efe9baef4dc58e2a9e0766d41c1fcb06254e1346021d1d86b1eb55d4b71a061da93ea830f1dfce WHIRLPOOL 4010a838619b3f04d1266bdee49e26169724f1c83c38a3a9cc081fc8f2166e46ecf9544bc25e276a7dec4af7a64f469a74aabc8ecdc745fd10d364db331ee704
--- a/dev-python/chardet/chardet-2.2.1.ebuild
+++ b/dev-python/chardet/chardet-2.2.1.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Universal encoding detector"
-HOMEPAGE="https://github.com/chardet/chardet https://pypi.python.org/pypi/chardet"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@ -1,3 +1 @@
-DIST coloredlogs-3.1.4.tar.gz 23038 SHA256 c906ef520d55b94ace4f0aad8625a89fc1d324f24ed2892cc1ac5d479183a14c SHA512 0ee97d0b0e12351c006686418b09a951c3f4c04b6533437e41ffd54f9c427c2b9e5a35c486a37c54565d7cb0c4150b1656a87fed5a86f3ed08b3cd2595d59bd5 WHIRLPOOL caeb81a34e2c832a0d75e8123bb0d9d7e9071269b44e103031ab31657225f43a578f4eb10c6f5aaccce24feba08460fceb8bce9e0bba8eb873df2daa65338fa0
-DIST coloredlogs-5.0.tar.gz 24933 SHA256 612354a11acd2e1d603c24fe7be21d736c53a23ad27f244cd9e3fdb4a99661d4 SHA512 f20a18779964b0bd4d48b51b6df81a57e3918f0097108510c50d27d88386ae89bc4e6abcb6263e757148c5094aa02edb6fe8829caecae13ed4fe7596db488763 WHIRLPOOL e23012b14689125ac09d3c16dfe32823e7f792030e3be77899f6aa8bbc1c757c23f9fd739907e67ae3a24304bda036e7e690f95ccf6e7793ca75379bff11f726
 DIST coloredlogs-6.1.tar.gz 28057 SHA256 4cc35158baab0a495736eca84020a1a29f8ea470b98133bb94aabd3212d7f3f7 SHA512 834cf993e7ffd3328644d334912fcf5a5156a441c6184643b38e5f356d46d7b5c48e02ee1e1b432265052c7a5ab1071ba456e575217a4a762f8387131059c405 WHIRLPOOL 71f8632736c0c280bd19d1662d9cebfa04c85e70058953f0ff88d5e45c0e9daa189447e9b2053cbf4293e1a3708ddaea6a2b51d7688b2182617a38a6b2cbcf1c
--- a/dev-python/coloredlogs/coloredlogs-3.1.4.ebuild
+++ b/dev-python/coloredlogs/coloredlogs-3.1.4.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Colored stream handler for the logging module"
-HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/humanfriendly-1.42[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/verboselogs[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( README.rst )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0-skip-cli-test.patch )
-
-python_test() {
-	esetup.py test
-}
--- a/dev-python/coloredlogs/coloredlogs-5.0.ebuild
+++ b/dev-python/coloredlogs/coloredlogs-5.0.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Colored stream handler for the logging module"
-HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/humanfriendly-1.42[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/verboselogs[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( README.rst )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0-skip-cli-test.patch )
-
-python_test() {
-	# Sandbox violations
-	sed \
-		-e 's:test_system_logging:_&:g' \
-		-i ${PN}/tests.py || die
-	esetup.py test
-}
--- a/Show More
+++ b/Show More