diff --git a/dev-lang/ekopath/Manifest b/dev-lang/ekopath/Manifest
index af2acd6cd773..03f8eacda0f0 100644
--- a/dev-lang/ekopath/Manifest
+++ b/dev-lang/ekopath/Manifest
@@ -1,8 +1,3 @@
 DIST ekopath-2015-12-13-installer.run 57231316 SHA256 85a3fc7df59373bfef32bf9388fd77c19d7c780dc5e9e52e1e8664f0139a9ac6 SHA512 9454f263c921d26f521e374eb2f346f1e257bf58daf2ce5e54ce1a2cced7291bd9b5ece08cd4da441498f66bcd6a01a45309d4463fe65ea5d094b21612a8d3f8 WHIRLPOOL 3157ed63da3d87912163af2e8927a332640b2682289234b25b5f7b75a698490dc2cf8e0d5f51d82eb0b072654f15040c6b94f94e3cf7a428b793a575d6f71ed0
-DIST ekopath-2015-12-31-installer.run 57236877 SHA256 f8e5a2910ac001ace7d42254553e27f79b62eb6650d89778eced3ff483854917 SHA512 d191ce829c1c285c848c58f7bca194df72975d0d0685cf70c324831ca9ce67729dbf9fa46f36b4e17cc726fb8144739608fa825d4e2dd447b40dc0b1461f9f9b WHIRLPOOL 7988f8c93522aa38ec18c69979789fda1f64ab647d712da02260961a98e7ee75d90525c76947e6f32c073f289af419154d58072e5edac5093fdeaee7489c096c
-DIST ekopath-2016-01-24-installer.run 57266129 SHA256 3ea7471dc29ccfd89b7a7cee788243cd94f0b86cbe4345f7576a4444119b1122 SHA512 514e1a317822ca8edf2bfe2f2d99928717876731fbb3949165ded97fe7ed99acf01eb27f862ba9c84e8a3fd4f0c46aa31734925847351ad0b74a4d0bde8c4240 WHIRLPOOL a9ca485f5196563fd5fe449c3ab745c162492eff6c51b560234338ab0aa96b3128fd44e401eb28e50c47425315447c1b8f2f9a80bb9ce59fdac21232c6262f8d
-DIST ekopath-2016-03-03-installer.run 57856781 SHA256 0db16cf44f38e170e80230e08cccd2596187c869a3cd9ec74a6c368f9f1cb617 SHA512 c7ddb516f420a2efd278472f2694cad87b6e8e956f56b48473f432cc9b3565e568713915137b980cd03e89003e80a098a29cb7f3fea93f02c590577ef521f0ba WHIRLPOOL a270e5eb8731fc5a8c536d2328b5c5d1012397df895d01009dc2d3751c0f344697069e998d51fcbc183cec719652cbfee0032b3b7ae408f5d9104376f22ddbaa
-DIST ekopath-2016-03-11-installer.run 57858541 SHA256 ff4dc9eca6c877a5a28e4249b783b742f2038d9e01fd1ad795bcbd5ad0059fa2 SHA512 339dd9cd2048629c4f1ef95e062b7029094b563cba9d078bebbd2b0d584da4840e3d824203767ee820da5dbd64b31dc1297529fe59ecdd028b1bad2dd602b3ed WHIRLPOOL ea7492fac3fffd611633d8b975fe73e2dcc3869d575de2fc5f9fc0e1694400e393f04728a63f372d2fd3f18a80ccb8d23ef518627e7d9474f4859b7d181af5ea
-DIST ekopath-2016-03-16-installer.run 57139166 SHA256 051f93cbb809471abc611cabc670b2d91ab2944a8f09e19ba2a64a1c99b76074 SHA512 356ffc628078e5e524ac5962b3c23c22f8d81fc5c7916ab5707755b853a27a89b7e6677b832a8cc6568499b2852c5c7916b57bad70ee3c027a595eacb4074c96 WHIRLPOOL c7d85d9c5b99b9527b6ed2aa434dac8aa90c8aaff73fa8300d67ba573b1fd0570d7ff33494a89ea20a9075557c6a1f7030efaa2b3ed86f0b70b919000177cfa1
-DIST ekopath-2016-03-24-installer.run 57140247 SHA256 4a1139432cd0eba1490bab6b18cb3d227e6b6ad9eb354be22a55b6914e436220 SHA512 314fb763972d53b9e0b95e02ff542deb663743185643a20845cca3d7098a264d857c6738e59c63490d1bbe7653d7fdd3e8463087c7755c8d0ae6bd73b53c308f WHIRLPOOL 83013389230b8cf1d5254822074e0bbdcf0de48e309900153fa5f58e2ab35d1f0577e1003d3f12ae34cbfe96ad77fa1d0b0d95f94c9d16b07381a49abb7ff6ac
 DIST ekopath-2016-04-09-installer.run 57165340 SHA256 ccdfe4aca6063d8cf885b3878b0ab12505aa765db081f4a0278e392f883dee46 SHA512 cdb8647d36ea8ca411cc2378d87c0a2edf34c834206905350a6cdde5ae0ed14f56f716ebb7ad28129b634088f94e0304c1cef3df1beaac38c3ccc87d5387dce0 WHIRLPOOL 299ac5494f17dc680a794f4cda3417e232c2fe6768df2ee5ba48356be0d929f7ed821b32b5e179c9fd0334081bcca61dddac577b6b8a63201723b1172f94a005
+DIST ekopath-2016-04-28-installer.run 57174533 SHA256 92a0d516fff57849ac88f6fe22e112184f5102cdf0f159324243dc49e7e248ac SHA512 9bb8f22bc3644b5bbfe0dcf768345fd9050d030ee2c9aba315004a5b2f2d95adbc8c613aa41e698f3fde7da235534ecb1b03f489ad2cbbec19b65abfe3ff0967 WHIRLPOOL c64a5578e789c1412da12053d7550689cdd1bb9a330c93b3d00c6b67c3bf7cd9fbcc9a558d2defc7a9ebb9e13c8be038c6c37d067bcf10bd70b29528b201db6c
diff --git a/dev-lang/ekopath/ekopath-6.0.661_p20160124-r1.ebuild b/dev-lang/ekopath/ekopath-6.0.661_p20160124-r1.ebuild
deleted file mode 100644
index f71706c8bc6d..000000000000
--- a/dev-lang/ekopath/ekopath-6.0.661_p20160124-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit pax-utils versionator
-
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="${MY_PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND="!dev-lang/ekopath:0/${MY_PV}"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/${MY_P}/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-	chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_install() {
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
-	# We must use XT_PAX to run the installer.
-	if [[ ${PAX_MARKINGS} == "XT" ]]; then
-		pax-mark m "${INSTALLER}"
-	fi
-
-	./"${INSTALLER}" \
-		--prefix "${ED%/}/opt/${MY_P}" \
-		--mode unattended || die
-
-	if [[ ! -d ${ED%/}/opt/${MY_P}/lib/${MY_PV} ]]; then
-		local guess
-		cd "${ED%/}/opt/${MY_P}/lib" && guess=( * )
-
-		if [[ ${guess[@]} ]]; then
-			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-		else
-			die "No libdir installed"
-		fi
-	fi
-	[[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-	rm -r "${ED}/opt/${MY_P}"/uninstall* || die
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.661_p20160124-r100.ebuild b/dev-lang/ekopath/ekopath-6.0.661_p20160124-r100.ebuild
deleted file mode 100644
index 6a39c1078870..000000000000
--- a/dev-lang/ekopath/ekopath-6.0.661_p20160124-r100.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit pax-utils versionator
-
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="0/${MY_PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND="!dev-lang/ekopath:${MY_PV}"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/${MY_P}/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-	chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_configure() {
-	cat > 99${PN} <<-EOF || die
-		PATH=${EROOT%/}/opt/${PN}/bin
-		ROOTPATH=${EROOT%/}/opt/${PN}/bin
-		LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
-		MANPATH=${EROOT%/}/opt/${PN}/docs/man
-	EOF
-}
-
-src_install() {
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
-	# We must use XT_PAX to run the installer.
-	if [[ ${PAX_MARKINGS} == "XT" ]]; then
-		pax-mark m "${INSTALLER}"
-	fi
-
-	./"${INSTALLER}" \
-		--prefix "${ED%/}/opt/${MY_P}" \
-		--mode unattended || die
-
-	if [[ ! -d ${ED%/}/opt/${MY_P}/lib/${MY_PV} ]]; then
-		local guess
-		cd "${ED%/}/opt/${MY_P}/lib" && guess=( * )
-
-		if [[ ${guess[@]} ]]; then
-			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-		else
-			die "No libdir installed"
-		fi
-	fi
-	[[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-	rm -r "${ED}/opt/${MY_P}"/uninstall* || die
-	dosym ${MY_P} /opt/${PN}
-	doenvd 99${PN}
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.705_p20160303-r1.ebuild b/dev-lang/ekopath/ekopath-6.0.705_p20160303-r1.ebuild
deleted file mode 100644
index f71706c8bc6d..000000000000
--- a/dev-lang/ekopath/ekopath-6.0.705_p20160303-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit pax-utils versionator
-
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="${MY_PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND="!dev-lang/ekopath:0/${MY_PV}"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/${MY_P}/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-	chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_install() {
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
-	# We must use XT_PAX to run the installer.
-	if [[ ${PAX_MARKINGS} == "XT" ]]; then
-		pax-mark m "${INSTALLER}"
-	fi
-
-	./"${INSTALLER}" \
-		--prefix "${ED%/}/opt/${MY_P}" \
-		--mode unattended || die
-
-	if [[ ! -d ${ED%/}/opt/${MY_P}/lib/${MY_PV} ]]; then
-		local guess
-		cd "${ED%/}/opt/${MY_P}/lib" && guess=( * )
-
-		if [[ ${guess[@]} ]]; then
-			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-		else
-			die "No libdir installed"
-		fi
-	fi
-	[[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-	rm -r "${ED}/opt/${MY_P}"/uninstall* || die
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.705_p20160303-r100.ebuild b/dev-lang/ekopath/ekopath-6.0.705_p20160303-r100.ebuild
deleted file mode 100644
index 6a39c1078870..000000000000
--- a/dev-lang/ekopath/ekopath-6.0.705_p20160303-r100.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit pax-utils versionator
-
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="0/${MY_PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND="!dev-lang/ekopath:${MY_PV}"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/${MY_P}/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-	chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_configure() {
-	cat > 99${PN} <<-EOF || die
-		PATH=${EROOT%/}/opt/${PN}/bin
-		ROOTPATH=${EROOT%/}/opt/${PN}/bin
-		LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
-		MANPATH=${EROOT%/}/opt/${PN}/docs/man
-	EOF
-}
-
-src_install() {
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
-	# We must use XT_PAX to run the installer.
-	if [[ ${PAX_MARKINGS} == "XT" ]]; then
-		pax-mark m "${INSTALLER}"
-	fi
-
-	./"${INSTALLER}" \
-		--prefix "${ED%/}/opt/${MY_P}" \
-		--mode unattended || die
-
-	if [[ ! -d ${ED%/}/opt/${MY_P}/lib/${MY_PV} ]]; then
-		local guess
-		cd "${ED%/}/opt/${MY_P}/lib" && guess=( * )
-
-		if [[ ${guess[@]} ]]; then
-			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-		else
-			die "No libdir installed"
-		fi
-	fi
-	[[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-	rm -r "${ED}/opt/${MY_P}"/uninstall* || die
-	dosym ${MY_P} /opt/${PN}
-	doenvd 99${PN}
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.713_p20160311-r1.ebuild b/dev-lang/ekopath/ekopath-6.0.713_p20160311-r1.ebuild
deleted file mode 100644
index f71706c8bc6d..000000000000
--- a/dev-lang/ekopath/ekopath-6.0.713_p20160311-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit pax-utils versionator
-
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="${MY_PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND="!dev-lang/ekopath:0/${MY_PV}"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/${MY_P}/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-	chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_install() {
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
-	# We must use XT_PAX to run the installer.
-	if [[ ${PAX_MARKINGS} == "XT" ]]; then
-		pax-mark m "${INSTALLER}"
-	fi
-
-	./"${INSTALLER}" \
-		--prefix "${ED%/}/opt/${MY_P}" \
-		--mode unattended || die
-
-	if [[ ! -d ${ED%/}/opt/${MY_P}/lib/${MY_PV} ]]; then
-		local guess
-		cd "${ED%/}/opt/${MY_P}/lib" && guess=( * )
-
-		if [[ ${guess[@]} ]]; then
-			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-		else
-			die "No libdir installed"
-		fi
-	fi
-	[[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-	rm -r "${ED}/opt/${MY_P}"/uninstall* || die
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.713_p20160311-r100.ebuild b/dev-lang/ekopath/ekopath-6.0.713_p20160311-r100.ebuild
deleted file mode 100644
index 6a39c1078870..000000000000
--- a/dev-lang/ekopath/ekopath-6.0.713_p20160311-r100.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit pax-utils versionator
-
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="0/${MY_PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND="!dev-lang/ekopath:${MY_PV}"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/${MY_P}/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-	chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_configure() {
-	cat > 99${PN} <<-EOF || die
-		PATH=${EROOT%/}/opt/${PN}/bin
-		ROOTPATH=${EROOT%/}/opt/${PN}/bin
-		LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
-		MANPATH=${EROOT%/}/opt/${PN}/docs/man
-	EOF
-}
-
-src_install() {
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
-	# We must use XT_PAX to run the installer.
-	if [[ ${PAX_MARKINGS} == "XT" ]]; then
-		pax-mark m "${INSTALLER}"
-	fi
-
-	./"${INSTALLER}" \
-		--prefix "${ED%/}/opt/${MY_P}" \
-		--mode unattended || die
-
-	if [[ ! -d ${ED%/}/opt/${MY_P}/lib/${MY_PV} ]]; then
-		local guess
-		cd "${ED%/}/opt/${MY_P}/lib" && guess=( * )
-
-		if [[ ${guess[@]} ]]; then
-			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-		else
-			die "No libdir installed"
-		fi
-	fi
-	[[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-	rm -r "${ED}/opt/${MY_P}"/uninstall* || die
-	dosym ${MY_P} /opt/${PN}
-	doenvd 99${PN}
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.720_p20160316-r1.ebuild b/dev-lang/ekopath/ekopath-6.0.720_p20160316-r1.ebuild
deleted file mode 100644
index f71706c8bc6d..000000000000
--- a/dev-lang/ekopath/ekopath-6.0.720_p20160316-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit pax-utils versionator
-
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="${MY_PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND="!dev-lang/ekopath:0/${MY_PV}"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/${MY_P}/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-	chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_install() {
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
-	# We must use XT_PAX to run the installer.
-	if [[ ${PAX_MARKINGS} == "XT" ]]; then
-		pax-mark m "${INSTALLER}"
-	fi
-
-	./"${INSTALLER}" \
-		--prefix "${ED%/}/opt/${MY_P}" \
-		--mode unattended || die
-
-	if [[ ! -d ${ED%/}/opt/${MY_P}/lib/${MY_PV} ]]; then
-		local guess
-		cd "${ED%/}/opt/${MY_P}/lib" && guess=( * )
-
-		if [[ ${guess[@]} ]]; then
-			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-		else
-			die "No libdir installed"
-		fi
-	fi
-	[[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-	rm -r "${ED}/opt/${MY_P}"/uninstall* || die
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.720_p20160316-r100.ebuild b/dev-lang/ekopath/ekopath-6.0.720_p20160316-r100.ebuild
deleted file mode 100644
index 6a39c1078870..000000000000
--- a/dev-lang/ekopath/ekopath-6.0.720_p20160316-r100.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit pax-utils versionator
-
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="0/${MY_PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND="!dev-lang/ekopath:${MY_PV}"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/${MY_P}/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-	chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_configure() {
-	cat > 99${PN} <<-EOF || die
-		PATH=${EROOT%/}/opt/${PN}/bin
-		ROOTPATH=${EROOT%/}/opt/${PN}/bin
-		LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
-		MANPATH=${EROOT%/}/opt/${PN}/docs/man
-	EOF
-}
-
-src_install() {
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
-	# We must use XT_PAX to run the installer.
-	if [[ ${PAX_MARKINGS} == "XT" ]]; then
-		pax-mark m "${INSTALLER}"
-	fi
-
-	./"${INSTALLER}" \
-		--prefix "${ED%/}/opt/${MY_P}" \
-		--mode unattended || die
-
-	if [[ ! -d ${ED%/}/opt/${MY_P}/lib/${MY_PV} ]]; then
-		local guess
-		cd "${ED%/}/opt/${MY_P}/lib" && guess=( * )
-
-		if [[ ${guess[@]} ]]; then
-			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-		else
-			die "No libdir installed"
-		fi
-	fi
-	[[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-	rm -r "${ED}/opt/${MY_P}"/uninstall* || die
-	dosym ${MY_P} /opt/${PN}
-	doenvd 99${PN}
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.728_p20160324-r1.ebuild b/dev-lang/ekopath/ekopath-6.0.728_p20160324-r1.ebuild
deleted file mode 100644
index f71706c8bc6d..000000000000
--- a/dev-lang/ekopath/ekopath-6.0.728_p20160324-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit pax-utils versionator
-
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="${MY_PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND="!dev-lang/ekopath:0/${MY_PV}"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/${MY_P}/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-	chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_install() {
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
-	# We must use XT_PAX to run the installer.
-	if [[ ${PAX_MARKINGS} == "XT" ]]; then
-		pax-mark m "${INSTALLER}"
-	fi
-
-	./"${INSTALLER}" \
-		--prefix "${ED%/}/opt/${MY_P}" \
-		--mode unattended || die
-
-	if [[ ! -d ${ED%/}/opt/${MY_P}/lib/${MY_PV} ]]; then
-		local guess
-		cd "${ED%/}/opt/${MY_P}/lib" && guess=( * )
-
-		if [[ ${guess[@]} ]]; then
-			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-		else
-			die "No libdir installed"
-		fi
-	fi
-	[[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-	rm -r "${ED}/opt/${MY_P}"/uninstall* || die
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.728_p20160324-r100.ebuild b/dev-lang/ekopath/ekopath-6.0.728_p20160324-r100.ebuild
deleted file mode 100644
index 6a39c1078870..000000000000
--- a/dev-lang/ekopath/ekopath-6.0.728_p20160324-r100.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit pax-utils versionator
-
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="0/${MY_PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND="!dev-lang/ekopath:${MY_PV}"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/${MY_P}/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-	chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_configure() {
-	cat > 99${PN} <<-EOF || die
-		PATH=${EROOT%/}/opt/${PN}/bin
-		ROOTPATH=${EROOT%/}/opt/${PN}/bin
-		LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
-		MANPATH=${EROOT%/}/opt/${PN}/docs/man
-	EOF
-}
-
-src_install() {
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
-	# We must use XT_PAX to run the installer.
-	if [[ ${PAX_MARKINGS} == "XT" ]]; then
-		pax-mark m "${INSTALLER}"
-	fi
-
-	./"${INSTALLER}" \
-		--prefix "${ED%/}/opt/${MY_P}" \
-		--mode unattended || die
-
-	if [[ ! -d ${ED%/}/opt/${MY_P}/lib/${MY_PV} ]]; then
-		local guess
-		cd "${ED%/}/opt/${MY_P}/lib" && guess=( * )
-
-		if [[ ${guess[@]} ]]; then
-			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-		else
-			die "No libdir installed"
-		fi
-	fi
-	[[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-	rm -r "${ED}/opt/${MY_P}"/uninstall* || die
-	dosym ${MY_P} /opt/${PN}
-	doenvd 99${PN}
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.637_p20151231-r1.ebuild b/dev-lang/ekopath/ekopath-6.0.779_p20160428-r1.ebuild
similarity index 100%
rename from dev-lang/ekopath/ekopath-6.0.637_p20151231-r1.ebuild
rename to dev-lang/ekopath/ekopath-6.0.779_p20160428-r1.ebuild
diff --git a/dev-lang/ekopath/ekopath-6.0.637_p20151231-r100.ebuild b/dev-lang/ekopath/ekopath-6.0.779_p20160428-r100.ebuild
similarity index 100%
rename from dev-lang/ekopath/ekopath-6.0.637_p20151231-r100.ebuild
rename to dev-lang/ekopath/ekopath-6.0.779_p20160428-r100.ebuild
diff --git a/dev-libs/libfastjson/libfastjson-0.99.2.ebuild b/dev-libs/libfastjson/libfastjson-0.99.2.ebuild
index 35f1c5d255e9..18d33648087e 100644
--- a/dev-libs/libfastjson/libfastjson-0.99.2.ebuild
+++ b/dev-libs/libfastjson/libfastjson-0.99.2.ebuild
@@ -15,7 +15,7 @@ LICENSE="MIT"
 # subslot = soname version
 SLOT="0/3.0.0"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-libs/librdkafka/librdkafka-0.9.0.99.ebuild b/dev-libs/librdkafka/librdkafka-0.9.0.99.ebuild
index 1204ecc34ed8..f1bf44992785 100644
--- a/dev-libs/librdkafka/librdkafka-0.9.0.99.ebuild
+++ b/dev-libs/librdkafka/librdkafka-0.9.0.99.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/libx86/files/libx86-1.1-x86emu.patch b/dev-libs/libx86/files/libx86-1.1-x86emu.patch
new file mode 100644
index 000000000000..7b4fe428e1b3
--- /dev/null
+++ b/dev-libs/libx86/files/libx86-1.1-x86emu.patch
@@ -0,0 +1,38 @@
+diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile
+--- a/libx86-1.1/Makefile	2008-05-19 12:28:59.000000000 +0300
++++ b/libx86-1.1/Makefile	2012-02-20 01:32:03.750068423 +0200
+@@ -5,6 +5,7 @@
+ ifeq ($(BACKEND),x86emu)
+ 	OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \
+ 	x86emu/ops.o x86emu/ops2.o x86emu/prim_ops.o x86emu/sys.o
++	CFLAGS += -DX86EMU
+ else
+ 	OBJECTS += lrmi.o
+ endif
+diff -Naur libx86-1.1+ds1.orig/thunk.c libx86-1.1+ds1/thunk.c
+--- a/libx86-1.1+ds1.orig/thunk.c	2008-04-03 03:48:00.000000000 +0300
++++ b/libx86-1.1/thunk.c	2012-02-20 01:12:56.468820192 +0200
+@@ -32,6 +32,7 @@
+ #define TRUE 1
+ #define FALSE 0
+ 
++#ifndef X86EMU
+ #define __BUILDIO(bwl,bw,type) \
+ static inline void out##bwl##_local(unsigned long port, unsigned type value) {        __asm__ __volatile__("out" #bwl " %" #bw "0, %w1" : : "a"(value), "Nd"(port)); \
+ }\
+@@ -44,6 +45,15 @@
+ __BUILDIO(b,b,char)
+ __BUILDIO(w,w,short)
+ __BUILDIO(l,,int)
++#else
++/* use libc functions */
++#define inb_local inb
++#define inw_local inw
++#define inl_local inl
++#define outb_local outb
++#define outw_local outw
++#define outl_local outl
++#endif /* X86EMU */
+ 
+ 
+ char *mmap_addr = SHMERRORPTR;
diff --git a/dev-libs/libx86/libx86-1.1-r4.ebuild b/dev-libs/libx86/libx86-1.1-r4.ebuild
new file mode 100644
index 000000000000..8b172d30d2ed
--- /dev/null
+++ b/dev-libs/libx86/libx86-1.1-r4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="A hardware-independent library for executing real-mode x86 code"
+HOMEPAGE="http://www.codon.org.uk/~mjg59/libx86"
+SRC_URI="http://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+	# fix compile failure with linux-headers-2.6.26, bug 235599
+	eapply -p0 "${FILESDIR}/${PN}-0.99-ifmask.patch"
+	# Patch for bugs #236888 and #456648
+	eapply -p0 "${FILESDIR}/${P}-makefile.patch"
+	# Wider arch compatibility, bug #579682
+	eapply -p2 "${FILESDIR}/${P}-x86emu.patch"
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC AR
+	append-flags -fno-delete-null-pointer-checks #523276
+}
+
+src_compile() {
+	local ARGS
+	use x86 || ARGS="BACKEND=x86emu"
+	emake ${ARGS} LIBRARY=shared shared
+	if use static-libs; then
+		emake ${ARGS} objclean
+		emake ${ARGS} LIBRARY=static static
+	fi
+}
+
+src_install() {
+	local install_static;
+	use static-libs && install_static='install-static'
+	emake \
+		LIBDIR="/usr/$(get_libdir)" \
+		DESTDIR="${D}" \
+		install-header install-shared ${install_static}
+}
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
new file mode 100644
index 000000000000..745db7c5f1a5
--- /dev/null
+++ b/dev-python/dominate/Manifest
@@ -0,0 +1 @@
+DIST dominate-2.2.0.tar.gz 23320 SHA256 318063a9b600cdc13f84592ad515db0fd3a2816a2433e2a2fad55a5398ae05da SHA512 416fa8ac56856aa06d547a307cdf46ca71b3a29caf36103e78a2522973e407cab90c0163a34fd8ed724586a6121bbd8f4822da78dbf1f77c18e9106aab112e74 WHIRLPOOL 9d5e8516d90b947c88c76e39b0ca73ff07737e36dd9336bd70f73fe5f3836d0fc43f28a7c1343e880367a449a117a1fdfa7e48c8b35f502ba20950b328f62c3b
diff --git a/dev-python/dominate/dominate-2.2.0.ebuild b/dev-python/dominate/dominate-2.2.0.ebuild
new file mode 100644
index 000000000000..764995fe66bc
--- /dev/null
+++ b/dev-python/dominate/dominate-2.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+COMMIT="acb02c7c71e353e5dfbc905d506b54908533027e"
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Library for creating and manipulating HTML documents using an elegant DOM API"
+HOMEPAGE="https://github.com/Knio/dominate"
+# Releases aren't tagged on GitHub, tests are missing from PyPI
+# https://github.com/Knio/dominate/pull/69
+SRC_URI="https://github.com/Knio/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=""
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dominate/metadata.xml b/dev-python/dominate/metadata.xml
new file mode 100644
index 000000000000..3f517fafb3d4
--- /dev/null
+++ b/dev-python/dominate/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">dominate</remote-id>
+		<remote-id type="github">Knio/dominate</remote-id>
+		<bugs-to>https://github.com/Knio/dominate/issues</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		Dominate is a Python library for creating and manipulating HTML documents using an elegant DOM API. It allows you to write HTML pages in pure Python very concisely, which eliminate the need to learn another template language, and to take advantage of the more powerful features of Python. 
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/flask-appconfig/Manifest b/dev-python/flask-appconfig/Manifest
new file mode 100644
index 000000000000..df31c4f01fb9
--- /dev/null
+++ b/dev-python/flask-appconfig/Manifest
@@ -0,0 +1 @@
+DIST flask-appconfig-0.11.1.tar.gz 14545 SHA256 9869a752692e56f35ed3b017ea0e5b1d4b918a23bac8bc98a9e41ab54f5a9902 SHA512 9ebc42be5ef247b1f14b85f7b65600a1595ecdc70e792c0cd495347254b07675a3b7a306df8d2f2663626ceafa4ce7700f6f26cd0f1bcd974ba6bbab293847ee WHIRLPOOL f59662f9e7ace02e1e8dfc1a0a99b40c0cc5a353782d925d71e528fecc73ffbcea2891f99c3a1d20900f5b4f4064be9981f04ec20519aa74e2f872e8167b7da3
diff --git a/dev-python/flask-appconfig/flask-appconfig-0.11.1.ebuild b/dev-python/flask-appconfig/flask-appconfig-0.11.1.ebuild
new file mode 100644
index 000000000000..0c24d0f2e201
--- /dev/null
+++ b/dev-python/flask-appconfig/flask-appconfig-0.11.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Configures Flask applications in a canonical way"
+HOMEPAGE="https://github.com/mbr/flask-appconfig"
+# PyPI tarballs don't include tests
+# https://github.com/mbr/flask-appconfig/pull/4
+SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-appconfig/metadata.xml b/dev-python/flask-appconfig/metadata.xml
new file mode 100644
index 000000000000..8639b4a6ed3a
--- /dev/null
+++ b/dev-python/flask-appconfig/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flask-appconfig</remote-id>
+		<remote-id type="github">mbr/flask-appconfig</remote-id>
+		<bugs-to>https://github.com/mbr/flask-appconfig/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-bootstrap/Manifest b/dev-python/flask-bootstrap/Manifest
new file mode 100644
index 000000000000..fd71a78e56ce
--- /dev/null
+++ b/dev-python/flask-bootstrap/Manifest
@@ -0,0 +1 @@
+DIST flask-bootstrap-3.3.5.7.tar.gz 485387 SHA256 f0cb530ff85a6756dd42a73f49783484eb06db2153a8ebb2ee2f2bf3152f2fa7 SHA512 2d8ed707ccd0dc028f7d765e1f213890186583b28b3879dae0df0282c5e068c91a285691355acf6742999a8bd96920a614098bf9f79ab67f3f40c1a17ac452a6 WHIRLPOOL 81d31625f2b9e35147c34a265405da561a9f91b9ccaf439588c01df68ec33e00c358bcecd78353e21ac1bc8dc6fbbc0b9aed534976b080efead4b0647a46ced5
diff --git a/dev-python/flask-bootstrap/flask-bootstrap-3.3.5.7.ebuild b/dev-python/flask-bootstrap/flask-bootstrap-3.3.5.7.ebuild
new file mode 100644
index 000000000000..62de09508cff
--- /dev/null
+++ b/dev-python/flask-bootstrap/flask-bootstrap-3.3.5.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="An extension that includes Bootstrap in your project, without boilerplate code"
+HOMEPAGE="https://pythonhosted.org/Flask-Bootstrap/"
+# PyPI tarballs don't include tests
+# https://github.com/mbr/flask-bootstrap/pull/134
+SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/dominate[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/visitor[${PYTHON_USEDEP}]
+	dev-python/wtforms[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flask-appconfig[${PYTHON_USEDEP}]
+		dev-python/flask-debug[${PYTHON_USEDEP}]
+		dev-python/flask-wtf[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Skip one test which requires network access
+	py.test -k "not test_versions_match" || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-bootstrap/metadata.xml b/dev-python/flask-bootstrap/metadata.xml
new file mode 100644
index 000000000000..0811c94c8fdd
--- /dev/null
+++ b/dev-python/flask-bootstrap/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flask-bootstrap</remote-id>
+		<remote-id type="github">mbr/flask-bootstrap</remote-id>
+		<bugs-to>https://github.com/mbr/flask-bootstrap/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-debug/Manifest b/dev-python/flask-debug/Manifest
new file mode 100644
index 000000000000..c5d0908ddc20
--- /dev/null
+++ b/dev-python/flask-debug/Manifest
@@ -0,0 +1 @@
+DIST flask-debug-0.4.3.tar.gz 9148 SHA256 059f230304805820955894eb1b3d336067eb3cb7a283cd9b7b3744305d65b827 SHA512 7bc1cf9f88f28e2ca5a24c1454dcdb4e2a450eff3c00329f299c3840032e0803079f565652974f4c3a0e5aac443365ce47a3d2c2fee8e21e2e0c7150367e8816 WHIRLPOOL 1080f045e58865f4dea39696b1acdee8a5a2eb5f5903e49cea5aad919f7c654ba3f78822723aedbec174b8bf952dcf14adcc669956e2e194a2e371d4adab4550
diff --git a/dev-python/flask-debug/flask-debug-0.4.3.ebuild b/dev-python/flask-debug/flask-debug-0.4.3.ebuild
new file mode 100644
index 000000000000..895b50d6389d
--- /dev/null
+++ b/dev-python/flask-debug/flask-debug-0.4.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="Flask-Debug"
+DESCRIPTION="Configures Flask applications in a canonical way"
+HOMEPAGE="https://github.com/mbr/Flask-Debug"
+# PyPI tarballs don't include tests
+# https://github.com/mbr/Flask-Debug/pull/2
+SRC_URI="https://github.com/mbr/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/inflection[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-debug/metadata.xml b/dev-python/flask-debug/metadata.xml
new file mode 100644
index 000000000000..5838f9e89967
--- /dev/null
+++ b/dev-python/flask-debug/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-Debug</remote-id>
+		<remote-id type="github">mbr/Flask-Debug</remote-id>
+		<bugs-to>https://github.com/mbr/Flask-Debug/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-nav/Manifest b/dev-python/flask-nav/Manifest
new file mode 100644
index 000000000000..8f73c7fb1bef
--- /dev/null
+++ b/dev-python/flask-nav/Manifest
@@ -0,0 +1 @@
+DIST flask-nav-0.5.tar.gz 11579 SHA256 68a608aae8c6c21453247cc288595c9d52a6b5f3bc31d9a9ee3fd7a1f9c28c47 SHA512 94ebd858754c0ac936b43762cf427c381faa40de86e73b487d6b415d099696e6216b96ad9fefa62516cefd8e51e7ef282e01e1a492783ab696a9fd3602de7e78 WHIRLPOOL f47f6773fd31e4a959437159c5de88f6463ad890e36387cf205ffd42d4de41f375f8264f568bd192ad4f8235cf6e5a6651c2ca3b5dbf14a785f749ab8510a098
diff --git a/dev-python/flask-nav/flask-nav-0.5.ebuild b/dev-python/flask-nav/flask-nav-0.5.ebuild
new file mode 100644
index 000000000000..f94f95a8ea8f
--- /dev/null
+++ b/dev-python/flask-nav/flask-nav-0.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily create navigation for Flask applications."
+HOMEPAGE="https://pythonhosted.org/flask-nav/"
+# docs are missing from PyPI tarballs
+# https://github.com/mbr/flask-nav/pull/12
+SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/dominate[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/visitor[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-nav/metadata.xml b/dev-python/flask-nav/metadata.xml
new file mode 100644
index 000000000000..af1c6276a546
--- /dev/null
+++ b/dev-python/flask-nav/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flask-nav</remote-id>
+		<remote-id type="github">mbr/flask-nav</remote-id>
+		<bugs-to>https://github.com/mbr/flask-nav/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/inflection/Manifest b/dev-python/inflection/Manifest
new file mode 100644
index 000000000000..977a311b4cdf
--- /dev/null
+++ b/dev-python/inflection/Manifest
@@ -0,0 +1 @@
+DIST inflection-0.3.1.tar.gz 12943 SHA256 97e5fd494e5c2a541b2c86f8866e342c894c4eef28a19c1907db02024777495a SHA512 2a69a6228f2d44a5afecbd3ef51a51b4d5f63f69ddc844f4abfd6f326cb25c518403e8c5b9f98589885777d41d8fea31bacab3a5a3ab80db411960238d2f49ad WHIRLPOOL 10cfde356372e2f8d41b58122f239c80d7d38dd62f40f62af2cb6e10b687b524989baaa5dfdfbdf8aad5432bc9ffb91aa15121054c754ec90778e7148d138ea0
diff --git a/dev-python/inflection/inflection-0.3.1.ebuild b/dev-python/inflection/inflection-0.3.1.ebuild
new file mode 100644
index 000000000000..fac3087875e7
--- /dev/null
+++ b/dev-python/inflection/inflection-0.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A port of Ruby on Rails inflector to Python"
+HOMEPAGE="https://github.com/jpvanhal/inflection"
+# PyPI tarballs don't include doc
+# https://github.com/jpvanhal/inflection/pull/12
+SRC_URI="https://github.com/jpvanhal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/inflection/metadata.xml b/dev-python/inflection/metadata.xml
new file mode 100644
index 000000000000..5fc3f78f866b
--- /dev/null
+++ b/dev-python/inflection/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">inflection</remote-id>
+		<remote-id type="github">jpvanhal/inflection</remote-id>
+		<bugs-to>https://github.com/jpvanhal/inflection/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/visitor/Manifest b/dev-python/visitor/Manifest
new file mode 100644
index 000000000000..f3c6e79560f4
--- /dev/null
+++ b/dev-python/visitor/Manifest
@@ -0,0 +1 @@
+DIST visitor-0.1.2.tar.gz 2957 SHA256 ff8c6231aa4a63c9f52f0d7eeedeb8561f847c4514753a9db33906296375c046 SHA512 3251e8c81673a7ded8eecd68bdc6294e4b386bfe6118280db0bac908b835aa1823cc0b470a6d69432f89821c6275afbe8c295da21edd1d10db3b8757727c43dd WHIRLPOOL 69f4d0344f3ca8ccd848bcf8ed848887c8845210dd8b9e09efa138ada5789b8c38f4a0e46e028be4b643e745d539f3a1cdf51d6b51688a97bc91146525c91a55
diff --git a/dev-python/visitor/metadata.xml b/dev-python/visitor/metadata.xml
new file mode 100644
index 000000000000..38969880dd20
--- /dev/null
+++ b/dev-python/visitor/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">visitor</remote-id>
+		<remote-id type="github">mbr/visitor</remote-id>
+		<bugs-to>https://github.com/mbr/visitor/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/visitor/visitor-0.1.2.ebuild b/dev-python/visitor/visitor-0.1.2.ebuild
new file mode 100644
index 000000000000..0d1c1bf207f7
--- /dev/null
+++ b/dev-python/visitor/visitor-0.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tiny pythonic visitor implementation"
+HOMEPAGE="https://github.com/mbr/visitor"
+# PyPI tarballs don't include tests
+# https://github.com/mbr/visitor/pull/2
+SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=""
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-ruby/acts_as_list/Manifest b/dev-ruby/acts_as_list/Manifest
index d1f5bcf823d3..15d4294ccc2f 100644
--- a/dev-ruby/acts_as_list/Manifest
+++ b/dev-ruby/acts_as_list/Manifest
@@ -1,2 +1 @@
-DIST acts_as_list-0.7.2.gem 18944 SHA256 a49748ee8e384094cbfa6858a465eb3f00ac866181e34f37ef3f350d4a281d95 SHA512 c007f28dec299564fec586062c7f22f8a096accecf558669efbab663aadde0642ec2fbf9b899540db13d02641ccbfc40b7970e8e5598bbeabdf7a43d3e1f8df5 WHIRLPOOL 7911fd53f1f1d6cc057615b1eb7140eba92a25badc144957c36a73ae56a8cd9cb3362f15622c7cfc018fd397ff17b1aac32a0b551c829988b9553db89c6e0bce
 DIST acts_as_list-0.7.4.gem 22528 SHA256 712123dfe4fbc026105425eecac5912e4a178b9593515005cd97b8e3bdce88e5 SHA512 33f4cd6c7a18a82ba06e40697772f03c5b817b76669efed197c23a377fda43c843f750d674a630a5fdd286cb4342fce77b8b7f16394250dd250f4bc429c3600c WHIRLPOOL 4a7dd28c7f8ef9ad8de6ecd103f4eb365021d0b19f181614c4a6aef687222c805cc02f321a1d7243c7b092e61f8a6e4501126782b4737247c64b9e3b225983bb
diff --git a/dev-ruby/acts_as_list/acts_as_list-0.7.2.ebuild b/dev-ruby/acts_as_list/acts_as_list-0.7.2.ebuild
deleted file mode 100644
index 2d5105c6cba7..000000000000
--- a/dev-ruby/acts_as_list/acts_as_list-0.7.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-DESCRIPTION="Capabilities for sorting and reordering a number of objects in a list"
-HOMEPAGE="https://github.com/swanandp/acts_as_list"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activerecord-3:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit:2
-		dev-ruby/activerecord:3.2[sqlite]
-	)"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '1,9 s:^:#:' test/helper.rb || die
-	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Tests currently only pass on rails 3.
-	sed -e '1igem "activerecord", "~>3.2.0"' -i test/helper.rb || die
-}
diff --git a/dev-ruby/colorator/colorator-0.1-r1.ebuild b/dev-ruby/colorator/colorator-0.1-r1.ebuild
index 8fc82f2394d2..41ce4fa8bc37 100644
--- a/dev-ruby/colorator/colorator-0.1-r1.ebuild
+++ b/dev-ruby/colorator/colorator-0.1-r1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index e1dbb01cc677..0c7cc6dee6ae 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,2 +1 @@
-DIST haml-4.0.6.gem 115712 SHA256 2ede5f8a1f38d98e71daf570d836ec0db18e1c6187c383a50fb7eb2223beff23 SHA512 a58d3de9efb6ac80a504152a4ca71914681a334d802301c9c8954890e97b031d771f4ac5127713d5e1c1e051d6c74fb7c9d55b6b6e7166743e95ed33685be1c4 WHIRLPOOL 0b821983baa267ae03dee990b2432562601af4fe2c84d4f8f9a46133817470c97baef47098ed78f714b9eda5dae75d4cba4a8059398d9f9acf018633a713e4ab
 DIST haml-4.0.7.gem 121856 SHA256 3754d0f7c21cf261a30b207a94524211293b921492fab58c89d1ede7e7933f57 SHA512 5736ded231bb10a0c0932453294604075e24a9020c2658e703c13ebf7a8d148327188157f982a3aea5db6d6938beb372c0167dfbc4ff06325517b2c8bd71a568 WHIRLPOOL 62f1f152dbf8eea15ef3935d8e85b062f5a3f079a3cc4e4ad47056acfe7427b443611f092f591ff957f348d1727ce43b23d9f88083a4678b30d759a2ecd6e659
diff --git a/dev-ruby/haml/haml-4.0.6-r1.ebuild b/dev-ruby/haml/haml-4.0.6-r1.ebuild
deleted file mode 100644
index d0276311c36f..000000000000
--- a/dev-ruby/haml/haml-4.0.6-r1.ebuild
+++ /dev/null
@@ -1,51 +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"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby web page templating engine"
-HOMEPAGE="http://haml-lang.com/"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="doc test"
-
-RDEPEND="${RDEPEND} !!<dev-ruby/haml-3.1.8-r2"
-
-ruby_add_rdepend "dev-ruby/tilt"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/nokogiri
-		dev-ruby/rails:4.2
-	)
-	doc? (
-		dev-ruby/yard
-		>=dev-ruby/maruku-0.7.2-r1
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/gem "minitest"/gem "minitest", "~>5.0"/'\
-		-e '1igem "actionpack", "~>4.2"'\
-		-e '1igem "activesupport", "~>4.2"'\
-		-e '1igem "railties", "~>4.2"'\
-		test/test_helper.rb || die
-	# Remove test that fails when RedCloth is available
-	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,+9 s/^/#/"\
-		test/filters_test.rb || die
-}
diff --git a/dev-ruby/haml/haml-4.0.6.ebuild b/dev-ruby/haml/haml-4.0.6.ebuild
deleted file mode 100644
index 24181ee30e68..000000000000
--- a/dev-ruby/haml/haml-4.0.6.ebuild
+++ /dev/null
@@ -1,51 +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"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby web page templating engine"
-HOMEPAGE="http://haml-lang.com/"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="doc test"
-
-RDEPEND="${RDEPEND} !!<dev-ruby/haml-3.1.8-r2"
-
-ruby_add_rdepend "dev-ruby/tilt"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:0
-		dev-ruby/nokogiri
-		dev-ruby/rails:3.2
-	)
-	doc? (
-		dev-ruby/yard
-		>=dev-ruby/maruku-0.7.2-r1
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/gem "minitest"/gem "minitest", "~>4.0"/'\
-		-e '1igem "actionpack", "~>3.2"'\
-		-e '1igem "activesupport", "~>3.2"'\
-		-e '1igem "railties", "~>3.2"'\
-		test/test_helper.rb || die
-	# Remove test that fails when RedCloth is available
-	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,+9 s/^/#/"\
-		test/filters_test.rb || die
-}
diff --git a/dev-ruby/haml/haml-4.0.7.ebuild b/dev-ruby/haml/haml-4.0.7.ebuild
index e79a24eb38d2..4937794ff940 100644
--- a/dev-ruby/haml/haml-4.0.7.ebuild
+++ b/dev-ruby/haml/haml-4.0.7.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://haml-lang.com/"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-ruby/liquid/liquid-3.0.6.ebuild b/dev-ruby/liquid/liquid-3.0.6.ebuild
index 5827e2782415..486a0020d77b 100644
--- a/dev-ruby/liquid/liquid-3.0.6.ebuild
+++ b/dev-ruby/liquid/liquid-3.0.6.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
diff --git a/dev-ruby/sigar/sigar-0.7.3.ebuild b/dev-ruby/sigar/sigar-0.7.3.ebuild
index 5c8af0aedf6a..f3e204537b06 100644
--- a/dev-ruby/sigar/sigar-0.7.3.ebuild
+++ b/dev-ruby/sigar/sigar-0.7.3.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 ruby23"
 
 RUBY_FAKEGEM_RECIPE_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a91f75944779..c6ef8891c2ce 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Apr 2016 06:38:43 +0000
+Fri, 29 Apr 2016 11:08:49 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a91f75944779..c6ef8891c2ce 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Apr 2016 06:38:43 +0000
+Fri, 29 Apr 2016 11:08:49 +0000
diff --git a/metadata/md5-cache/dev-lang/ekopath-6.0.637_p20151231-r100 b/metadata/md5-cache/dev-lang/ekopath-6.0.637_p20151231-r100
deleted file mode 100644
index a59d585d606d..000000000000
--- a/metadata/md5-cache/dev-lang/ekopath-6.0.637_p20151231-r100
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=!!app-arch/rpm
-DESCRIPTION=PathScale EKOPath Compiler Suite
-EAPI=6
-HOMEPAGE=http://www.pathscale.com/ekopath-compiler-suite
-KEYWORDS=~amd64
-LICENSE=all-rights-reserved
-RDEPEND=!dev-lang/ekopath:6.0.637
-RESTRICT=bindist mirror
-SLOT=0/6.0.637
-SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2015-12-31-installer.run
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0d5b5204160b97c6d5043e1b16a3b02c
diff --git a/metadata/md5-cache/dev-lang/ekopath-6.0.661_p20160124-r1 b/metadata/md5-cache/dev-lang/ekopath-6.0.661_p20160124-r1
deleted file mode 100644
index 8ca597b7cf31..000000000000
--- a/metadata/md5-cache/dev-lang/ekopath-6.0.661_p20160124-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=!!app-arch/rpm
-DESCRIPTION=PathScale EKOPath Compiler Suite
-EAPI=6
-HOMEPAGE=http://www.pathscale.com/ekopath-compiler-suite
-KEYWORDS=~amd64
-LICENSE=all-rights-reserved
-RDEPEND=!dev-lang/ekopath:0/6.0.661
-RESTRICT=bindist mirror
-SLOT=6.0.661
-SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2016-01-24-installer.run
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f8dbc62511d10306f7c45fe7c9def22e
diff --git a/metadata/md5-cache/dev-lang/ekopath-6.0.661_p20160124-r100 b/metadata/md5-cache/dev-lang/ekopath-6.0.661_p20160124-r100
deleted file mode 100644
index fe1488b876d5..000000000000
--- a/metadata/md5-cache/dev-lang/ekopath-6.0.661_p20160124-r100
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=!!app-arch/rpm
-DESCRIPTION=PathScale EKOPath Compiler Suite
-EAPI=6
-HOMEPAGE=http://www.pathscale.com/ekopath-compiler-suite
-KEYWORDS=~amd64
-LICENSE=all-rights-reserved
-RDEPEND=!dev-lang/ekopath:6.0.661
-RESTRICT=bindist mirror
-SLOT=0/6.0.661
-SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2016-01-24-installer.run
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0d5b5204160b97c6d5043e1b16a3b02c
diff --git a/metadata/md5-cache/dev-lang/ekopath-6.0.705_p20160303-r1 b/metadata/md5-cache/dev-lang/ekopath-6.0.705_p20160303-r1
deleted file mode 100644
index 39bcc226e533..000000000000
--- a/metadata/md5-cache/dev-lang/ekopath-6.0.705_p20160303-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=!!app-arch/rpm
-DESCRIPTION=PathScale EKOPath Compiler Suite
-EAPI=6
-HOMEPAGE=http://www.pathscale.com/ekopath-compiler-suite
-KEYWORDS=~amd64
-LICENSE=all-rights-reserved
-RDEPEND=!dev-lang/ekopath:0/6.0.705
-RESTRICT=bindist mirror
-SLOT=6.0.705
-SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2016-03-03-installer.run
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f8dbc62511d10306f7c45fe7c9def22e
diff --git a/metadata/md5-cache/dev-lang/ekopath-6.0.713_p20160311-r1 b/metadata/md5-cache/dev-lang/ekopath-6.0.713_p20160311-r1
deleted file mode 100644
index f70a90150b43..000000000000
--- a/metadata/md5-cache/dev-lang/ekopath-6.0.713_p20160311-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=!!app-arch/rpm
-DESCRIPTION=PathScale EKOPath Compiler Suite
-EAPI=6
-HOMEPAGE=http://www.pathscale.com/ekopath-compiler-suite
-KEYWORDS=~amd64
-LICENSE=all-rights-reserved
-RDEPEND=!dev-lang/ekopath:0/6.0.713
-RESTRICT=bindist mirror
-SLOT=6.0.713
-SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2016-03-11-installer.run
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f8dbc62511d10306f7c45fe7c9def22e
diff --git a/metadata/md5-cache/dev-lang/ekopath-6.0.713_p20160311-r100 b/metadata/md5-cache/dev-lang/ekopath-6.0.713_p20160311-r100
deleted file mode 100644
index 2a0cb7a618a8..000000000000
--- a/metadata/md5-cache/dev-lang/ekopath-6.0.713_p20160311-r100
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=!!app-arch/rpm
-DESCRIPTION=PathScale EKOPath Compiler Suite
-EAPI=6
-HOMEPAGE=http://www.pathscale.com/ekopath-compiler-suite
-KEYWORDS=~amd64
-LICENSE=all-rights-reserved
-RDEPEND=!dev-lang/ekopath:6.0.713
-RESTRICT=bindist mirror
-SLOT=0/6.0.713
-SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2016-03-11-installer.run
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0d5b5204160b97c6d5043e1b16a3b02c
diff --git a/metadata/md5-cache/dev-lang/ekopath-6.0.720_p20160316-r1 b/metadata/md5-cache/dev-lang/ekopath-6.0.720_p20160316-r1
deleted file mode 100644
index b23208f5456c..000000000000
--- a/metadata/md5-cache/dev-lang/ekopath-6.0.720_p20160316-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=!!app-arch/rpm
-DESCRIPTION=PathScale EKOPath Compiler Suite
-EAPI=6
-HOMEPAGE=http://www.pathscale.com/ekopath-compiler-suite
-KEYWORDS=~amd64
-LICENSE=all-rights-reserved
-RDEPEND=!dev-lang/ekopath:0/6.0.720
-RESTRICT=bindist mirror
-SLOT=6.0.720
-SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2016-03-16-installer.run
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f8dbc62511d10306f7c45fe7c9def22e
diff --git a/metadata/md5-cache/dev-lang/ekopath-6.0.720_p20160316-r100 b/metadata/md5-cache/dev-lang/ekopath-6.0.720_p20160316-r100
deleted file mode 100644
index 7412dd26d6ef..000000000000
--- a/metadata/md5-cache/dev-lang/ekopath-6.0.720_p20160316-r100
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=!!app-arch/rpm
-DESCRIPTION=PathScale EKOPath Compiler Suite
-EAPI=6
-HOMEPAGE=http://www.pathscale.com/ekopath-compiler-suite
-KEYWORDS=~amd64
-LICENSE=all-rights-reserved
-RDEPEND=!dev-lang/ekopath:6.0.720
-RESTRICT=bindist mirror
-SLOT=0/6.0.720
-SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2016-03-16-installer.run
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0d5b5204160b97c6d5043e1b16a3b02c
diff --git a/metadata/md5-cache/dev-lang/ekopath-6.0.728_p20160324-r1 b/metadata/md5-cache/dev-lang/ekopath-6.0.728_p20160324-r1
deleted file mode 100644
index effd691f34fd..000000000000
--- a/metadata/md5-cache/dev-lang/ekopath-6.0.728_p20160324-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=!!app-arch/rpm
-DESCRIPTION=PathScale EKOPath Compiler Suite
-EAPI=6
-HOMEPAGE=http://www.pathscale.com/ekopath-compiler-suite
-KEYWORDS=~amd64
-LICENSE=all-rights-reserved
-RDEPEND=!dev-lang/ekopath:0/6.0.728
-RESTRICT=bindist mirror
-SLOT=6.0.728
-SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2016-03-24-installer.run
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f8dbc62511d10306f7c45fe7c9def22e
diff --git a/metadata/md5-cache/dev-lang/ekopath-6.0.728_p20160324-r100 b/metadata/md5-cache/dev-lang/ekopath-6.0.728_p20160324-r100
deleted file mode 100644
index fcb037fdbcc4..000000000000
--- a/metadata/md5-cache/dev-lang/ekopath-6.0.728_p20160324-r100
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=!!app-arch/rpm
-DESCRIPTION=PathScale EKOPath Compiler Suite
-EAPI=6
-HOMEPAGE=http://www.pathscale.com/ekopath-compiler-suite
-KEYWORDS=~amd64
-LICENSE=all-rights-reserved
-RDEPEND=!dev-lang/ekopath:6.0.728
-RESTRICT=bindist mirror
-SLOT=0/6.0.728
-SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2016-03-24-installer.run
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0d5b5204160b97c6d5043e1b16a3b02c
diff --git a/metadata/md5-cache/dev-lang/ekopath-6.0.637_p20151231-r1 b/metadata/md5-cache/dev-lang/ekopath-6.0.779_p20160428-r1
similarity index 87%
rename from metadata/md5-cache/dev-lang/ekopath-6.0.637_p20151231-r1
rename to metadata/md5-cache/dev-lang/ekopath-6.0.779_p20160428-r1
index 10a3c8899370..5a0a026cb200 100644
--- a/metadata/md5-cache/dev-lang/ekopath-6.0.637_p20151231-r1
+++ b/metadata/md5-cache/dev-lang/ekopath-6.0.779_p20160428-r1
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=http://www.pathscale.com/ekopath-compiler-suite
 KEYWORDS=~amd64
 LICENSE=all-rights-reserved
-RDEPEND=!dev-lang/ekopath:0/6.0.637
+RDEPEND=!dev-lang/ekopath:0/6.0.779
 RESTRICT=bindist mirror
-SLOT=6.0.637
-SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2015-12-31-installer.run
+SLOT=6.0.779
+SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2016-04-28-installer.run
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f8dbc62511d10306f7c45fe7c9def22e
diff --git a/metadata/md5-cache/dev-lang/ekopath-6.0.705_p20160303-r100 b/metadata/md5-cache/dev-lang/ekopath-6.0.779_p20160428-r100
similarity index 87%
rename from metadata/md5-cache/dev-lang/ekopath-6.0.705_p20160303-r100
rename to metadata/md5-cache/dev-lang/ekopath-6.0.779_p20160428-r100
index 24c7baaa1b81..3ff1fce0b07a 100644
--- a/metadata/md5-cache/dev-lang/ekopath-6.0.705_p20160303-r100
+++ b/metadata/md5-cache/dev-lang/ekopath-6.0.779_p20160428-r100
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=http://www.pathscale.com/ekopath-compiler-suite
 KEYWORDS=~amd64
 LICENSE=all-rights-reserved
-RDEPEND=!dev-lang/ekopath:6.0.705
+RDEPEND=!dev-lang/ekopath:6.0.779
 RESTRICT=bindist mirror
-SLOT=0/6.0.705
-SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2016-03-03-installer.run
+SLOT=0/6.0.779
+SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2016-04-28-installer.run
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0d5b5204160b97c6d5043e1b16a3b02c
diff --git a/metadata/md5-cache/dev-libs/libfastjson-0.99.2 b/metadata/md5-cache/dev-libs/libfastjson-0.99.2
index ed44cd1e2f83..7180a92cd430 100644
--- a/metadata/md5-cache/dev-libs/libfastjson-0.99.2
+++ b/metadata/md5-cache/dev-libs/libfastjson-0.99.2
@@ -4,9 +4,9 @@ DESCRIPTION=Fork of the json-c library, which is optimized for liblognorm proces
 EAPI=6
 HOMEPAGE=http://www.rsyslog.com/tag/libfastjson/
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~x86
 LICENSE=MIT
 SLOT=0/3.0.0
 SRC_URI=http://download.rsyslog.com/libfastjson/libfastjson-0.99.2.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=c82d85d3462f286ea2ca4aba65e1d587
+_md5_=43c3081af52bf9a2bf5768a4f379a215
diff --git a/metadata/md5-cache/dev-libs/librdkafka-0.9.0.99 b/metadata/md5-cache/dev-libs/librdkafka-0.9.0.99
index d98d863438ce..5c3473e082f6 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-0.9.0.99
+++ b/metadata/md5-cache/dev-libs/librdkafka-0.9.0.99
@@ -4,9 +4,9 @@ DESCRIPTION=Apache Kafka C/C++ client library
 EAPI=6
 HOMEPAGE=https://github.com/edenhill/librdkafka
 IUSE=sasl ssl static-libs
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~x86
 LICENSE=BSD-2
 RDEPEND=sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) sys-libs/zlib
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/0.9.0.99.tar.gz -> librdkafka-0.9.0.99.tar.gz
-_md5_=7d11c6d72433e29f229f7bfe23b79d48
+_md5_=28b958f004c3c54678cb406259e3acbb
diff --git a/metadata/md5-cache/dev-libs/libx86-1.1-r4 b/metadata/md5-cache/dev-libs/libx86-1.1-r4
new file mode 100644
index 000000000000..b3ceb5114347
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libx86-1.1-r4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=A hardware-independent library for executing real-mode x86 code
+EAPI=6
+HOMEPAGE=http://www.codon.org.uk/~mjg59/libx86
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=485ab4c394ce89eca08afe457ea6eeca
diff --git a/metadata/md5-cache/dev-python/dominate-2.2.0 b/metadata/md5-cache/dev-python/dominate-2.2.0
new file mode 100644
index 000000000000..e64d52c6ccd2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dominate-2.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Library for creating and manipulating HTML documents using an elegant DOM API
+EAPI=6
+HOMEPAGE=https://github.com/Knio/dominate
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/Knio/dominate/archive/acb02c7c71e353e5dfbc905d506b54908533027e.tar.gz -> dominate-2.2.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d
+_md5_=4bba3f826a5cb83fa629abdc764e5f7f
diff --git a/metadata/md5-cache/dev-python/flask-appconfig-0.11.1 b/metadata/md5-cache/dev-python/flask-appconfig-0.11.1
new file mode 100644
index 000000000000..f28d672210d0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-appconfig-0.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Configures Flask applications in a canonical way
+EAPI=6
+HOMEPAGE=https://github.com/mbr/flask-appconfig
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/mbr/flask-appconfig/archive/0.11.1.tar.gz -> flask-appconfig-0.11.1.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=0ffc785d0b753248cadd18a3fbab5e09
diff --git a/metadata/md5-cache/dev-python/flask-bootstrap-3.3.5.7 b/metadata/md5-cache/dev-python/flask-bootstrap-3.3.5.7
new file mode 100644
index 000000000000..7d8bcfda6863
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-bootstrap-3.3.5.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/flask-appconfig[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-debug[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-wtf[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/dominate[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/visitor[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/wtforms[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=An extension that includes Bootstrap in your project, without boilerplate code
+EAPI=6
+HOMEPAGE=https://pythonhosted.org/Flask-Bootstrap/
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/dominate[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/visitor[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/wtforms[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/mbr/flask-bootstrap/archive/3.3.5.7.tar.gz -> flask-bootstrap-3.3.5.7.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=e1413bdc6734323170304c39d4217baa
diff --git a/metadata/md5-cache/dev-python/flask-debug-0.4.3 b/metadata/md5-cache/dev-python/flask-debug-0.4.3
new file mode 100644
index 000000000000..0662fe80dc67
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-debug-0.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/inflection[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Configures Flask applications in a canonical way
+EAPI=6
+HOMEPAGE=https://github.com/mbr/Flask-Debug
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/inflection[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/mbr/Flask-Debug/archive/0.4.3.tar.gz -> flask-debug-0.4.3.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=393eca86012f6997e2e8cfb5ec5d145f
diff --git a/metadata/md5-cache/dev-python/flask-nav-0.5 b/metadata/md5-cache/dev-python/flask-nav-0.5
new file mode 100644
index 000000000000..de604a1565bf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-nav-0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Easily create navigation for Flask applications.
+EAPI=6
+HOMEPAGE=https://pythonhosted.org/flask-nav/
+IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/dominate[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/visitor[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/mbr/flask-nav/archive/0.5.tar.gz -> flask-nav-0.5.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=b1a17077f882cc577b499ee59172e965
diff --git a/metadata/md5-cache/dev-python/inflection-0.3.1 b/metadata/md5-cache/dev-python/inflection-0.3.1
new file mode 100644
index 000000000000..3ec7f180db9b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/inflection-0.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A port of Ruby on Rails inflector to Python
+EAPI=6
+HOMEPAGE=https://github.com/jpvanhal/inflection
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/jpvanhal/inflection/archive/0.3.1.tar.gz -> inflection-0.3.1.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=b9116404c8f8f503c375a6ed622ea631
diff --git a/metadata/md5-cache/dev-python/visitor-0.1.2 b/metadata/md5-cache/dev-python/visitor-0.1.2
new file mode 100644
index 000000000000..6dadc1183437
--- /dev/null
+++ b/metadata/md5-cache/dev-python/visitor-0.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A tiny pythonic visitor implementation
+EAPI=6
+HOMEPAGE=https://github.com/mbr/visitor
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/mbr/visitor/archive/0.1.2.tar.gz -> visitor-0.1.2.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=4d15e75b99fbf60825373d01088c1028
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.7.2 b/metadata/md5-cache/dev-ruby/acts_as_list-0.7.2
deleted file mode 100644
index b58bb72c25d8..000000000000
--- a/metadata/md5-cache/dev-ruby/acts_as_list-0.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] dev-ruby/activerecord:3.2[ruby_targets_ruby20,sqlite] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/activerecord:3.2[ruby_targets_ruby21,sqlite] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=Capabilities for sorting and reordering a number of objects in a list
-EAPI=5
-HOMEPAGE=https://github.com/swanandp/acts_as_list
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~x86 ~x86-macos
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=3
-SRC_URI=mirror://rubygems/acts_as_list-0.7.2.gem
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=40189ad630359c8c959653a34aecaa32
diff --git a/metadata/md5-cache/dev-ruby/colorator-0.1-r1 b/metadata/md5-cache/dev-ruby/colorator-0.1-r1
index 7cc863101585..8b43735c4bff 100644
--- a/metadata/md5-cache/dev-ruby/colorator-0.1-r1
+++ b/metadata/md5-cache/dev-ruby/colorator-0.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Colorize your text in the terminal
 EAPI=5
 HOMEPAGE=https://github.com/octopress/colorator
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/colorator-0.1.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=007babd08970d3aa6f919ad072d2ecdc
+_md5_=5ba756e2cf79d6ac2c6adb514b84771a
diff --git a/metadata/md5-cache/dev-ruby/haml-4.0.6 b/metadata/md5-cache/dev-ruby/haml-4.0.6
deleted file mode 100644
index 4cafc3460030..000000000000
--- a/metadata/md5-cache/dev-ruby/haml-4.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/tilt[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/tilt[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby19] dev-ruby/nokogiri[ruby_targets_ruby19] dev-ruby/rails:3.2[ruby_targets_ruby19] ) doc? ( dev-ruby/yard[ruby_targets_ruby19] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby20] dev-ruby/nokogiri[ruby_targets_ruby20] dev-ruby/rails:3.2[ruby_targets_ruby20] ) doc? ( dev-ruby/yard[ruby_targets_ruby20] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=A ruby web page templating engine
-EAPI=5
-HOMEPAGE=http://haml-lang.com/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby19? ( dev-ruby/tilt[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/tilt[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=4
-SRC_URI=mirror://rubygems/haml-4.0.6.gem
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d581ff26783fafda05680a736e84e8a7
diff --git a/metadata/md5-cache/dev-ruby/haml-4.0.6-r1 b/metadata/md5-cache/dev-ruby/haml-4.0.6-r1
deleted file mode 100644
index 9910b4785fde..000000000000
--- a/metadata/md5-cache/dev-ruby/haml-4.0.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/tilt[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/tilt[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/tilt[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby19] dev-ruby/nokogiri[ruby_targets_ruby19] dev-ruby/rails:4.2[ruby_targets_ruby19] ) doc? ( dev-ruby/yard[ruby_targets_ruby19] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] dev-ruby/nokogiri[ruby_targets_ruby20] dev-ruby/rails:4.2[ruby_targets_ruby20] ) doc? ( dev-ruby/yard[ruby_targets_ruby20] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/rails:4.2[ruby_targets_ruby21] ) doc? ( dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=A ruby web page templating engine
-EAPI=5
-HOMEPAGE=http://haml-lang.com/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby19? ( dev-ruby/tilt[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/tilt[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/tilt[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=4
-SRC_URI=mirror://rubygems/haml-4.0.6.gem
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=783e1c2c86879a5c27f0d3660893b37c
diff --git a/metadata/md5-cache/dev-ruby/haml-4.0.7 b/metadata/md5-cache/dev-ruby/haml-4.0.7
index 42441c29a3f4..cbb224dc9de7 100644
--- a/metadata/md5-cache/dev-ruby/haml-4.0.7
+++ b/metadata/md5-cache/dev-ruby/haml-4.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=A ruby web page templating engine
 EAPI=5
 HOMEPAGE=http://haml-lang.com/
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby20? ( dev-ruby/tilt:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/tilt:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/haml-4.0.7.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=edad7e2c020e6783d76a6dd64fa9e693
+_md5_=32ad25e32aabee303f9fd48396f358c1
diff --git a/metadata/md5-cache/dev-ruby/liquid-3.0.6 b/metadata/md5-cache/dev-ruby/liquid-3.0.6
index 1e74ee119435..70161e67410c 100644
--- a/metadata/md5-cache/dev-ruby/liquid-3.0.6
+++ b/metadata/md5-cache/dev-ruby/liquid-3.0.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] dev-ruby/spy[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/spy[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] dev-ruby/spy[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/spy[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/spy[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Template engine for Ruby
 EAPI=5
 HOMEPAGE=http://www.liquidmarkup.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/Shopify/liquid/archive/v3.0.6.tar.gz -> liquid-3.0.6.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9d6b218edba61e8d1c325ebd6c96409d
+_md5_=829e1bc35d777812ef34cb891f214f2e
diff --git a/metadata/md5-cache/dev-ruby/sigar-0.7.3 b/metadata/md5-cache/dev-ruby/sigar-0.7.3
index eda2dff1b7c4..d4a7eb74895f 100644
--- a/metadata/md5-cache/dev-ruby/sigar-0.7.3
+++ b/metadata/md5-cache/dev-ruby/sigar-0.7.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=System Information Gatherer And Reporter
 EAPI=5
 HOMEPAGE=http://sigar.hyperic.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sigar-0.7.3.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b30f883a2ddab92eadca00bdb4ef98e8
+_md5_=a2f43dda8e3d6e15c0f9858e158d11cc
diff --git a/metadata/md5-cache/net-misc/connman-1.31-r1 b/metadata/md5-cache/net-misc/connman-1.32
similarity index 92%
rename from metadata/md5-cache/net-misc/connman-1.31-r1
rename to metadata/md5-cache/net-misc/connman-1.32
index 9634adcad51f..a222bc77099a 100644
--- a/metadata/md5-cache/net-misc/connman-1.31-r1
+++ b/metadata/md5-cache/net-misc/connman-1.32
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=net-firewall/iptables-1.4.8 bluetooth? ( net-wireless/bluez ) l2tp? ( net-dialup/xl2tpd ) ofono? ( net-misc/ofono ) openconnect? ( net-misc/openconnect ) openvpn? ( net-misc/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wispr? ( net-libs/gnutls )
 SLOT=0
-SRC_URI=mirror://kernel/linux/network/connman/connman-1.31.tar.xz
+SRC_URI=mirror://kernel/linux/network/connman/connman-1.32.tar.xz
 _eclasses_=multilib	23ae8c186171e6476af098d2a50d0ee0	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=7bb2b40dff4b38b188987c4c1f4738be
+_md5_=306f83692ee4f0dbe438332bce823235
diff --git a/metadata/md5-cache/net-misc/stunnel-5.30 b/metadata/md5-cache/net-misc/stunnel-5.30
index 979034909b32..33779de828ee 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.30
+++ b/metadata/md5-cache/net-misc/stunnel-5.30
@@ -4,11 +4,11 @@ DESCRIPTION=TLS/SSL - Port Wrapper
 EAPI=5
 HOMEPAGE=http://www.stunnel.org/index.html
 IUSE=ipv6 libressl selinux stunnel3 tcpd ssl
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) stunnel3? ( dev-lang/perl ) selinux? ( sec-policy/selinux-stunnel )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.30.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.30.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.30.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.30.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.30.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.30.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.30.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b031e94f4c7c34e1d677376b8929821a	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=b20f03506c45d1c62aaa4e1f997aef49
+_md5_=c4739653734de515af9fc7b70458855c
diff --git a/metadata/md5-cache/www-client/otter-0.9.07 b/metadata/md5-cache/www-client/otter-0.9.07
deleted file mode 100644
index f2a771b51491..000000000000
--- a/metadata/md5-cache/www-client/otter-0.9.07
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=Project aiming to recreate classic Opera (12.x) UI using Qt5
-EAPI=5
-HOMEPAGE=http://otter-browser.org/
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://github.com/Emdek/otter/archive/v0.9.07.tar.gz -> otter-0.9.07.tar.gz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=22ec9a49f548385eff6db01218dd0a53
diff --git a/metadata/md5-cache/www-client/otter-0.9.08 b/metadata/md5-cache/www-client/otter-0.9.08
deleted file mode 100644
index b1ecf9b31269..000000000000
--- a/metadata/md5-cache/www-client/otter-0.9.08
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=Project aiming to recreate classic Opera (12.x) UI using Qt5
-EAPI=5
-HOMEPAGE=http://otter-browser.org/
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5
-SLOT=0
-SRC_URI=https://github.com/Emdek/otter/archive/v0.9.08.tar.gz -> otter-0.9.08.tar.gz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c37af212f4c8e474d9e66d038d06d635
diff --git a/metadata/md5-cache/x11-misc/xdg-utils-1.1.1-r1 b/metadata/md5-cache/x11-misc/xdg-utils-1.1.1-r1
new file mode 100644
index 000000000000..382cdfc37bab
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xdg-utils-1.1.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=app-text/xmlto-0.0.26-r1[text(+)] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-utils/
+IUSE=doc +perl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info x11-apps/xprop x11-apps/xset perl? ( dev-perl/File-MimeInfo )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://portland.freedesktop.org/download/xdg-utils-1.1.1.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=02e56af291a1bd787596257eb31a828f
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a91f75944779..c6ef8891c2ce 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Apr 2016 06:38:43 +0000
+Fri, 29 Apr 2016 11:08:49 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 331271e792f4..ba0bb03a7ea0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Apr 29 06:37:50 UTC 2016
+Fri Apr 29 11:07:55 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9b358785dd0e..cbc469f653dc 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Apr 2016 07:00:01 +0000
+Fri, 29 Apr 2016 11:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index b44b5de0a457..249dbcfa8d0a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1461912002 Fri 29 Apr 2016 06:40:02 AM UTC
+1461928201 Fri 29 Apr 2016 11:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a91f75944779..c6ef8891c2ce 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Apr 2016 06:38:43 +0000
+Fri, 29 Apr 2016 11:08:49 +0000
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 4c1b30ee8a94..ef0a9eb813a4 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,2 +1,2 @@
 DIST connman-1.29.tar.xz 653324 SHA256 2a5a69693566f7fd59b2e677fa89356ada6d709998aa665caef8707b1e7a8594 SHA512 19f623dd23c6312f29bbd570dcb22d31154ffcd16ee66ed2280df3d9d844301f18538418363222d99eabdc33da0021488ed66ba2e4f88df30646004b724538ee WHIRLPOOL 9439cadeb20b72c922b1426da213f8567fe7b0da45f9a4abf270c38687a9d9161a8ee14250623344864d612e130e6f28926918468aaf4346a9e5ff41e6ad22bb
-DIST connman-1.31.tar.xz 668120 SHA256 88fcf0b6df334796b90e2fd2e434d6f5b36cd6f13b886a119b8c90276b72b8e2 SHA512 f9871ead096ead37d3bc524fb143ec8c88125e9c18b5eb1f451581b9a2061719e90361e5b7f3e09901701707d977c42c630457b0ead8e76e04e964a7542c7bbd WHIRLPOOL 0e7f73e1d83a862fb33d2a3b6983c00b2305fea95803836d5dadbb31a8a55d19e2a21447e5e5654b04b0320929eaef2eba99b5921ab4a6fbf2d89e3befbe81b4
+DIST connman-1.32.tar.xz 668404 SHA256 3185864c73206a6033d12e9f583689dcd03f714a40a58333709d3f74a4e0934c SHA512 031b876f98b27c1a657af1e5242d06d9295f3710053c365fc94b13f386fe25e150ef95fbed81462c0d770522625bd5f55c621f5ecb1ad638dd64779c3e444066 WHIRLPOOL b20652bcb19b172b09aa3c10de3736eaeb500bd56a131b8580d750bf72ef9ba034b80c563b929f9d81de226b381e56b2aeee84186db66b0d169ffd2463e9417b
diff --git a/net-misc/connman/connman-1.31-r1.ebuild b/net-misc/connman/connman-1.32.ebuild
similarity index 95%
rename from net-misc/connman/connman-1.31-r1.ebuild
rename to net-misc/connman/connman-1.32.ebuild
index 2b1ee4634177..d035086a1f61 100644
--- a/net-misc/connman/connman-1.31-r1.ebuild
+++ b/net-misc/connman/connman-1.32.ebuild
@@ -32,8 +32,7 @@ DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-2.6.39"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.16-execinfo-assumptions.patch"
-	"${FILESDIR}/${PN}-1.31-iptables-1.6.0.patch"
+	"${FILESDIR}/${PN}-1.32-execinfo-assumptions.patch"
 	"${FILESDIR}/${PN}-1.31-xtables.patch"
 )
 
diff --git a/net-misc/connman/files/connman-1.31-iptables-1.6.0.patch b/net-misc/connman/files/connman-1.31-iptables-1.6.0.patch
deleted file mode 100644
index 30131e690bb1..000000000000
--- a/net-misc/connman/files/connman-1.31-iptables-1.6.0.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From acea08a0e4234a4c1a87bedc087c73ff36de0c7b Mon Sep 17 00:00:00 2001
-From: Wu Zheng <wu.zheng@intel.com>
-Date: Thu, 28 Jan 2016 18:04:17 +0800
-Subject: iptables: Add missing function item of xtables to match iptables 1.6
-
-The struct of xtables_globals has been modified in iptables 1.6.
-If connman runs with iptables 1.6, it can crash.
-
-Program received signal SIGSEGV, Segmentation fault.
-0x00000000 in ?? ()
-0xb7dea89c in xtables_find_target () from /usr/lib/libxtables.so.11
-0xb7deac1c in ?? () from /usr/lib/libxtables.so.11
-0xb7dea793 in xtables_find_target () from /usr/lib/libxtables.so.11
-
-The the missing function item of xtables is added to xtables_globals.
----
- src/iptables.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/iptables.c b/src/iptables.c
-index bc0c763..5ef757a 100644
---- a/src/iptables.c
-+++ b/src/iptables.c
-@@ -1566,6 +1566,9 @@ struct xtables_globals iptables_globals = {
- 	.option_offset = 0,
- 	.opts = iptables_opts,
- 	.orig_opts = iptables_opts,
-+#if XTABLES_VERSION_CODE > 10
-+	.compat_rev = xtables_compatible_revision,
-+#endif
- };
- 
- static struct xtables_target *prepare_target(struct connman_iptables *table,
--- 
-cgit v0.12
-
diff --git a/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch b/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch
new file mode 100644
index 000000000000..eb8e4fc0c131
--- /dev/null
+++ b/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch
@@ -0,0 +1,54 @@
+diff -uNr a/config.h.in b/config.h.in
+--- a/config.h.in	2013-07-02 17:41:03.715261748 +0000
++++ b/config.h.in	2013-07-02 17:41:21.707260667 +0000
+@@ -3,6 +3,9 @@
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+ #undef HAVE_DLFCN_H
+ 
++/* Define to 1 if you have the <execinfo.h> header file. */
++#undef HAVE_EXECINFO_H
++
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+ 
+diff -uNr a/configure.ac b/configure.ac
+--- a/configure.ac	2013-07-02 17:41:03.715261748 +0000
++++ b/configure.ac	2013-07-02 17:41:21.719260666 +0000
+@@ -181,6 +181,8 @@
+ AC_CHECK_FUNC(signalfd, dummy=yes,
+ 			AC_MSG_ERROR(signalfd support is required))
+ 
++AC_CHECK_HEADERS([execinfo.h], [], [])
++
+ AC_CHECK_LIB(dl, dlopen, dummy=yes,
+ 			AC_MSG_ERROR(dynamic linking loader is required))
+ 
+diff -uNr a/src/backtrace.c b/src/backtrace.c
+--- a/src/backtrace.c	2013-07-02 17:41:03.727261747 +0000
++++ b/src/backtrace.c	2013-07-02 17:42:12.717257603 +0000
+@@ -30,7 +30,9 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+ #include <dlfcn.h>
+ 
+ #include "connman.h"
+@@ -37,6 +38,7 @@
+ void print_backtrace(const char* program_path, const char* program_exec,
+ 		unsigned int offset)
+ {
++#ifdef HAVE_EXECINFO_H
+ 	void *frames[99];
+ 	size_t n_ptrs;
+ 	unsigned int i;
+@@ -135,6 +138,7 @@
+ 
+ 	close(outfd[1]);
+ 	close(infd[0]);
++#endif
+ }
+ 
+ static void signal_handler(int signo)
diff --git a/net-misc/stunnel/stunnel-5.30.ebuild b/net-misc/stunnel/stunnel-5.30.ebuild
index a0c117c3fd62..5acb98e89aed 100644
--- a/net-misc/stunnel/stunnel-5.30.ebuild
+++ b/net-misc/stunnel/stunnel-5.30.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest
index e1dbc258b82d..7a7677279143 100644
--- a/www-client/otter/Manifest
+++ b/www-client/otter/Manifest
@@ -1,3 +1 @@
-DIST otter-0.9.07.tar.gz 2634317 SHA256 1c27509f9736a9c99e12a3ef23b08cc41548ad7f6d7481bf07020fb471788da9 SHA512 035462e7a601e74a6a3dc924caf2d80e38e2ec75d75211d5f83176e0065a0289e8c0fd034643aa01c94dd6cfe9f695a4533e7464e6f019ed9153eec20641fa78 WHIRLPOOL 4c50c76d2d5fc75f9c6545dc57e2b21295e046af1bae9653999bc4880c5bd6021cfb75e125d6c75f3ef76e6c3999bcf271cafc090ab52d63cf84165876541227
-DIST otter-0.9.08.tar.gz 3124966 SHA256 b4606aca5983b90b232a90517f283c2c6a1045f295352792b4a2c00a51b5d4c8 SHA512 9244a84490bb8dda12b932f6b39a41000a96740ef9c194e8f52a31122d763f857462e88219f086e8ad886dd6e0d79d4143060ddb801aaeb30c2952cef283e5ff WHIRLPOOL b395badb4b92e954f6437267ef3cb4f9b59a8b4043efd3bccadc8e9b3dc63dfb460d872e1837363464a2f8b46eca2022d7aaea318ccfcbe73329959c38f1aca2
 DIST otter-0.9.09.tar.gz 3197615 SHA256 4fb555da8c8268cce3893a5af8c777b355978da4f87184a5a413a5c233622c6c SHA512 269d896784f6cdcc051c4d6c1b182910d62c10998b10993cb90387cc81a8ca032a36cbe0182695d441b3e470a7a5ba7f54ffb5436cbf566a3ccd9bf3911734b1 WHIRLPOOL 1bd3acf698b6d04bd4f65abcac1bef2c0708bdf56bf53eeb36b42bc36a36b06baf5c5239fcaca15dbf48a701eebca6701bba4ba7db39e7a0dfe91c606554ae43
diff --git a/www-client/otter/otter-0.9.07.ebuild b/www-client/otter/otter-0.9.07.ebuild
deleted file mode 100644
index 11d2ff0b075f..000000000000
--- a/www-client/otter/otter-0.9.07.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WANT_CMAKE="always"
-inherit eutils cmake-utils
-
-DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="http://otter-browser.org/"
-SRC_URI="https://github.com/Emdek/${PN}/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="
-	${DEPEND}
-"
-
-S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
-DOCS=( CHANGELOG CONTRIBUTING.md TODO )
-
-src_prepare() {
-	if [[ -n ${LINGUAS} ]]; then
-		local lingua
-		for lingua in resources/translations/*.qm; do
-			lingua=$(basename ${lingua})
-			lingua=${lingua/otter-browser_/}
-			lingua=${lingua/.qm/}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm resources/translations/otter-browser_${lingua}.qm || die
-			fi
-		done
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	domenu ${PN}-browser.desktop
-}
diff --git a/www-client/otter/otter-0.9.08.ebuild b/www-client/otter/otter-0.9.08.ebuild
deleted file mode 100644
index 4627713d4beb..000000000000
--- a/www-client/otter/otter-0.9.08.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WANT_CMAKE="always"
-inherit eutils cmake-utils
-
-DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="http://otter-browser.org/"
-SRC_URI="https://github.com/Emdek/${PN}/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxmlpatterns:5
-"
-RDEPEND="
-	${DEPEND}
-"
-
-S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
-DOCS=( CHANGELOG CONTRIBUTING.md TODO )
-
-src_prepare() {
-	if [[ -n ${LINGUAS} ]]; then
-		local lingua
-		for lingua in resources/translations/*.qm; do
-			lingua=$(basename ${lingua})
-			lingua=${lingua/otter-browser_/}
-			lingua=${lingua/.qm/}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm resources/translations/otter-browser_${lingua}.qm || die
-			fi
-		done
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	domenu ${PN}-browser.desktop
-}
diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch b/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch
new file mode 100644
index 000000000000..eee4684c17c4
--- /dev/null
+++ b/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch
@@ -0,0 +1,43 @@
+From 31db8136bdf61e7f9cb866f9d47c99c63343558d Mon Sep 17 00:00:00 2001
+From: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+Date: Fri, 15 Apr 2016 11:17:37 +0200
+Subject: xdg-mime: support for KDE Frameworks 5.6
+
+
+diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
+index 129850f..63b8a82 100644
+--- a/scripts/xdg-mime.in
++++ b/scripts/xdg-mime.in
+@@ -428,13 +428,9 @@ defapp_kde()
+       case "${KDE_SESSION_VERSION}" in
+         4)
+           KTRADER=`which ktraderclient 2> /dev/null`
+-          MIMETYPE="--mimetype"
+-          SERVICETYPE="--servicetype"
+         ;;
+         5)
+           KTRADER=`which ktraderclient${KDE_SESSION_VERSION} 2> /dev/null`
+-          MIMETYPE="--mimetype"
+-          SERVICETYPE="--servicetype"
+         ;;
+       esac
+     else
+@@ -442,8 +438,8 @@ defapp_kde()
+     fi
+     if [ -n "$KTRADER" ] ; then
+         DEBUG 1 "Running KDE trader query \"$MIME\" mimetype and \"Application\" servicetype"
+-        trader_result=`$KTRADER $MIMETYPE "$MIME" $SERVICETYPE Application 2>/dev/null \
+-            | grep DesktopEntryPath | head -n 1 | cut -d ':' -f 2 | cut -d \' -f 2`
++        trader_result=`$KTRADER --mimetype "$MIME" --servicetype Application 2>/dev/null \
++            | grep -E "^DesktopEntryPath : |\.desktop$" | head -n1 | sed "s/^DesktopEntryPath : '\(.*\.desktop\)'\$/\1/"`
+         if [ -n "$trader_result" ] ; then
+             basename "$trader_result"
+             exit_success
+@@ -954,4 +950,3 @@ esac
+ update_mime_database $xdg_base_dir
+ 
+ exit_success
+-
+-- 
+cgit v0.10.2
+
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..75a0b97fc5d0
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
+#SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
+#SRC_URI="https://people.freedesktop.org/~rdieter/${PN}/${MY_P}.tar.gz
+#	https://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
+SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +perl"
+
+RDEPEND="dev-util/desktop-file-utils
+	x11-misc/shared-mime-info
+	x11-apps/xprop
+	x11-apps/xset
+	perl? ( dev-perl/File-MimeInfo )"
+DEPEND=">=app-text/xmlto-0.0.26-r1[text(+)]"
+
+DOCS=( README RELEASE_NOTES TODO ) # ChangeLog is bogus, see git instead
+
+PATCHES=( "${FILESDIR}/${P}-ktraderclient5.patch" )
+
+RESTRICT="test" # Disabled because of sandbox violation(s)
+
+#S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	# If you choose to do git snapshot instead of patchset, you need to remember
+	# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
+	# all the files
+	if [[ -d ${WORKDIR}/patch ]]; then
+		EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
+	fi
+	eautoreconf
+	pushd scripts && make scripts-clean && popd
+}
+
+src_configure() {
+	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
+	default
+}
+
+src_install() {
+	default
+
+	newdoc scripts/xsl/README README.xsl
+	use doc && dodoc -r scripts/html
+
+	# Install default XDG_DATA_DIRS, bug #264647
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
+	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
+	doenvd 30xdg-data-local
+
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
+	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
+	doenvd 90xdg-data-base
+}
+
+pkg_postinst() {
+	[[ -x $(type -P gtk-update-icon-cache) ]] || elog "Install x11-libs/gtk+:2 for the gtk-update-icon-cache command."
+}