Sync with portage [Tue Mar 29 11:10:44 MSK 2016].

8 years ago · 68dd7ff2fd
parent aa4495f4f3
commit 68dd7ff2fd
1263 changed files with 5765 additions and 4705 deletions
--- a/app-arch/libarchive/libarchive-3.1.2-r4.ebuild
+++ b/app-arch/libarchive/libarchive-3.1.2-r4.ebuild
@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib-minimal toolchain-funcs
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://www.libarchive.org/"
+SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl +lzma lzo nettle static-libs xattr +zlib"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	kernel_linux? (
+		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+		)
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs )
+		)"
+
+DOCS=( NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-CVE-2013-0211.patch
+	epatch "${FILESDIR}"/${P}-outofsource.patch
+	eautoreconf
+}
+
+multilib_src_configure() {
+	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+	local myconf=()
+	myconf=(
+		$(use_enable static-libs static)
+		$(use_enable xattr)
+		$(use_enable acl)
+		$(use_with zlib)
+		$(use_with bzip2 bz2lib)
+		$(use_with iconv)
+		$(use_with lzma)
+		$(use_with lzo lzo2)
+		$(use_with nettle)
+		$(use_with !expat xml2)
+		$(use_with expat)
+	)
+	if multilib_is_native_abi ; then myconf+=(
+		--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
+		--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
+	); else myconf+=(
+		--disable-bsdtar
+		--disable-bsdcpio
+	); fi
+
+	# We disable lzmadec because we support the newer liblzma from xz-utils
+	# and not liblzmadec with this version.
+	myconf+=(
+		--without-lzmadec
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		emake libarchive.la
+	fi
+}
+
+multilib_src_test() {
+	# Replace the default src_test so that it builds tests in parallel
+	multilib_is_native_abi && emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		emake DESTDIR="${D}" install
+
+		# Libs.private: should be used from libarchive.pc instead
+		prune_libtool_files
+
+		# Create tar symlink for FreeBSD
+		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
+			dosym bsdtar /usr/bin/tar
+			echo '.so bsdtar.1' > "${T}"/tar.1
+			doman "${T}"/tar.1
+			# We may wish to switch to symlink bsdcpio to cpio too one day
+		fi
+	else
+		emake DESTDIR="${D}" \
+			install-includeHEADERS \
+			install-libLTLIBRARIES \
+			install-pkgconfigDATA
+
+		# Libs.private: should be used from libarchive.pc instead
+		prune_libtool_files
+	fi
+}
+
+multilib_src_install_all() {
+	cd "${S}" || die
+	dodoc "${DOCS[@]}"
+}
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@ -1,2 +1,3 @@
 DIST bluefish-2.2.6.tar.bz2 3793018 SHA256 54c2892c317eb2287c9fb0a3e29c3f19bef51d9ab0353bfb158e52a1cdae4216 SHA512 39dee296ec6bbe1a946f9fb1c54e7143363da4bb6ce52aee14c9bef906d2eb82e5e58f78680810357c0bfcb11c21f982756a9199fec2f454c2816005a4d9d83e WHIRLPOOL b0847ea74fdc388e9ddccf1a23e8802379d149b85c5010ff9a64b3e061b0c1999e1f1a5872404b8bad2b0024fcdb09db964dae2177092d770f56aca50628d146
 DIST bluefish-2.2.7.tar.bz2 3836580 SHA256 23534b73b929754e15b86d12904ca3ffc1b069da5dcd4f34a67e842fe9e858df SHA512 8b9eca746062d47d646805b02370eb9529d449d6a6a9f175353022d9df9060a9736430b6579cdd52717caab75661204e4c940c4a78fb8f6e29845e84a65395ce WHIRLPOOL 748c965da307807df6a7ebd2f430b5148bd6b8644f722d1ba5bfe70853a884eae951c35cc0c9f4a82e56b47b098fa7bd364623cc773920b08f1197852c720ee8
+DIST bluefish-2.2.8.tar.bz2 4097769 SHA256 32578f955cee3f43e5b3a86e2588e6a679df94438b21dcbe38e3c82282745000 SHA512 0450909feb2370c1c84a214744f103bfe891086ba5f3ccc85060b4e134ee2161c3fde641720a3544a4d71c25f120a35925517cee4ffce6e2f07c778baa2cc5c1 WHIRLPOOL 0253e2176d68033c57db2ea1ec67c8e154722835652fe792e218a9430832ad40f67c360fc03f03e7317cda5d0fff7e83437cfd8543d58dbaf7b663ee4f68a77f
--- a/app-editors/bluefish/bluefish-2.2.8.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.8.ebuild
@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils fdo-mime python-single-r1
+
+MY_P=${P/_/-}
+
+DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
+SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
+HOMEPAGE="http://bluefish.openoffice.nl/"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="gtk2 +gtk3 gucharmap nls python spell"
+
+RDEPEND="
+	gnome-extra/gucharmap:2.90
+	sys-libs/zlib
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	gucharmap? ( gnome-extra/gucharmap:2.90 )
+	python? ( ${PYTHON_DEPS} )
+	spell? ( app-text/enchant )"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=dev-libs/glib-2.24:2
+	virtual/pkgconfig
+	x11-libs/pango
+	nls? (
+		sys-devel/gettext
+		dev-util/intltool
+	)"
+
+REQUIRED_USE="
+	gtk2? ( !gtk3 !gucharmap )
+	gtk3? ( !gtk2 )"
+
+S="${WORKDIR}/${MY_P}"
+
+# there actually is just some broken manpage checkup -> not bother
+RESTRICT="test"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+# Never eautoreconf this package as gettext breaks completely (no translations
+# even if it compiles afterwards)!
+
+src_prepare() {
+	default
+	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-dependency-tracking \
+		--disable-update-databases \
+		--disable-xml-catalog-update \
+		$(use_with gtk2 ) \
+		$(use_enable nls) \
+		$(use_enable spell spell-check) \
+		$(use_enable python)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+
+	einfo "Adding XML catalog entries..."
+	/usr/bin/xmlcatalog  --noout \
+		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
+		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
+		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
+		/etc/xml/catalog \
+		|| ewarn "Failed to add XML catalog entries."
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	einfo "Removing XML catalog entries..."
+	/usr/bin/xmlcatalog  --noout \
+		--del 'Bluefish/DTD/Bflang' \
+		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
+		--del 'http://bluefish.openoffice.nl/DTD' \
+		/etc/xml/catalog \
+		|| ewarn "Failed to remove XML catalog entries."
+}
--- a/app-editors/bluefish/metadata.xml
+++ b/app-editors/bluefish/metadata.xml
@ -11,6 +11,10 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 <use>
+	<flag name="gtk2">Enable GTK2 instead of GTK3 even if GTK3 is available</flag>
+	<flag name="gtk3">Enable GTK3 interface (default)</flag>
 	<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>
+	<flag name="python">Enable Python integration for zen-coding plugin</flag>
+	<flag name="spell">Enable spell checking capabilities via enchant library</flag>
 </use>
 </pkgmetadata>
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@ -1,4 +1 @@
-DIST qemu-2.3.0.tar.bz2 24683085 SHA256 b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5ded18893bd8281588 SHA512 7a40d213c5696b27784abd2a3119e49d42c38c923be431826c73a8f14c19074435d7f1a652686c53baf08e81f5a3005b2ddc92d67c32f6a2b19659ab627e9eaa WHIRLPOOL 9dad6e342027c3be512b4e0b40e810e0a6f1dc84a16847aa5aac74d97f7a347e60d42e770335a090f83e90a1614294f86552a84edc1faafc7093d3e32602f5de
-DIST qemu-2.3.1.tar.bz2 24692020 SHA256 661d029809421cae06b4b1bc74ac0e560cb4ed47c9523c676ff277fa26dca15f SHA512 309e6df7dcc0a064d1a17c7dac2f60398700dfa8c6b60b66e4202966248097cbc49af75aa97725bc34773151be6fd75836810e9f0741ba65cdc208414fa78f6b WHIRLPOOL 26750ee00513daa99cdcd585c4b8407b8258a9c3559ae6335266d7754cb6679e7c10c56f8d12ae0ef2b5cd5d6a9a6a536213f8e86e81ced37e46205c796a773e
-DIST qemu-2.4.0.tar.bz2 25070979 SHA256 72b0b991bbcc540663a019e1e8c4f714053b691dda32c9b9ee80b25f367e6620 SHA512 8740e0fb2c654ed897dff4649f1f83d14d57cfa9cbde723899f115982f93253ce9a2bddd60aab379d241027d2044137770efe4c0b3c83d5b20f3a2a06f05a5dc WHIRLPOOL 8c6cfae096624e01f0d5daeb86aa2dccbeaa86d2aeab626cf55cf20b7edace82d0b0f3a1d85eeb2dc1fd53abaaa9dccf8f0d7ddc657a1f5ffd72fd68301648f1
 DIST qemu-2.5.0.tar.bz2 25464996 SHA256 3443887401619fe33bfa5d900a4f2d6a79425ae2b7e43d5b8c36eb7a683772d4 SHA512 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3 WHIRLPOOL 8f5717989d8d234ecf1763ee386b2e1f20c3b17918de130c6dae255e4523a230b2b01a759eba25e4b9f604c680d9b868c56f58bd71b7c6c2c22a2e46804435ef
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.3.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.3.0.ebuild
@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils systemd udev python-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}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	python_setup
-
-	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.3.1.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.3.1.ebuild
@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils systemd udev python-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}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	python_setup
-
-	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.4.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.4.0.ebuild
@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils systemd udev python-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}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	python_setup
-
-	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.5.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.5.0.ebuild
@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-2
 else
 	SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 fi

 DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
--- a/app-emulation/qemu/files/qemu-2.5.0-9pfs-segfault.patch
+++ b/app-emulation/qemu/files/qemu-2.5.0-9pfs-segfault.patch
@ -0,0 +1,34 @@
+From 4b3a4f2d458ca5a7c6c16ac36a8d9ac22cc253d6 Mon Sep 17 00:00:00 2001
+From: Greg Kurz <gkurz@linux.vnet.ibm.com>
+Date: Wed, 23 Dec 2015 10:56:58 +0100
+Subject: [PATCH] virtio-9p: use accessor to get thread_pool
+
+The aio_context_new() function does not allocate a thread pool. This is
+deferred to the first call to the aio_get_thread_pool() accessor. It is
+hence forbidden to access the thread_pool field directly, as it may be
+NULL. The accessor *must* be used always.
+
+Fixes: ebac1202c95a4f1b76b6ef3f0f63926fa76e753e
+Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
+Tested-by: Michael Tokarev <mjt@tls.msk.ru>
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
+---
+ hw/9pfs/virtio-9p-coth.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/9pfs/virtio-9p-coth.c b/hw/9pfs/virtio-9p-coth.c
+index fb6e8f8..ab9425c 100644
+--- a/hw/9pfs/virtio-9p-coth.c
+++ b/hw/9pfs/virtio-9p-coth.c
+@@ -36,6 +36,6 @@ static int coroutine_enter_func(void *arg)
+ void co_run_in_worker_bh(void *opaque)
+ {
+     Coroutine *co = opaque;
+-    thread_pool_submit_aio(qemu_get_aio_context()->thread_pool,
+    thread_pool_submit_aio(aio_get_thread_pool(qemu_get_aio_context()),
+                            coroutine_enter_func, co, coroutine_enter_cb, co);
+ }
+-- 
+2.7.4
+
--- a/app-emulation/qemu/files/qemu-2.5.0-ne2000-reg-check.patch
+++ b/app-emulation/qemu/files/qemu-2.5.0-ne2000-reg-check.patch
@ -0,0 +1,37 @@
+From 415ab35a441eca767d033a2702223e785b9d5190 Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Wed, 24 Feb 2016 11:41:33 +0530
+Subject: [PATCH] net: ne2000: check ring buffer control registers
+
+Ne2000 NIC uses ring buffer of NE2000_MEM_SIZE(49152)
+bytes to process network packets. Registers PSTART & PSTOP
+define ring buffer size & location. Setting these registers
+to invalid values could lead to infinite loop or OOB r/w
+access issues. Add check to avoid it.
+
+Reported-by: Yang Hongke <yanghongke@huawei.com>
+Tested-by: Yang Hongke <yanghongke@huawei.com>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+---
+ hw/net/ne2000.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
+index e408083..f0feaf9 100644
+--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
+@@ -155,6 +155,10 @@ static int ne2000_buffer_full(NE2000State *s)
+ {
+     int avail, index, boundary;
+ 
+    if (s->stop <= s->start) {
+        return 1;
+    }
+
+     index = s->curpag << 8;
+     boundary = s->boundary << 8;
+     if (index < boundary)
+-- 
+2.7.4
+
--- a/app-emulation/qemu/qemu-2.5.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-2.5.0-r2.ebuild
@ -7,8 +7,10 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="ncurses,readline"

+PLOCALES="de_DE fr_FR hu it tr zh_CN"
+
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo pax-utils
+	user udev fcaps readme.gentoo pax-utils l10n

 BACKPORTS=

@ -295,6 +297,29 @@ check_targets() {
 	popd >/dev/null
 }

+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror " po/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	if use nls ; then
+		# Delete locales the user does not want. #577814
+		rm_loc() { rm po/$1.po || die; }
+		l10n_for_each_disabled_locale_do rm_loc
+	else
+		# Cheap hack to disable gettext .mo generation.
+		rm -f po/*.po
+	fi
+}
+
 src_prepare() {
 	check_targets IUSE_SOFTMMU_TARGETS softmmu
 	check_targets IUSE_USER_TARGETS linux-user
@ -304,9 +329,6 @@ src_prepare() {
 		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
 		Makefile Makefile.target || die

-	# Cheap hack to disable gettext .mo generation.
-	use nls || rm -f po/*.po
-
 	epatch "${FILESDIR}"/qemu-2.5.0-cflags.patch
 	[[ -n ${BACKPORTS} ]] && \
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
@ -337,6 +359,9 @@ src_prepare() {
 	MAKEOPTS+=" V=1"

 	epatch_user
+
+	# Run after we've applied all patches.
+	handle_locales
 }

 ##
--- a/app-emulation/qemu/qemu-2.5.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-2.5.0-r3.ebuild
@ -0,0 +1,696 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses,readline"
+
+PLOCALES="de_DE fr_FR hu it tr zh_CN"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+	user udev fcaps readme.gentoo pax-utils l10n
+
+BACKPORTS=
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-2
+	SRC_URI=""
+else
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
+	${BACKPORTS:+
+		https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
+gnutls gtk gtk2 infiniband iscsi +jpeg \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
+png pulseaudio python \
+rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu
+static-user systemtap tci test +threads usb usbredir +uuid vde +vhost-net \
+virgl virtfs +vnc vte xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
+mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
+x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	gtk2? ( gtk )
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	sdl2? ( sdl )
+	static? ( static-softmmu static-user )
+	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 )
+	virtfs? ( xattr )
+	vte? ( gtk )"
+
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+#
+# Older versions of gnutls are supported, but it's simpler to just require
+# the latest versions.  This is also why we require nettle.
+COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? ( app-accessibility/brltty[static-libs(+)] )
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		dev-libs/nettle[static-libs(+)]
+		>=net-libs/gnutls-3.0[static-libs(+)]
+	)
+	gtk? (
+		gtk2? (
+			x11-libs/gtk+:2
+			vte? ( x11-libs/vte:0 )
+		)
+		!gtk2? (
+			x11-libs/gtk+:3
+			vte? ( x11-libs/vte:2.90 )
+		)
+	)
+	infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	jpeg? ( virtual/jpeg:=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses:0=[static-libs(+)] )
+	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gles2]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		!sdl2? (
+			media-libs/libsdl[X]
+			>=media-libs/libsdl-1.2.11[static-libs(+)]
+		)
+		sdl2? (
+			media-libs/libsdl2[X]
+			media-libs/libsdl2[static-libs(+)]
+		)
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy[static-libs(+)] )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
+X86_FIRMWARE_DEPEND="
+	>=sys-firmware/ipxe-1.0.0_p20130624
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.8.2
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/seabios
+		sys-firmware/sgabios
+		sys-firmware/vgabios
+	)"
+CDEPEND="
+	!static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) )
+	!static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xen? ( app-emulation/xen-tools:= )"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-apps/texinfo
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) )
+	static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-qemu )
+"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or32
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
+you have the kernel module loaded before running kvm. The easiest way to
+ensure that the kernel module is loaded is to load it on boot.\n
+For AMD CPUs the module is called 'kvm-amd'\n
+For Intel CPUs the module is called 'kvm-intel'\n
+Please review /etc/conf.d/modules for how to load these\n\n
+Make sure your user is in the 'kvm' group\n
+Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+
+qemu_support_kvm() {
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+		use qemu_softmmu_targets_s390x; then
+		return 0
+	fi
+
+	return 1
+}
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror " po/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	if use nls ; then
+		# Delete locales the user does not want. #577814
+		rm_loc() { rm po/$1.po || die; }
+		l10n_for_each_disabled_locale_do rm_loc
+	else
+		# Cheap hack to disable gettext .mo generation.
+		rm -f po/*.po
+	fi
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	epatch "${FILESDIR}"/qemu-2.5.0-cflags.patch
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	epatch "${FILESDIR}"/${P}-CVE-2015-8567.patch #567868
+	epatch "${FILESDIR}"/${P}-CVE-2015-8558.patch #568246
+	epatch "${FILESDIR}"/${P}-CVE-2015-8701.patch #570110
+	epatch "${FILESDIR}"/${P}-CVE-2015-8743.patch #570988
+	epatch "${FILESDIR}"/${P}-CVE-2016-1568.patch #571566
+	epatch "${FILESDIR}"/${P}-CVE-2015-8613.patch #569118
+	epatch "${FILESDIR}"/${P}-CVE-2015-8619.patch #569300
+	epatch "${FILESDIR}"/${P}-CVE-2016-1714.patch #571560
+	epatch "${FILESDIR}"/${P}-CVE-2016-1922.patch #572082
+	epatch "${FILESDIR}"/${P}-CVE-2016-1981.patch #572412
+	epatch "${FILESDIR}"/${P}-usb-ehci-oob.patch #572454
+	epatch "${FILESDIR}"/${P}-CVE-2016-2197.patch #573280
+	epatch "${FILESDIR}"/${P}-CVE-2016-2198.patch #573314
+	epatch "${FILESDIR}"/${P}-CVE-2016-2392.patch #574902
+	epatch "${FILESDIR}"/${P}-usb-ndis-int-overflow.patch #575492
+	epatch "${FILESDIR}"/${P}-rng-stack-corrupt-{0,1,2,3}.patch #576420
+	epatch "${FILESDIR}"/${P}-sysmacros.patch
+	epatch "${FILESDIR}"/${P}-ne2000-reg-check.patch #573816
+	epatch "${FILESDIR}"/${P}-9pfs-segfault.patch #578142
+
+	# Fix ld and objcopy being called directly
+	tc-export AR LD OBJCOPY
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	epatch_user
+
+	# Run after we've applied all patches.
+	handle_locales
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+	local static_flag="static-${buildtype}"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		--enable-docs
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets as the default configure
+	# options will autoprobe and try to link in a bunch of unused junk.
+	conf_softmmu() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		$(conf_softmmu accessibility brlapi)
+		$(conf_softmmu aio linux-aio)
+		$(conf_softmmu bluetooth bluez)
+		$(conf_softmmu caps cap-ng)
+		$(conf_softmmu curl)
+		$(conf_softmmu fdt)
+		$(conf_softmmu glusterfs)
+		$(conf_softmmu gnutls)
+		$(conf_softmmu gnutls nettle)
+		$(conf_softmmu gtk)
+		$(conf_softmmu infiniband rdma)
+		$(conf_softmmu iscsi libiscsi)
+		$(conf_softmmu jpeg vnc-jpeg)
+		$(conf_softmmu kernel_linux kvm)
+		$(conf_softmmu lzo)
+		$(conf_softmmu ncurses curses)
+		$(conf_softmmu nfs libnfs)
+		$(conf_softmmu numa)
+		$(conf_softmmu opengl)
+		$(conf_softmmu png vnc-png)
+		$(conf_softmmu rbd)
+		$(conf_softmmu sasl vnc-sasl)
+		$(conf_softmmu sdl)
+		$(conf_softmmu seccomp)
+		$(conf_softmmu smartcard)
+		$(conf_softmmu snappy)
+		$(conf_softmmu spice)
+		$(conf_softmmu ssh libssh2)
+		$(conf_softmmu usb libusb)
+		$(conf_softmmu usbredir usb-redir)
+		$(conf_softmmu uuid)
+		$(conf_softmmu vde)
+		$(conf_softmmu vhost-net)
+		$(conf_softmmu virgl virglrenderer)
+		$(conf_softmmu virtfs)
+		$(conf_softmmu vnc)
+		$(conf_softmmu vte)
+		$(conf_softmmu xen)
+		$(conf_softmmu xen xen-pci-passthrough)
+		$(conf_softmmu xfs xfsctl)
+	)
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		;;
+	softmmu)
+		# audio options
+		local audio_opts="oss"
+		use alsa && audio_opts="alsa,${audio_opts}"
+		use sdl && audio_opts="sdl,${audio_opts}"
+		use pulseaudio && audio_opts="pa,${audio_opts}"
+
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--with-system-pixman
+			--audio-drv-list="${audio_opts}"
+		)
+		use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
+		use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+		)
+		static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		gcc-specs-pie && conf_opts+=( --enable-pie )
+	fi
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	[[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	if [[ -z ${softmmu_targets}${user_targets} ]]; then
+		cd "${S}/tools-build"
+		default
+	fi
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake -j1 check
+		emake -j1 check-report.html
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/kvm_stat"
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets
+		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dohtml check-report.html
+
+		if use kernel_linux; then
+			udev_dorules "${FILESDIR}"/65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	if [[ -z ${softmmu_targets}${user_targets} ]]; then
+		cd "${S}/tools-build"
+		emake DESTDIR="${ED}" install
+	fi
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	# Remove the docdir placed qmp-commands.txt
+	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/" || die
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dodoc docs/qmp-*.txt
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+		fi
+
+		# Remove vgabios since we're using the vgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+			dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	qemu_support_kvm && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if qemu_support_kvm; then
+		readme.gentoo_print_elog
+	fi
+
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/vgabios)"
+}
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@ -7,8 +7,10 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="ncurses,readline"

+PLOCALES="de_DE fr_FR hu it tr zh_CN"
+
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo pax-utils
+	user udev fcaps readme.gentoo pax-utils l10n

 BACKPORTS=

@ -295,6 +297,29 @@ check_targets() {
 	popd >/dev/null
 }

+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror " po/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	if use nls ; then
+		# Delete locales the user does not want. #577814
+		rm_loc() { rm po/$1.po || die; }
+		l10n_for_each_disabled_locale_do rm_loc
+	else
+		# Cheap hack to disable gettext .mo generation.
+		rm -f po/*.po
+	fi
+}
+
 src_prepare() {
 	check_targets IUSE_SOFTMMU_TARGETS softmmu
 	check_targets IUSE_USER_TARGETS linux-user
@ -304,9 +329,6 @@ src_prepare() {
 		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
 		Makefile Makefile.target || die

-	# Cheap hack to disable gettext .mo generation.
-	use nls || rm -f po/*.po
-
 	epatch "${FILESDIR}"/qemu-2.5.0-cflags.patch
 	[[ -n ${BACKPORTS} ]] && \
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
@ -319,6 +341,9 @@ src_prepare() {
 	MAKEOPTS+=" V=1"

 	epatch_user
+
+	# Run after we've applied all patches.
+	handle_locales
 }

 ##
--- a/app-portage/portage-utils/portage-utils-0.62.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.62.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz

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

 RDEPEND="dev-libs/iniparser:0"
--- a/app-text/dos2unix/dos2unix-7.3.3.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.3.ebuild
@ -4,7 +4,9 @@

 EAPI=6

-inherit toolchain-funcs
+PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
+
+inherit l10n toolchain-funcs

 DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
 HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/"
@ -27,9 +29,28 @@ DEPEND="
 	test? ( virtual/perl-Test-Simple )
 	dev-lang/perl"

+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror "po*/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	rm_loc() { rm po*/$1.po || die; }
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
 src_prepare() {
 	default

+	handle_locales
+
 	sed \
 		-e '/^LDFLAGS/s|=|+=|' \
 		-e '/CFLAGS_OS \+=/d' \
--- a/dev-cpp/libcmis/libcmis-0.5.1.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.5.1.ebuild
@ -29,6 +29,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
+	>=sys-devel/boost-m4-0.4_p20160328
 	man? (
 		app-text/docbook2X
 		dev-libs/libxslt
@ -46,13 +47,15 @@ RDEPEND="${COMMON_DEPEND}
 "

 src_prepare() {
-	eapply_user
+	default
+	# fixes bug 569614, which is due to an outdated bundled boost.m4
+	rm m4/boost.m4 || die
+
 	eautoreconf
 }

 src_configure() {
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--program-suffix=-${SLOT} \
 		--disable-werror \
 		$(use_with man) \
--- a/dev-embedded/avr-libc/Manifest
+++ b/dev-embedded/avr-libc/Manifest
@ -5,13 +5,16 @@ DIST avr-libc-1.7.0.tar.bz2 1409160 SHA256 27499f59e7e2d8c1dedfabdd0a9ec9aa243ba
 DIST avr-libc-1.7.1.tar.bz2 1417545 SHA256 c6fe3f0fc0e7b1703e173ff265de1a7cac9fffdc9b249047a53f1e741c233aac SHA512 814e41b84b62213782ef886140d6aae99a76495ad3c06796038e3c58a138a3ef55076b7809dab8f4ce856b2b49a29d23952230a7784a914e20507ce06a6f99ed WHIRLPOOL dd61eb4038c3fb5cf58ce884156f30dcd4d5e6d8378c871addb2545010dcc3e4716f2326523bf12e4af1a4159d8a1a385f41ca3dabb18d9403870271da02fe81
 DIST avr-libc-1.8.0.tar.bz2 1428776 SHA256 67a36bdb43a16f9b0512ba09584d4785f9bce6c057393f1020a5552e096e34ce SHA512 932cd41be062c5930cf4d2c555b1748a6916cf8e901e2bdb6d79fec3193d8b142c32e26b9b48c680fd909cd4bafb5ed74c346846f0a4200386db6ddc2651567a WHIRLPOOL bad84f40625371eca9c87a890edba2df20a7613c34e9826e370d7a96747690c79a6fd78f560f8864ebb5fa45edfd8515ef488e939820e739234d18c2e7fc4082
 DIST avr-libc-1.8.1.tar.bz2 3230418 SHA256 c3062a481b6b2c6959dc708571c00b0e26301897ba21171ed92acd0af7c4a969 SHA512 9827028117d63bab9071bc0af68ef87038ed1e6e6c5cfd6db2c77a8387ce5b9eb2825c651405ad2842d81bc0abe173b76340b56671b930fc42d2f05bb7f261f7 WHIRLPOOL 6dc7c8901184313a8bff73f7d7fca30e1ddc0578cedf1a42e19ec9de47f4bc508922d1d29992e359c05b305d4c90d7d93c437c5c9af770fa358c567455bc81af
+DIST avr-libc-2.0.0.tar.bz2 3590893 SHA256 b2dd7fd2eefd8d8646ef6a325f6f0665537e2f604ed02828ced748d49dc85b97 SHA512 fc8d062043d633350dbe05978935dcb8028257a4f1013f246af9658aef0671def19ac11577d1ee9302df68df1b8cf030b22441d96852e185db212263aacabea6 WHIRLPOOL 18f149bdda6cadb2e29d42e16a15fbe2d2331aa044a3c668a984bbf95ef2b5cad93b907bb4cadcac4f5002c6d62dd0928e74592cd453e21afe70618176a88231
 DIST avr-libc-manpages-1.6.2.tar.bz2 133249 SHA256 1c2ab29c62e308ebbb906691d0197f4b3f45fb03439c6ed674babb171104943f SHA512 8eb4aa0aedb20613253e4f17424251752fd61c5095690e69b2a4a0d6072460a0015379c04b9f01946d1063942ec876b6c6f2c0689878bfd8473a5e1cd31a534b WHIRLPOOL 1da3e7ebdf640c33c42a2ca01e822ae5fe6a9c506c9d87887f239f30e8fe9ec2a3395645e14bd413d5841a6b3b82aa1591484db19773d0975568ff676bfd219a
 DIST avr-libc-manpages-1.7.0.tar.bz2 143540 SHA256 d97ec03a075b331b957ffe968e7236cf79260ae22195036e644b1ba5279d7fcf SHA512 4422deb8778be3e617d6059ba9c40f7cd4069f3f3d8343944f8aa370fc88aa5934c6f5bb375c130ff59bb7450599bb13da4cf127a87f8057abb85eb68001d702 WHIRLPOOL cb5ec836aa3d29f11262c370aa50d2a343eafdbb21f4bef97de20315767c1630719169e00d83ef1579503d2875526bca58df08094028dfc49631ccf0b156aad6
 DIST avr-libc-manpages-1.7.1.tar.bz2 143831 SHA256 13a17b8e7522045a88a49b972f8861e8350ba0403cf692087f86525f401fe404 SHA512 c77f60be472a26ec7a158dcbfc38960dcde7bc192518bf5a35d339c628cf39030f44c56785770a3e0c01ced568e6ca7fff0f655e4a396348464c9d23cc1ccd3e WHIRLPOOL ec58b4cf18f6dbd031d19b365b969b38198a88273e383b548a77d94bdc6657cad96f24cfd255a7945069e4435461e42f44763d6365e32cd76c488a143e46f82e
 DIST avr-libc-manpages-1.8.0.tar.bz2 127217 SHA256 14589188581a7ecd9684b34d52326d8b5ff77b8ac4cdc21e316b293e90e24c12 SHA512 8b7d5734ded698f0f136b8a38785efc87d288ece7fbed943e7da0d1c6aa21ffd73707e63d54757df47da687d5e6d70d781bf9b4947624976921b5fb5c9cffc86 WHIRLPOOL f86f91a0d6987d419ff56d0a91c1e395e453acadd63563431daa9b92b8b3af0bd420bc4ba20b036658072b58e22034cf66e8bbf088487f0a642885285e0bc3a0
 DIST avr-libc-manpages-1.8.1.tar.bz2 158580 SHA256 93ee7ac6880048abd968873fa3f180a49ec7b141b39c1940b7c4afd6efc9ba6c SHA512 84f12c4b56b0c5e21edb0ad27a68c8b1d665a60b19bd2aee10714840d4153cb5aff65f90b0e815ddce9037ad06a4a3b54856cf81b0aea85a1d97a0cf3c672a80 WHIRLPOOL 0d4fe85c906af8ff687af6e5a0f55cf7cc4edf81623c34615bf86cbdf887bd988a423c6eb5546616117d893eab4561c35d005e2f8d51154734cf778fca9f44c7
+DIST avr-libc-manpages-2.0.0.tar.bz2 151137 SHA256 f1086ff15cbe341eda0286a7191c563a10127343573e01aad66a97924d7b41b5 SHA512 8b4aaa6ae176076171e90e629e0e6142c4c56f9cc4f1640432384276df2f7b457f5137739535b07b9cede9b5b2e564db7fe200203faa4e2d0cd9874432507823 WHIRLPOOL 2fd740cb4345c43d0789b12edc5d34eae5cf16c13ae1ad3f5984f13960c710255988f54bb576cd89a0a99685aa3883b29f0fabef4079002af0f2018857492e4b
 DIST avr-libc-user-manual-1.6.2.tar.bz2 511408 SHA256 cc02a2a1a69870add0a69178e06f6ee1c972f139d39826aefbc0ed46febde4ee SHA512 09d531d612b72fff9dc3f0bbdf34866ed9f2b979d7d00adfd9e6d52557bb1500f18936c3b859ce7a477df6cf63bfbfab53871b6c4565f3127faa67ad912704e1 WHIRLPOOL ef001fdf58fa13389b7852087a81f45ca9ffdc90c5cfa918a66007ab66d2a2d8babe6e64cd0eef65790899267db195ad17c38af51b0525dbb4ad7589bb41fa9e
 DIST avr-libc-user-manual-1.7.0.tar.bz2 690477 SHA256 85bc2d7f4fcacfc727a5c026705b7d7545fb8886e1333e18a3c358571344145f SHA512 d8fd5e9c35b840f094c06620836744982c2302a024499f4dcbfaa107a52dac3eaaaaa58ce49529d31a60cf6c1ecdfb9b2c9313febc7cb82c7577b7da22db65a4 WHIRLPOOL 4b5106c9242330ae7df80e045255570ad8264b7709615390b19e8a78b6e2527ae05baa104e44eb484f4365ec2acee2b3665d6ba10669b7a3f8deaf1f0a55315e
 DIST avr-libc-user-manual-1.7.1.tar.bz2 692262 SHA256 25a47084f312b553f12e19d401dc63e26d36ce1821bfd38d168908f6f04a008a SHA512 9996ed97aac12a37c589beb32d761dc0740b321bb219d316091f9b3a763b8a96401c2de6cf99f89744d337a482e8be88104778deb6d8b9a76e96870526139d5e WHIRLPOOL e1a78eed29dd168a86ad32fcd9b4ae0648efacfe03b5b2b5460e9b7b63553b63548a417d06018a97aa3958a382bd55c4cc682b64137c587977c9a86e13b51c6f
 DIST avr-libc-user-manual-1.8.0.tar.bz2 705087 SHA256 ecfb970067ce5a19bd5c93501f5480e6824834d449bd53dc61cf8597a4c0b601 SHA512 731fbc45e9184b70f28001a9427d72ab5385017f1d8f197b2c942e458a6542632420f11e57a81949586d6fd8d4f4cd401b5fc76595ab7d95ccad7b158ceef59b WHIRLPOOL eea3f807208ccf5e3ada13f327898098eaf70594f9c8bff073f7143a80380cc90af4619e476dc7b1b77e752f0568829d000b5f04b110616ae72fbe813a594b39
 DIST avr-libc-user-manual-1.8.1.tar.bz2 864405 SHA256 0966df5d624f6a24de86086d388914501904302bb60a0cfb0b17d024f2ba7ce9 SHA512 65da1b6f648bc8f2dc23dca15be45c960606c44703407fcdb60a924174cd9970d9d4f5a9c10eda827b91a5dbd0cd122daab92458626e67817c3ad8a864baedf4 WHIRLPOOL 7cc3edc8f2cd17ab2b25e875ec1766582a785deeacfebd9a6531d23e97f5db9db72f1f503e0ae1f76ba85e8f6059122de33148e3896bda02372b106fbc857486
+DIST avr-libc-user-manual-2.0.0.tar.bz2 932920 SHA256 3bb4dbfafe32595f035d3373afb622b68ae8c7a3d4bb2a8ed89ca69edc42e5b0 SHA512 246180be1f793b46335a49f33028ff59bd7cc06ca3d8627309521801e405e0e1305663a2c0760521467e75732ad513749bf707732b59fb17744e51acda9bb2c6 WHIRLPOOL 59090a877ab58f2fa208c15ad629e879c93f61513e3168fff34cee28555f40fb7870d8a16cc2daeb94fc69c2bc4ee1ceb046ffa5514a2277486465f84c81152f
--- a/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild
+++ b/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild
@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+CHOST="avr"
+CTARGET="avr"
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="C library for Atmel AVR microcontrollers"
+HOMEPAGE="http://www.nongnu.org/avr-libc/"
+SRC_URI="http://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
+	http://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${PV}.tar.bz2
+	doc? ( http://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${PV}.tar.bz2 )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc crosscompile_opts_headers-only"
+
+DEPEND=">=sys-devel/crossdev-0.9.1"
+[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
+	&& RDEPEND="!dev-embedded/avr-libc" \
+	|| RDEPEND=""
+
+DOCS="AUTHORS ChangeLog* NEWS README"
+
+pkg_setup() {
+	# check for avr-gcc, bug #134738
+	ebegin "Checking for avr-gcc"
+	if type -p avr-gcc > /dev/null ; then
+		eend 0
+	else
+		eend 1
+
+		eerror
+		eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
+		eerror "  $ crossdev -t avr"
+		eerror
+		die "AVR toolchain not found"
+	fi
+}
+
+src_prepare() {
+	epatch_user #455828
+
+	# work around broken gcc versions PR45261
+	local mcu
+	for mcu in $(sed -r -n '/CHECK_AVR_DEVICE/{s:.*[(](.*)[)]:\1:;p}' configure.ac) ; do
+		if avr-gcc -E - -mmcu=${mcu} <<<"" |& grep -q 'unknown MCU' ; then
+			sed -i "/HAS_${mcu}=yes/s:yes:no:" configure
+		fi
+	done
+
+	# Install docs in correct directory
+	sed -i -e "/DOC_INST_DIR/s:\$(VERSION):${PVR}:" configure || die
+
+	strip-flags
+	strip-unsupported-flags
+}
+
+src_install() {
+	default
+
+	# man pages can not go into standard locations
+	# as they would then overwrite libc man pages
+	insinto /usr/share/doc/${PF}/man/man3
+	doins "${WORKDIR}"/man/man3/*
+
+	use doc	&& dohtml "${WORKDIR}"/${PN}-user-manual-${PV}/*
+
+	# Make sure diff cross-compilers don't collide #414075
+	mv "${ED}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
+}
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@ -2,3 +2,4 @@ DIST jemalloc-2.2.5.tar.bz2 224118 SHA256 efcc9636757bd7f53a0fde084c2988bfe26f28
 DIST jemalloc-3.3.1.tar.bz2 252997 SHA256 35c433cc1df5cdf9eb58b7980338552fc1d7aa64f89fe5643a972ccedb7cf20a SHA512 32814e8678af4954e26c0c0a0e5d06aba8f3844205fe212c5e41929dfab6a94ff11127a9238b5c18d72749827c467ecb874b8f3a9bc161cf1afdf4ea84c58690 WHIRLPOOL 35e8948e18ea7111ae830a8245be995b35f44ed2c2f687f706ee6941c78350c2cfaabefba223c4433069de47a9f92d621feaf176ec0c728e513e5f076e5fc874
 DIST jemalloc-3.6.0.tar.bz2 338964 SHA256 e16c2159dd3c81ca2dc3b5c9ef0d43e1f2f45b04548f42db12e7c12d7bdf84fe SHA512 ebe7c64558a87a735b5906d5cb7527c241664eeae7328538675a12eabe7a1004be0f8766a3bd2a78e61334b196ca7ffc0ee8b8ff59167922a35f126cd1e76e43 WHIRLPOOL d5452005951b10d9d529349481779d79361ec8d8ac1f36f4b54408b5e0184f35d79fee8378188d98f1b8e41ae13557a2cf41ab849b68856ba69f33870fe6e980
 DIST jemalloc-4.0.4.tar.bz2 391483 SHA256 3fda8d8d7fcd041aa0bebbecd45c46b28873cf37bd36c56bf44961b36d0f42d0 SHA512 93be0551a80d5f5dc3a1044ef3d5f06c5ce65f3c1fd753743ee64340b841fc2d7902178774ab71eaa633f68abad44109870eb84159679fdc8ce6d93db3a53112 WHIRLPOOL c8bc1a81555b30ff519fda90bfbcfcdb6c9e370ba7478bca17058e58e08c36d20a1995ab12d5374d4edb9cdd2469748517a6f1795a24667c5f798c4c0c756a9c
+DIST jemalloc-4.1.0.tar.bz2 412900 SHA256 fad06d714f72adb4265783bc169c6d98eeb032d57ba02d87d1dcb4a2d933ec8e SHA512 12433101936a104115d8d93991b4849daf897bd39d6c28b1235215c7abc627163a70d19259fb1f2eeb0cdd66cfe889c2e40eb77dccee6debd73b1a4313d0de73 WHIRLPOOL 0305d1cc715c565749c5e9c2de396d349c0d79513da80b461324c82f880c6a070a932cea19802ac809810fe01690dcb24047914f937ddf167a990cf7b4110f0c
--- a/dev-libs/jemalloc/files/jemalloc-4.1-fix_stack_corruption.patch
+++ b/dev-libs/jemalloc/files/jemalloc-4.1-fix_stack_corruption.patch
@ -0,0 +1,70 @@
+From 33184bf69813087bf1885b0993685f9d03320c69 Mon Sep 17 00:00:00 2001
+From: Dmitri Smirnov <dmitrism@microsoft.com>
+Date: Mon, 29 Feb 2016 14:30:19 -0800
+Subject: [PATCH] Fix stack corruption and uninitialized var warning
+
+Stack corruption happens in x64 bit
+
+This resolves #347.
+---
+ src/arena.c      |  2 +-
+ test/unit/hash.c | 13 +++++++------
+ 2 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/src/arena.c b/src/arena.c
+index 99e20fd..965c0fe 100644
+--- a/src/arena.c
+++ b/src/arena.c
+@@ -2423,7 +2423,7 @@ arena_malloc_large(tsd_t *tsd, arena_t *arena, szind_t binind, bool zero)
+ 	uintptr_t random_offset;
+ 	arena_run_t *run;
+ 	arena_chunk_map_misc_t *miscelm;
+-	UNUSED bool idump;
+	UNUSED bool idump JEMALLOC_CC_SILENCE_INIT(false);
+ 
+ 	/* Large allocation. */
+ 	usize = index2size(binind);
+diff --git a/test/unit/hash.c b/test/unit/hash.c
+index f50ba81..010c9d7 100644
+--- a/test/unit/hash.c
+++ b/test/unit/hash.c
+@@ -64,14 +64,15 @@ static void
+ hash_variant_verify_key(hash_variant_t variant, uint8_t *key)
+ {
+ 	const int hashbytes = hash_variant_bits(variant) / 8;
+-	VARIABLE_ARRAY(uint8_t, hashes, hashbytes * 256);
+	const int hashes_size = hashbytes * 256;
+	VARIABLE_ARRAY(uint8_t, hashes, hashes_size);
+ 	VARIABLE_ARRAY(uint8_t, final, hashbytes);
+ 	unsigned i;
+ 	uint32_t computed, expected;
+ 
+ 	memset(key, 0, KEY_SIZE);
+-	memset(hashes, 0, sizeof(hashes));
+-	memset(final, 0, sizeof(final));
+	memset(hashes, 0, hashes_size);
+	memset(final, 0, hashbytes);
+ 
+ 	/*
+ 	 * Hash keys of the form {0}, {0,1}, {0,1,2}, ..., {0,1,...,255} as the
+@@ -102,17 +103,17 @@ hash_variant_verify_key(hash_variant_t variant, uint8_t *key)
+ 	/* Hash the result array. */
+ 	switch (variant) {
+ 	case hash_variant_x86_32: {
+-		uint32_t out = hash_x86_32(hashes, hashbytes*256, 0);
+		uint32_t out = hash_x86_32(hashes, hashes_size, 0);
+ 		memcpy(final, &out, sizeof(out));
+ 		break;
+ 	} case hash_variant_x86_128: {
+ 		uint64_t out[2];
+-		hash_x86_128(hashes, hashbytes*256, 0, out);
+		hash_x86_128(hashes, hashes_size, 0, out);
+ 		memcpy(final, out, sizeof(out));
+ 		break;
+ 	} case hash_variant_x64_128: {
+ 		uint64_t out[2];
+-		hash_x64_128(hashes, hashbytes*256, 0, out);
+		hash_x64_128(hashes, hashes_size, 0, out);
+ 		memcpy(final, out, sizeof(out));
+ 		break;
+ 	} default: not_reached();
--- a/dev-libs/jemalloc/jemalloc-4.1.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-4.1.0.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs multilib-build
+
+DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
+HOMEPAGE="http://www.canonware.com/jemalloc/"
+SRC_URI="http://www.canonware.com/download/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="debug static-libs stats"
+HTML_DOCS=( doc/jemalloc.html )
+PATCHES=( "${FILESDIR}/${PN}-3.5.1-strip-optimization.patch"
+	"${FILESDIR}/${PN}-3.5.1_fix_html_install.patch"
+	"${FILESDIR}/${PN}-4.1-fix_stack_corruption.patch"
+)
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
+# autotools-utils.eclass auto-adds configure options when static-libs is in IUSE
+# but jemalloc doesn't implement them in its configure; need this here to
+# supress the warnings until automagic is removed from the eclass
+QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable debug)
+		$(use_enable stats)
+}
+
+multilib_src_install() {
+	# Copy man file which the Makefile looks for
+	cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fixup install_name, #437362
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.1.dylib \
+			"${ED}"/usr/$(get_libdir)/libjemalloc.1.dylib || die
+	fi
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
--- a/dev-lisp/uiop/uiop-3.1.7.ebuild
+++ b/dev-lisp/uiop/uiop-3.1.7.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-inherit eutils
+inherit common-lisp-3

 DESCRIPTION="UIOP is a portability layer spun off ASDF3"
 HOMEPAGE="http://common-lisp.net/project/asdf/"
@ -20,9 +20,9 @@ RDEPEND="~dev-lisp/asdf-${PV}"
 S="${WORKDIR}/${PN}"

 src_install() {
-	insinto /usr/share/common-lisp/source/${PN}
-	doins -r contrib *.lisp ../version.lisp-expr uiop.asd asdf-driver.asd
-	dodir /usr/share/common-lisp/systems
-	dosym /usr/share/common-lisp/source/${PN}/uiop.asd /usr/share/common-lisp/systems/uiop.asd
-	dosym /usr/share/common-lisp/source/${PN}/asdf-driver.asd /usr/share/common-lisp/systems/asdf-driver.asd
+	insinto "${CLSOURCEROOT}/${PN}"
+	doins -r contrib *.lisp ../version.lisp-expr "${PN}.asd" asdf-driver.asd
+	dodir "${CLSYSTEMROOT}"
+	dosym "${CLSOURCEROOT}/${PN}/${PN}.asd" "${CLSYSTEMROOT}/${PN}.asd"
+	dosym "${CLSOURCEROOT}/${PN}/asdf-driver.asd" "${CLSYSTEMROOT}/asdf-driver.asd"
 }
--- a/dev-perl/Module-Install/Manifest
+++ b/dev-perl/Module-Install/Manifest
@ -1,2 +1 @@
-DIST Module-Install-1.06.tar.gz 135467 SHA256 de9ec8395b3b497d6d9629859b54086643c3911dff80cc7e0e22b380cb194519 SHA512 0bc90ee5e53923af7d1bf0359587762c4a79cc35608ff38e9c4a3bb0e3fb122a596a29c3cc6e91c75e7c7670d65683ce9cb2510ca39d889676fb88c038e444fa WHIRLPOOL 022e7668c8a3190f23720d7b9f0bbe8c4a6e4f79a498d7edefe3e55f796c819f2ca3695ede05bfa61b7c2986cb8dbcc710c80e67048f6616cd7102ddba2ac1c6
 DIST Module-Install-1.16.tar.gz 113004 SHA256 afac1264255f4d822d44f84df1aa9affad207f9ae805e803d93c845fa120025e SHA512 479a3b1a3e489c100bcb25c9f90445abcc90d194238804849b7d3ca1fa171a625b99f8390ce8967e96b10e854d843d117c70e566f12309b3ccdf32113f006422 WHIRLPOOL 909765d0acbb095ec085f8aee346cbaa515d96d08f2fdff66989d41ec59c1e38164df2b51639437b3bf71601270cbdf96e010cb2d5f52471bf5d416054402ddf
--- a/dev-perl/Module-Install/Module-Install-1.60.0-r1.ebuild
+++ b/dev-perl/Module-Install/Module-Install-1.60.0-r1.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ADAMK
-MODULE_VERSION=1.06
-inherit perl-module
-
-DESCRIPTION="Standalone, extensible Perl module installer"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=virtual/perl-File-Spec-3.28
-	>=virtual/perl-Archive-Tar-1.44
-	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
-	>=virtual/perl-ExtUtils-ParseXS-2.19
-	>=dev-perl/Module-Build-0.33
-	>=virtual/perl-Module-CoreList-2.17
-	>=virtual/perl-Parse-CPAN-Meta-1.39
-	>=dev-perl/libwww-perl-5.812
-	>=dev-perl/File-Remove-1.42
-	>=dev-perl/JSON-2.14
-	>=dev-perl/Module-ScanDeps-0.89
-	>=dev-perl/PAR-Dist-0.29
-	>=dev-perl/YAML-Tiny-1.38"
-DEPEND="${RDEPEND}
-	test? ( >=virtual/perl-Test-Harness-3.13
-		>=virtual/perl-Test-Simple-0.86 )"
-
-SRC_TEST=do
--- a/dev-perl/Module-Locate/Manifest
+++ b/dev-perl/Module-Locate/Manifest
@ -1,2 +1 @@
-DIST Module-Locate-1.79.tar.gz 7339 SHA256 64ef248ec1b0b04015a8bd63cb844ac8c9fc0631715d5892c66cc4d54f9a2da6 SHA512 5c5029c54d82e91821a07274cdf6465f1f4c6ab443f0f3a6283d2177cb0097f164ba52edab3c0b364d4eb926ea50bf4632ab1f9039ed2336559f89dade9545c2 WHIRLPOOL a6f83e1f308261d3caaa56b95adba753dc0694018b3dc51cea047e681ea08604351f0d618e9c27488c333299134b593c71ed61ac6dad15929b0f35e61696f599
 DIST Module-Locate-1.80.tar.gz 14420 SHA256 a1b6bbf9c25e851effbf9654ecf29469d99e975be376946dfde93773d5ae61dc SHA512 b917d871fe84ae5e362543957bad2da22416dce5d82bf31764900893a6924b7e6c59785aa85af08ed01d5cd30a240665af3d4e57968e41d2c7fc05e540e46422 WHIRLPOOL 8a5e69577cfdd61cbc124f44e8e651e92df01b0ad446967d1df244c989946647b973a7a9bb58ca68f27071e56c36c3a203f1f2e2c10bf83f66c8a65db75e4f0e
--- a/dev-perl/Module-Locate/Module-Locate-1.790.0.ebuild
+++ b/dev-perl/Module-Locate/Module-Locate-1.790.0.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=NEILB
-MODULE_VERSION=1.79
-inherit perl-module
-
-DESCRIPTION="Locate modules in the same fashion as require and use"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-File-Spec
-	virtual/perl-IO
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST="do parallel"
--- a/dev-perl/Module-Pluggable/Manifest
+++ b/dev-perl/Module-Pluggable/Manifest
@ -1,2 +1 @@
-DIST Module-Pluggable-4.7.tar.gz 26906 SHA256 f7d9ae87f37ebf12e8ff6396554fb4bcd36291c53443e3fb0904a5955cb80fb5 SHA512 cede5dbcff3dfeeaa427047f8845e11c08e08f86be534ff2af9bdd562c5ca96b41acd94960e0f9b02cf4ae1cbc38a058a174ebc8bce2d60f68f9c2aeb96af9a5 WHIRLPOOL 0a7aef7df71673d1b846ccf5c7eb8db89935ece65b1433501d15d5c8c3e76e076e12d238f9a8c69f15722d3af7d4818a96a2021cbfd9b1bd9870109b0196b24a
 DIST Module-Pluggable-5.2.tar.gz 26920 SHA256 b3f2ad45e4fd10b3fb90d912d78d8b795ab295480db56dc64e86b9fa75c5a6df SHA512 7df8ee6713c8e0d4df756736c43c2033632cb8887c82ed5b9f38476dbf402b5daa3af83d3b2bd1228afb020ce5855831812f86299b63518e04e0929390b0c5f5 WHIRLPOOL af064c08187fc3ea2905ee2333a6a15485839a583bb89fa6d5733a8a0d3bd57fdcbec026a199f856041307f1b8195540179360d002b1dcc534b447f479fd9825
--- a/dev-perl/Module-Pluggable/Module-Pluggable-4.700.0.ebuild
+++ b/dev-perl/Module-Pluggable/Module-Pluggable-4.700.0.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SIMONW
-MODULE_VERSION=4.7
-inherit perl-module
-
-DESCRIPTION="automatically give your module the ability to have plugins"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="virtual/perl-File-Spec"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-"
-
-SRC_TEST="do"
--- a/dev-perl/Module-Runtime/Manifest
+++ b/dev-perl/Module-Runtime/Manifest
@ -1,2 +1 @@
-DIST Module-Runtime-0.013.tar.gz 15849 SHA256 ec37e03d90dc905679dab62a82f42cf0897ed79244b87fd9d531438dc3c31023 SHA512 4e8ad61d27d9e269a26a7da4905fcfb2bcc4d775ca1bcddd96f14e8238c725ff8c916dfc8e6faebad5d42c3a0a8eb7d264298471b0cc65d972b5d344a6b9a339 WHIRLPOOL 2d81c860868e44df0f791f6f59d0efdf7d998c364ea7dbbea1673dfe2ea5eef93719001514979dbc90c7c561a59019e3d08e2f797b9f9abd6237925b161c96f5
 DIST Module-Runtime-0.014.tar.gz 17396 SHA256 4c44fe0ea255a9fd00741ee545063f6692d2a28e7ef2fbaad1b24a92803362a4 SHA512 5431d9aeb092bb357bafed4e4cf216e9eda4bbbdd0c27547a1729adbb2f6f5a114ac25580a814f2d07844d6b742b9df3ca8d5972668bcacab2f791d617c1d32b WHIRLPOOL 3a790f8db9061a24941c6a61781f1f53c176f8d3a92ac327290296400454ba2605e09c3efeef24ed0a3c62428af14f287baea46661a3ce16e6e7ac5fcee99d6c
--- a/dev-perl/Module-Runtime/Module-Runtime-0.13.0-r1.ebuild
+++ b/dev-perl/Module-Runtime/Module-Runtime-0.13.0-r1.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ZEFRAM
-MODULE_VERSION=0.013
-inherit perl-module
-
-DESCRIPTION="Runtime module handling"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		virtual/perl-Test-Simple
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)
-"
-
-SRC_TEST="do"
--- a/dev-perl/Module-ScanDeps/Manifest
+++ b/dev-perl/Module-ScanDeps/Manifest
@ -1,2 +1 @@
-DIST Module-ScanDeps-1.12.tar.gz 60453 SHA256 0d17643aa76773a4e4173576656b5c874e78e21b203c267544bf3eea074dfa13 SHA512 4f980e49f90188934b47f777fef400334f43798bc63c139e001a978c64997ea6355869849b1360f7a4b38a3c7070008d565afc4f35deab3949f57ff098df92d0 WHIRLPOOL 99009db519b7b40db1c1c416e416e9ced980d813d8f890b9291a243938cb969e2f699384a3624931793c9d066f265a53e4f28438aeebed330979b6fbd1609497
 DIST Module-ScanDeps-1.20.tar.gz 64260 SHA256 72003547e36db833f920eb85247943b755c94ded998e640bae20ff37d6104691 SHA512 1756c48d8932d50f03e5440e9b1a1c38c4f795c5701d6c9704cef88ac1162efeefb863f003b105b8516bb9cb8113c9c8524e7c6847070450228ef6baeb4d578d WHIRLPOOL d7d573c3138cf62ca371deac91ef10c9a0fad8d09abb1b7eb315921a7a420a80cf3cff4fc99bee499e1a4f22dc462da63ecd837ac0a3389789a123a71d5fae5d
--- a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.120.0.ebuild
+++ b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.120.0.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RSCHUPP
-MODULE_VERSION=1.12
-inherit perl-module
-
-DESCRIPTION="Recursively scan Perl code for dependencies"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="dev-perl/Module-Build
-	virtual/perl-version"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/prefork
-		dev-perl/Module-Pluggable
-		dev-perl/Test-Requires )"
-
-SRC_TEST=do
--- a/dev-perl/MogileFS-Utils/Manifest
+++ b/dev-perl/MogileFS-Utils/Manifest
@ -1,2 +1 @@
-DIST MogileFS-Utils-2.28.tar.gz 40822 SHA256 16875b6f52d245fd50c4ccde78285251373339efb713e77a414ee82aa9901932 SHA512 fb8391e08ee9a2834bf1ecd89d395d293c23e26352dc91987fd9285b12279bb23ff2d0bb754e3c36ae0fd8460a2e2d80dce1de0285faf96cadf61612c0cac121 WHIRLPOOL 71f04c259e57f772568ed2b6c2528fef620af14ac4f948ee1af1c832240ee435d597267d45d24b7f17e71692607640ac80d7623704ed0b7836852054bcbd1d6c
 DIST MogileFS-Utils-2.29.tar.gz 40648 SHA256 56eacdbd9d3ff2c09300d94d5ca7cf740590e5422435625e4c8a2e7c6059d9cd SHA512 833dd37266be5337ac4a64df5677ed988aee47df6e883d409e6d2326207dd9540e941f61752959e3ca200d83ae061a234fc79073ccffb71fddcda88753efbd99 WHIRLPOOL f28604b6bdd2c0760f2c5bea2b65600dc88003907d980b14621b0cc4022ca7f28ca425a11f228993ba9d3f2ba7d1a8293c072828f5469ba3e4f375a683ed1825
--- a/dev-perl/MogileFS-Utils/MogileFS-Utils-2.280.0-r1.ebuild
+++ b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.280.0-r1.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DORMANDO
-MODULE_VERSION=${PV%0.0}
-inherit perl-module
-
-DESCRIPTION="Server for the MogileFS distributed file system"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="virtual/perl-IO-Compress
-	dev-perl/libwww-perl
-	>=dev-perl/MogileFS-Client-1.16"
-DEPEND="${RDEPEND}"
--- a/dev-perl/MongoDB/Manifest
+++ b/dev-perl/MongoDB/Manifest
@ -1,4 +1,2 @@
-DIST MongoDB-0.701.4.tar.gz 1465098 SHA256 1cb5e77449aab787abdb69df2dd98a721e243ca80500b88815090f44e9320813 SHA512 329da2bddecf33bb02fc04e3e2d62d7c3ca106fdcba01a2b604d3e5319ca57a03a20229764245e152d5dc6aa2e187459ae7fa96b564a975461c56545e71267c9 WHIRLPOOL c9547405da0896dbbadc803603b40138c7d4d72ed9df88bfbdb108038c9c61b4b1539c3fe4f93742e791d519a16ea836b192b8108c8b1419a96d4b841d665ec7
-DIST MongoDB-v0.708.0.0.tar.gz 1625892 SHA256 ec7d9a3d5b50b99a7249ee3744cf9ce0ec587e5664dfaed6db33001c5acc7f20 SHA512 1bc623d45e885953d51fcefda8efe2e1fa20b507ef3fda77dac40aa3009f7bd0290c75413dc9ef1f026776dbb1c06b77950842bc2d05d310aad694403130be72 WHIRLPOOL 392ca5dfaef7fedc545b89f578caecfd3e57e69beb041d088aafe4dcd4ea7417106415b5ca23948223b97ded35f284f910496c2b2010db85cabf9f60b8c76812
 DIST MongoDB-v0.708.3.0.tar.gz 1627550 SHA256 03c4b885f327de7a8c0d9f449306d849d43e7fea4a6331da8a970710934378f0 SHA512 01bd174504cfb172f9ba179a97dffa4d3c1acbeee93ecb4d6a898928c9a6139f8199baa764eb6cdfcf121fd278b0eff899d774e1549a46c3bc5af7d9534f75f1 WHIRLPOOL 6b259e8391dcb883160eff7de0d9ad6c06479dfe7a3285251d9e2d954d2b1bd75c40b649cefe897bcda0cf38a2712c70e7f6297686426a5be30edea33b5d2604
 DIST MongoDB-v1.2.2.tar.gz 1735147 SHA256 ed57c87c649f77cb41e122cd610111b136651e5d3b21b51d953b1fcbe79013e7 SHA512 49687c6e2d283709a2745293a00db37f16261868e47bc228926325526834c8988bd931c6befbb8c35578d63f0699dff94ed6e0e1a65ae533ebc2ca04e4de7f27 WHIRLPOOL 50e825b2d40eef73a0613f139adf6bec4b399fcb9b2fc19801c1ad2c7739c9884f3eb2d494957ec72f7de3a5eae84df6e4c32a422fb93df08489ae58af40180f
--- a/dev-perl/MongoDB/MongoDB-0.701.4.ebuild
+++ b/dev-perl/MongoDB/MongoDB-0.701.4.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MODULE_AUTHOR="FRIEDO"
-
-inherit perl-module
-
-DESCRIPTION="A Mongo Driver for Perl"
-
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-perl/DateTime
-	dev-perl/Tie-IxHash
-	dev-perl/Data-Types
-	dev-perl/DateTime-Tiny
-	dev-perl/Class-Method-Modifiers
-	dev-perl/boolean
-	dev-perl/Moose
-	dev-perl/File-Slurp
-	dev-perl/Try-Tiny
-	dev-perl/Module-Install
-	dev-perl/JSON
-	virtual/perl-ExtUtils-MakeMaker"
-
-src_prepare() {
-	epatch "${FILESDIR}"/gridfs-perl-patch.diff
-}
--- a/dev-perl/MongoDB/MongoDB-0.708.0.0.ebuild
+++ b/dev-perl/MongoDB/MongoDB-0.708.0.0.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-MODULE_AUTHOR=MONGODB
-MODULE_VERSION=v0.708.0.0
-
-inherit perl-module
-
-DESCRIPTION="Official MongoDB Driver for Perl"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-LICENSE="Apache-2.0"
-IUSE=test
-
-RDEPEND="
-	dev-perl/Authen-SCRAM
-	virtual/perl-Carp
-	dev-perl/Moose
-	>=dev-perl/DateTime-0.780.0
-	virtual/perl-Digest-MD5
-	virtual/perl-Encode
-	>=virtual/perl-Exporter-5.570.0
-	virtual/perl-IO
-	virtual/perl-MIME-Base64
-	dev-perl/Safe-Isa
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Syntax-Keyword-Junction
-	dev-perl/Throwable
-	dev-perl/Tie-IxHash
-	virtual/perl-Time-HiRes
-	dev-perl/Try-Tiny
-	virtual/perl-XSLoader
-	dev-perl/boolean
-	virtual/perl-if
-	dev-perl/namespace-clean
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Config-AutoConf-0.220.0
-	virtual/perl-ExtUtils-MakeMaker
-	>=dev-perl/Path-Tiny-0.52.0
-	test? (
-		virtual/perl-Data-Dumper
-		dev-perl/DateTime-Tiny
-		virtual/perl-File-Spec
-		virtual/perl-File-Temp
-		dev-perl/JSON
-		>=dev-perl/Test-Deep-0.111.0
-		dev-perl/Test-Fatal
-		>=virtual/perl-Test-Simple-0.960.0
-		dev-perl/Test-Warn
-		virtual/perl-bignum
-	)
-"
--- a/dev-perl/Monitoring-Plugin/Manifest
+++ b/dev-perl/Monitoring-Plugin/Manifest
@ -1,2 +1 @@
-DIST Monitoring-Plugin-0.38.tar.gz 62426 SHA256 bdf035b4f72e8fc9f67a9ae09080377a30187f10e7e09db0bd6430fe3a5dae87 SHA512 8e682c3e9ca823ac4f568134c060a3ff99b40aa7ecebd4e9988aa97c0312be658afa269bce7a182d6e744ea0bc3cc28f6360bb723a4fe611d68e6c96209e6f6b WHIRLPOOL b6415684154821663ed5311d482c798ea12746e356aafca0009b29b3c4f49fd1afb5f88144061fcc3e8f960ced543dd5c310c8cf1f96121bbdc8057290c80962
 DIST Monitoring-Plugin-0.39.tar.gz 62733 SHA256 5ceeaf33bc6205b847b1645a3a24cb65d1b85e19691a6333fa221c240de20c0c SHA512 7bdba894cffc0839586e52f3667157cf578e94734ddc0ccd05899f631271e5b69e9cbfe4b2fb59f68b45e1d13afc82b095b65e249527f2c448a38b93e510a05c WHIRLPOOL 7edf6b1989eea956e75e3f9386db776611412eec5c58fd04302301b6b4cc6d285d7be28e7f586f9885f1acab8e31b60283b5937508fc49e00fb6423876691526
--- a/dev-perl/Monitoring-Plugin/Monitoring-Plugin-0.380.0.ebuild
+++ b/dev-perl/Monitoring-Plugin/Monitoring-Plugin-0.380.0.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR="NIERLEIN"
-MODULE_VERSION="0.38"
-
-inherit perl-module
-
-DESCRIPTION="Modules to streamline Nagios, Icinga, Shinken, etc. plugins"
-
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-DEPEND="dev-perl/Class-Accessor
-	dev-perl/Config-Tiny
-	dev-perl/Math-Calc-Units
-	dev-perl/Params-Validate"
-
-SRC_TEST=do
--- a/dev-perl/Moo/Manifest
+++ b/dev-perl/Moo/Manifest
@ -1,3 +1 @@
-DIST Moo-1.004002.tar.gz 80226 SHA256 d32b61b8e85795b302afdf3bc684239a6f8f3b4b8896ada96298164703085183 SHA512 b6a179cb3c6adc80e51c542eccbac4d6e781bd0de927db7cdad75502cc6d9527d6eebeabd9ede6c40d581ad8bcf435435151b953098f8c4e8a7fc8716b7f842d WHIRLPOOL 7ecb9ff164432698ca3c3cc0833ab979841c3fe0ae499eea1ff94fde224e8aee8f5bd0bec5477f8ff5d69a8d1aa8f72266b9d4844a814852f1081f2412f99b54
-DIST Moo-2.000000.tar.gz 92576 SHA256 57a743bba2e51568c83d00eb3b91d76767069b0fb3d06ef5407bb527b8f35de5 SHA512 1eaabd0a8f0dc0273a33988c7194ab43fa9e1cef24d1cd93c176ca43c445638f6c777999c7f01d6467bf9f9455ebbcfc22797447ff34543ea617bf402a5667c6 WHIRLPOOL 0223cd492f0fa5cbadba4a173c0fab7c86efc0613f360cfaf5237697396e62beb014880b995c2f862d13919d9435a17f3b8711fbb08f6611d4a6634e073b802e
 DIST Moo-2.000002.tar.gz 94253 SHA256 fb4bfa751f0dd06bd70f2e06e811f85a640501f263c228a8efafbf6b26691fd4 SHA512 dbafbe0fe976492bc98610591c80d6f5c19c33b61a4d1cf4752ee03b7ceedf5ff5a5ef789436adf49a697508dde7db8a58dafbcec9ac88780b75896cb0dc072c WHIRLPOOL e811e0785f1ec5155d9aa90112f2c04a62d9d00c3f04cb9f8533812ac94592d60b1bb3eb0bfb4e889a776967b6ab9ed45869453d8d59801934b4fa7404f574a0
--- a/dev-perl/Moo/Moo-1.4.2.ebuild
+++ b/dev-perl/Moo/Moo-1.4.2.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=HAARG
-MODULE_VERSION=1.004002
-inherit perl-module
-
-DESCRIPTION="Minimalist Object Orientation (with Moose compatiblity)"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/Class-Method-Modifiers-1.100.0
-	>=dev-perl/Devel-GlobalDestruction-0.110.0
-	>=dev-perl/Dist-CheckConflicts-0.20.0
-	>=dev-perl/Import-Into-1.2.0
-	>=dev-perl/Module-Runtime-0.12.0
-	>=dev-perl/Role-Tiny-1.3.2
-	>=dev-perl/strictures-1.4.3
-	>=dev-lang/perl-5.8.1
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-perl/Test-Fatal-0.3.0
-		>=virtual/perl-Test-Simple-0.94
-	)
-"
-
-SRC_TEST="do parallel"
--- a/dev-perl/Moo/Moo-2.0.0.ebuild
+++ b/dev-perl/Moo/Moo-2.0.0.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=HAARG
-MODULE_VERSION=2.000000
-inherit perl-module
-
-DESCRIPTION="Minimalist Object Orientation (with Moose compatiblity)"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/Class-Method-Modifiers-1.100.0
-	>=dev-perl/Devel-GlobalDestruction-0.110.0
-	>=virtual/perl-Exporter-5.570.0
-	>=dev-perl/Module-Runtime-0.14.0
-	>=dev-perl/Role-Tiny-2.0.0
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=dev-perl/Test-Fatal-0.3.0
-		>=virtual/perl-Test-Simple-0.94
-	)
-"
-
-SRC_TEST="do parallel"
--- a/dev-perl/Moose/Manifest
+++ b/dev-perl/Moose/Manifest
@ -1,4 +1,3 @@
 DIST Moose-2.0604.tar.gz 696388 SHA256 121fa0032e3838faddfea63028458ff963fd527c63c6cea7a6c8f186169d9b5b SHA512 58ccb7e8e5065ae4b49c683295231e7e03fbee41ce18dfb68255b21087091c45227452acbb2eef61abfa94f661eaf888078cdc40a0640b96e9b7ab49d7d81cc3 WHIRLPOOL 995d955a17befed17a4dfe043e2c2239f17a2bf43e056863cd31615ea619e8e49ff71ba1044306dbab5277f1e782894386ef0f00f5e609838823d3c285e69795
-DIST Moose-2.1405.tar.gz 808857 SHA256 c2cb820cc71cb80ed3bb69b3e52cb57b19b160d42c86b782521e56c14635305a SHA512 a04ad6efce1bb99efd028a59cc21900083202a80cd93a195d2384d6523ebaa96f23d2a02ddd9cb57606188e5c2d5765961e70bbd9928c5a445c3eef8065bef50 WHIRLPOOL 22210412b1242c0c5dbe960c287344d636443c8483af6dc4b57a252c6aa2ef7274a57d408e6b266371992a5cb136d28ae298610cac1e6a0c18f5edaa3298dfe2
 DIST Moose-2.1604.tar.gz 802830 SHA256 3fee73c316046597d61cde3a82a55d7b521ed54392c20ee4637578955ceaaa5f SHA512 f0506dfd8bad0f59a1cb85cf994572ec521da93099354138bbba4622bb04cf67b1313e805231ec73b9af69ab8c443b998524219121fecbe00f8af74a6e9556ba WHIRLPOOL e79975bff0b1ac4bb4be2ca362879e4daa53b964147a23d020863a4c30a9af3a406a313ffb1d676daea7ff164cba7499fe6350e382cb1c04eab327114e4657cc
 DIST Moose-2.1605.tar.gz 803156 SHA256 ca94e4e1fe65e98238db1df416ff66c856ef9b11f47b43802ed418c001b5e8ae SHA512 66a868a017885e626c1d46c3d85452dc04c7350e8a3c2abc20a882dd4e1854dd50a17ea8488d024edd0b0219b7f2800186c62c5a0de23109ccd19ef88e52cadf WHIRLPOOL 7f9f868863421f6406267fd947936db7f2a1c3d003e5f427548b693b8992e4e9427484775d36d4d8273d464f19645d4188554c091bfc62ff157e4a3393cb8c26
--- a/dev-perl/Moose/Moose-2.140.500.ebuild
+++ b/dev-perl/Moose/Moose-2.140.500.ebuild
@ -1,130 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ETHER
-MODULE_VERSION=2.1405
-inherit perl-module
-
-DESCRIPTION="A postmodern object system for Perl 5"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-macos"
-IUSE="test"
-
-CONFLICTS="
-	!<=dev-perl/Catalyst-5.900.499.990
-	!<=dev-perl/Config-MVP-2.200.4
-	!<=dev-perl/Devel-REPL-1.3.20
-	!<=dev-perl/Dist-Zilla-Plugin-Git-2.16.0
-	!<=dev-perl/Fey-0.360.0
-	!<=dev-perl/Fey-ORM-0.420.0
-	!<=dev-perl/File-ChangeNotify-0.150.0
-	!<=dev-perl/HTTP-Throwable-0.17.0
-	!<=dev-perl/KiokuDB-0.510.0
-	!<=dev-perl/Markdent-0.160.0
-	!<=dev-perl/Mason-2.180.0
-	!<=dev-perl/MooseX-ABC-0.50.0
-	!<=dev-perl/MooseX-Aliases-0.80.0
-	!<=dev-perl/MooseX-AlwaysCoerce-0.130.0
-	!<=dev-perl/MooseX-App-1.220.0
-	!<=dev-perl/MooseX-Attribute-Deflator-2.1.7
-	!<=dev-perl/MooseX-Attribute-Dependent-1.1.0
-	!<=dev-perl/MooseX-Attribute-Prototype-0.100.0
-	!<=dev-perl/MooseX-AttributeHelpers-0.220.0
-	!<=dev-perl/MooseX-AttributeIndexes-1.0.0
-	!<=dev-perl/MooseX-AttributeInflate-0.20.0
-	!<=dev-perl/MooseX-CascadeClearing-0.30.0
-	!<=dev-perl/MooseX-ClassAttribute-0.260.0
-	!<=dev-perl/MooseX-Constructor-AllErrors-0.21.0
-	!<=dev-perl/MooseX-Declare-0.350.0
-	!<=dev-perl/MooseX-FollowPBP-0.20.0
-	!<=dev-perl/MooseX-Getopt-0.560.0
-	!<=dev-perl/MooseX-InstanceTracking-0.40.0
-	!<=dev-perl/MooseX-LazyRequire-0.60.0
-	!<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0
-	!<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0
-	!<=dev-perl/MooseX-Method-Signatures-0.440.0
-	!<=dev-perl/MooseX-MethodAttributes-0.220.0
-	!<=dev-perl/MooseX-NonMoose-0.240.0
-	!<=dev-perl/MooseX-Object-Pluggable-0.1.100
-	!<=dev-perl/MooseX-POE-0.214.0
-	!<=dev-perl/MooseX-Params-Validate-0.50.0
-	!<=dev-perl/MooseX-PrivateSetters-0.30.0
-	!<=dev-perl/MooseX-Role-Cmd-0.60.0
-	!<=dev-perl/MooseX-Role-Parameterized-1.0.0
-	!<=dev-perl/MooseX-Role-WithOverloading-0.140.0
-	!<=dev-perl/MooseX-Runnable-0.30.0
-	!<=dev-perl/MooseX-Scaffold-0.50.0
-	!<=dev-perl/MooseX-SemiAffordanceAccessor-0.50
-	!<=dev-perl/MooseX-SetOnce-0.100.473
-	!<=dev-perl/MooseX-Singleton-0.250.0
-	!<=dev-perl/MooseX-SlurpyConstructor-1.100.0
-	!<=dev-perl/MoooseX-Storage-0.420.0
-	!<=dev-perl/MooseX-StrictConstructor-0.120.0
-	!<=dev-perl/MooseX-Traits-0.110.0
-	!<=dev-perl/MooseX-Types-0.190.0
-	!<=dev-perl/MooseX-Types-Parameterizable-0.50.0
-	!<=dev-perl/MooseX-Types-Set-Object-0.30.0
-	!<=dev-perl/MooseX-Types-Signal-1.101.930
-	!<=dev-perl/MooseX-UndefTolerant-0.110.0
-	!<=dev-perl/PRANG-0.140.0
-	!<=dev-perl/Pod-Elemental-0.93.280
-	!<=dev-perl/Pod-Weaver-3.101.638
-	!<=dev-perl/Reaction-0.2.3
-	!<=dev-perl/Test-Able-0.100.0
-	!<=dev-perl/Test-CleanNamespaces-0.30.0
-	!<=dev-perl/Test-Moose-More-0.22.0
-	!<=dev-perl/Test-TempDir-0.50.0
-	!<=dev-perl/Throwable-0.102.80
-	!<=dev-perl/namespace-autoclean-0.80.0
-"
-
-# r:List::Util, r:Scalar::Util -> Scalar-List-Utils
-RDEPEND="
-	${CONFLICTS}
-	>=virtual/perl-Carp-1.220.0
-	>=dev-perl/Class-Load-0.90.0
-	>=dev-perl/Class-Load-XS-0.10.0
-	>=dev-perl/Data-OptList-0.107.0
-	dev-perl/Devel-GlobalDestruction
-	>=dev-perl/Devel-OverloadInfo-0.2.0
-	>=dev-perl/Devel-StackTrace-1.330.0
-	>=dev-perl/Dist-CheckConflicts-0.20.0
-	>=dev-perl/Eval-Closure-0.40.0
-	>=dev-perl/List-MoreUtils-0.280.0
-	>=dev-perl/MRO-Compat-0.50.0
-	>=dev-perl/Module-Runtime-0.14.0
-	>=dev-perl/Module-Runtime-Conflicts-0.2.0
-	>=dev-perl/Package-DeprecationManager-0.110.0
-	>=dev-perl/Package-Stash-0.320.0
-	>=dev-perl/Package-Stash-XS-0.240.0
-	>=dev-perl/Params-Util-1.0.0
-	>=virtual/perl-Scalar-List-Utils-1.350.0
-	>=dev-perl/Sub-Exporter-0.980.0
-	dev-perl/Sub-Identify
-	>=dev-perl/Sub-Name-0.50.0
-	dev-perl/Task-Weaken
-	>=dev-perl/Try-Tiny-0.170.0
-	>=virtual/perl-parent-0.223.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.560.0
-	>=virtual/perl-ExtUtils-CBuilder-0.270.0
-	virtual/perl-File-Spec
-	test? (
-		>=dev-perl/CPAN-Meta-Check-0.7.0
-		virtual/perl-CPAN-Meta-Requirements
-		>=dev-perl/Test-CleanNamespaces-0.130.0
-		>=dev-perl/Test-Fatal-0.1.0
-		>=virtual/perl-Test-Simple-0.880.0
-		>=dev-perl/Test-Requires-0.50.0
-		>=dev-perl/Test-Warnings-0.16.0
-	)"
-SRC_TEST="do parallel"
-
-src_compile() {
-	emake OPTIMIZE="${CFLAGS}"
-}
--- a/dev-perl/MooseX-ClassAttribute/Manifest
+++ b/dev-perl/MooseX-ClassAttribute/Manifest
@ -1,2 +1 @@
-DIST MooseX-ClassAttribute-0.26.tar.gz 19050 SHA256 6aa89dd7bf3135ff06bd990e6b77a74a911cd0b68674dced170a2e0f4f88b2e8 SHA512 17a54453f25614d9283a276f28ee93d37ed694c69eaf8398886dbfec15d498904d9147aff41c626d6076004e552d8bb6797e465d873d9fbb966ee03fc3b3803f WHIRLPOOL d0965caa2f6ee10bc30d350d7d41ee578174a65b491f8e633a15f58edd4da4f05a014ef2342c0588e73f09ca8a57c09d261e8461f989a48faff6867b20ff2bc5
 DIST MooseX-ClassAttribute-0.27.tar.gz 20132 SHA256 77d97b2c642f96073df5d778a1487ec9483cd0d0661ab50856931af13aa8bf93 SHA512 0734fc114f717aca8ea9860c978d8898b2db69bda8d4b2ac7f9d269c38154fb800a0eb07318e02ec0be9bb38df91f8909aa34181f7bb5b55572051195d8da256 WHIRLPOOL 74c33abcafeb52dfc3f0019c69eed7bb3164861d9d27bb2728e5441e3acc1fa4c249085b01da3565fa51854ee9eda666a37dd7cd1a0f39c314e201f2533984ec
--- a/dev-perl/MooseX-ClassAttribute/MooseX-ClassAttribute-0.260.0.ebuild
+++ b/dev-perl/MooseX-ClassAttribute/MooseX-ClassAttribute-0.260.0.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=0.26
-inherit perl-module
-
-DESCRIPTION="Declare class attributes Moose-style"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-perl/Moose-1.230
-	>=dev-perl/namespace-autoclean-0.11
-	>=dev-perl/namespace-clean-0.200"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.31
-	test? ( >=virtual/perl-Test-Simple-0.88
-		dev-perl/Test-Fatal
-		>=dev-perl/Test-Requires-0.05 )"
-
-SRC_TEST=do
--- a/dev-perl/MooseX-ConfigFromFile/MooseX-ConfigFromFile-0.130.0.ebuild
+++ b/dev-perl/MooseX-ConfigFromFile/MooseX-ConfigFromFile-0.130.0.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ETHER
-MODULE_VERSION=0.13
-inherit perl-module
-
-DESCRIPTION="An abstract Moose role for setting attributes from a configfile"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# MooseX::Types::Moose -> MooseX-Types
-RDEPEND="
-	virtual/perl-Carp
-	>=dev-perl/Moose-0.350.0
-	dev-perl/MooseX-Types
-	>=dev-perl/MooseX-Types-Path-Tiny-0.5.0
-	dev-perl/namespace-autoclean
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-Tiny-0.30.0
-	test? (
-		virtual/perl-ExtUtils-MakeMaker
-		virtual/perl-File-Spec
-		virtual/perl-Scalar-List-Utils
-		dev-perl/Moose
-		dev-perl/Test-Deep
-		dev-perl/Test-Fatal
-		virtual/perl-Test-Simple
-		dev-perl/Test-Requires
-		dev-perl/Test-Without-Module
-		virtual/perl-if
-	)
-"
-
-SRC_TEST="do parallel"
-mytargets="install"
--- a/dev-perl/MooseX-Getopt/Manifest
+++ b/dev-perl/MooseX-Getopt/Manifest
@ -1,2 +1 @@
-DIST MooseX-Getopt-0.65.tar.gz 48797 SHA256 c07c2b7312c471bf2d331025c0ad6cc02068633eda1e208cbdb5511ef5da7fda SHA512 deff6814d5f085d64f4e7261aef91dee24af3aa8cde69a2e7500ec59fad0ab2cc452d9d7a237f50a8a79e500eff2fb23d2e943924c005725c7193adaa9e5fc5a WHIRLPOOL 436b966e5042a0d963e7e978d155b52a96a8184cbc28c55edef17f52822d0d0de846099020befe417c0c497213a71dd5bd1854985de3efcf3a380cf426525417
 DIST MooseX-Getopt-0.68.tar.gz 51971 SHA256 acb5118b4666352e58d4268040869d7dc2b68968fe26b5dd6715f51ebd784483 SHA512 bc85b829fd55bb71086986863646feb3cd4c1da2f46cce6fff6c705ea95306fe37fa983288796ee1481b42c33aabc92fbf3b7411df032f509045556e8d53d5da WHIRLPOOL cfa2fbae61a79179e9899db3d3061424d9c098871af7fcc5992a8fe2f7cedda47bc98eb80e3981ecb581a3149afea6ee0ac681334e83cb605363ad7eca293f81
--- a/dev-perl/MooseX-Getopt/MooseX-Getopt-0.650.0.ebuild
+++ b/dev-perl/MooseX-Getopt/MooseX-Getopt-0.650.0.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ETHER
-MODULE_VERSION=0.65
-inherit perl-module
-
-DESCRIPTION="A Moose role for processing command line options"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=virtual/perl-Getopt-Long-2.370.0
-	>=dev-perl/Getopt-Long-Descriptive-0.88.0
-	dev-perl/Moose
-	dev-perl/MooseX-Role-Parameterized
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Try-Tiny
-	dev-perl/namespace-autoclean
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.310.0
-	>=dev-perl/Module-Build-Tiny-0.37.0
-	test? (
-		virtual/perl-File-Spec
-		dev-perl/Module-Runtime
-		>=dev-perl/Path-Tiny-0.9.0
-		dev-perl/Test-Deep
-		>=dev-perl/Test-Fatal-0.3.0
-		virtual/perl-Test-Simple
-		dev-perl/Test-Requires
-		dev-perl/Test-Trap
-		>=dev-perl/Test-Warnings-0.9.0
-	)
-"
-
-SRC_TEST=do
-mytargets="install"
--- a/dev-perl/MooseX-MultiInitArg/Manifest
+++ b/dev-perl/MooseX-MultiInitArg/Manifest
@ -1,2 +1 @@
-DIST MooseX-MultiInitArg-0.01.tar.gz 2980 SHA256 971689feac40201411d2cadafa246ceb38f70f6560863c60aee5c4025ea52ea1 SHA512 73629c7cf03c3bf6f634e12c8cf51b070c60e8c05e8ab8157e7e28b59f357fce3497210034bdfc19de1fe265c3d5c2bfc8e984d66055ccc4ff96b995f7791688 WHIRLPOOL 1e03ae55be90dcc61283a599c23598406ca7fc6af8b9c0bf20a73067b627d957554f082962cc5c070aea9f9e924ce6e6ab20690a08fa5ab0bc162406c7f8220f
 DIST MooseX-MultiInitArg-0.02.tar.gz 10306 SHA256 9fb65d5a6343368288f6ac83d9f4fad40b1e2ab4811ac1279536c177be9c28f2 SHA512 73260d333e7ddfb0666f0f075d19887d74a310114616fc270ff2382a8a5e010a8294c776e4aa77ef8970f4499cb07f6da74696670fea30c208e2634e346b33bb WHIRLPOOL e99630b6a1a6af63ef78c0307182ec0d120956f1527943f92cbc8db0bdb3f486011b0a5a9ed9d5123f03f22e5551dd8406b6b59fa2d390c16ae3b250bc0551bf
--- a/dev-perl/MooseX-MultiInitArg/MooseX-MultiInitArg-0.10.0.ebuild
+++ b/dev-perl/MooseX-MultiInitArg/MooseX-MultiInitArg-0.10.0.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=FRODWITH
-MODULE_VERSION=0.01
-inherit perl-module
-
-DESCRIPTION="Attributes with aliases for constructor arguments"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="dev-perl/Moose"
-DEPEND="test? ( ${DEPEND}
-		dev-perl/Test-Pod )"
-
-SRC_TEST="do"
--- a/dev-perl/MooseX-Object-Pluggable/Manifest
+++ b/dev-perl/MooseX-Object-Pluggable/Manifest
@ -1,2 +1 @@
-DIST MooseX-Object-Pluggable-0.0011.tar.gz 25097 SHA256 c2625210482a40d32fa9f7e10b3abec823a87aa2e588d8d67a43dd16253af477 SHA512 7d2c65dcbe97a7038d5bd6f78b50e02d0a280e9605853c1b92a0679aa5228106f2754c8a0d795720a37467fa771726ea22c4a8156db6d2722e190e247cf0d44f WHIRLPOOL 5031fed9ca112363d3f45a645ddc4f2bdb2a1168a64e835f0c5e82926aa1b482eddeda47736ce4970336edd231a38f109c679ec1e10ed032ad679ee18d1f1f26
 DIST MooseX-Object-Pluggable-0.0014.tar.gz 32080 SHA256 f3bf7cbbe83f59c2111463e0c7dc8e69fa53fb3a8903f36f36d3f886cc3e64e0 SHA512 0eab6798519fdf5f0b6c698112af62db9d3dade00d4e28d622f4dbabdb0d3f099ae1427d7a5913c8c6db25fc547c2b949672af1f8a58fdff2546b795814c36e5 WHIRLPOOL dcafe9308d421112ebc463c0f1fd1046cb480d0febdcaf540718b2e58a134e9c2fc1432fe878458a1944a903ab78951f92bac2e5d2a327b458e321ad8335630a
--- a/dev-perl/MooseX-Object-Pluggable/MooseX-Object-Pluggable-0.1.100-r1.ebuild
+++ b/dev-perl/MooseX-Object-Pluggable/MooseX-Object-Pluggable-0.1.100-r1.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=GRODITI
-MODULE_VERSION=0.0011
-inherit perl-module
-
-DESCRIPTION="Make your classes pluggable"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="dev-perl/Module-Pluggable
-	dev-perl/Moose"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)"
-
-SRC_TEST=do
--- a/dev-perl/MooseX-Role-Parameterized/Manifest
+++ b/dev-perl/MooseX-Role-Parameterized/Manifest
@ -1,2 +1 @@
-DIST MooseX-Role-Parameterized-1.00.tar.gz 34386 SHA256 fefcd169416b15ca72b31ff0a0c34690ddc4e78f5687df7196208224c3818218 SHA512 57f558cc49f2bdc37f37221e7961fe7e2a791c254079fe99f93575c1ae63f976572396181acf6f9d2b3d3fb2db34351dcf8086ac9187312d5e4109b8169b26d5 WHIRLPOOL 1485381b779efb0e62eea38442b910a3e5f8438b5c7e30d5033c1f2b01340289fad0b8351f2f3eaecf8ce54e356f737e9c1f4c2ada9eace39a947af9d81f2d53
 DIST MooseX-Role-Parameterized-1.08.tar.gz 43284 SHA256 58121a8f4edcab823e38241e41d5fdc01c09064c7d09b0bd1121e61170b5428b SHA512 2ee0a9c98090a2e82f360eb1276114bca243ec7676899830d06416cb378745d38ede5021eeb788b6c3499ba12969138dffadbbce34fe391778469ef3c5f4afdd WHIRLPOOL b426601a31d8b5692fc6dac9b7883de9fcff07583adb556fc2501ea770d48b3cebda8896783e792049be7be5331b822d67e74f21a97b6c247bbb2139caa4209f
--- a/dev-perl/MooseX-Role-Parameterized/MooseX-Role-Parameterized-1.0.0-r1.ebuild
+++ b/dev-perl/MooseX-Role-Parameterized/MooseX-Role-Parameterized-1.0.0-r1.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SARTAK
-MODULE_VERSION=1.00
-inherit perl-module
-
-DESCRIPTION="Roles with composition parameters"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/Moose-2.30.0
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		>=virtual/perl-Test-Simple-0.960.0
-		dev-perl/Test-Fatal
-	)
-"
-SRC_TEST="do"
--- a/dev-perl/MooseX-SimpleConfig/Manifest
+++ b/dev-perl/MooseX-SimpleConfig/Manifest
@ -1,2 +1 @@
-DIST MooseX-SimpleConfig-0.09.tar.gz 28203 SHA256 475ea37e8d9a87cc43813bec0a20a1a4d8b57de5bdb683fa9fef2efb02c2490c SHA512 acd31397a3cd2c26ef6a85e959ff85d4505a748c88a971b22e70ce95481305d05f29a92e28eec6069fc8b2a52810ecffb639a6c1a9ed96b8069cbd70cc9f6697 WHIRLPOOL 90c19d592b33bb96a7a048711d85ae65026d987dccd83762736a4174a74b422a19a51eee81318ed768711f33358c4a576531e4f7f9bbeb607299785c0d9c183a
 DIST MooseX-SimpleConfig-0.11.tar.gz 29384 SHA256 42c83f4b92ef2785fa8dbcfae69d5d28d5be10141d171472ccf37288682c79ad SHA512 be8d8336f26d440dbbd390ce4a5720106d691b9583eaa2af0211485176a84cc3831d54f08af8af9f5b0431521a6219efaacfb59e472b9220adcde513f49853f7 WHIRLPOOL c05792f6ef513d7077d71e1d803a0f5f1a29e4c68661e588b203994199723179e39abb1a65b6f34ae44ab91e3207e225bc4a5833fe557d4f328d1141b1baebaf
--- a/dev-perl/MooseX-SimpleConfig/MooseX-SimpleConfig-0.90.0.ebuild
+++ b/dev-perl/MooseX-SimpleConfig/MooseX-SimpleConfig-0.90.0.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=BOBTFISH
-MODULE_VERSION=0.09
-inherit perl-module
-
-DESCRIPTION="A Moose role for setting attributes from a simple configfile"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/MooseX-ConfigFromFile-0.20.0
-	>=dev-perl/Moose-0.350.0
-	>=dev-perl/Config-Any-0.130.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.420.0
-	test? (
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
-
-SRC_TEST=do
--- a/dev-perl/MooseX-Types-DateTime-MoreCoercions/Manifest
+++ b/dev-perl/MooseX-Types-DateTime-MoreCoercions/Manifest
@ -1,2 +1 @@
-DIST MooseX-Types-DateTime-MoreCoercions-0.11.tar.gz 29516 SHA256 c746a9284b7db49ce9acb2fbce26629fa816e6636e883d2ed6c62e336cfc52cb SHA512 4a3220e62b92affa0f3eb5121ca53613aefe28b2d4e5a5ef8be7ca24e5be583a4e6ffc69ca751fc7474bc4f51fc7c3479e9fcda4c5e3888dbaacc31de67815c9 WHIRLPOOL 776cc4b89451f017edb5c0ea64db7d3ee4fe9077281e4ba4bc5498385dc9ed2326b008f57090f8b6779b25da3ba010af37ba74ee7e1d89c9ab5988e6566ee810
 DIST MooseX-Types-DateTime-MoreCoercions-0.15.tar.gz 29824 SHA256 21bb3a597719888edb6ceaa132418d5cf92ecb92a50cce37b94259a55e0e3796 SHA512 c0e3e1d1d4969d674d0c5d88b99aa401049b8ca7a61c3ec139a8e7c39d44e8a12ee2a8151029d24b1ef0063af3de6ec235c81c576ef21d6ab0b680f0a94cc020 WHIRLPOOL e98f335df4cd0b25e5f77b11e2430000ce371a2c5329a8cdb5929001bf77d290483b89b45064df538fa22e0667bc275e08623e564c21f024663be65702e33ff5
--- a/dev-perl/MooseX-Types-DateTime-MoreCoercions/MooseX-Types-DateTime-MoreCoercions-0.110.0.ebuild
+++ b/dev-perl/MooseX-Types-DateTime-MoreCoercions/MooseX-Types-DateTime-MoreCoercions-0.110.0.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ILMARI
-MODULE_VERSION=0.11
-inherit perl-module
-
-DESCRIPTION="Extensions to MooseX::Types::DateTime"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/DateTime-0.430.200
-	>=dev-perl/DateTimeX-Easy-0.85.0
-	>=dev-perl/Moose-0.410.0
-	>=dev-perl/MooseX-Types-0.140.0
-	>=dev-perl/MooseX-Types-DateTime-0.70.0
-	>=dev-perl/MooseX-Types-0.40.0
-	>=dev-perl/Time-Duration-Parse-0.60.0
-	>=dev-perl/namespace-clean-0.80.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-perl/Test-Exception-0.270.0
-		|| ( >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-use-ok-0.20.0 )
-	)"
-
-SRC_TEST=do
--- a/dev-perl/MooseX-Types-DateTime/Manifest
+++ b/dev-perl/MooseX-Types-DateTime/Manifest
@ -1,2 +1 @@
-DIST MooseX-Types-DateTime-0.07.tar.gz 4960 SHA256 e5979f3a668c6369124ba3c38c7498ceb49257b566d19df43d7848b9939afaa9 SHA512 3fa5bff09b0779856d6ca02ede9bc54069cec82e11982ce596c758dae9a1988652c0ee85e23eaa9844c2f30e1205be25825b168f6cb5b706e710afb56d4fe2c8 WHIRLPOOL 962f7dc098e72f8b3d6ac3b0f2826f590520ae23c159435d42c5e798e86bfe726e120d56faace2b34435aacbdf81f0d2c48b10bb8b1881aefe9095e6b87f5652
 DIST MooseX-Types-DateTime-0.13.tar.gz 30494 SHA256 b89fa26636f6a17eaa3868b4514340472b68bbdc2161a1d79a22a1bf5b1d39c6 SHA512 aadd07960d4d20ed5926ea6e14650bf2162a73e40e3e26797ad0323a083c1796f7d623b895e3a612da89315387082a9835380ff2ed7d74455a2074c818533dc5 WHIRLPOOL bc65f3b5d60e72db3d10400e753afdca9153df749e5aed72812caaaf395a19fd40c483f26c78523e731cb5e791b76ba5bb032320fac81cdb7b49f4d64e991111
--- a/dev-perl/MooseX-Types-DateTime/MooseX-Types-DateTime-0.70.0.ebuild
+++ b/dev-perl/MooseX-Types-DateTime/MooseX-Types-DateTime-0.70.0.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ILMARI
-MODULE_VERSION=0.07
-inherit perl-module
-
-DESCRIPTION="DateTime related constraints and coercions for Moose"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/DateTime-0.430.200
-	>=dev-perl/DateTime-Locale-0.400.100
-	>=dev-perl/DateTime-TimeZone-0.950.0
-	>=dev-perl/Moose-0.410.0
-	>=dev-perl/MooseX-Types-0.300.0
-	>=dev-perl/namespace-clean-0.80.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-perl/Test-Exception-0.270.0
-		|| ( >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-use-ok-0.20.0 )
-	)"
-
-SRC_TEST=do
--- a/dev-perl/MooseX-Types-DateTimeX/Manifest
+++ b/dev-perl/MooseX-Types-DateTimeX/Manifest
@ -1,2 +1 @@
-DIST MooseX-Types-DateTimeX-0.06.tar.gz 23880 SHA256 f086253081e31025923dd209ff6392d3c9e4db4d186562189114365d254bd088 SHA512 247c13f277c38e29630fe29c013bc72b6ca895ef8f97d08ff20fe20cb21c645db8d89fdbcc994fe8b962d26cfa315b6f0c76b37f8d2abb29a7abbcab4578ef60 WHIRLPOOL acfb23b8b26d44ed4ced8703acb0f77e2eaf7050dc4f39b83ee119058f54f9744ee3b53db87609563df71a642d1dd9d6ca4895dfd646f6b8abf2c1a0b32b32b0
 DIST MooseX-Types-DateTimeX-0.10.tar.gz 27853 SHA256 3791c9c3ae5661f5669fc0e81b8481d22382a66d5a3b598d84073aba59b706c9 SHA512 e13a1396ba92688784ef4b1dbba43748183f7817de74156351f97cb78eb522738d397b41f20071b179fa0a6a6dd1dd56d936d58af78f3bce0dc45a2e73368f01 WHIRLPOOL abe8ab410e220356e79ddf3fbebf51b32fa8a34ffdc5807ea82e65db5029ef82a75d9b50d167e8b3f60f7c983eb53c0d35af388f8853d3562fa3c90c5424122a
--- a/dev-perl/MooseX-Types-DateTimeX/MooseX-Types-DateTimeX-0.60.0.ebuild
+++ b/dev-perl/MooseX-Types-DateTimeX/MooseX-Types-DateTimeX-0.60.0.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ECARROLL
-MODULE_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION="DateTime related constraints and coercions for Moose"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-perl/Moose
-	>=dev-perl/MooseX-Types-0.04
-	>=dev-perl/namespace-clean-0.08
-	>=dev-perl/Time-Duration-Parse-0.06
-	>=dev-perl/MooseX-Types-DateTime-ButMaintained-0.04
-	>=dev-perl/DateTimeX-Easy-0.085"
-DEPEND="${RDEPEND}
-	test? (
-		|| ( >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-use-ok-0.02 )
-		>=dev-perl/Test-Exception-0.27
-	)"
-
-SRC_TEST=do
--- a/dev-perl/MooseX-Types-JSON/Manifest
+++ b/dev-perl/MooseX-Types-JSON/Manifest
@ -1,2 +1 @@
-DIST MooseX-Types-JSON-0.02.tar.gz 2363 SHA256 5ffc6710902e4799e269ec0d3e01ebe1b81f8955646de813f85ec2f9af291a32 SHA512 b6c072bae945243ee0efb4a230c31bb20d74d7eccddd3a4c5ae106e21e7eca59f85da5b49950d835d5d396d33cd003063e301728bcac846127ac58b7eb8bd451 WHIRLPOOL f9ab752dc6f7ad00a0df6d68902be0e5d3601ab25f4fa7187a8986e81d4e65c54c08a36ff3619d72db3ff87361500015cacb81e2d0c2eb56c77d02a78770fdc9
 DIST MooseX-Types-JSON-1.00.tar.gz 9742 SHA256 030bdecd7a2f9046ae25824001a27743997efad3ae2378d507551135eb29a30b SHA512 1dfaa8907c04ca765fc03c2049cbf076b2e29f1df34b569d91b3cc3931acde8cc7563cb186d3ea4b278ee40f1c4706f6b03139fb370d6a9d79eb7e6de21aa23f WHIRLPOOL da0208982920ccacd1b98ac882b15d404befabb8994cdd5a011df4693ac058df27bf3637000df1b148f3f1ba60fcc535c1ed7ae63d7e03b439a82e00d3f93c4d
--- a/dev-perl/MooseX-Types-JSON/MooseX-Types-JSON-0.20.0.ebuild
+++ b/dev-perl/MooseX-Types-JSON/MooseX-Types-JSON-0.20.0.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MILA
-MODULE_VERSION=0.02
-inherit perl-module
-
-DESCRIPTION="JSON datatype for Moose"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/JSON-XS-2.00
-	>=dev-perl/Moose-0.82
-	>=dev-perl/MooseX-Types-0.15"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
--- a/dev-perl/MooseX-Types-Path-Class/Manifest
+++ b/dev-perl/MooseX-Types-Path-Class/Manifest
@ -1,2 +1 @@
-DIST MooseX-Types-Path-Class-0.06.tar.gz 10536 SHA256 ef107415831672a76f6423668f27dc23614e2b4848dbc37854dadc6bb2419c0a SHA512 93cd8760f9f87c18b7ffce54ef60cf208c923e2d8da341c4a0d5c79e34e526d6f0dae407971c9e320d98c5b157ba32145adf22880799cdb670860b39cacd8441 WHIRLPOOL ec9f90b967976d33c6c1906a9468303311c7f036a35b42eb978dfd4ef0643444b32003118ccc9b28b638bdb09ee5d8a611950af63551603664c5d4d01bf41d8b
 DIST MooseX-Types-Path-Class-0.08.tar.gz 28203 SHA256 38c55c0723d2533b0b16b41eda78adbe71194f3b7588a3b3f7ec71b2768664b7 SHA512 d206b32d765f7766e18cc15a045f1ab34efa160aa699823a9be437861bc2a3c8deee0bf66a46b7e2ccb5fc6ba25fa18c40391606f25c5a9e024f7744be7841c7 WHIRLPOOL bc673df8e53b681e835057e12c2af7e03bea7cdccec651aa9682f52db18f053ace3bda681f34d55f30a04f788c3e5b30e3bccc05cf85d6cc82df00f2fd55bf8b
--- a/dev-perl/MooseX-Types-Path-Class/MooseX-Types-Path-Class-0.60.0.ebuild
+++ b/dev-perl/MooseX-Types-Path-Class/MooseX-Types-Path-Class-0.60.0.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=THEPLER
-MODULE_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION="A Path::Class type library for Moose"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/Moose-1.990
-	>=dev-perl/Moose-0.390.0
-	>=dev-perl/MooseX-Types-0.40.0
-	>=dev-perl/Path-Class-0.160.0"
-
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
--- a/dev-perl/MooseX-Types-Path-Tiny/Manifest
+++ b/dev-perl/MooseX-Types-Path-Tiny/Manifest
@ -1,2 +1 @@
-DIST MooseX-Types-Path-Tiny-0.002.tar.gz 12703 SHA256 656939c6a2abcbbeab6a28dff4f488e31004c558f2b4daa72c3925a31a9454bb SHA512 371dcbf7a77187a242f9a020e5bfdb4e9919f05bc975f29bfefbda63653e293f206c9e285f4191a5f94c56ca35a9f9c46409d29db8d445f80cc9cadcea2387d9 WHIRLPOOL ba6a72e7c1c30d9b6091a51333b2572f4f62355ce80cee4bd27a60d362a79026ce42656f5e8666847af9606d5117d3f2078f1b6e02f3424310351a612beb8123
 DIST MooseX-Types-Path-Tiny-0.011.tar.gz 25140 SHA256 668ea48c99bc4a61cbdd87c39cfa0cb6c1e9c1b0c9f221a25a976bb4bccc6f00 SHA512 b18d674d0fbed5266591bd3cc221d8ebe996ff9214cc7d74e111bb3b570193e6373e7220023a79a71ff982b4d5b4829fc2a9f3dd9aef8b78a8d1457718f8a679 WHIRLPOOL 3b2c490c667066d48e7223230e1407e86d176e293cab59230b0fabdb900fa04e26d8c50d7944dcf55c974c588ac39f8d2a59bd19b973a205bd2097bc60de8b15
--- a/dev-perl/MooseX-Types-Path-Tiny/MooseX-Types-Path-Tiny-0.2.0.ebuild
+++ b/dev-perl/MooseX-Types-Path-Tiny/MooseX-Types-Path-Tiny-0.2.0.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DAGOLDEN
-MODULE_VERSION=0.002
-inherit perl-module
-
-DESCRIPTION="Path::Tiny types and coercions for Moose"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/Path-Tiny
-	>=dev-perl/Moose-2.0.0
-	dev-perl/MooseX-Types
-	dev-perl/MooseX-Types-Stringlike
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	test? (
-		dev-perl/File-pushd
-		dev-perl/Test-Fatal
-		>=virtual/perl-File-Temp-0.180.0
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
-
-SRC_TEST=do
--- a/dev-perl/MooseX-Types-Stringlike/Manifest
+++ b/dev-perl/MooseX-Types-Stringlike/Manifest
@ -1,2 +1 @@
-DIST MooseX-Types-Stringlike-0.001.tar.gz 10357 SHA256 2ba71fff105d851ea6aee85bef5d6629726138a2b005b77a163a8bfb403cea03 SHA512 7e83f53bf2778ad2af36dd210a30f5c76b20270a4dd0ffa0610ded6fc5128ec1e772ee471783e4b084cf1fda9bc72e5e69631684a32751a97aa8a2b2244aa126 WHIRLPOOL f445d93fa8fc56f8cf9b6150e3be9cb760d4ae463fab3624dbd513e45a3ecbb1e65402be8e937aabe9ddc6747fd600c8b3e585fdb655cbc0805b7aeb44182a64
 DIST MooseX-Types-Stringlike-0.003.tar.gz 13510 SHA256 2ee349ec5c529a6f347f42ff640e47b245564b93cca305df63c7821f5b55cf19 SHA512 a9312e5441cdab2d01ef1f86babf2f4f5fdb595dcb1de4374759ee5543d13cc7f1431f0a4db4edbc4a168b8410cc7aff41bb60fb1ef7d1db64642501e6212d9d WHIRLPOOL bf9601b4d6127ca0412fd36a688766f556f3248aa53b486514c48eb7cfca693939850597143730c34413f52fa2a91704e4d18a032aa22e344ec9f8bc729f8725
--- a/dev-perl/MooseX-Types-Stringlike/MooseX-Types-Stringlike-0.1.0.ebuild
+++ b/dev-perl/MooseX-Types-Stringlike/MooseX-Types-Stringlike-0.1.0.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DAGOLDEN
-MODULE_VERSION=0.001
-inherit perl-module
-
-DESCRIPTION="Moose type constraints for strings or string-like objects"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/MooseX-Types
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	test? (
-		dev-perl/Moose
-		virtual/perl-File-Temp
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
-
-SRC_TEST=do
--- a/dev-python/gcs-oauth2-boto-plugin/Manifest
+++ b/dev-python/gcs-oauth2-boto-plugin/Manifest
@ -1,3 +1,3 @@
-DIST gcs-oauth2-boto-plugin-1.7.tar.gz 13573 SHA256 a83dab83fb55c633bc5a80e6491e2aa00542914e7f550a8fecd1bb273d4b4dd4 SHA512 9972c7334d7710f3aa4f2aeb3b733a376fded6670b0fd950432af5b544b3e4e140bd8726112ab03bee79ee619660d1a71ac24f130be8de070671c2b8c400b8ae WHIRLPOOL 871aeb3db56d4e2727d5b42d3a0a97ca026d51c51abb7d439b0a372560713b53b9a2a5ad59e10bdd78bad591e37a08545bc2ce738d835583a3be319af503c7ca
+DIST gcs-oauth2-boto-plugin-1.12.tar.gz 14601 SHA256 4d35958f3724d6632f91a70acb3761c3860425ea6438c001e7e6b94d1431ad23 SHA512 998bc3187ef1483d8301f952dd68daf1dabf5775c7c948a18bdec1ed1c0ecacc336d8a0b4401e93f10e7d2b70a2fd4675c2c9d8f077fed5f126ee334e966ca19 WHIRLPOOL 48bda2622963b93b3d87abd2c3744ca9a21ba1e9f574b0a29c02e1de7379f4f4af35612b89cfcce60e09ee629960f2491347b11f7cfe26b6ae4d5199c2783af1
 DIST gcs-oauth2-boto-plugin-1.8.tar.gz 13248 SHA256 cb4f3c608c953c9f6eecbad0dd33c6a2dba283cf1cd332ceaac1a9ba8a17c64b SHA512 5504fc38d58ee68a78ee2b8e6c3757045494d000748382bc26888a65085cec08d2d137c63cb51afd1cef72d31b3f0cac5d40014548cca47c5322a67a7f1ef204 WHIRLPOOL 238ee67cdad11162abe614fad7d6eb6175a27fc132c790e17f4380373b8c8d48906e5ac361c4d3c34fbac85e851bdf6426c3660434bf809d4abca87f6cb995a9
 DIST gcs-oauth2-boto-plugin-1.9.tar.gz 14625 SHA256 82e70621354a0291ff312d060fedf25f8016eb0af215d443562ac2b26f94b28d SHA512 439def0c7b78a103bd3041600e25eaede44c3aac8a161f12acd6dee98cd8404b03229df24cf4e7814d63600ca50793496a80893f1e32f8ed8ac4a2825dd07df8 WHIRLPOOL ba28ac45e909a2410f36c81ba7f5e83e9c71963b1fd4d69df7fe425d26f066ea8376cf935f6b732c57d98b7d2e770d68a2658953279f0985725970af9d206dd6
--- a/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.12-use-friendy-version-checks.patch
+++ b/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.12-use-friendy-version-checks.patch
@ -1,8 +1,11 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -36,9 +36,7 @@ requires = [
-     'python-gflags>=2.0',
-     'google-api-python-client>=1.1',
+@@ -36,11 +36,9 @@
+ requires = [
+     'boto>=2.29.1',
+     'httplib2>=0.8',
+-    'oauth2client==1.5.2',
+    'oauth2client>=1.5.2',
     'pyOpenSSL>=0.13',
 -    # Not using 1.02 because of:
 -    #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.12.ebuild
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.12.ebuild
@ -1,8 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI="5"
+
+# Python 3: https://github.com/GoogleCloudPlatform/gcs-oauth2-boto-plugin/issues/10
 PYTHON_COMPAT=( python2_7 )

 inherit distutils-r1
@ -17,17 +19,16 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""

 PATCHES=(
-	"${FILESDIR}/${P}-use-friendy-version-checks.patch"
+	"${FILESDIR}/${PN}-1.12-use-friendy-version-checks.patch"
 )

 # Keep versions in sync with setup.py.
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
+DEPEND="${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${PYTHON_DEPS}
 	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
 	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.ebuild
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.python.org/pypi/gcs-oauth2-boto-plugin"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-use-friendy-version-checks.patch"
-)
-
-# Keep versions in sync with setup.py.
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@ -1,3 +1,4 @@
 DIST google-apitools-0.4.11.tar.gz 141425 SHA256 60dae36e70c87909cb8942ebf401bbec50583461c9aa40d24564bc4c3832a550 SHA512 3ee58add383da4ed0dec2e646b13e840c3bb9d4a7b1adf68293e8e22b3db1f7689d19282236995e9374aa160f0569a2b533e737e3ef4f1f4b60d00ff4d4d1bb9 WHIRLPOOL c96200b26eed1ba92411f295a0f34dda995888687c136d7f0744fa09c5ba9bc6d93f168b4e12d905278128f8a28ecf173f968ee69c6636a580439ec3b5a3a223
 DIST google-apitools-0.4.12.tar.gz 198590 SHA256 dd69b791b9421d3a9dd782f5a811555dd60ba198a71581186114c3779e6e31d5 SHA512 6cdb55b94ebf9fcd26e0d4b8659ed44809b5fbd9bbb2830f3352219fb7231b79cf2f8668497a85bc8ea29dbf8b110a081b34c4783f71beb2cd707838e1e107dc WHIRLPOOL 273cb43c7c42d3d99fd9f52484d30583723edcc4d511dfe9512dbf2197ada51a483141b66ac3e1349dcb8fdbde3de2a8c036648abc3e48f3f5dd49b54ca6f949
 DIST google-apitools-0.4.15.tar.gz 199795 SHA256 97c1d918243329d6afb26d6395dda58d9363dfd5a52b9093068e7667b7c632d2 SHA512 ace7a8743933010d777811211921ca1fdb6e43cac18decc68097faefc0ee07913928a1480a5cdb49dedf1ae34f1a5b6df67411a41d1e324fefc411fbc6234a33 WHIRLPOOL 2ddcd5a643e4f2df40425cb1ee3f2d5ff76a8e5bbf8eff432ea5611759f07d52f98f8630c7ba0cec3ac60b849351ef0b828dcfa457977eaf49de82d6bce1f234
+DIST google-apitools-0.5.2.tar.gz 200492 SHA256 d4847888b16c0da685217898da56007ed7d3998fd383a9109eab677675de5466 SHA512 b2345f414b9486ec78f12aeaaa272e6dcda18b5236986bf2cdcf6755c7693699b52cd8c8b93163ca45ecea22f4a0b41f82165cc0743f01d786571bcd2299adfc WHIRLPOOL bf57b7e8e22ed8586e3b43cf1ec6b2d80aa7c7b1a9372763eb1eb232a1b2fc3a9c12b70b99446aca354dce26fa6343ebdaf56b91b1e244dd170e1c8f8214950f
--- a/dev-python/google-apitools/google-apitools-0.5.2.ebuild
+++ b/dev-python/google-apitools/google-apitools-0.5.2.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to manipulate Google APIs"
+HOMEPAGE="https://github.com/google/apitools"
+SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/google-apputils-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/apitools-${PV}"
--- a/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild
+++ b/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild
@ -4,7 +4,8 @@

 EAPI="5"

-PYTHON_COMPAT=( python2_7 )	# Doesn't yet support py3
+# Python 3: https://github.com/google/google-apputils/issues/9
+PYTHON_COMPAT=( python2_7 )

 inherit distutils-r1

--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@ -3,4 +3,4 @@ DIST oauth2client-1.4.12.tar.gz 109339 SHA256 f735b41a57fe46c0b170e919e81b9bbe7d
 DIST oauth2client-1.4.6.tar.gz 95325 SHA256 d4376fc0f5543612c62cdee5ea68530bd9c8542891b3f4427d8bf9a1f5a134c8 SHA512 e75e6c535ca4e427f3a869fa7e600bf7544752a100f623cbbeb117d872a2361a60d1524fc2639521393a58dc6f684d9e1452980d6a5ffb6f4dbed516911cc4ca WHIRLPOOL acb26ef17115138a8932313cbbb8c9a802e2296d20343ab746123ad0ef8a38ea8587c10c45863b56b7b4d5b052675434236a050ae64c6c05546a42fd3cdc4f6b
 DIST oauth2client-1.5.1.tar.gz 130237 SHA256 3e4ad7b3399cd9c4b8785acbbba2ca55eaefef17989f784352d2386776bf17c5 SHA512 ad228264b93ec23bfb4bbc9614a980172e3c763adde12e0b050166ccd49eece1d2464a078884ed16cbaea60a7bf88784a22314382073e360f1ec591b19a2da2f WHIRLPOOL 963b9518944dc081fdd3c32f1c6a12527a567f2c762355b109cee01b1cb1c1c35d85301bd2df6e47d2d11ac1e5b6c6a2bbc59098c10baa75ea2574567617f7ec
 DIST oauth2client-1.5.2.tar.gz 131665 SHA256 b8df20b122e4f49a5fe5bc3c825d16015f5012c171c6c81eb4048e4d8c2ffee3 SHA512 15f10b52aa93fc10289658d5ff671a247e5c92c5ff2be424a04617fee1a3a82439b829b0f5dcb04e3e84802e02580e366e08356df7ec6e24563a530d2f6b1db5 WHIRLPOOL 00f3033359eceda12528ef4caffc0a9d7d6561919272fe98e09d2599114f07d9be42eb32a4038c155c621581f98ecc0eb516bcaa018d4376e30906dd4a0adfbc
-DIST oauth2client-2.0.0_p1.tar.gz 149275 SHA256 0a4a9777f5c68a28605bb8510da0b09446ec3a4cb4d6e53ec9c2e240b357eb24 SHA512 e864c8e34757fa2e72b95d556c92549359be8e65fb709300c816090440ee6466ef6e638d67aaa5c0862d1d1e34caf5e4a9f565911cac05d186ef2c71b59aaf9c WHIRLPOOL 499097e9f7de89a76f73dd6fe631647e7d4f76716d64558c3c05c5d03e33ed1ee0183c5b2202347e99bcfd388767c199a31bc990d441bfb55e5df89685bee0a3
+DIST oauth2client-2.0.1.tar.gz 153127 SHA256 fa0357fca4ce431073ead236256347aafe3d368c16c5edaeba7f826b1b1d5fb6 SHA512 66179a604418a8aee9ca9dbfc5ad18356d5130a588e85f4dab3330feef194af2114bc2eb18ec625acf791938e4d7f78ee55284f45a67a48c775676697ce2b183 WHIRLPOOL bef0f7394cbeade328f74288bd602973a7828915ff616c7331d6c1910be02bc74a8e11062bd0602a2c4f1681d7d8c6558aecd695df3ef711f74ba81fad0b1ab3
--- a/dev-python/oauth2client/oauth2client-2.0.0_p1.ebuild
+++ b/dev-python/oauth2client/oauth2client-2.0.0_p1.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI="5"

 PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy)

--- a/dev-python/pyopengl/pyopengl-3.1.0.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
@ -4,7 +4,7 @@

 EAPI=5
 PYTHON_REQ_USE="tk?"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )

 inherit distutils-r1

--- a/dev-python/python-gflags/python-gflags-3.0.2.ebuild
+++ b/dev-python/python-gflags/python-gflags-3.0.2.ebuild
@ -4,6 +4,8 @@

 EAPI=6

+# Python 3 is in testing, but is waiting for the next release:
+# https://github.com/gflags/python-gflags/issues/17
 PYTHON_COMPAT=( python2_7 pypy )

 inherit distutils-r1
--- a/dev-python/sympy/sympy-1.0-r1.ebuild
+++ b/dev-python/sympy/sympy-1.0-r1.ebuild
@ -4,7 +4,7 @@

 EAPI=5

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

 inherit distutils-r1 eutils virtualx

--- a/dev-ruby/amq-client/amq-client-1.0.4.ebuild
+++ b/dev-ruby/amq-client/amq-client-1.0.4.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"

 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.textile"
--- a/dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild
+++ b/dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"

 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
--- a/dev-ruby/ferret/Manifest
+++ b/dev-ruby/ferret/Manifest
@ -1,2 +1 @@
-DIST ferret-0.11.8.5.gem 627712 SHA256 cc925797c7f85fe55ec86e511b27ec36f3b842e2bdcd89ebbc8e7c90cb1e515b SHA512 3478784437d7787517f3c928485f507ee90e78bb8e7155714798b83bc0e29996275e6e55f6fcc245777d1ec49eee421b048ddda3089ef7602c7fe2dc62e91c49 WHIRLPOOL 57ef977105948fe09dd8417394947462b82941299d979b76ce4f9043548f4ca781f898580cb27feaabc365b5552f5e8c4043f3fef8b03cbd88b6891864b82bcd
 DIST ferret-0.11.8.6.gem 617984 SHA256 c1d1bc3fe18d0496f02d11c925683c87ab994fd6e096b3ebac1652e3514e6d6e SHA512 bc545dc86abf7e818791f4f280025fd0a6ca3aad66fc4f4c6a532e995d718ee4adcdace15538cd35e068887ade059c874d8b6d72f5b02f98829d6db44b019c59 WHIRLPOOL ca148404fe29a3cf8b2e550ef73aa99dcf32654cb060f2e3d0c378e995733f8a4dadcd6f7bad6597c398caba39e06d9db0b6292ac87c23f0740f83a55da9d10c
--- a/dev-ruby/ferret/ferret-0.11.8.5-r2.ebuild
+++ b/dev-ruby/ferret/ferret-0.11.8.5-r2.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_NAME="ferret"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_DOCDIR="doc/api"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG RELEASE_CHANGES RELEASE_NOTES README TODO TUTORIAL"
-
-inherit multilib ruby-fakegem
-
-MY_P="${P/ruby-/}"
-DESCRIPTION="A ruby indexing/searching library"
-HOMEPAGE="http://ferret.davebalmain.com/trac/"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND+=" app-arch/bzip2"
-DEPEND+=" app-arch/bzip2"
-
-all_ruby_prepare() {
-	# Remove bundled bzlib code and use system version instead.
-	rm ext/BZLIB* ext/bzlib* || die
-	sed -i -e '14i  $LDFLAGS += " -lbz2 "' ext/extconf.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
-	cp ext/ferret_ext$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test_all.rb || die
-}
--- a/dev-ruby/ferret/ferret-0.11.8.6.ebuild
+++ b/dev-ruby/ferret/ferret-0.11.8.6.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5

-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"

 RUBY_FAKEGEM_NAME="ferret"

--- a/dev-ruby/fivemat/Manifest
+++ b/dev-ruby/fivemat/Manifest
@ -1,2 +1 @@
-DIST fivemat-1.3.1.gem 9728 SHA256 b8f02fcee55e1d9fc69878d110a67b3fdd62a0c91ef9f150b233f335934c3499 SHA512 e905fd13858c762a4a4e028083d14b85397781fcb4f55227716ccd6797f8dc964d3e7d53973c27e8bb9b2525d1211dd3cef9e1d32ee014c9ec81c18562085d5c WHIRLPOOL 8726df2c2a9f8d2799b2b49093ca09c0bbedcc5acda720ce99e31be10358d555eb911440f61c7706955319d18a1ccf92ecec36022818a260270a0fde3fe31692
 DIST fivemat-1.3.2.gem 9728 SHA256 f319d820bb37fe6292db9fc7184497ed76a99d87eac5edd915d424e6c9337cbf SHA512 76290698c35e6b26234bd76d07fd032a037cd21cb289557dc72c095de6ea86a81d6717ffff0391a9b6305a89f7559f199ec81a1ff29d470d0c7b3ea006119405 WHIRLPOOL 65273439fc6f7307103391e57e7e3f299ad4db2061f039120d9164d169f93386e111e5d4b3722fef176c6341b8f324265ce8e5c8ab6713fab66fe059eb43ac76
--- a/dev-ruby/fivemat/fivemat-1.3.1.ebuild
+++ b/dev-ruby/fivemat/fivemat-1.3.1.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-# Package does not contain tests
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="MiniTest/RSpec/Cucumber formatter that gives each test file its own line of dots"
-HOMEPAGE="https://github.com/tpope/fivemat"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
--- a/dev-ruby/fivemat/fivemat-1.3.2.ebuild
+++ b/dev-ruby/fivemat/fivemat-1.3.2.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"

 # Package does not contain tests
 RUBY_FAKEGEM_TASK_TEST=""
--- a/dev-ruby/http-cookie/http-cookie-1.0.2-r1.ebuild
+++ b/dev-ruby/http-cookie/http-cookie-1.0.2-r1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"

 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
--- a/dev-ruby/lemon/lemon-0.9.1.ebuild
+++ b/dev-ruby/lemon/lemon-0.9.1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"

 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
--- a/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
+++ b/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"

 RUBY_FAKEGEM_RECIPE_TEST="rspec"

--- a/dev-ruby/listen/listen-0.7.3-r2.ebuild
+++ b/dev-ruby/listen/listen-0.7.3-r2.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5

-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"

 RUBY_FAKEGEM_RECIPE_TEST="rspec"

--- a/dev-ruby/listen/listen-1.3.1-r3.ebuild
+++ b/dev-ruby/listen/listen-1.3.1-r3.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5

-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"

 RUBY_FAKEGEM_RECIPE_TEST="rspec"

--- a/dev-ruby/listen/listen-2.8.6-r1.ebuild
+++ b/dev-ruby/listen/listen-2.8.6-r1.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5

-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"

 RUBY_FAKEGEM_RECIPE_TEST="rspec3"

--- a/dev-ruby/parslet/Manifest
+++ b/dev-ruby/parslet/Manifest
@ -1,4 +1 @@
-DIST parslet-1.6.1.tar.gz 236653 SHA256 cedb3aa719914e8ee7902932dd5833de21472831c81917aa480b59e131795816 SHA512 1467a958d7c5e5c6c52d170aa3815c9d87adc8d0f3522e41c0e3d7ae8af43573a960ae1875c75def0d5eddedc35b44e4a89173d00307c1a761b0732fcb46c7c8 WHIRLPOOL 22775d067a2929c971d3db34ab0254ea539c29b2eaa5695546ab9cd66b232e9a2a92046dd5923519f3bb793259de1f856ed00954889d4aedddb57f74661a4ba1
-DIST parslet-1.6.2.tar.gz 237637 SHA256 9ecba337984770838624d2fe0cd75eca41a1c16c4dc9fff6171b5492466e2405 SHA512 a686b41b006c933617ec23d07320882b9ce65f9af73e4065d3e106639f07174e138dfa6654ba00d2c57fd062f26d801c9e6eb21b1d08a7df442d9ea39fa94bf9 WHIRLPOOL 259d70a8f9468ccca765c8f837a2ad68253b4324cf485ca2fab1a60ae31c25e8b2c0c25f17a8ef7c16a0fb62601bbeecd441e480aedf95ccb9b1c7a058f9032a
-DIST parslet-1.7.0.tar.gz 240360 SHA256 9deb7d7191d405c9469ae8ffc224648e7472f2ac0491053f882eff7373f527a4 SHA512 6fa6f9951f68d0d75076c27bf243a65c59d0f18ebec7b5ea9dbdbcc2082f3afda20feb174ac8dd0f84e6bd4f7bea0e573d3c1643d239fbf93275523f07e2d318 WHIRLPOOL f26251068d81f623b8c37b839d6c157bf6bf186417e127f5e7fe36601547c60e69f057929eb402ff7ef065f36bb2972341ea8d9f18d26da34dda7af2cea7ef1d
 DIST parslet-1.7.1.tar.gz 243045 SHA256 84bef8d5ee590e034867953814abf1cceef77f77121927a0c8ede1a27d8b4d13 SHA512 aa4e3bb0ef91a5af30e3ca424ca6d8d690272bec025b16f5bd9ae7b1194bcb48b3988a0b90b960348e062e994a73bc4edf9eee6aec74c878bd9b8c033de4794c WHIRLPOOL a325bc7def35940c6da70a04adafed59e1b7043926f48b83e0e40718cf2a0d52c28e65ab9464d7e6c33227f54e0086402c55d0de26e4cbc7b3d6651580065c38
--- a/dev-ruby/parslet/parslet-1.6.1.ebuild
+++ b/dev-ruby/parslet/parslet-1.6.1.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_EXTRADOC="HISTORY.txt README"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A small PEG based parser library"
-HOMEPAGE="https://github.com/kschiess/parslet"
-SRC_URI="https://github.com/kschiess/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_rdepend "dev-ruby/blankslate:2"
-
-all_ruby_prepare() {
-	sed -i -e "/sdoc/d" Rakefile || die
-
-	# Make sure correct version of blankslate is used without bundler
-	sed -i -e '1igem "blankslate", "~> 2.0"' spec/spec_helper.rb || die
-
-	# Avoid spec calling out to ruby since we can't guarantee the
-	# correct version of blankslate in this case.
-	rm spec/acceptance/examples_spec.rb || die
-}
--- a/Show More
+++ b/Show More