diff --git a/app-backup/kbackup/Manifest b/app-backup/kbackup/Manifest
index 2d7a59c3d243..fef838bfd000 100644
--- a/app-backup/kbackup/Manifest
+++ b/app-backup/kbackup/Manifest
@@ -1 +1,2 @@
 DIST kbackup-0.8.tar.bz2 507597 SHA256 8ef4a9c9665a8af17cce93b2f09b1d8da83cedf1f5da11f36343699fb65f08b1 SHA512 c5187f3a4a12047b849a432dc30f8dc435e14c170ae76659a00406d37cb215a563509632d3d61873077535f9b20b31893ea91b03453b51cd875e68f46f920378 WHIRLPOOL 27aacdacb194addccf31ecd8a6d8b5b8db6f065f1644bf53bdc9529c4cd10884861a8a20e8c0d703848147c3e4a813d9e66e779a5ec0e0965648fdad246accfc
+DIST kbackup-1.0.tar.bz2 500638 SHA256 cfa27bbc26a66aef07512f6bae9e73125f39f79bb0a337c1033e01852b895134 SHA512 9c85b018d926dfdc9d33e89e4f605d529639471a685e6e20cc4fe3515c9c125f47a2c34f2f0dec299753892d68f24a9bc38346aef333385cf41f6e8eaf86b43a WHIRLPOOL 2307a0bcabbcc126a13680b024ba02895e55a30f923848d2e7259e9fbd26cec7b1f8a0fcbe7fad19c422a8d75419c24b5302cb628fb31863303e97ef0294d0cc
diff --git a/app-backup/kbackup/kbackup-1.0.ebuild b/app-backup/kbackup/kbackup-1.0.ebuild
new file mode 100644
index 000000000000..57d085069a8d
--- /dev/null
+++ b/app-backup/kbackup/kbackup-1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program that lets you back up any directories or files"
+HOMEPAGE="http://kde-apps.org/content/show.php/KBackup?content=44998"
+SRC_URI="http://members.aon.at/m.koller/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${CDEPEND}
+	x11-misc/shared-mime-info
+"
+RDEPEND="${CDEPEND}
+	!app-backup/kbackup:4
+"
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 932f9d472061..00cd107b8946 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,13 +1,7 @@
 DIST kvmtool-1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz 244571 SHA256 c72c0e3463a8f0cfe2cdaa8b8e7951f4eb7293c486e44f84b9e421073dbf5ab9 SHA512 13db2bf2ff794f34c2a825c9b1862c85b0f470c81e3d91177979302f921e3970b8dfaeaf54602005fba8903bba52e43b6e8d67edaa0ee8de82002db7b396c3a0 WHIRLPOOL 0904a5783ac27befb207a5fa0030baede68ae589b69abf012ec733ff2e6d9f77b7198273c22fa7404b2c78bcc9ae40abc39d002519700666ba1e54c6550525b2
-DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
-DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
 DIST linux-4.8.6.tar.xz 91969848 SHA256 74744e00420856cfc8049fa3b3a55e57a116994226a498ef56801bc9492df36b SHA512 235acc394ce347d4131e86f6ff3f3fa9d552bf227c2483c25da7de99f3dc8fd20c4a04db0c8d59cdfa4fa9d98a5b102a5734f7b7704df6648c6efa5e8a7515ea WHIRLPOOL cb27d5654f7351ff32d057501c594f9b6e15fefe78c588b9e9cfedd88fbdb807ba7cfc1e238444d94f3d46168d6edc1bbb8e3966c2ca0f46c668dd4e9d60a01f
-DIST qemu-2.6.1.tar.bz2 25762855 SHA256 4942fd1b6ee31f2f55ffc2201dd7397e6b9c55a2ef332e6d660c730d268e08d1 SHA512 adb55d0774618c9cd02d376222814f2047977bfbca73248841275084ae537db583db4ac6cfa5cc65c3182941d5f4b40f2f7f4661b2cd93cbb3796e2f325bc919 WHIRLPOOL 1b9c0de78fcf874fd307ce2ee49448e96140fae0ea5739af28947bf8f241e768b47abe3edd2d798b826d99cfd4ca143cf71192d254b54ab47515ac59327fc172
 DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 SHA512 654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db WHIRLPOOL dcb3e5f7da89dd8e14d636d7ebd476e076e0043880bb9ea3fb1c03cb4bcd4e5c7d3c4719da26c3ce521e3a3db5ae671e86f198ac1bc3474e774d75504fef8b8d
-DIST rkt-1.18.0.tar.gz 3042834 SHA256 3897afeb743f77509cf7bfb484800e5b75eadb15f42bc0258e2e5b5598ae8290 SHA512 e47da81dde38f5c63cfd2955b1219c4339b51d5bf396042d7872893c5475f796b0279218380fa43ebe3ed7bbdfaf360ed286095193a279c364623dcbd8d9da14 WHIRLPOOL 409451eb50dfdd0726641ea843e48ebcc10629b6b6e85ce7ece4b1f6cb5b8586645f3990b0d9510ba6b7b3c0f0beb58f1c740e8cb5610fea675eb0c3ea1305a6
-DIST rkt-1.19.0.tar.gz 3071413 SHA256 49b5c1cc9a376a241e8b72b9702a911c3daa9187715e70fddbf2d267140b627a SHA512 0d14716de6cdb2bf6c7d8b1ddd4ae839f98cb05290a8d85f3ed7b604dce5250556d849909c21c51889c43f0779c20f76f708a83bb6ba2b2d7c1f1761cec22a0c WHIRLPOOL 4c0d99fd77444c992be0fc4be7461c8e34b7e26dd64f17f1468d8a0b93b4878d32ded7bcac96a01cf8d6c981bd1ed8b25fae9efde5574a8fb64c7e9f9b290f96
-DIST rkt-1.20.0.tar.gz 3315218 SHA256 3b0a08971cc22004fe8367f8d3e35d5f66fcd0191802b4e35c5c273c1f772096 SHA512 37c46a044838660eb22d74ff5cc16c7d9a29b178a5ccece97d484e4aebfd587a7558d665d2a2162adee859135330d4504a4dca60faf4ce5e3552633924c3b960 WHIRLPOOL 65c734f97f942886c7e7c6bcdc5a99bf3350b7f6286a015af57750c2b7d1282cd2c032d9bdc10d3209fb94c817fbc6f3cf1c8ea5307a820ba9a817d78afd38ca
 DIST rkt-1.21.0.tar.gz 3334473 SHA256 63eed8da954c24c1f9010e7513ee6ac21ffeaf63a648f9d5a0f9e9d3eb92fde5 SHA512 2723aab1aadbe7be0f7ce9c7f4e000c76d8c34d167b1157a08de7fb2248e4b73a7fc765ead557db495bab803f5d5c8d09e1d9441301396e18fa49b21a8c4c7ae WHIRLPOOL 11b28be68dd246ddafb5455becc64ea1b185d1128747dc51103ab692c34cd9157423164c4847be9e9a39338cb5ad6e2db3e588545378179b51a0ce58a1be1935
-DIST rkt-pxe-1192.0.0.img 233603403 SHA256 a6233ff4b91457181c3f9eed942af9df66161f5ae84256fbe2d08b5d184c35be SHA512 8e6e5311e209453992da80722229723854b66b983b31922ba68131dbf1c009989e3181ecd6fc9876d1e1eb1956f6463bb66d6ff9114904c4b6dca6c0474fcdee WHIRLPOOL 1d3b0914a38be7518f4f0abc6050aab82318a380bbb2b722671f5e1111aa11fa019ccbd029eaa7f8262bcef90ce159c36eb09dfb8911dd60c57637da4e00270e
+DIST rkt-1.22.0.tar.gz 3338862 SHA256 49fda935e0ec628889b0c6ba22277354dbf9b89b4c09429c10800a562bbf1b7c SHA512 2aa6c15a0994e1ba427b05694f6fa12446e2f336ff51593fc6d4776f77d0b798203a0ab97f4c12ada1226c934b4e1866d9a5545f48ae1938e79d696d236ad8c7 WHIRLPOOL 98c8761e47379a02b536b760f327dc65dabd3594d30fdc792326044fc0e825401cc49abf0b5ab6ce6d4bc6072f0008466da4f3d2a12cdad16908e8549c0fa88e
 DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
 DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.18.0.ebuild b/app-emulation/rkt/rkt-1.18.0.ebuild
deleted file mode 100644
index b3e3df4ee826..000000000000
--- a/app-emulation/rkt/rkt-1.18.0.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1192.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.3.1"
-KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
-QEMU_VERSION="v2.6.1"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
-	${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
-	https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
-	${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
-	http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
-	${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
-
-DEPEND=">=dev-lang/go-1.5
-	app-arch/cpio
-	app-crypt/trousers
-	sys-fs/squashfs-tools
-	dev-perl/Capture-Tiny
-	rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
-	rkt_stage1_kvm_qemu? (
-		sys-apps/attr[static-libs(+)]
-		sys-libs/libcap[static-libs(+)]
-		sys-libs/zlib[static-libs(+)]
-		>=x11-libs/pixman-0.28.0[static-libs(+)]
-	)"
-
-RDEPEND="!app-emulation/rocket
-	rkt_stage1_host? ( systemd? (
-		>=sys-apps/systemd-222
-		app-shells/bash:0
-	) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
-	enewgroup rkt-admin
-	enewgroup rkt
-}
-
-src_unpack() {
-	local x
-	for x in ${A}; do
-		case ${x} in
-			*.img|linux-*) continue ;;
-			kvmtool-*)
-				mkdir kvmtool || die
-				pushd kvmtool >/dev/null || die
-				unpack ${x}
-				popd >/dev/null || die
-				;;
-			*)
-				unpack ${x}
-		esac
-	done
-}
-
-src_prepare() {
-	eapply_user
-
-	# avoid sdjournal include for bug 595874
-	if ! use systemd; then
-		sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
-			-i rkt/rkt.mk || die
-	fi
-
-	sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
-	# disable git fetch of systemd
-	sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
-	# disable git fetch of kvmtool
-	sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
-	# disable git fetch of qemu
-	sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
-	-e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
-	-i stage1/usr_from_kvm/qemu.mk || die
-
-	# disable fetch of kernel sources
-	sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
-		-i stage1/usr_from_kvm/kernel.mk || die
-
-	if use rkt_stage1_host; then
-		# Make systemdUnitsPath consistent with host
-		sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
-			-i stage1/init/init.go || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local flavors hypervisors myeconfargs=(
-		--with-stage1-default-images-directory="/usr/share/rkt"
-		--with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
-	)
-
-	use systemd || myeconfargs+=( --enable-sdjournal=no )
-
-	# enable flavors (first is default)
-	use rkt_stage1_host && flavors+=",host"
-	use rkt_stage1_src && flavors+=",src"
-	use rkt_stage1_coreos && flavors+=",coreos"
-	use rkt_stage1_fly && flavors+=",fly"
-	{ use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
-	myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
-	if use rkt_stage1_src; then
-		myeconfargs+=(
-			--with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
-			--with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
-		)
-	fi
-
-	if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
-		myeconfargs+=(
-			--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
-			--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
-		)
-	fi
-
-	if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
-		use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
-		use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
-		myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
-	fi
-
-	# Go's 6l linker does not support PIE, disable so cgo binaries
-	# which use 6l+gcc for linking can be built correctly.
-	if gcc-specs-pie; then
-		append-ldflags -nopie
-	fi
-
-	export CC=$(tc-getCC)
-	export CGO_ENABLED=1
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-	export CGO_LDFLAGS="${LDFLAGS}"
-	export BUILDDIR
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	local arch=${ARCH}
-	case ${arch} in
-		amd64) arch=x86_64;;
-	esac
-	ARCH=${arch} emake V=3
-	ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	use examples && dodoc -r examples
-	use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
-	dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
-	insinto /usr/share/rkt
-	doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
-	# create symlink for default stage1 image path
-	if use rkt_stage1_host; then
-		dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_src; then
-		dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_coreos; then
-		dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_fly; then
-		dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_kvm_lkvm; then
-		dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_kvm_qemu; then
-		dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
-	fi
-
-	systemd_dounit "${S}"/dist/init/systemd/*.service \
-		"${S}"/dist/init/systemd/*.timer \
-		"${S}"/dist/init/systemd/*.socket
-
-	insinto /usr/lib/tmpfiles.d
-	doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
-	newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
-	keepdir /etc/${PN}
-	fowners :rkt-admin /etc/${PN}
-	fperms 2775 /etc/${PN}
-}
diff --git a/app-emulation/rkt/rkt-1.19.0.ebuild b/app-emulation/rkt/rkt-1.19.0.ebuild
deleted file mode 100644
index 559845b6f6b3..000000000000
--- a/app-emulation/rkt/rkt-1.19.0.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1192.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.8.6"
-KVMTOOL_VERSION="1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2"
-QEMU_VERSION="v2.7.0"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
-	${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
-	https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
-	${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
-	http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
-	${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
-
-# Some tests fail.
-# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
-RESTRICT="test rkt_stage1_src? ( userpriv )"
-
-DEPEND=">=dev-lang/go-1.5
-	app-arch/cpio
-	app-crypt/trousers
-	sys-fs/squashfs-tools
-	dev-perl/Capture-Tiny
-	rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
-	rkt_stage1_kvm_qemu? (
-		sys-apps/attr[static-libs(+)]
-		sys-libs/libcap[static-libs(+)]
-		sys-libs/zlib[static-libs(+)]
-		>=x11-libs/pixman-0.28.0[static-libs(+)]
-	)"
-
-RDEPEND="!app-emulation/rocket
-	rkt_stage1_host? ( systemd? (
-		>=sys-apps/systemd-222
-		app-shells/bash:0
-	) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
-	enewgroup rkt-admin
-	enewgroup rkt
-}
-
-src_unpack() {
-	local x
-	for x in ${A}; do
-		case ${x} in
-			*.img|linux-*) continue ;;
-			kvmtool-*)
-				mkdir kvmtool || die
-				pushd kvmtool >/dev/null || die
-				unpack ${x}
-				popd >/dev/null || die
-				;;
-			*)
-				unpack ${x}
-		esac
-	done
-}
-
-src_prepare() {
-	eapply_user
-
-	# This patch breaks linux kernel cc-option checks when the
-	# compiler doesn't recognize the -no-pie option.
-	rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
-
-	# avoid sdjournal include for bug 595874
-	if ! use systemd; then
-		sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
-			-i rkt/rkt.mk || die
-	fi
-
-	sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
-	# disable git fetch of systemd
-	sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
-	# disable git fetch of kvmtool
-	sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
-	# disable git fetch of qemu
-	sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
-	-e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
-	-i stage1/usr_from_kvm/qemu.mk || die
-
-	# disable fetch of kernel sources
-	sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
-		-i stage1/usr_from_kvm/kernel.mk || die
-
-	if use rkt_stage1_host; then
-		# Make systemdUnitsPath consistent with host
-		sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
-			-i stage1/init/init.go || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local flavors hypervisors myeconfargs=(
-		--with-stage1-default-images-directory="/usr/share/rkt"
-		--with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
-	)
-
-	use systemd || myeconfargs+=( --enable-sdjournal=no )
-
-	# enable flavors (first is default)
-	use rkt_stage1_host && flavors+=",host"
-	use rkt_stage1_src && flavors+=",src"
-	use rkt_stage1_coreos && flavors+=",coreos"
-	use rkt_stage1_fly && flavors+=",fly"
-	{ use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
-	myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
-	if use rkt_stage1_src; then
-		myeconfargs+=(
-			--with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
-			--with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
-		)
-	fi
-
-	if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
-		myeconfargs+=(
-			--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
-			--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
-		)
-	fi
-
-	if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
-		use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
-		use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
-		myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
-	fi
-
-	# Go's 6l linker does not support PIE, disable so cgo binaries
-	# which use 6l+gcc for linking can be built correctly.
-	if gcc-specs-pie; then
-		append-ldflags -nopie
-	fi
-
-	export CC=$(tc-getCC)
-	export CGO_ENABLED=1
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-	export CGO_LDFLAGS="${LDFLAGS}"
-	export BUILDDIR
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	local arch=${ARCH}
-	case ${arch} in
-		amd64) arch=x86_64;;
-	esac
-	ARCH=${arch} emake V=3
-	ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	use examples && dodoc -r examples
-	use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
-	dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
-	insinto /usr/share/rkt
-	doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
-	# create symlink for default stage1 image path
-	if use rkt_stage1_host; then
-		dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_src; then
-		dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_coreos; then
-		dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_fly; then
-		dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_kvm_lkvm; then
-		dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_kvm_qemu; then
-		dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
-	fi
-
-	systemd_dounit "${S}"/dist/init/systemd/*.service \
-		"${S}"/dist/init/systemd/*.timer \
-		"${S}"/dist/init/systemd/*.socket
-
-	insinto /usr/lib/tmpfiles.d
-	doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
-	newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
-	keepdir /etc/${PN}
-	fowners :rkt-admin /etc/${PN}
-	fperms 2775 /etc/${PN}
-}
diff --git a/app-emulation/rkt/rkt-1.20.0.ebuild b/app-emulation/rkt/rkt-1.22.0.ebuild
similarity index 98%
rename from app-emulation/rkt/rkt-1.20.0.ebuild
rename to app-emulation/rkt/rkt-1.22.0.ebuild
index 97a036e13b2d..7e401a48d7a6 100644
--- a/app-emulation/rkt/rkt-1.20.0.ebuild
+++ b/app-emulation/rkt/rkt-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -133,7 +133,7 @@ src_prepare() {
 '$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
 'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
 '\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
+'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
 'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
 'else\n'\
 '\t\0\n'\
diff --git a/app-misc/sl/Manifest b/app-misc/sl/Manifest
index d20efd54f2d0..f4402c94333c 100644
--- a/app-misc/sl/Manifest
+++ b/app-misc/sl/Manifest
@@ -1,4 +1 @@
 DIST sl-5.02.tar.gz 5353 SHA256 1e5996757f879c81f202a18ad8e982195cf51c41727d3fea4af01fdcbbb5563a SHA512 a4d18bc79d7e0eca7748b10226a6b2a85a7a01d636e4e9215bf524a7849bc5cb250034326e5a69f7423d79e40b92182fddc0e56e25df616edae06369c782cb26 WHIRLPOOL cd44531f70bb854f3fe0f421cc63c9ec7e694631d23249cd3ea452eb76ef3aa43bbe7159796e879dac85be8188084ca1321d5368f87a0d32178dc42aaa72d8c4
-DIST sl.en.1.gz 467 SHA256 51dc6d6c902a9c8dd1f04379b53d873e0f321d78710a7fecccf68f08ca6923dc SHA512 5acfc9818ea0f2d3931a24ae0ed1c82685b38b384bd635122ddfbf5d04199cbc3cbc370fa9be48825440abad972029218285a5486ee820f77ea8ab77a3dec2e6 WHIRLPOOL 10fe3e52a18a739381ac7b6ea16cb58a04550bb57534dd3226de349eafad51cce60b7ea7f5ff36ece008d363e81b5c37e3ec943ac8183b8183a95012b7adb0ae
-DIST sl.tar 20480 SHA256 b2bcbd86acf2017c84b6aaf6161b3b24f97e34a2d70ab0204c9503f5d50965f4 SHA512 eb0cc0bc0d6e795e32ed84a6813644b41e81ad6fd7ac51e67ec6c99747acdbc9d102041d3af53c9ba75ba7b1581ab4c6a14fc9db20e1f69a30713aefb17f7737 WHIRLPOOL 5173ab275c8a47ef6a20c39bcb7053a9f5d317c092f5813b882913ed625d806f477eaee35398b53fc40b0944f298d3fc540ce94ec9b343491286237aa35b4168
-DIST sl5-1.patch 36035 SHA256 4943b6f000f518ed08755b36d9b753291989c4867e55d74bc4cc4502f6e9422f SHA512 25321da4fd2359f1e47a6ab939d3ce5dc8a160a6ede4db3e7355d5efcecf686622f3c9e3e941eeeeed504c61cb15b959648d97f70a97f88efe3a2628eaa96038 WHIRLPOOL 56d11bcdf9f1e27d1261b4616859b8381c6ae49c0897d28a7214fe59f7227013b39ff55d438078bd3cd7e196403a327af1edaba8be38255db38f2090db3070b8
diff --git a/app-misc/sl/files/Makefile b/app-misc/sl/files/Makefile
deleted file mode 100644
index 663a9bff6b1d..000000000000
--- a/app-misc/sl/files/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LDLIBS = -lncurses
-all: sl
-sl: sl.o
-clean:
-	rm -f sl sl.o
diff --git a/app-misc/sl/files/fix_compilation.patch b/app-misc/sl/files/fix_compilation.patch
deleted file mode 100644
index 5b63a844f9f5..000000000000
--- a/app-misc/sl/files/fix_compilation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- sl.orig/sl.c	2010-08-09 21:36:45.483225339 +0200
-+++ sl/sl.c	2010-08-09 22:01:12.462051982 +0200
-@@ -30,6 +30,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <strings.h>
-+#include <string.h>
- #include <time.h>
- #ifdef LINUX20
-   #include <ncurses/curses.h>
-@@ -186,10 +187,7 @@ int main(int argc, char *argv[])
-     scrollok(stdscr, FALSE);
-     DIREC = RTOL;
-     p = 3 * COLS / 10;
--    pp = (char*)malloc((size_t)(COLS + ALL_LENGTH + 10) * (D51HIGHT + 1) * (D51PATTERNS + 1));
--    for (i = 0; i <= (COLS + ALL_LENGTH + 1) * (D51HIGHT + 1) * D51PATTERNS; ++i) {
--      pp[i] = (char)NULL;
--    }
-+    pp = (char *)calloc(1, (size_t)(COLS + ALL_LENGTH + 10) * (D51HIGHT + 1) * (D51PATTERNS + 1));
- 
-     for (j = 0; j < D51PATTERNS; ++j) {
-       for (i = 0; i <= D51HIGHT; ++i) {
diff --git a/app-misc/sl/files/sl-3.03-gentoo.diff b/app-misc/sl/files/sl-3.03-gentoo.diff
deleted file mode 100644
index e6350ca5b37e..000000000000
--- a/app-misc/sl/files/sl-3.03-gentoo.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- sl.c.orig	2003-09-07 14:20:29.000000000 +0900
-+++ sl.c	2003-09-07 14:21:11.000000000 +0900
-@@ -164,6 +164,7 @@
-     signal(SIGINT, end_proc);
- #else
-+    signal(SIGTSTP, SIG_IGN);
-     signal(SIGINT, SIG_IGN);
-     PASSNUM = (int)(drand48() * 20.0) + 10;
-     if (drand48() > 0.5) {
-       ONEDIREC = 1;
diff --git a/app-misc/sl/metadata.xml b/app-misc/sl/metadata.xml
index f1b8905dc941..8718eb017e2e 100644
--- a/app-misc/sl/metadata.xml
+++ b/app-misc/sl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
 	<longdescription lang="en">
 		SL is an extremely sophisticated type remediation program at which you
 		will be astonished.  The original program has experienced gradual
diff --git a/app-misc/sl/sl-3.03-r3.ebuild b/app-misc/sl/sl-3.03-r3.ebuild
deleted file mode 100644
index 5193c62e5eab..000000000000
--- a/app-misc/sl/sl-3.03-r3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs flag-o-matic
-
-SL_PATCH="sl5-1.patch"
-
-DESCRIPTION="sophisticated graphical program which corrects your miss typing"
-HOMEPAGE="http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html http://www.izumix.org.uk/sl/"
-SRC_URI="http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/sl/${PN}.tar
-	!vanilla? (
-		http://www.linet.gr.jp/~izumi/sl/${SL_PATCH}
-		http://www.sodan.ecc.u-tokyo.ac.jp/~okayama/sl/${PN}.en.1.gz
-	)"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug linguas_ja vanilla"
-
-REQUIRED_USE="debug? ( !vanilla )"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	tc-export CC
-	use debug && append-cppflags -DDEBUG
-}
-
-src_prepare() {
-	if ! use vanilla ; then
-		epatch -p1 "${DISTDIR}/${SL_PATCH}"
-		epatch "${FILESDIR}/${P}-gentoo.diff"
-		epatch "${FILESDIR}/fix_compilation.patch"
-	fi
-
-	cp "${FILESDIR}"/Makefile "${S}" || die
-
-	if use linguas_ja; then
-		iconv -f ISO-2022-JP -t EUC-JP sl.1 > sl.ja.1
-	fi
-}
-
-src_compile() {
-	emake LDLIBS="$($(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
-	dobin sl
-	dodoc sl.txt
-
-	if ! use vanilla ; then
-		newman "${WORKDIR}/sl.en.1" sl.1
-	fi
-
-	if use linguas_ja ; then
-		dodoc README*
-		insinto /usr/share/man/ja/man1
-		newins sl.ja.1 sl.1
-	fi
-}
diff --git a/app-misc/sl/sl-5.02.ebuild b/app-misc/sl/sl-5.02.ebuild
index 03788f07cd87..dd453d6c5b01 100644
--- a/app-misc/sl/sl-5.02.ebuild
+++ b/app-misc/sl/sl-5.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mtoyoda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="l10n_ja"
 
 RDEPEND="sys-libs/ncurses:0="
@@ -24,8 +24,8 @@ src_prepare() {
 }
 
 src_install() {
-	dobin sl
-	doman ${PN}.1
+	dobin "${PN}"
+	doman "${PN}.1"
 	local DOCS=( README.md )
 	if use l10n_ja; then
 		newman ${PN}.1.ja ${PN}.ja.1
diff --git a/app-misc/task/task-2.5.1-r1.ebuild b/app-misc/task/task-2.5.1-r1.ebuild
index 0d8b558bd2bd..9136bbc52ab8 100644
--- a/app-misc/task/task-2.5.1-r1.ebuild
+++ b/app-misc/task/task-2.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -43,17 +43,17 @@ src_install() {
 
 	newbashcomp scripts/bash/task.sh task
 
-	if use vim-syntax ; then
-		rm scripts/vim/README
+	if use vim-syntax; then
+		rm scripts/vim/README || die
 		insinto /usr/share/vim/vimfiles
 		doins -r scripts/vim/*
 	fi
 
-	if use zsh-completion ; then
+	if use zsh-completion; then
 		insinto /usr/share/zsh/site-functions
 		doins scripts/zsh/*
 	fi
 
-	exeinto /usr/share/${PN}/scripts
+	exeinto "/usr/share/${PN}/scripts"
 	doexe scripts/add-ons/*
 }
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild
new file mode 100644
index 000000000000..506ddf1b2785
--- /dev/null
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Copy files/directories in a curses interface"
+HOMEPAGE="http://members.iinet.net.au/~lynx/vcp/"
+SRC_URI="http://members.iinet.net.au/~lynx/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+DOCS=( Changelog README INSTALL )
+
+src_prepare() {
+	default
+	sed -i Makefile -e '/-o vcp/s|$(CFLAGS)|& $(LDFLAGS)|' || die "sed Makefile"
+}
+
+src_compile() {
+	filter-lfs-flags
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.1"
+	insinto /etc
+	newins "${PN}.conf.sample" "${PN}.conf"
+	einstalldocs
+}
diff --git a/app-misc/when/Manifest b/app-misc/when/Manifest
index 4503c72a7e41..268ee044b60e 100644
--- a/app-misc/when/Manifest
+++ b/app-misc/when/Manifest
@@ -1,3 +1 @@
-DIST when-1.1.33.tar.gz 49740 SHA256 568a49e999363a018186e03c38d116c587b332f7fcf60820f9cfc34779050ab0 SHA512 5c0934257133f75a7de984499f99f68dde5343d51051acf1b454f04dae82254c733e946a6c5ead546dc3c07cd113d938a48c95af39b80cbfc04ee6d748223c83 WHIRLPOOL 9bcbe73a4034b817fc34d302689a0b404563081163c692ee23e484fbb9ab993a90a5d468f2586e7f5327abad98f4033ebd7546255f682898e899a9fdd7629c97
-DIST when-1.1.35.tar.gz 51308 SHA256 f880c0d80b1023a05df99690e36be133c46071657b9921fc9e8d16115fb13ae6 SHA512 b9acd1e3ea69c3ea9672eb16bd291c79612bbd037b4b96f6350d44da1400729a62bfc320eed2637646a728c243abacd7e26f22e76b5b12006dbd0c70bcb4a7da WHIRLPOOL 04ac240b99c5a0a3a2e0f80e7edd6ab0fd85939676016877f595d5698c8238d754ca4deb697eea507744bb936f64f6011548aa062751d99ffcc47a24362dbf4f
 DIST when-1.1.36.tar.gz 50926 SHA256 3ff95c1881e8fe25c82943720a81c9b9b3bd4ac002cd8ffc2d25c588fe7d50b1 SHA512 04b2efbcebae79325d8410a5aa5cdf59662fe42c06229ebc91f3b7163091d305a6ba91914a2a9117d86807d5ca0c875d48679dbc3545162a7263679bf605a52e WHIRLPOOL 1e7ed8d6e2939eaf898e01acebcd74f340e33eff5af17613e60eed62b756e8dd4df300990194b3cbebec64751c2adc1cb44848f1aad3d0b840bc9fe7174ea144
diff --git a/app-misc/when/when-1.1.33.ebuild b/app-misc/when/when-1.1.33.ebuild
deleted file mode 100644
index a4a2e3c63817..000000000000
--- a/app-misc/when/when-1.1.33.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Extremely simple personal calendar program aimed at the Unix geek who wants something minimalistic"
-HOMEPAGE="http://www.lightandmatter.com/when/when.html"
-SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/when_dist
-
-src_prepare() {
-	# Fix path for tests
-	sed -i 's,^	when,	./when,' Makefile || die 'sed failed'
-}
-
-src_compile() { :; }
-
-src_test() {
-	# The when command requires these files, or attempts to run setup function.
-	mkdir "${HOME}"/.when || die 'mkdir failed'
-	touch "${HOME}"/.when/{calendar,preferences} || die 'touch failed'
-	emake test
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc README
-}
diff --git a/app-misc/when/when-1.1.35.ebuild b/app-misc/when/when-1.1.35.ebuild
deleted file mode 100644
index 3be68497f5a2..000000000000
--- a/app-misc/when/when-1.1.35.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Extremely simple personal calendar program aimed at the Unix geek who wants something minimalistic"
-HOMEPAGE="http://www.lightandmatter.com/when/when.html"
-SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/when_dist
-
-src_prepare() {
-	# Fix path for tests
-	sed -i 's,^	when,	./when,' Makefile || die 'sed failed'
-}
-
-src_compile() { :; }
-
-src_test() {
-	# The when command requires these files, or attempts to run setup function.
-	mkdir "${HOME}"/.when || die 'mkdir failed'
-	touch "${HOME}"/.when/{calendar,preferences} || die 'touch failed'
-	emake test
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc README
-}
diff --git a/app-misc/when/when-1.1.36.ebuild b/app-misc/when/when-1.1.36.ebuild
index 73272c18172e..1cd434587f0a 100644
--- a/app-misc/when/when-1.1.36.ebuild
+++ b/app-misc/when/when-1.1.36.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=6
 
-DESCRIPTION="Extremely simple personal calendar program aimed at the Unix geek who wants something minimalistic"
+DESCRIPTION="Minimalistic personal calendar program"
 HOMEPAGE="http://www.lightandmatter.com/when/when.html"
 SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}"
diff --git a/app-office/projectlibre-bin/Manifest b/app-office/projectlibre-bin/Manifest
new file mode 100644
index 000000000000..297fc14773e0
--- /dev/null
+++ b/app-office/projectlibre-bin/Manifest
@@ -0,0 +1 @@
+DIST projectlibre-1.6.2.tar.gz 14735171 SHA256 72ea964533a2da0af0882acb91268647e7f5a99151b0abb8f3b84c6f26229fc4 SHA512 128319a37aeeb4603fd45433e3961805b0de30e5760394d5eef2de1910bff3815e600462aa3264fa64df55eb8568849895c9d673e5574badafcbc1df89e2c9e7 WHIRLPOOL 78124a7a2dd488b55938cd0e2465ab5212dd3cc9dfb673a408664667fe49458ac6cf8aa9b684832e51c1af18f7fdd48acd5fd967db70eb4ee5f9f3b70c615289
diff --git a/app-office/projectlibre-bin/files/projectlibre.desktop b/app-office/projectlibre-bin/files/projectlibre.desktop
new file mode 100644
index 000000000000..6087406b0533
--- /dev/null
+++ b/app-office/projectlibre-bin/files/projectlibre.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=ProjectLibre
+Comment=Project Management
+Comment[fr]=Gestion de projet
+Exec=projectlibre %F
+Icon=projectlibre
+Terminal=false
+Type=Application
+Categories=Office;ProjectManagement;
+MimeType=application/x-projectlibre;
+
diff --git a/app-office/projectlibre-bin/files/projectlibre.png b/app-office/projectlibre-bin/files/projectlibre.png
new file mode 100644
index 000000000000..a68aff0629ff
Binary files /dev/null and b/app-office/projectlibre-bin/files/projectlibre.png differ
diff --git a/app-office/projectlibre-bin/metadata.xml b/app-office/projectlibre-bin/metadata.xml
new file mode 100644
index 000000000000..5ae0c0c4e56f
--- /dev/null
+++ b/app-office/projectlibre-bin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>creffett@gentoo.org</email>
+		<name>Chris Reffett</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">projectlibre</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild b/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild
new file mode 100644
index 000000000000..1b063c2fc88f
--- /dev/null
+++ b/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=6
+
+inherit eutils
+
+MY_PN=${PN/-bin}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="An open source desktop alternative to Microsoft Project"
+HOMEPAGE="http://www.projectlibre.org/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="CPAL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.8"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cp "${FILESDIR}"/${MY_PN}.{desktop,png} ./ || die
+	cd "${S}"
+	rm -rf license projectlibre.bat
+}
+
+src_prepare() {
+	eapply_user
+	sed -i \
+		-e "/^OPENPROJ_HOME0=/s:=.*:=/opt/${MY_PN}:" \
+		${MY_PN}.sh || die
+}
+
+src_install() {
+	local d="/opt/${MY_PN}"
+	insinto ${d}
+	doins -r * || die
+	fperms a+rx ${d}/${MY_PN}.sh
+
+	dodir /opt/bin
+	dosym ../${MY_PN}/${MY_PN}.sh /opt/bin/${MY_PN} || die
+
+	newmenu ../${MY_PN}.desktop ${MY_PN}.desktop || die
+	newicon ../${MY_PN}.png ${MY_PN}.png || die
+}
diff --git a/app-shells/mpv-bash-completion/Manifest b/app-shells/mpv-bash-completion/Manifest
index 6f92850b791e..0bb3de7ab111 100644
--- a/app-shells/mpv-bash-completion/Manifest
+++ b/app-shells/mpv-bash-completion/Manifest
@@ -1,2 +1 @@
-DIST mpv-bash-completion-0.17.tar.gz 15033 SHA256 a4c3be027ec52fef684a545a43c05f32cf512da93ae4a569d273e6e182b90ab1 SHA512 851a9f2b5e54f176fc7519a5fceace2b3281bef4062a48e108f17b83ccbd53e7b7545969be9cbccd3f093ba9ee65bd6736650f1b4d88997808a8b1df40d769eb WHIRLPOOL ba077f686d2e9ba4e819cf30f17cdca5b98b321e6c39b72a3bd7c1f5269da3d20abe7f610838a51b941fdba8c6636fc3eaae81f07fcd08f8f61f6262d2d0fab5
 DIST mpv-bash-completion-3.3.7.tar.gz 18986 SHA256 8eb7f516539b0a1b9221088ba0e6676bda63746432ce1c7ec7a2dd91c3dff766 SHA512 927aae0a720c562046cdeda6cedd1dccda45c27789a421e538039c3e1f99d4dc6825a87b1d4493ca9508f32a7b810ff47a7f65e61ef4e53da1aae4ecfe3a5d8d WHIRLPOOL 9fdf1c857243f6b965f95fe7f4e9cd835808f95b05a8d07c23469d6af06eb5f589b19a4d8685fcb2ef0bdf1386540e3a1b7f106808668a91b2e7c90eeb4da120
diff --git a/app-shells/mpv-bash-completion/mpv-bash-completion-0.17.ebuild b/app-shells/mpv-bash-completion/mpv-bash-completion-0.17.ebuild
deleted file mode 100644
index d025b165614d..000000000000
--- a/app-shells/mpv-bash-completion/mpv-bash-completion-0.17.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Bash completion for the mpv video player"
-HOMEPAGE="https://2ion.github.io/mpv-bash-completion/"
-SRC_URI="https://github.com/2ion/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="media-video/mpv[cli]"
-RDEPEND="${DEPEND}
-	>=app-shells/bash-completion-2.3-r1
-"
-
-DOCS=( KNOWN_BUGS README.mkd )
-
-src_compile() {
-	"${S}"/gen.sh > ${PN} || die
-}
-
-src_install() {
-	einstalldocs
-	newbashcomp ${PN} mpv
-}
diff --git a/app-text/a2ps/a2ps-4.14-r5.ebuild b/app-text/a2ps/a2ps-4.14-r5.ebuild
index 6724fa8a9489..abef7a7bb0f9 100644
--- a/app-text/a2ps/a2ps-4.14-r5.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="emacs latex linguas_ja nls static-libs userland_BSD userland_GNU vanilla"
 
 RESTRICT=test
diff --git a/dev-lang/c-intercal/Manifest b/dev-lang/c-intercal/Manifest
index f8b7ba0da282..1a3f2ada0057 100644
--- a/dev-lang/c-intercal/Manifest
+++ b/dev-lang/c-intercal/Manifest
@@ -1,2 +1 @@
-DIST intercal-0.29.pax.gz 1003800 SHA256 fba1678bdd058350742fad2f3f0673bcea9f4c8add761855a67d8ada6650950b SHA512 0789278b334f65b6e2034493cf08b26a9885e7aec09072c9d9d3d2796b2c6b09f13a856afea1f77f6c6aac0f386b0a76e35ddd9c87584386f3b8a0ad30bddd31 WHIRLPOOL 9039db79d0ecfd17abdd2ba4788d5e812d4fc5db1fab3ba554567ec3d08cd7091408d054903e8a59dbf77fc78f5408dfc1608eaac0b10e1bf76c32b3a92e300d
 DIST intercal-0.30.tar.gz 930759 SHA256 b38b62a61a3cb5b0d3ce9f2d09c97bd74796979d532615073025a7fff6be1715 SHA512 e82f52082a73e0eb6116026f78fdcc38369f54af828b9ed0d3ca6ed6c40550bfa81db4ca7c4d09015b5db5104a1c06229cfed52e1d202c3a7443f933fbcc0498 WHIRLPOOL b76542b81d8322c5791a30573e0b7efdd7793a298970b29f074e49fa061e3a28f38fdbf7732f74a77d940e8167650182d3366f657ed525d079feb0c3d47d7dc2
diff --git a/dev-lang/c-intercal/c-intercal-29.0.ebuild b/dev-lang/c-intercal/c-intercal-29.0.ebuild
deleted file mode 100644
index dfc1909a7364..000000000000
--- a/dev-lang/c-intercal/c-intercal-29.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit elisp-common eutils multilib
-
-# C-INTERCAL uses minor-major ordering of version components and
-# negative version numbers. We map version components -1, -2, ...
-# to 65535, 65534, ..., and subtract one from the next component.
-# For example, upstream version 0.28 is mapped to Gentoo version 28.0
-# and 0.-2.0.29 is mapped to 28.65535.65534.0.
-get_intercal_version() {
-	local i=.${1:-${PV}} j k c=0
-	while [[ ${i} ]]; do
-		(( k = ${i##*.} + c ))
-		(( (c = (k >= 32768)) && (k -= 65536) ))
-		i=${i%.*}
-		j=${j}.${k}
-	done
-	echo ${j#.}
-}
-
-MY_PN="${PN#c-}"
-MY_PV="$(get_intercal_version)"
-DESCRIPTION="C-INTERCAL - INTERCAL to binary (via C) compiler"
-HOMEPAGE="http://c.intercal.org.uk/"
-SRC_URI="http://overload.intercal.org.uk/c/${MY_PN}-${MY_PV}.pax.gz"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs examples"
-
-DEPEND="emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-MY_PV2=${MY_PV%.${MY_PV##*.}}
-S="${WORKDIR}/${MY_PN}-${MY_PV2##*.}.${MY_PV##*.}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	tar xzf "${DISTDIR}/${A}" || die "tar failed"
-}
-
-src_compile() {
-	emake
-
-	if use emacs; then
-		elisp-compile etc/intercal.el || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc BUGS NEWS HISTORY README doc/THEORY.txt
-
-	if use emacs; then
-		elisp-install ${PN} etc/intercal.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r pit
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/c-intercal/c-intercal-30.0.ebuild b/dev-lang/c-intercal/c-intercal-30.0.ebuild
index 8c0b34dc7738..374b59209641 100644
--- a/dev-lang/c-intercal/c-intercal-30.0.ebuild
+++ b/dev-lang/c-intercal/c-intercal-30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -33,14 +33,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs examples"
 
-DEPEND="emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
+RDEPEND="emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc"
 
 S="${WORKDIR}/${MY_PN}-${MY_PV}"
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
 	eapply "${FILESDIR}"/${P}-version.patch
+	eapply "${FILESDIR}"/${P}-yywrap.patch
 	eapply_user
 	eautoreconf
 }
diff --git a/dev-lang/c-intercal/files/c-intercal-30.0-yywrap.patch b/dev-lang/c-intercal/files/c-intercal-30.0-yywrap.patch
new file mode 100644
index 000000000000..9d46a91beceb
--- /dev/null
+++ b/dev-lang/c-intercal/files/c-intercal-30.0-yywrap.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/604848
+
+--- intercal-0.30-orig/src/lexer.l
++++ intercal-0.30/src/lexer.l
+@@ -38,12 +38,10 @@
+ /*#undef wchar_t*/
+ /*#define wchar_t unsigned char*/
+ 
+-#ifndef yywrap
+ static int yywrap(void)
+ {
+     return 1;
+ }
+-#endif /* yywrap */
+ 
+ int 	iyylineno = 1;
+ 
diff --git a/dev-lang/go/go-1.7.4.ebuild b/dev-lang/go/go-1.7.4.ebuild
index b982f48ffa1d..0770059396be 100644
--- a/dev-lang/go/go-1.7.4.ebuild
+++ b/dev-lang/go/go-1.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -45,7 +45,7 @@ else
 	case ${PV} in
 		*9999*|*_rc*) ;;
 		*)
-			KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+			KEYWORDS="-* amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
 			;;
 	esac
 fi
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 2441974b7b74..fa2499441b69 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -3,8 +3,10 @@ DIST Python-2.7.12.tar.xz 12390820 SHA256 d7837121dd5652a05fef807c361909d255d173
 DIST Python-3.4.3.tar.xz 14421964 SHA256 b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8 SHA512 55b2d7c07da8ad3a3971b4687da2e45809c6f1474732e93b0432f121f287d0b63ad8a9bf381987ea70f47a03d9474c3e55b7d86d14800bf7ef29b3324d8d35b9 WHIRLPOOL f851dedc6a1ea35adec83d60784a5fbcd9dfcf6aa8858bb5ada114fa2ff55add1fbf323ab94ec039ecdedb26d59e8f2e6e171cd9fc1ed41ad9cfa434a555cff3
 DIST Python-3.4.5.tar.xz 14516820 SHA256 ee64b1c8a47461009abf25252332d29a4e587cb4f0c1c96aa793a3732e9d898a SHA512 b548a5338d141b3086dea372fa2cc245ba5350ee9f0d1304ef6222dc45380b66d380b092e547d54206d56ca68563b95036f445f97f72bb0ef1d48f81a74a3d4c WHIRLPOOL 43e0aed0177d46148964447b4fb24475c4c736afb2ba84ec393fbf55db3da3f192308f9c8f236deaa7a608dac56946ee7755970fadaa82bf406c910a05f36883
 DIST Python-3.5.2.tar.xz 15222676 SHA256 0010f56100b9b74259ebcd5d4b295a32324b58b517403a10d1a2aa7cb22bca40 SHA512 c07c3366f1c81e214241444bb9da6db9d11da32ad66bfa29cdad5a3b2e34e4d870bda6d4ce3c3910b582942e91f1d8c8a1c1a7b9464cc147b83c9e0007012742 WHIRLPOOL cf55d67f362b6a7529d43bb5aa8014c8349be190c6d4dae9d48de1679ab8623087478f41686cdced981cf18bb3d107052732cd437ff31ba5de2cc06b04ec2289
+DIST Python-3.6.0.tar.xz 16805836 SHA256 b0c5f904f685e32d9232f7bdcbece9819a892929063b6e385414ad2dd6a23622 SHA512 9d06bee9172bc0bfd2d280fd1c27ea712f3258cfbfd2e2aeb734d0a6710998d5deeefc5d6e72251750dd9493d35461511ceaa187a29dea700ca238ff6ac1dbb2 WHIRLPOOL 4fbe3b971ff6fca4349c74ca07ade0406ae70e0d201cb7689e95744a6f39d1bcc010eb426f4e02aa8f692828aa996aa5c7656b8031503b342b9b4a42beeb7827
 DIST python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256 c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512 5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056 WHIRLPOOL f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9
 DIST python-gentoo-patches-2.7.12-0.tar.xz 13576 SHA256 cd842eec7202df57c153adc1fbb81e70b26ef651f8e9346e065d8577b93f343b SHA512 8bf530fca15c47fa5d9bc958e433b35943a12c98e4172806a45aa60dc85ec92f8ab6ffcd90f752dc5bf8ffc711414894c15820c4b6ef72dbcedc2808119fb1f6 WHIRLPOOL 54b8ca6a4371d460dadccfdffcc096c12930d58714eef95117a658d7a1337ea89c45c69553b5b993017211faaa0f8d670e09a8452e53c0fb176be3e908524ee6
 DIST python-gentoo-patches-3.4.3-0.tar.xz 11736 SHA256 917a9d98d40a91379c81ea57922a8632ba3c6f6db6f304ed6262bc88c5044946 SHA512 7ad1b30cf8bb7900fe518ed71e4ee55dd92ce7e23ae583a1f2f851b26cfa8c4f4271d28f418e780f3725a48d4ca8eeb8fd083f850810c66c29fb08c430828d72 WHIRLPOOL 074e8c0055b49a028eebda21d1acfb8a25ec968eb8b350c2bed37e042f9f354871e413db13e0ef2fe41d7e56d647178a7b3622019f36c4819c2c68f088366eb1
 DIST python-gentoo-patches-3.4.5-0.tar.xz 12044 SHA256 84ee7630670a1dac4bbbc55fabf5f99b5b29007de4f140ad956e93d2e7aba8fa SHA512 108a4845667ecdf4001fcbeffab0cfbbac87439a449a7351428b0f3e2f159e3848ee0c0dfa45c9fba893b9f9584b33722fc8bb0bd7485a1d0909c3a35ede6ed8 WHIRLPOOL f0248faa0b4ce5679e37381bba90f8a4d361a49db792787bffc06a54a4bc82fea4d53255120f10e6dbf51b99e12417fc1b469be9624e73508fa3a212a38e7352
 DIST python-gentoo-patches-3.5.2-0.tar.xz 12008 SHA256 eb898fb448bd40f086ae2910e94c608faa932eb377fe40bd34f4390b4c37aac1 SHA512 e2ef1b8f10f9ea849bf52a0be65d48f7cfecf07bdf151cbbd7e3a1c9428a8d96e901650496c4ae7fd0093af8cc90de8df674dc1a4c66ad21916a4ee45a81efc8 WHIRLPOOL 66b99c7c50e3eaca783f773349b3e8a357f706a7da6a66bd2e0a53946bc81d965ac99d8fd4c50ba7e42052aa84508c8aede5eacedbb95f040a48cf1a5de6b6b0
+DIST python-gentoo-patches-3.6.0-0.tar.xz 10680 SHA256 ecf78d292f2fef1116b41c3884f492d41ea716a14f0a21755ba2f8d76aefe1a7 SHA512 f340643cf338c693ce315fab705ba888040a2989b0887686d43886319419245c24bb46ebb71cea422644f1f3beaf64289b773e72db3377187bf11a83f9313a90 WHIRLPOOL 4a4d12ea0dbb03b5d2730db40b5aebe4c1c937cfe63341c775431dc06a3b60552b9390fdf9b7fff5e50024a93d11b269ef80a95afcf308327943f7003dd4c379
diff --git a/dev-lang/python/python-3.6.0.ebuild b/dev-lang/python/python-3.6.0.ebuild
new file mode 100644
index 000000000000..a3138f0cd64e
--- /dev/null
+++ b/dev-lang/python/python-3.6.0.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="3.6.0-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="3.6/3.6m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:0=
+	app-arch/xz-utils:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libffi
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:0=[berkdb] )
+	ncurses? (
+		>=sys-libs/ncurses-5.2:0=
+		readline? ( >=sys-libs/readline-4.1:0= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tk? (
+		>=dev-lang/tcl-8.0:0=
+		>=dev-lang/tk-8.0:0=
+		dev-tcltk/blt:0=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:0= )
+	!!<sys-apps/sandbox-2.6-r1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
+
+S="${WORKDIR}/${MY_P}"
+PYVER=${SLOT%/*}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	epatch_user
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		configure.ac \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	use gdbm     || disable+=" gdbm"
+	use ncurses  || disable+=" _curses _curses_panel"
+	use readline || disable+=" readline"
+	use sqlite   || disable+=" _sqlite3"
+	use ssl      || export PYTHON_DISABLE_SSL="1"
+	use tk       || disable+=" _tkinter"
+	use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		--with-fpectl
+		--enable-shared
+		$(use_enable ipv6)
+		$(use_with threads)
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E "${ED}usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	use threads || rm -r "${libdir}/multiprocessing" || die
+	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
+		doins -r "${S}"/Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# for python-exec
+	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	else
+		vars=( PYTHON "${vars[@]}" )
+	fi
+
+	python_export "python${PYVER}" "${vars[@]}"
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+	ln -s "python${pymajor}" \
+		"${D}${PYTHON_SCRIPTDIR}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${D}${PYTHON_SCRIPTDIR}/python-config" || die
+	# 2to3, pydoc, pyvenv
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${D}${PYTHON_SCRIPTDIR}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+	ln -s "../../../bin/pyvenv-${PYVER}" \
+		"${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${D}${PYTHON_SCRIPTDIR}/idle" || die
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn
+		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 6c4e7aa2d415..56d7311cde25 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,9 +1,7 @@
 DIST pl-6.6.6.tar.gz 14838653 SHA256 9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe44ec1d8d04351a776996d SHA512 a850b0f6b283d34aa77d5e9d8a0053161fa534fa6d8935c7472362ff7b59ea6035de0658d9e38c317e2d92ed810370f2adc3e92b6346fc0ff392d18f1c8012a6 WHIRLPOOL 448d844fe45aee97ad2e37bea3f81dd5eb388e1dcb9f1c4dc54c18991aa91d481bff5b70174fb06edb06c1361759621a570a083fe36d62bffdf6028c49244b2a
 DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb WHIRLPOOL 0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e
 DIST swi-prolog-7.2.3-gentoo-patchset-1.tar.gz 1875 SHA256 c11e48122dc468f21e08da4a65f5a2daa9e0ddbc2e186bbd952626c95b29db04 SHA512 3506f4168d52f7d3539cd753c5153750df8c3239b78ffac1784c634b585d5fb0c825700e77abc9c1f467af71473ae1861eef629ebdf76b7c783d276c393f40fc WHIRLPOOL 8b70ab91592280d0634c6c897771696c0c63d30680044994cedf69f18cd4f386adf833998e64d4ad892cff97300b5bbfaa8dec8448ea04ebaba7e31f7e9c30d0
-DIST swi-prolog-7.3.28-gentoo-patchset-0.tar.gz 1469 SHA256 ad5cc6fb9084f06694068556846165d8b692c8e0d617f674ff61c75b0d087327 SHA512 cc4d8e1c670cdd4ac3c79df7a74cbb995f32a0ed796bb0d780bb4a5b5f648396d409835e2f371bfee4417407c8a137db4363cd2bd1465ddc694d7e5c58969f9c WHIRLPOOL eabb0fd025188939facf2425591fbe7e10ec232fafa0974814063a570a707847e8c065a901e733f874f09054f775c8c06f4ca6555f93d4bdca1afe31843d9a1e
 DIST swipl-7.2.3.tar.gz 16192142 SHA256 43657d51b7c5887bc2d2bced50a9822b86a08a6841399b8e76ee877f51d646b5 SHA512 da27a6b171d3b471401f1a91e86a4dbe98973d8a1db8c72aa27e452311d08b893b01a1de8f9f4dafcdac460774b4ea980050256d37284546941e1bdf84f8cd7b WHIRLPOOL de695c8e0317921dcc13898f7a3c88d1012e3f87f633cd25766ca5cb6637b29ca81b9245d015614089291a7d9abd0d8c7109ccae1df9297d78301d241cb258b3
-DIST swipl-7.3.28.tar.gz 16560583 SHA256 dc517d2acff270cdf94d1214934dfb467e66682665d97a39053485eff9540704 SHA512 7c7342a74ee9dd796ec67a170b29293bc70ac4d19ddb6d97949905837932e7709ca3dfaf0b20153c348c61bf0c5142843a258e778ffad9a236625e43a442a2a2 WHIRLPOOL 34800420f3b7349b686117c250c772c92253993d7a5c39af2b51e8a2156c5b172c09238b4248846e305c857fcc57f82d2297889609b893c820389de37f6243d4
-DIST swipl-7.3.29.tar.gz 16557791 SHA256 c0eaa072790604cc636c36fd007bc1bdf214c6ac2f7617023f22f0c08f6a3035 SHA512 e61bed0cd4b4d50a3fb8e15a6e268f3bc8d68ea509705a4201a4f1267362988e0b3998a0e14c519337a1f17ae586accea6f998c411c8bd39b45d27fb654ca7ac WHIRLPOOL e4ca383ee238f9c4b1e4bc2d8109127e753554a27ad855f294d76533446c2757fc2e053038b1664d67c43f9659834e7903fecfed56347f70690285ea90f53a2a
 DIST swipl-7.3.30.tar.gz 16556898 SHA256 6cbb1451466f449cf06c6855300b3b5f179e474a5dddf0e2531c456316496cec SHA512 fc15774a72b1d0040d5e135646c217379b4813e3a3cfebc616468e29f791c292cdb6541e7e96306a02f7efb1aee48d8ffc3f1d573aa07661383c99e6401dec1a WHIRLPOOL 81d20aee79fd3a7a53325c03e76bda72eec9bc170df855f4c73e2c2493cfbce8d41cd264f1f3624685b5aa630ba1d8481f1d2cd6876e289f92bf5f310a266bfd
 DIST swipl-7.3.31.tar.gz 16562182 SHA256 a19f81c739fcf4b850d1580ffed09b3f2b63fbf03c77d9f9b90709ca2607c64f SHA512 cdf607b57eaaa809542815189ecfb4ed9e40bbe5f6dd7c436d33d51e289632188361e102ec28303e747b7ad1e313ea22e2f2f0f79806980906ec4e8098b3683e WHIRLPOOL 146e3275870a209d35e15d771509964cfaf07dc3bcb3132460a3e76590c7999ab8a31961949e86eb53caccff5e2620da271344c8b9f0b7741a52db22d2caf957
+DIST swipl-7.3.32.tar.gz 16569053 SHA256 932556e92946b3a05c0667914bd43039abd421fcb0cdb52f005cc20bde0a2c28 SHA512 1ecd3b3a438a230823e3e923fb52d370bb9b16a536a3e6c568a88f42fb85b9774c775c80acfeace26c3cc3997da60ad91ee318cc285fe2b251f2838ad782e790 WHIRLPOOL b5248f59584f7094a73c086e730ab0f09c9aed12d45f21cc48ca9bee36c515199377687c1a0fb2feaeaa1c301deada4118e268e012a6d5e6bd1f76e691a48102
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.28.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.28.ebuild
deleted file mode 100644
index fae71813b66e..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.3.28.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="BSD-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive berkdb debug doc +gmp hardened java libressl minimal odbc +readline ssl static-libs test uuid zlib X"
-
-RDEPEND="sys-libs/ncurses:=
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline:= )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	java? ( >=virtual/jdk-1.5:= )
-	uuid? ( dev-libs/ossp-uuid )
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	if ! use uuid; then
-		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
-	fi
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with berkdb bdb ) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		unset DISPLAY
-		cd "${S}/packages" || die
-		emake \
-			USE_PUBLIC_NETWORK_TESTS=false \
-			USE_ODBC_TESTS=false \
-			check
-		./report-failed || die
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.29.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.32.ebuild
similarity index 98%
rename from dev-lang/swi-prolog/swi-prolog-7.3.29.ebuild
rename to dev-lang/swi-prolog/swi-prolog-7.3.32.ebuild
index f212c56f28a3..2f3775ec54c1 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.3.29.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.3.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/dev-libs/appstream-glib/appstream-glib-0.6.3.ebuild b/dev-libs/appstream-glib/appstream-glib-0.6.3.ebuild
index 54f43d0de043..f6c6d3402b76 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.6.3.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/dev-libs/jansson/jansson-2.9.ebuild b/dev-libs/jansson/jansson-2.9.ebuild
index b9690ccb5ca8..e3b18b8981f9 100644
--- a/dev-libs/jansson/jansson-2.9.ebuild
+++ b/dev-libs/jansson/jansson-2.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index 4d5cec792398..cec70f846d25 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -1,5 +1,7 @@
 DIST klibc-1.5.25.tar.bz2 510064 SHA256 0b910ec0b2a97d4c775ed06e44ad7bca7be150efdf2a77a19253a573e16367d3 SHA512 e550afb319cd995fb9c7fb086bc8ede550e5e4a48856ff5856e2296f691ba643c9fcc314c5e973f4d5b4f33b543ef4bc10d29b389f83e5418ec860a80e7cac45 WHIRLPOOL d986dcdcc95e2c7846d2eda9338519d5d84f50e94f82f1eee0234a17504ae10abaa75b6c89e9cf4c228690c0cc489d4323d98e5e62cde10cf7a04581026309f3
 DIST klibc-2.0.4.tar.xz 469348 SHA256 7f9a0850586def7cf4faeeb75e5d0f66e613674c524f6e77b0f4d93a26c801cb SHA512 7a01d1744b49f3de64111fefc522b1d63f054199acf671254bc046d6f1d0b6ca68e050c99025bf8303751c2466a5e034677555649ae5909c40997858d393db8d WHIRLPOOL f5dc71b48f118155df512d8ac839b66d361b22ff4e040e49a562722d82f18ac83a8c682bf0b4c59a9b108473f74bebc673d38456cf0ab5b1051071ca3fa9b78e
 DIST klibc_2.0.2-1.debian.tar.gz 21305 SHA256 93f4b9be5a3c725a38b7ac137850311e3cf8d8094874006c7dce793d2b71e469 SHA512 9cbcc39396a49bc37ace79eaefad6e704ddc9f30aba1b39f40dd2888dad06eeeb7b9c1a387cee60a95cf5641f50bd7f225cf8209547c75a8bae8af4285152d91 WHIRLPOOL a42e148550a27426e8f38b54cb4f3b1f355759d573ab27c0ecadb0c68d0afd54a5950471628ec4e2e27ac9c8b9d841940d6b0f2c0a873d4feab7af37e7989a52
+DIST klibc_2.0.4-9.debian.tar.xz 28628 SHA256 069f3496d66bda23bca227acdbf2b5e5b57e57419db619c293b81ed4929aba12 SHA512 0fe9a6642be962fa631919850d7eeed5a87c10682766ee10fe31dec2b19a6179e0067602acb26bdc2aa8ceecfd39b1dc95a76f3b0a9bc813b172c0ffe9f0ff53 WHIRLPOOL 96de652f4b0cea4e2c117f541d820b9e869c05763e408b7bd203d04ae2b70a89939713794e0dda27f253b2662ef03aea62bd669b06de4a2290f807890b1b01e8
 DIST linux-2.6.39.tar.bz2 76096559 SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6 SHA512 06cb5aba7c53c68d43afcebbbb9507d8b398b3e994d8a237c66a49374ca569237f074adaa3fccba7f908eab4f51f99bae40656793eab5c2f5ce03cd3a65fa02c WHIRLPOOL 2f2c833ab1d8ddbe3e0b862b71a38d47fd3fc5688ea81cdd818369b09e72fa50481bf84533ddcea992af1130b2ceec10b6ff5eaff393a14ee70639293a555912
 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
+DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
diff --git a/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch b/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch
index cfbc5f63655f..3ddf834d46da 100644
--- a/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch
+++ b/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch
@@ -1,6 +1,6 @@
 diff -Nuar --exclude '*.g' --exclude '*.cmd' klibc-2.0.2-r1/work/klibc-2.0.2/usr/utils/mkfifo.c klibc-2.0.2.orig/work/klibc-2.0.2/usr/utils/mkfifo.c
---- klibc-2.0.2-r1/work/klibc-2.0.2/usr/utils/mkfifo.c	2012-10-03 09:41:43.000000000 -0700
-+++ klibc-2.0.2.orig/work/klibc-2.0.2/usr/utils/mkfifo.c	2013-12-26 13:19:34.270949780 -0800
+--- a/usr/utils/mkfifo.c	2012-10-03 09:41:43.000000000 -0700
++++ b/usr/utils/mkfifo.c	2013-12-26 13:19:34.270949780 -0800
 @@ -13,6 +13,11 @@
  
  char *progname;
diff --git a/dev-libs/klibc/klibc-2.0.4-r1.ebuild b/dev-libs/klibc/klibc-2.0.4-r1.ebuild
new file mode 100644
index 000000000000..702d35e4cb6e
--- /dev/null
+++ b/dev-libs/klibc/klibc-2.0.4-r1.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
+# This still needs major work.
+# But it is significently better than the previous version.
+# In that it will now build on biarch systems, such as ppc64-32ul.
+
+# NOTES:
+# ======
+# We need to bring in the kernel sources seperately
+# Because they have to be configured in a way that differs from the copy in
+# /usr/src/. The sys-kernel/linux-headers are too stripped down to use
+# unfortunately.
+# This will be able to go away once the klibc author updates his code
+# to build again the headers provided by the kernel's 'headers_install' target.
+
+EAPI=6
+K_TARBALL_SUFFIX="xz"
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="A minimal libc subset for use with initramfs"
+HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc/ https://www.kernel.org/pub/linux/libs/klibc/"
+KV_MAJOR="4" KV_MINOR="x" KV_SUB="4"
+PKV_EXTRA=""
+if [[ ${PKV_EXTRA} ]]; then
+	if [[ ${KV_MAJOR} == 2 ]]; then
+		PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-${PKV_EXTRA}"
+	else
+		PKV="${KV_MAJOR}.$((${KV_SUB}+1))-${PKV_EXTRA}"
+	fi
+	PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.${K_TARBALL_SUFFIX}"
+fi
+if [[ ${KV_MAJOR} == 2 ]]; then
+	OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}"
+else
+	OKV="${KV_MAJOR}.${KV_SUB}"
+fi
+KERNEL_URI="
+	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.${K_TARBALL_SUFFIX}
+	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.${K_TARBALL_SUFFIX}"
+DEBIAN_PV=2.0.4
+DEBIAN_PR=9
+DEBIAN_A="${PN}_${DEBIAN_PV}-${DEBIAN_PR}.debian.tar.xz"
+SRC_URI="
+	mirror://kernel/linux/libs/klibc/${PV:0:3}/${P}.tar.${K_TARBALL_SUFFIX}
+	mirror://debian/pool/main/k/klibc/${DEBIAN_A}
+	${PATCH_URI}
+	${KERNEL_URI}"
+
+LICENSE="|| ( GPL-2 LGPL-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="debug test custom-cflags"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+KS="${WORKDIR}/linux-${OKV}"
+
+# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
+QA_EXECSTACK="*"
+# Do not strip
+RESTRICT="strip"
+
+kernel_asm_arch() {
+	a="${1:${ARCH}}"
+	case ${a} in
+		# Merged arches
+		x86) echo i386 ;; # for build on x86 userspace & 64bit kernel
+		amd64) echo x86 ;;
+		ppc*) echo powerpc ;;
+		# Non-merged
+		alpha|arm|arm64|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
+		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
+	esac
+}
+
+# For a given Gentoo ARCH,
+# specify the kernel defconfig most relevant
+kernel_defconfig() {
+	a="${1:${ARCH}}"
+	# most, but not all arches have a sanely named defconfig
+	case ${a} in
+		ppc64) echo ppc64_defconfig ;;
+		ppc) echo pmac32_defconfig ;;
+		sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
+		*) echo defconfig ;;
+	esac
+}
+
+src_unpack() {
+	unpack linux-${OKV}.tar.${K_TARBALL_SUFFIX} ${P}.tar.${K_TARBALL_SUFFIX} ${DEBIAN_A}
+}
+
+PATCHES=(
+	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
+	"${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
+	# Fix usage of -s, bug #201006
+	"${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
+	# The inline definition from sys/stat.h does not seem to get used
+	# So just copy it to make this compile for now
+	"${FILESDIR}"/klibc-2.0.2-mkfifo.patch
+	# Newer kernels have some headers in the uapi dir
+	"${FILESDIR}"/klibc-2.0.3-kernel-uapi.patch
+)
+
+src_prepare() {
+	[[ ${PKV} ]] && EPATCH_OPTS="-d ${KS} -p1" eapply "${DISTDIR}"/patch-${PKV}.${K_TARBALL_SUFFIX}
+
+	# Symlink /usr/src/linux to ${S}/linux
+	ln -snf "${KS}" linux
+	#ln -snf "/usr" linux
+
+	# Borrow the debian fixes too
+	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
+		PATCHES+=( "${WORKDIR}/debian/patches/${p}" )
+	done
+
+	default
+}
+
+# klibc has it's own ideas of arches
+# They reflect userspace strictly.
+# This functions maps from a Gentoo ARCH, to an arch that klibc expects
+# Look at klibc-${S}/usr/klibc/arch for a list of these arches
+klibc_arch() {
+	a="${1:${ARCH}}"
+	case ${a} in
+		amd64) echo x86_64;;
+		mips) die 'TODO: Use the $ABI' ;;
+		x86) echo i386;;
+		*) echo ${a} ;;
+	esac
+}
+
+src_compile() {
+	local myargs="all"
+	local myARCH="${ARCH}" myABI="${ABI}"
+	# TODO: For cross-compiling
+	# You should set ARCH and ABI here
+	CC="$(tc-getCC)"
+	LD="$(tc-getLD)"
+	HOSTCC="$(tc-getBUILD_CC)"
+	HOSTLD="$(tc-getBUILD_LD)"
+	KLIBCARCH="$(klibc_arch ${ARCH})"
+	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
+	libdir="$(get_libdir)"
+	# This should be the defconfig corresponding to your userspace!
+	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
+	defconfig=$(kernel_defconfig ${ARCH})
+	unset ABI ARCH # Unset these, because they interfere
+	unset KBUILD_OUTPUT # we are using a private copy
+
+	cd "${KS}"
+	emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "No defconfig"
+	if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \
+	   [[ "${CHOST/eabi}" != "${CHOST}" ]]; then
+		# The delete and insert are seperate statements
+		# so that they are reliably used.
+		sed -i \
+		-e '/CONFIG_AEABI/d' \
+		-e '1iCONFIG_AEABI=y' \
+		-e '/CONFIG_OABI_COMPAT/d' \
+		-e '1iCONFIG_OABI_COMPAT=y' \
+		-e '1iCONFIG_ARM_UNWIND=y' \
+		"${KS}"/.config \
+		"${S}"/defconfig
+	fi
+	emake prepare CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "Failed to prepare kernel sources for header usage"
+
+	cd "${S}"
+
+	use debug && myargs="${myargs} V=1"
+	use test && myargs="${myargs} test"
+	append-ldflags -z noexecstack
+	append-flags -nostdlib
+
+	emake \
+		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
+		EXTRA_KLIBCLDFLAGS="-z noexecstack" \
+		HOSTLDFLAGS="-z noexecstack" \
+		KLIBCOPTFLAGS='-nostdlib' \
+		HOSTCC="${HOSTCC}" CC="${CC}" \
+		HOSTLD="${HOSTLD}" LD="${LD}" \
+		INSTALLDIR="/usr/${libdir}/klibc" \
+		KLIBCARCH=${KLIBCARCH} \
+		KLIBCASMARCH=${KLIBCASMARCH} \
+		SHLIBDIR="/${libdir}" \
+		libdir="/usr/${libdir}" \
+		mandir="/usr/share/man" \
+		T="${T}" \
+		$(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \
+		$(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \
+		$(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \
+		${myargs} || die "Compile failed!"
+
+		#SHLIBDIR="/${libdir}" \
+
+	ARCH="${myARCH}" ABI="${myABI}"
+}
+
+src_install() {
+	local myargs
+	local myARCH="${ARCH}" myABI="${ABI}"
+	# TODO: For cross-compiling
+	# You should set ARCH and ABI here
+	CC="$(tc-getCC)"
+	HOSTCC="$(tc-getBUILD_CC)"
+	KLIBCARCH="$(klibc_arch ${ARCH})"
+	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
+	libdir="$(get_libdir)"
+	# This should be the defconfig corresponding to your userspace!
+	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
+	defconfig=$(kernel_defconfig ${ARCH})
+
+	use debug && myargs="${myargs} V=1"
+
+	local klibc_prefix
+	if tc-is-cross-compiler ; then
+		klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
+	else
+		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
+	fi
+
+	unset ABI ARCH # Unset these, because they interfere
+	unset KBUILD_OUTPUT # we are using a private copy
+
+	emake \
+		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
+		EXTRA_KLIBCLDFLAGS="-z noexecstack" \
+		HOSTLDFLAGS="-z noexecstack" \
+		KLIBCOPTFLAGS='-nostdlib' \
+		HOSTCC="${HOSTCC}" CC="${CC}" \
+		HOSTLD="${HOSTLD}" LD="${LD}" \
+		INSTALLDIR="/usr/${libdir}/klibc" \
+		INSTALLROOT="${D}" \
+		KLIBCARCH=${KLIBCARCH} \
+		KLIBCASMARCH=${KLIBCASMARCH} \
+		SHLIBDIR="/${libdir}" \
+		libdir="/usr/${libdir}" \
+		mandir="/usr/share/man" \
+		T="${T}" \
+		$(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \
+		$(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \
+		$(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \
+		${myargs} \
+		install || die "Install failed!"
+
+		#SHLIBDIR="/${libdir}" \
+
+	# klibc doesn't support prelinking, so we need to mask it
+	cat > "${T}/70klibc" <<-EOF
+		PRELINK_PATH_MASK="/usr/${libdir}/klibc"
+	EOF
+
+	doenvd "${T}"/70klibc
+
+	# Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include
+	# Actually I have no idea, why the includes have those weird-ass permissions
+	# on a particular system, might be due to inherited permissions from parent
+	# directory
+	find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
+	find "${D}"/usr/${libdir}/klibc/include -type f \
+		\( -name '.install' -o -name '..install.cmd' \) -delete || die
+
+	# Hardlinks becoming copies
+	for x in gunzip zcat ; do
+		rm -f "${D}/${klibc_prefix}/bin/${x}"
+		dosym gzip "${klibc_prefix}/bin/${x}"
+	done
+
+	# Restore now, so we can use the tc- functions
+	ARCH="${myARCH}" ABI="${myABI}"
+	if ! tc-is-cross-compiler ; then
+		cd "${S}"
+		insinto /usr/share/aclocal
+		doins contrib/klibc.m4
+
+		dodoc README usr/klibc/CAVEATS
+		docinto gzip; dodoc usr/gzip/README
+	fi
+
+	# Fix up the symlink
+	# Mainly for merged arches
+	linkname="${D}/usr/${libdir}/klibc/include/asm"
+	if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then
+		ln -snf asm-${KLIBCASMARCH} "${linkname}"
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler ; then
+		cd "${S}"/usr/klibc/tests
+		ALL_TESTS="$(ls *.c |sed 's,\.c$,,g')"
+		BROKEN_TESTS="fcntl fnmatch testrand48"
+		failed=0
+		for t in $ALL_TESTS ; do
+			if has $t $BROKEN_TESTS ; then
+				echo "=== $t SKIP"
+			else
+				echo -n "=== $t "
+				./$t </dev/null >/dev/null
+				rc=$?
+				if [ $rc -eq 0 ]; then
+					echo PASS
+				else
+					echo FAIL
+					failed=1
+				fi
+			fi
+		done
+		[ $failed -ne 0 ] && die "Some tests failed."
+	fi
+}
diff --git a/dev-libs/libxml2/libxml2-2.9.4-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.4-r1.ebuild
index fb6d58c55d03..4c456a2d8a17 100644
--- a/dev-libs/libxml2/libxml2-2.9.4-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.4-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index c5f1d3b7bf76..51c832c25834 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -4,7 +4,7 @@ DIST nss-3.23.tar.gz 7467001 SHA256 94b383e31c9671e9dfcca81084a8a813817e8f05a57f
 DIST nss-3.25.tar.gz 7338238 SHA256 5d1ad475da19d0c033a716350dc5f8a747999d3eba5ac07ee0368c5bad6e2359 SHA512 a33cff42d0d85eea091057648d598b7421de88f16ed357965ea08a8812de968c3f18d45452afd21afc90122f65c2c5bb2d7071357947b45e935aae55d28c4218 WHIRLPOOL 3857bffe7a58043612bbeaf0e596b3afdd4f0792441af667fb503dd2d354a535bb8523c258242b470d888ef2beff267b4480e6398a3328f0c44193b83f4a5934
 DIST nss-3.26.1.tar.gz 7387756 SHA256 abebb079288e4b0d34648a1fcdba8564ac05b29f5f1d19b53021ccb3ac37ad25 SHA512 f2a6754e4766cdf169b0abfc0ff47c469ae0e6ddc08c020ef154da7806e8ce31b49076af11b659bf19e9c4b5c6e53a0ac9e7855ee1c33b98a45cfeec446b93bd WHIRLPOOL 9152e3c7430b3362647adb494d1983cc37659b1d8691f1f1e21470aab4f496f3aecd925b8e19d83fa3735e72eeb6d6579bcc304c30e48359d05cb6e052610b0f
 DIST nss-3.27.2.tar.gz 7397599 SHA256 dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524 SHA512 699847665e93fd649cb60ce6bc8f849f452779e7232a09bbeb0613f9e6c57bb81948f1ae59cc86648e41a212cda259109850ccd14546d35910deb75f5d2a13b8 WHIRLPOOL 08229d87de1c7020c1d7fc12fb8a2afc4bc9ab9f0208aad12698aba17386fbe9163cb506101c7d4d568409fd99141fb88c0e71fc32cecbc6640a4a8f7a4efabf
-DIST nss-3.28.tar.gz 7440502 SHA256 c79dd15f66f581c294ce0ef032119357d03fee3a0aa61be263747d84f1b33254 SHA512 dd442c6d04edd0507cc49a1e3c2bfaa64555f7cde5cb9e512ccf33f14de458dddbb17efddd83271056ed6e6e32327e6e1b6f6609e1910a05e625b08e6f0965df WHIRLPOOL d013972f18d75e83da03c3903b712ef1094e6b8543c1755ea2b7ed7f6335e39ac20112808c86bb9df74cda4a8c5c1159401ecd05d1d8b07b3ecdca85f7f0ac82
+DIST nss-3.28.1.tar.gz 7451477 SHA256 58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad SHA512 f10c8e404741fafe5e5772dc754ff4503ec1826942db5fbc13b99155fcac50f29e1405dd249b69a27f27ebcfef73849b1f0f636a2076ab761384e8a0ed9a2b8b WHIRLPOOL e1a6b9886759159294c4d8e47e693a2e790703e368ede18425c9a9130df72ac56a6e717cb794607c7bcfc68c82df9aec8771bc74e729f5bbd70fdcd8ce0fed3b
 DIST nss-cacert-class1-class3.patch 22950 SHA256 6bba29cee34276e2ca6436dabedfeba2b61fb46668c5d5ceabf0c871574649bf SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 WHIRLPOOL 1246223b01292604e5609bb9c580f092dc5937bf8c98f6891b099e8bab960e03612b6617e30a55d6ff8817d88f190e03812fe8f89f84f25c20970493dc2f7700
 DIST nss-pem-20140125.tar.bz2 28805 SHA256 62604dfc4178399a804e87ca7566d8316a0a40a535de3b2d0fa48fd80c97f768 SHA512 352faf812735e1374c534ada6dd577842603ea193dafaacfd51f201599ffe3f7a23ce1c673421e42f8b692091b58085f90843c29f70ae916949715e7baba2b39 WHIRLPOOL 3ae81410f6f4d2699e9dc55982cad03c226045fbeee25984d53d37ff78ce5c96d008d6837e1c0a10b6c96cdff17c21142e437159896d314e81afc8820867ca62
 DIST nss-pem-20160329.tar.xz 27732 SHA256 6c13c342e7a9fe34b585556099beca33c3078b3df3e11b72827fb70232ac1443 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 WHIRLPOOL 16fb714fab29e44f7a15fa1928a0f4c1a770f0847b8da97816e29a3b124dee782cffe2357648c445f4d29081f349571b6fffe48c5bc725c7c2dde491f3e0e836
diff --git a/dev-libs/nss/nss-3.27.2.ebuild b/dev-libs/nss/nss-3.27.2.ebuild
index c5ba59e37a6d..c1ef5c7a708e 100644
--- a/dev-libs/nss/nss-3.27.2.ebuild
+++ b/dev-libs/nss/nss-3.27.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert +nss-pem utils"
 CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/nss/nss-3.28.ebuild b/dev-libs/nss/nss-3.28.1.ebuild
similarity index 99%
rename from dev-libs/nss/nss-3.28.ebuild
rename to dev-libs/nss/nss-3.28.1.ebuild
index 5b7426731b9c..dfc0cd6d7093 100644
--- a/dev-libs/nss/nss-3.28.ebuild
+++ b/dev-libs/nss/nss-3.28.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 
 inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
 
-NSPR_VER="4.12"
+NSPR_VER="4.13.1"
 RTM_NAME="NSS_${PV//./_}_RTM"
 # Rev of https://git.fedorahosted.org/cgit/nss-pem.git
 PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
diff --git a/dev-libs/qoauth/qoauth-2.0.1_pre20160315-r1.ebuild b/dev-libs/qoauth/qoauth-2.0.1_pre20160315-r1.ebuild
index 80398f30f74e..02c9d9825a38 100644
--- a/dev-libs/qoauth/qoauth-2.0.1_pre20160315-r1.ebuild
+++ b/dev-libs/qoauth/qoauth-2.0.1_pre20160315-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="debug doc test"
 
 COMMON_DEPEND="
diff --git a/dev-libs/qtkeychain/metadata.xml b/dev-libs/qtkeychain/metadata.xml
index 502eae2dae12..02aa7a57ebd5 100644
--- a/dev-libs/qtkeychain/metadata.xml
+++ b/dev-libs/qtkeychain/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>johu@gentoo.org</email>
-    <name>Johannes Huber</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">frankosterfeld/qtkeychain</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">frankosterfeld/qtkeychain</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
index 3953b0f771f9..26a2b8485345 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 SLOT="2/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 src_configure() {
 	econf $(use_enable debug) \
diff --git a/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r1.ebuild b/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r1.ebuild
deleted file mode 100644
index 52fffa360349..000000000000
--- a/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="OS independent wrapper class for executing ping calls"
-
-LICENSE="PHP-2.02"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
diff --git a/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild b/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild
new file mode 100644
index 000000000000..9b8cf9c6cbec
--- /dev/null
+++ b/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="OS independent wrapper class for executing ping calls"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="dev-lang/php:*
+	dev-php/PEAR-PEAR"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	use examples && dodoc -r docs/examples
+
+	insinto /usr/share/php/Net
+	doins -r Ping.php
+}
diff --git a/dev-php/PEAR-Net_Ping/metadata.xml b/dev-php/PEAR-Net_Ping/metadata.xml
index aca42932b833..478285c47091 100644
--- a/dev-php/PEAR-Net_Ping/metadata.xml
+++ b/dev-php/PEAR-Net_Ping/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>php-bugs@gentoo.org</email>
-	<name>PHP</name>
-</maintainer>
+  <maintainer type="project">
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">pear/Net_Ping</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_SMTP/Manifest b/dev-php/PEAR-Net_SMTP/Manifest
index c1880d886fe5..4028d698b64a 100644
--- a/dev-php/PEAR-Net_SMTP/Manifest
+++ b/dev-php/PEAR-Net_SMTP/Manifest
@@ -1,2 +1 @@
-DIST Net_SMTP-1.6.2.tgz 13077 SHA256 98d3ab28e99de2a8b1c39650c3ac107ac1caf09639b1d2018adf058dd9864785 SHA512 ffb9fd28e2ef66f26197423dd9249f3a7b6d2ad2fabe5719eb890cabaa7a20f75a8cd90bb829fd301cee22026805c96824ea03acb3e931ba9edf8d1ef320f3e3 WHIRLPOOL 909eba8a96b465aa81cba186b33dc1bafbb2340d86d6fac16d5cebe5f4297128b6ec5b837c6dbae554b6fbcbf26d751e591523137c5c7ee8907abcd23cbef0e0
 DIST Net_SMTP-1.7.2.tgz 14795 SHA256 4ee7ba52d75e26fe033a4241754246db6c0bbc76768be3aac168058a24d3dfbf SHA512 06ab00a033709c5f4adc01fabe100ee0033b07e1c5633f995a672bf463484622a5bd976ada9932ee741ff593d739bd1172566f0a8446060bbccde71ea5b0160d WHIRLPOOL c67893aa19cb0bd2c9a3d0e6dc5d2f9987b58eaff562861d0f0962cff1022519d16feb11d0d8bcd7b276886d464c975028a5dc5fe484a5a2d3bbf2ae50851ff8
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.6.2.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.6.2.ebuild
deleted file mode 100644
index 9b02bd86cd3f..000000000000
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.6.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="An implementation of the SMTP protocol"
-
-LICENSE="PHP-2.02"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="sasl"
-
-RDEPEND=">=dev-php/PEAR-Net_Socket-1.0.7
-	sasl? ( >=dev-php/PEAR-Auth_SASL-1.0.1-r1 )"
diff --git a/dev-php/PEAR-Net_Sieve/Manifest b/dev-php/PEAR-Net_Sieve/Manifest
index f4125f90bec4..8aa38e3824ce 100644
--- a/dev-php/PEAR-Net_Sieve/Manifest
+++ b/dev-php/PEAR-Net_Sieve/Manifest
@@ -1,2 +1 @@
-DIST Net_Sieve-1.3.3.tgz 15109 SHA256 53666be373739b7b98dfd9538d6d8aaa7e45f51c191fc034b2675e8f12297db6 SHA512 3fd41c7f60ce1ba89ecdf0d2cbeed61e7ceb53d1218dc2b4079267235da9b17a478eaf85ecf4e0449122ec866ad1a0b579f1a7484b37681081dcabe261fc7213 WHIRLPOOL e08aae13555ee24f8fae3659d3ed54dc67946215ba7da5ce3e9d68f2756232e6220769f7a40a78b31f7b9d72ac55484221bfd860211162d4354e200394aa3edd
 DIST PEAR-Net_Sieve-1.5.2.tar.gz 16332 SHA256 07d6b4dff6cf67fd022fd521c4a2555a0e0e82ee2804fe8eb14624524586a6a4 SHA512 672d2f6f4c3241f748fbdebd804f2186dd2a5f8b7be6a75cb9187ed16e61502e4a338bfaa1815190b74ab534cb7277b534b0542309098797fcb63582dc81bdbe WHIRLPOOL 065bb5629de459b884d63a5411ffa6bc10eab8c195e41623cf923afb22eb56201c16799f15dc1477e3e97ca34d1216fe9be49645c717f4058ddb8e98271e5848
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.3.3.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.3.3.ebuild
deleted file mode 100644
index 98995484486b..000000000000
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.3.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="Provides an API to talk to the timsieved server that comes with Cyrus IMAPd"
-
-LICENSE="BSD BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="sasl"
-
-RDEPEND=">=dev-php/PEAR-Net_Socket-1.0.6-r1
-	sasl? ( >=dev-php/PEAR-Auth_SASL-1.0 )
-	"
diff --git a/dev-php/PEAR-Net_SmartIRC/Manifest b/dev-php/PEAR-Net_SmartIRC/Manifest
index 903bc5ff736b..ce33e92f1f0a 100644
--- a/dev-php/PEAR-Net_SmartIRC/Manifest
+++ b/dev-php/PEAR-Net_SmartIRC/Manifest
@@ -1,2 +1,2 @@
+DIST Net_SmartIRC-1.1.10.tar.gz 927009 SHA256 f6f46ec80584b9a62d8bfa3b4180fbd663f473aeb56e8f2440510ded5f66b760 SHA512 16ad30d358af99f40c53a75cf5f1c944a3e68f4c1cffd586acd61ceed280d5d1fcd4f4d5e88db55f1f66c37c5b7f37aec2f45a26dc6b98860eacb42c9f3fbea5 WHIRLPOOL 5fa0d4f1a9e05287b2079d99ba05c85e2c79e8db8a371e455a56fb3537f9761b90f216a8f2f8531e049a42e5d2e534d671ec77a65970dd68395e5c085eb336fa
 DIST Net_SmartIRC-1.1.4.tgz 163494 SHA256 a853622ca4b8cb0224d81d11f0308d8d9f1d0d2326fe65f259fb60b7f66b6484 SHA512 58bea369e7f43094cb4b3d0354cb82afb2842ca21fd83409e683fbecda590f6dc02594e20897acbd6de6f3b60c9122daafd01ab86af270c5ec8a1b4a5ed47afe WHIRLPOOL 812cfe224c8e2fcdddb26615fce538492dfe4e5a8e58f17c8d843af533e913bcc6a561cfaf02fe448cc1785e55e0e8cff1dbb8cc4bdc64a803444bdd2442fac1
-DIST Net_SmartIRC-1.1.9.tgz 168069 SHA256 b3d272221543b8866879ab1d2548b2bca34e14bb8f5e791066e2dcce723b59e1 SHA512 161fb4cbe8443e0e793ce70fcdcb839eee4268be2592dadde23832b54703503c8a57bb7b4819ef023617a256aa2474fceccff58454fb496cb6e52018d0064e35 WHIRLPOOL 09f8affc5e3ea865da784e8ed89de09b818a5460fcbdbe80966f21d51bdcdcfd24bec3c05c42cedcddf65e03047dc56144e1768705560051a82691b409ef839c
diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10.ebuild
new file mode 100644
index 000000000000..4ff22338e886
--- /dev/null
+++ b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+# The PEAR tarball is missing some docs as of v1.10.0.
+SRC_URI="https://github.com/pear/${MY_PN}/archive/v${PV}.tar.gz
+	-> ${MY_P}.tar.gz"
+DESCRIPTION="PHP class to communicate with IRC networks"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-lang/php:*
+	dev-php/PEAR-PEAR"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	dodoc CREDITS FEATURES docs/HOWTO README.md TODO
+	use examples && dodoc -r docs/examples
+
+	if use doc; then
+		dodoc docs/DOCUMENTATION
+		dodoc -r docs/HTML
+	fi
+
+	insinto /usr/share/php
+	doins -r Net
+}
diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.9.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.9.ebuild
deleted file mode 100644
index 4ce71310c42f..000000000000
--- a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-HOMEPAGE="http://pear.php.net/package/${MY_PN}"
-SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
-DESCRIPTION="Net_SmartIRC is a PHP class for communication with IRC networks"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-php/PEAR-PEAR >=dev-lang/php-5.3:*"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local DOCS=( README.md CREDITS FEATURES )
-	insinto /usr/share/php
-	doins -r Net
-	einstalldocs
-}
-
-pkg_postinst() {
-	# Register the package from the package.xml file
-	"${EROOT}usr/bin/peardev" install -nrO --force "${WORKDIR}/package.xml" 2> /dev/null || die
-}
-
-pkg_postrm() {
-	# Uninstall known dependency
-	"${EROOT}usr/bin/peardev" uninstall -nrO "pear.php.net/${MY_PN}"
-}
diff --git a/dev-php/PEAR-Net_SmartIRC/metadata.xml b/dev-php/PEAR-Net_SmartIRC/metadata.xml
index aca42932b833..bbe76b3f8353 100644
--- a/dev-php/PEAR-Net_SmartIRC/metadata.xml
+++ b/dev-php/PEAR-Net_SmartIRC/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>php-bugs@gentoo.org</email>
-	<name>PHP</name>
-</maintainer>
+  <maintainer type="project">
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">pear/Net_SmartIRC</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.14.ebuild b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.14.ebuild
deleted file mode 100644
index 1de04e519654..000000000000
--- a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.14.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit php-pear-r1
-
-DESCRIPTION="class interface to TCP sockets"
-
-LICENSE="PHP-2.02"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2-r1.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2-r1.ebuild
new file mode 100644
index 000000000000..417452c52718
--- /dev/null
+++ b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV^^}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Package for reading and writing OLE containers"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/php:*
+	dev-php/PEAR-PEAR"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/share/php
+	doins "${MY_PN}.php"
+	doins -r "${MY_PN}"
+}
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2.ebuild
deleted file mode 100644
index 602a4f9765bd..000000000000
--- a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="Package for reading and writing OLE containers"
-LICENSE="PHP-2.02 PHP-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
diff --git a/dev-php/PEAR-OLE/metadata.xml b/dev-php/PEAR-OLE/metadata.xml
index aca42932b833..8ccf2b59195b 100644
--- a/dev-php/PEAR-OLE/metadata.xml
+++ b/dev-php/PEAR-OLE/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>php-bugs@gentoo.org</email>
-	<name>PHP</name>
-</maintainer>
+  <maintainer type="project">
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">pear/OLE</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Structures_Graph/Manifest b/dev-php/PEAR-Structures_Graph/Manifest
index 27ec9e5a159f..96a29cf0fff2 100644
--- a/dev-php/PEAR-Structures_Graph/Manifest
+++ b/dev-php/PEAR-Structures_Graph/Manifest
@@ -1,2 +1 @@
-DIST Structures_Graph-1.0.4.tgz 30318 SHA256 3619ac17892855117283e3555b1a156df0eb4d175e70e63d9c6d27d2c31a2e4f SHA512 40d45c932c571e38807fbfdcf1df6d4fcab29ab43f518ed313bac2bd35a55396aa2b87790dc827bd2e9e5c5f721df55eadfe83ff1a106bf325c467e44556c9fe WHIRLPOOL af2df6bc3d23eae990fa9c258c6277ee35fec8c9efb3e737f84278e5a3ba1d41202c66f8ae69cfc8054fb5f6b544b6407300cf25fe5ba32f4c3975c44f160c91
 DIST Structures_Graph-1.1.1.tgz 12402 SHA256 00f18a59e517db8c4eb167ada9f2a8a007c5a14b2adafc0308e5c3fad3ddd8de SHA512 cd4feb265e1aa05de348645dfc0b8e336486cb02c553dd8fcacb0a1eab452bf54108e07864395d55e0c92f4ffd338a5ae846b2dc28804bb23f03c91864ef0284 WHIRLPOOL f832c8be32e18c05ccc6958633c423570ece02cae83b4ce2b9f03ecc3d8ef98795f5e951652b3ffc95756f145435449970c568f550ceb265736a55df60fca568
diff --git a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4-r2.ebuild b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4-r2.ebuild
deleted file mode 100644
index 6597ad55eef8..000000000000
--- a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# BIG FAT WARNING!
-# Do not use any pear eclass here since pear itself depends on this package.
-# Using the pear eclass will thus create a circular dependency
-
-EAPI="5"
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Graph datastructure manipulation library"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
-DEPEND="dev-lang/php:*[pcre(+)]
-		>=dev-php/PEAR-PEAR-1.8.1"
-RDEPEND="${DEPEND}"
-PDEPEND="dev-php/pear"
-HOMEPAGE="http://pear.php.net/package/Structures_Graph"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins -r Structures
-
-	dohtml -r docs/html/*
-}
diff --git a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..0e720f28449a
--- /dev/null
+++ b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Render text using FIGlet fonts"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01
+	examples? ( GPL-2+ OFL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="dev-lang/php:*
+	dev-php/PEAR-PEAR"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	dodoc docs/README.TXT
+
+	if use examples; then
+		dodoc -r docs/examples
+
+		# Earlier versions of this ebuild installed this font under
+		# /usr/share/php/data, which is obviously the wrong place for
+		# them, but is where we have configured PEAR's data_dir. The
+		# fonts can be referenced by absolute path, however, and not
+		# just by name. Since this font is used in the example -- and as
+		# long as no one expects this *particular* font to work out of
+		# the box -- installing it with the docs will suffice.
+		#
+		# The one consumer of this in the tree is PEAR-Text_CAPTCHA, and
+		# it loads its fonts using an absolute path.
+		dodoc fonts/makisupa.flf
+	fi
+
+	insinto /usr/share/php
+	doins -r Text
+}
diff --git a/dev-php/PEAR-Text_Figlet/metadata.xml b/dev-php/PEAR-Text_Figlet/metadata.xml
index b86acf66c756..2a5655b9d725 100644
--- a/dev-php/PEAR-Text_Figlet/metadata.xml
+++ b/dev-php/PEAR-Text_Figlet/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">pear/Text_Figlet</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Var_Dump/PEAR-Var_Dump-1.0.4-r1.ebuild b/dev-php/PEAR-Var_Dump/PEAR-Var_Dump-1.0.4-r1.ebuild
deleted file mode 100644
index 19808a203445..000000000000
--- a/dev-php/PEAR-Var_Dump/PEAR-Var_Dump-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="Provides methods for dumping structured information about a variable"
-
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-DEPEND=">=dev-lang/php-5.3"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	php-pear-r1_src_install
-	# Remove the documenation generation binary that is specific to this package
-	rm "${D}usr/bin/gen_php_doc.sh" || die
-}
diff --git a/dev-php/PEAR-Var_Dump/PEAR-Var_Dump-1.0.4-r2.ebuild b/dev-php/PEAR-Var_Dump/PEAR-Var_Dump-1.0.4-r2.ebuild
new file mode 100644
index 000000000000..edce450e670d
--- /dev/null
+++ b/dev-php/PEAR-Var_Dump/PEAR-Var_Dump-1.0.4-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Dump structured information about a variable"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples test"
+
+RDEPEND="dev-lang/php:*
+	dev-php/PEAR-PEAR"
+DEPEND="test? ( ${RDEPEND} )"
+
+S="${WORKDIR}/${MY_P}"
+
+# The test suite fails due to some deprecation warnings that are output.
+# The test cases themselves set error_reporting(E_ALL), so there's no
+# easy way to override it.
+RESTRICT=test
+
+src_install() {
+	use examples && dodoc -r docs/example*.php
+
+	insinto /usr/share/php
+	doins "${MY_PN}.php"
+	doins -r "${MY_PN}"
+}
+
+src_test() {
+	# Requires the "pear" executable from dev-php/PEAR-PEAR.
+	pear run-tests tests || die
+
+	# The command succeeds regardless of whether or not the test suite
+	# passed, but this file is only written when there was a failure.
+	[[ -f run-tests.log ]] && die "test suite failed"
+}
diff --git a/dev-php/PEAR-XML_Util/Manifest b/dev-php/PEAR-XML_Util/Manifest
index eb9fef2a997b..a37d39ebb164 100644
--- a/dev-php/PEAR-XML_Util/Manifest
+++ b/dev-php/PEAR-XML_Util/Manifest
@@ -1,2 +1 @@
-DIST XML_Util-1.2.3.tgz 17134 SHA256 ddbb99bf9907e1f7b1a4ae1bc340d1bba42960d61fbb93015133099472844705 SHA512 720319bb6c57e7f67ae213768b41727a24bccd5e7cfba88006796edbbed7a351042fcaef85dc1cfd6248daac8b86af5b9d5021290e7e13a5ef679c2a8a2875c3 WHIRLPOOL 29ee4effa8f3349a0d877c8e231bb6a4c4946055c36c96b0649b9cdf0ecbf121b34da6f0e4007b176a5035f26a4d541714c3d82b7e01cd6431c1c72971f98f31
 DIST XML_Util-1.3.0.tgz 17186 SHA256 1396dbf975ae7235ec4131c40d772a3958d6086c34ea985a03e988e241c0892e SHA512 751af0c2329bee53b6b374fc613ed8c388ace6b9d5246f7ecade0e74e5f41101bd14727e1bcd566d850aea5b336981daac92d6adb8d66dbe7425990460ef0633 WHIRLPOOL d5dbbe9bcca96fdf11d009ea93c94b0eb3b2b332ad13ac23a8365a8e384d24b3da9e314fa56bd68c4b987d23a6a323772963f62390494b80f4be48a40d897195
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.3-r1.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.3-r1.ebuild
deleted file mode 100644
index 5b789a05b92f..000000000000
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XML utility class"
-
-LICENSE="PHP-2.02"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
-
-DEPEND="dev-lang/php:*[pcre(+)]
-		>=dev-php/PEAR-PEAR-1.8.1"
-RDEPEND="${DEPEND}"
-PDEPEND="dev-php/pear"
-
-HOMEPAGE="http://pear.php.net/package/XML_Util"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php/XML
-	doins XML/Util.php
-
-	insinto /usr/share/php/docs/${MY_PN}
-	doins examples/*
-}
diff --git a/dev-php/recaptcha/recaptcha-1.1.2.ebuild b/dev-php/recaptcha/recaptcha-1.1.2-r1.ebuild
similarity index 94%
rename from dev-php/recaptcha/recaptcha-1.1.2.ebuild
rename to dev-php/recaptcha/recaptcha-1.1.2-r1.ebuild
index 67be64d1f732..134d714bda88 100644
--- a/dev-php/recaptcha/recaptcha-1.1.2.ebuild
+++ b/dev-php/recaptcha/recaptcha-1.1.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="PHP client library for Google's reCAPTCHA service"
 HOMEPAGE="https://github.com/google/recaptcha"
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index 766c50fdff40..9ee00268cb7b 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,4 +1,5 @@
 DIST bottle-0.12.10.tar.gz 69554 SHA256 1308133647adc2d266f0ba5fea6684ba955cbf5e8133590cf0314c8beb814ff4 SHA512 43d114017aecabcde0c81a20bdab20ef1f4a2aa194986b690de8bb5cc6978aa82e7bafecc21aefaf53c8a7f5495f96025f1193447d411e17fa08b04a6b0dd4be WHIRLPOOL 4d3e55cf953baf97ccc1c31d973a17e63ba8458606c7650484cc776b71f7bd721a152f7a90b6cb0acb3fabd73a06b76aad61639f80d828b45cc1cc1d21cb2326
+DIST bottle-0.12.12.tar.gz 71554 SHA256 3d4b6b0e22f67b421c273105b30d9a21fd147eaf0c1576172378ee034fbf5313 SHA512 cdba3859129680f08b8c641708fd884ccf46d404786cbf48435d752fece998a446f49799e4e05e979b967843866f3e966a35a6cac7aed3270df55fae508bae31 WHIRLPOOL 68bd9399c55409139bd93b588240a3569ff9773b30949d86b5a9bba7882dd6d824cb22883c922f3f910764c9655e0e91fb40b3c9675790a67e1b6330122ab741
 DIST bottle-0.12.7.tar.gz 69375 SHA256 e3ea2191f06ca51af45bf6ca41ed2d1b2d809ceda0876466879fe205be7b2073 SHA512 ef58c0ec3b09b237914a170aae59a577a59e579478cd5f1bcef9fe73a9d3a4776794263d6f7b60dd426629aec2987ee4c3f6b8fa0486a99879792c70e373fcbc WHIRLPOOL dc6a34f9819ed77b0b05c01c13efe553af37fc9c32cfe955d6199277a8e38992a0e4982b8e67b0aab12349f15434d094ec7674a7970c71e264e72f3b74c617f0
 DIST bottle-0.12.8.tar.gz 69414 SHA256 cd5d1755a85e533205ed8a2465badf38602227c5f171c3852e07724b28c050ac SHA512 85fbdac6f7ae804a74bc527bb47bcdb5cf653a0227efe36e81e25513b687dd4abc1f772ff7232bd914cb392dea07297154d80aa05b1216c1f796dbed0d5a9510 WHIRLPOOL 833f434683f18511560973a9b0defeaa048ec21d0c60d30c69b11fc12f0ea4511a693a532d227b4ef419c99e664ba26384a95111950bf2ec1128a5509d8a0259
 DIST bottle-0.12.9.tar.gz 69516 SHA256 fe0a24b59385596d02df7ae7845fe7d7135eea73799d03348aeb9f3771500051 SHA512 c11d3cb916a0912dcda953a25b9e3a4c6f8e68e31bbaba653f1cae0e12f6b6d827fcbc9d1dfbdb9af2e28276b0056a31fa863d3723a709911406f426d528840b WHIRLPOOL 03f2a43002110b7e2aaf3d477d249b804db20cc68a0c534a059e1c0937ed574c1b6f00fd5ffe43acd027425e9e40815269af617a769cce74e5ca5f25b25dc0e7
diff --git a/dev-python/bottle/bottle-0.12.12.ebuild b/dev-python/bottle/bottle-0.12.12.ebuild
new file mode 100644
index 000000000000..9f7e595ba6e6
--- /dev/null
+++ b/dev-python/bottle/bottle-0.12.12.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="https://pypi.python.org/pypi/bottle http://bottlepy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12.8-py3.5-backport.patch
+)
+
+python_prepare_all() {
+	sed -i -e '/scripts/d' setup.py || die
+
+	# Remove test file requring connection to network
+	rm test/test_server.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# A few odd fails in the suite under pypy
+	# https://github.com/bottlepy/bottle/issues/714
+	"${PYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Templating support" dev-python/mako
+	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
+	elog "we do as most other distros and do not install the script anymore."
+	elog "If you do want/have to call it directly rather than through your app,"
+	elog "please use the following instead:"
+	elog '  `python -m bottle`'
+}
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index a1d1f76490c9..24d72c142c0d 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,4 +1,4 @@
 DIST Jinja2-2.7.3.tar.gz 378470 SHA256 2e24ac5d004db5714976a04ac0e80c6df6e47e98c354cb2c0d82f8879d4f8fdb SHA512 2810db2b52fe800e2a4a47ea41a07f997b1647a2b7ad05fe564f9d554d6a402283c84c4e2491e5dad8d22acd83d3ca420f0983ed2effc732f6d79600a846071b WHIRLPOOL ece9b68dff414739103eac202b5903d96802939f5742a2bf3ff421d87ef49043ed9a4b2a3a6bf0c2f3d9be0d8295b73c47b253553731b44912cb58add8f233c0
 DIST Jinja2-2.8.1.tar.gz 358129 SHA256 35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891 SHA512 0a2e2aa94f5c2f04f79d59d34d5324d2a440385b71192e85e960c761b4a073400e4ab0458e57305650f696a474593d6fbf398fb1d9518be261bb2a5cb866e163 WHIRLPOOL 380636268f903d05afda9c41296986d1c83949dead6c78d3e3cb880137a6c6ec06f0e2297169fc0ea8fd1348c9928f5841d37f951dd941fe89a8ccc96080e191
 DIST Jinja2-2.8.tar.gz 357055 SHA256 bc1ff2ff88dbfacefde4ddde471d1417d3b304e8df103a7a9437d47269201bf4 SHA512 2e80d6d9ad10dafcce1e6dd24493f5dffc43a17f71a30a650415638e12d3a3891738ebacc569701129214026d062d91a2b10e4f7a2c7b85d801dde26ded1bebb WHIRLPOOL 31adc38738848aa224cceb0d0afb2b85eb080d166ed84f145eb0576eeedfb91cf8d99d7c98b6a6cc6ab4fedf33fdbe3171c80fd559df48036a7441232702e749
-DIST Jinja2-2.9.2.tar.gz 368290 SHA256 2333eae399fb538f934d661f7debab8a9736002c343c8e95c56f1e413076c0ce SHA512 989b9a0c8975916a98f5caaa85e4d18dad751d3373b9a1e7539740d456438aa9d2f1ffcd81b20c0a262da6579b4b4a9228969c8a7dc42c8959bd887ba4c59766 WHIRLPOOL debe3027a5a9ac108344bd591ec4d37d1957bc05a4bc6edc7c3d24420f1828dba1ad769babc1cad8ccde407637dc3ea1cb3e05950f183aab1a347ff46c8cf33a
+DIST jinja-2.9.3.tar.gz 415502 SHA256 1ddce1c6a45de023692aa56c2b68232dbeac6ffd83741b3876ee36f1a1a4e704 SHA512 7f5fdfde6b8c64050a27c39460ec9907cab52afe49aff83ec38ac8ad92ef97c8e592efefc633cd2a95336b551fd6a1adfeb92446aa53c5a2a8765d03feab8311 WHIRLPOOL 6fccde87f7f3c77a619a0e005118abb4f59964610a314df932c60477b45e7a18a681c3103f55f150fd8a0b83938f845577c249e9cd5b16442f6044a505b27e73
diff --git a/dev-python/jinja/jinja-2.9.2.ebuild b/dev-python/jinja/jinja-2.9.3.ebuild
similarity index 84%
rename from dev-python/jinja/jinja-2.9.2.ebuild
rename to dev-python/jinja/jinja-2.9.3.ebuild
index 2517c5c6dfc9..59c208aa191c 100644
--- a/dev-python/jinja/jinja-2.9.2.ebuild
+++ b/dev-python/jinja/jinja-2.9.3.ebuild
@@ -9,29 +9,28 @@ PYTHON_REQ_USE="threads(+)"
 
 inherit eutils distutils-r1
 
-MY_PN=Jinja2
-MY_P=${MY_PN}-${PV}
-
 DESCRIPTION="A full-featured template engine for Python"
 HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+# pypi tarball is missing tests
+SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="doc examples"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	!dev-python/jinja:compat"
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 # XXX: handle Babel better?
 
-S=${WORKDIR}/${MY_P}
-
 wrap_opts() {
 	local mydistutilsargs=()
 
@@ -54,7 +53,7 @@ python_compile_all() {
 }
 
 python_test() {
-	esetup.py test
+	py.test || die
 }
 
 python_install_all() {
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index 6957f48de42d..f50f81e67db9 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -1,2 +1,3 @@
 DIST ovs-2.4.0.tar.gz 61230 SHA256 ea38287b56fd19af24dd6d1c0098ccc8ded9e8f9daeb04b152e3835278becd01 SHA512 45dd7e040c56f8ef16a2ca1fddb769c6d2c67c729f1889dcd867d57d6de8fe4f6baafe99113db05e20adf41389feea2ea9f69739256842404edce6ac28782e07 WHIRLPOOL 2dfde0a2eb334deea8bf88ceea15ad8c5e237cdd3e01cf6a0a7a5a1029bb7aca9bfc3ee83f88687d014723e82199776882ac89ccca1cac051142f48e46ad53a5
 DIST ovs-2.6.0.tar.gz 67450 SHA256 f30d7c4bf06398f5b0d5992d0460e90efb1b8334337fd27078ec28a5c9e34d89 SHA512 6efc35a6935253cbf5f7b17b200d79e8c705c43c465668fbe060d76708728b27a537e25120539628ea10d041643caa61d70871adf6d6dfdbd394cc221cc0bd63 WHIRLPOOL 08cf29e1fe2bc3caf744a35b3bdedba4111b8cca5646e72aaea9290a8a211cf2240043e6ee329357a9f85956d8feb0e396bb083d4eafb34552d4b09c771f1b21
+DIST ovs-2.6.1.tar.gz 67436 SHA256 939aa4e3135b02143907c850ab573d42c192b14a5c210cd6417a9489a7e65f3f SHA512 967baf44ccb36902fb28eb0df299bd9cca42a5cc030aa059d7cf90c79b8ad79ce8d854801acba4f711753bca47957485d6f4ad7deacd72cbce7d9fa9fba02292 WHIRLPOOL 561ad0cab25e7471cd189f9ea3b1d6a358f2cd48fe78550c2020333db66eb8cb13fac9486a033e96b65abffb7e47924d1987d26b84030e9d568dc13542b6fad5
diff --git a/dev-python/ovs/ovs-2.6.1.ebuild b/dev-python/ovs/ovs-2.6.1.ebuild
new file mode 100644
index 000000000000..dea283675c80
--- /dev/null
+++ b/dev-python/ovs/ovs-2.6.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OVS bindings for python."
+HOMEPAGE="https://github.com/openvswitch/ovs/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="!<net-misc/openvswitch-2.6.0-r2"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
index 6de762165755..00d3c62ff3d0 100644
--- a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
+++ b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
+
 CMAKE_IN_SOURCE_BUILD="1"
 CMAKE_MAKEFILE_GENERATOR="emake" # bug 558248
-PYTHON_COMPAT=( python{2_7,3_4} )
-VIRTUALX_COMMAND="cmake-utils_src_test"
 
-inherit eutils cmake-utils python-r1 vcs-snapshot virtualx
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit cmake-utils python-r1 vcs-snapshot virtualx
 
 DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
 HOMEPAGE="https://wiki.qt.io/Pyside"
@@ -30,17 +31,28 @@ DEPEND="${RDEPEND}
 	test? ( virtual/pkgconfig )
 "
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/0.2.13-fix-pysideuic-test-and-install.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/0.2.13-fix-pysideuic-test-and-install.patch
+	cmake-utils_src_prepare
 
 	python_copy_sources
 
 	preparation() {
 		pushd "${BUILD_DIR}" >/dev/null || die
 		if python_is_python3; then
-			rm -fr pysideuic/port_v2
+			rm -fr pysideuic/port_v2 || die
+
+			# need to run with -py3 to generate
+			# proper python 3 interfaces
+			sed -i -e 's:${PYSIDERCC_EXECUTABLE}:"${PYSIDERCC_EXECUTABLE} -py3":' \
+				tests/rcc/CMakeLists.txt || die
 		else
-			rm -fr pysideuic/port_v3
+			rm -fr pysideuic/port_v3 || die
 		fi
 
 		sed -i -e "/pkg-config/ s:shiboken:&-${EPYTHON}:" \
@@ -55,7 +67,7 @@ src_configure() {
 		local mycmakeargs=(
 			-DPYTHON_BASENAME="-${EPYTHON}"
 			-DPYTHON_SUFFIX="-${EPYTHON}"
-			$(cmake-utils_use_build test TESTS)
+			-DBUILD_TESTS=$(usex test)
 		)
 		CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_configure
 	}
@@ -71,7 +83,7 @@ src_compile() {
 
 src_test() {
 	testing() {
-		CMAKE_USE_DIR="${BUILD_DIR}" virtualmake
+		CMAKE_USE_DIR="${BUILD_DIR}" virtx cmake-utils_src_test
 	}
 	python_foreach_impl testing
 }
@@ -81,6 +93,4 @@ src_install() {
 		CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_install DESTDIR="${D}"
 	}
 	python_foreach_impl installation
-
-	dodoc AUTHORS
 }
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.2.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.2.1.ebuild
index 396fa87d4331..3955fcb303a0 100644
--- a/dev-python/python-openstackclient/python-openstackclient-3.2.1.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.9.4.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.9.4.ebuild
index 3af1a00e398f..444c5883c0da 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.9.4.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ IUSE="debug"
 
 DEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/sip-4.18:=[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
 	>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest
index 7fdf69bfe00b..e5cdd0a0fbf8 100644
--- a/dev-ruby/rcairo/Manifest
+++ b/dev-ruby/rcairo/Manifest
@@ -1,3 +1,4 @@
 DIST cairo-1.14.3.gem 97792 SHA256 e3a31ef8097c0b16f2ad71561dca37b4564ae3003838a82805aadeceb69d03b6 SHA512 aba56403ca813bdcc56c01fed76642e4115a683ed3e3d056675195d2d86fc7dfa44f0077ca47407eeea27789824171251222e6300f3f3c395bc186afb616c772 WHIRLPOOL 724d072ad881f54cdcdc631399f99e6bdc563bc78f70c611bdeb3ddc659de78e4ce75c1ec51ac6659542e9ab8ae9c138caa610f97e37a6a1d69440313b69e6a9
 DIST cairo-1.15.2.gem 98304 SHA256 954cb9bf7ac7cc79a5cc805be61ca81378454f20f621939fa6afb4513cab50d9 SHA512 61ebc30c096de50e4a1d5115c3af45913870aa357a788aa3d440f3945b0292ff410022296879f5a5d03229114261227db1fb15ceaee1cf91c586bb1f00544fc6 WHIRLPOOL 6be8cf957f08c3e871bbd73e33a41d117e92e123569756332552e47b6287c68682f91c3b23e85156d84348de17f3f901ffd7bce9cbaf6289558d27ffa522a2c5
 DIST cairo-1.15.3.gem 98816 SHA256 16cf6fdce8671b90a22079cb5734f5c43f1f7e315a69fe276c7080ff41f64e5a SHA512 787593d87dd40f4c17fe8e1cf40d12a8a97f67eacf40a298e29c6d17a6ec85092969250930b4aff25e0be9d378dc99c96def7b97b3e6331b268f2474a79c5d66 WHIRLPOOL 741c03a3b6b745f30fb0dbce77c61dc2d29a301c972c5a235cfa90eefb413fa16c08ba2a661e25f520430a4c5b50edfe16959e18f2fa3bf8b439b98c3abed612
+DIST cairo-1.15.4.gem 101376 SHA256 d6a0f70f6e1cac4385b28ed784fe4c4bccc7e9bc563ea7057f56ca737bc4a592 SHA512 c8e09f35dc3eddb3106a11230c38b58b03a98f0465d7d721b2ad6ccd90149ce010b7d5d873329c6704bde60ca943dbe6d325d662b6fefcac090ec1252f0b374e WHIRLPOOL 94699573c74edb4383916c0ee2b246efdcff99c69a06fe6ad1e1b5a90bfc8a5e4d2e5210f5d3b63e71f9d235f3a390af579bb844971b6da99ee1f1458fd382d3
diff --git a/dev-ruby/rcairo/rcairo-1.15.4.ebuild b/dev-ruby/rcairo/rcairo-1.15.4.ebuild
new file mode 100644
index 000000000000..b95447981501
--- /dev/null
+++ b/dev-ruby/rcairo/rcairo-1.15.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_NAME="cairo"
+
+# Documentation depends on files that are not distributed.
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby bindings for cairo"
+HOMEPAGE="https://cairographics.org/rcairo/"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Ruby GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="${RDEPEND}
+	>=x11-libs/cairo-1.2.0[svg]"
+DEPEND="${DEPEND}
+	>=x11-libs/cairo-1.2.0[svg]"
+
+ruby_add_bdepend "
+	>=dev-ruby/pkg-config-1.1.5
+	dev-ruby/ruby-glib2
+	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 )"
+
+all_ruby_prepare() {
+	# Avoid development dependency.
+	sed -i -e '/notify/ s:^:#:' test/cairo-test-utils.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/cairo extconf.rb || die "extconf failed"
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/cairo
+
+	# again, try to make it more standard, to install it more easily.
+	cp ext/cairo/cairo$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+	# don't rely on the Rakefile because it's a mess to load with
+	# their hierarchy, do it manually.
+	${RUBY} -Ilib -r ./test/cairo-test-utils.rb \
+		-e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	insinto $(ruby_get_hdrdir)
+	doins ext/cairo/rb_cairo.h
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}/samples
+	doins -r samples/*
+}
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index a5d21bf41937..4debfc444d30 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -2,3 +2,4 @@ DIST yard-0.8.7.3-git.tgz 854557 SHA256 d606b5780c8cbe4b4508c34a354f04a5d17609bc
 DIST yard-0.8.7.6-git.tgz 859257 SHA256 ccfadf98936b90e63189f805b6ea9dd6158447b7972f2ddd1578c9898be98a22 SHA512 7f9d4100183e51a2059f01a06a77d9856961390975fd9981b81bf9ea55f047cfd9056c78b5400df277b8230f28990cb421216c4506bbeea797651f37ae2e5db1 WHIRLPOOL a6737f831820dea014a3b093e0c3af43e49cc5815010012bbf1ece2f5ccef7594e4ef95077bd3e97cb5324b79d7ab67d61502052fad498fe0940e2d6a93ec86a
 DIST yard-0.9.0-git.tgz 870211 SHA256 409e52eda8a2fc5d69a4ffa46727ef8c39cc50e1b07a8881873fbd1c3c140a07 SHA512 409d29defb7760e9121406d63fcf5cf967cb866a918370ae9c089c9fb235827ee655de644bd7c955c7afaeedfd31455eaffb7dbfbcb518f7bfc1b2140c9df568 WHIRLPOOL e1ae9984c4200771fe727b9f67db6ee93b4ec0c2fd14ebafc057213f2a822f43d39d7a99559e7e07e4a0c42ca3876642bbb09aa759f5fa1783242fb79b14de1c
 DIST yard-0.9.4-git.tgz 884608 SHA256 4d5440848130aa1dae4d24987015030f3fd0a89e18a755cc8a49bef4c05f3fab SHA512 2255c56498dc147ee5ede5e4898ce7aad78e9350f317e5d5c942f6b12262e9e1d0893ffd985a6bf3822d6af902e8ff555c489e1d847049ba51a472ad3c4aa140 WHIRLPOOL 1a06ccebd661e180ed2420cc136790621da6a0c3113b427120323a99aae0bb61bc9606ad8f7a88e3ebd721c7fcc0381870c1f43b8200fdc57e1f57cde9fa7e81
+DIST yard-0.9.6-git.tgz 897630 SHA256 afad40aacbd97d5b51c119f6e0b67f3d55d12ce5e853e8bfcfeef407df225f67 SHA512 55e7899becfee9cef711c3ab7cd2f12efec306a13e512101a38a1872ca9db62c0614f88ee00bb8e6ef5e288f450676c4d9735c94f4dcdf8a3cdef5eefad41c65 WHIRLPOOL 24de3ae26e98a9d6ad8d80a9a0a64851056d0e6dbb48c95f21d7db810c396bc58a94b2fb6e8a79c678e3bc34e04d99018453d8ccd77d7be8fbc5aace2a9029af
diff --git a/dev-ruby/yard/yard-0.9.6.ebuild b/dev-ruby/yard/yard-0.9.6.ebuild
new file mode 100644
index 000000000000..5a8809420705
--- /dev/null
+++ b/dev-ruby/yard/yard-0.9.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_DOCDIR="doc docs"
+
+RUBY_FAKEGEM_EXTRAINSTALL="templates"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Documentation generation tool for the Ruby programming language"
+HOMEPAGE="http://yardoc.org/"
+
+# The gem lakes the gemspec file needed to pass tests.
+SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
+
+USE_RUBY="ruby20 ruby21 ruby22" ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid specs that make assumptions on load ordering that are not
+	# true for us. This may be related to how we install in Gentoo. This
+	# also drops a test requirement on dev-ruby/rack.
+	rm -f spec/cli/server_spec.rb || die
+}
diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
index 6f695c54ef50..93ea646c5ae3 100644
--- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
+++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} != 9999* ]]; then
 fi
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+man"
 
 DEPEND="
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 8040e3cd775b..c0b3675a1256 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,3 +1,4 @@
 DIST cinnamon-desktop-2.8.1.tar.gz 529226 SHA256 e3eb7210013992db9de050bc6c26f405d66a6c4f0363812deaf191b1fbab595b SHA512 2f1447232ed11bca7507aa0af1de1f0843c5161665a42c9382b402695fa1f0b42972fb29d6d02cf8f951a7573f44fa9771e82f5bad6aa714419bf4a690e35dae WHIRLPOOL 729b191ecf237ae3bc0bfe68c63c650b596ff76347457ce15b267cb01e52dcd13f39b0d21ea1d5164ee841dc0065393587da1f51868338bd71af753891c24860
 DIST cinnamon-desktop-3.0.2.tar.gz 577776 SHA256 a8bbf148b9ee25f21fb2c196a54c95eeee7e35cd23b32f25919516f08e8f4dda SHA512 0adcc7bd9f9dace245a7d7528893f729947228e4c454e423cdb1d3ac2ae3c04d010226e340d5d9315cc45a84f96f7b0bb173ee1589169ddcfbfadba59e0787a6 WHIRLPOOL 039e080ae6e43d356d0c22fce2b18ba1f382d31273a51f1c07daa0e2d0572a3b14426ec44d5e402b987676f36e606a381816396c2f466da593faeabf27d87c12
 DIST cinnamon-desktop-3.2.0.tar.gz 572478 SHA256 84c29fd9256370b6789613292fd12ec7893c1b752487dc938b056a3d68607212 SHA512 e93ec4ee44152b800f75848bd9327b46f4ab0c6b2f4d0dc7f6d6f631eda0d486b995a5bb1537b2c85774fb3a48ae99332937fa8b6021aa08d98b98fc25a8429f WHIRLPOOL de9ab65cc297d8000ee9c74245080da95e12ac2e2c39a1a02316fb4d257693acee8414d98950790e9c880c6acaca0c6d535a236ab6605edbccd30d93008a9f2b
+DIST cinnamon-desktop-3.2.4.tar.gz 570814 SHA256 f9920082b299c85d11cfdb6747026f5f044eabf3a09c0164873fa2850561abad SHA512 d07dbc63df4b689cb1fdeb7032c9f19557de0849def929a9ffc99d5aa1bb49edd37899256152d1245e1d43690821ed61a10e63f82962f787f5e06d999dadaf76 WHIRLPOOL 0474c43c922b517ba0a227bff5b9a48b737621f3bdcf01628c37f9ed3b7ce8cf910dc5ae3ec990c0416cae1c9ac1c882b8637862fc4cebd92c9b9d82cfbce392
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild
new file mode 100644
index 000000000000..52c3349f97d3
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python3_4 )
+
+inherit autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0/4" # subslot = libcinnamon-desktop soname version
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection systemd"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.37.3:2[dbus]
+	media-sound/pulseaudio[glib]
+	>=x11-libs/gdk-pixbuf-2.22:2[introspection?]
+	>=x11-libs/gtk+-3.3.16:3[introspection?]
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXrandr-1.3
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.6
+	gnome-base/gnome-common
+	x11-proto/randrproto
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# set sane default gschema values for systemd users
+	if use systemd; then
+		insinto /usr/share/glib-2.0/schemas/
+		newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
+	fi
+}
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index ffb7333dfcec..626f2f0371cf 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -2,3 +2,4 @@ DIST cinnamon-screensaver-2.8.0.tar.gz 146275 SHA256 595c787bdc9d3a7189d603fe065
 DIST cinnamon-screensaver-3.0.1.tar.gz 147036 SHA256 de32ab1852b605835ea0ca41f248d18b32d7805d479eb6fd5877d4de92dbb784 SHA512 d9ad3f5c09d35388811387e3a7d1a8637d59390c4f797dedc4f6ff97cff631deb009d1cd1288317ca119f5db6456c05fd99c87c135595b2b1f07882892447427 WHIRLPOOL 6b4094cff650234933d82248fc671e399956bc435d1c47aa3b6869f2ba7c3eaaf9d973e05d29f1c274b269b6be62beca0ff0b3babc3804a73d62b9329be568f2
 DIST cinnamon-screensaver-3.2.13.tar.gz 143389 SHA256 7b1a0c156cc0e1983d6ed4370426eac372a5cc3d5f6b8203ddc6913a58d972e9 SHA512 f0c8b533416d5ec9e80f1220a54a8f87839dfd24ac6c00b1b4166c893f0c75519b14f19e9fa91b7c1d71864002d256787d66926042efa9e19b18b7f9f270e8c4 WHIRLPOOL 78067fa402bc83b3013b70e03a476346e2abb6f744cb89a97906bb866cc4075697e7c91a158354d2e9dc7834e2b4aa2443bf8d63547c4c4dced2ffa5ab3b8f50
 DIST cinnamon-screensaver-3.2.2.tar.gz 120816 SHA256 d8ec85d3b984f527790d68d61156adea84f84f35bc956d32923d5116d4937df2 SHA512 0ebc5da00973b6b7972e3f7a2ee671d204cadf25ae99af8a53fd176a5070598aaec9a0def86dca47538e6334c2b6d19db09bc0ac1ec226c85b439c0762a40d18 WHIRLPOOL dfd8ba669cd5732b5ff9e32fd9a1f5076da6da333d6a0822060340948b85aba34f043bd39a24797a7cef5ea0eb2f2e5acd931e3a76883da388bd5179f9df9c33
+DIST cinnamon-screensaver-3.2.6.tar.gz 124287 SHA256 5e0795d46f5f6f93e79139e87449c8a20438bc94af67f002b1b6ba3726db4741 SHA512 78b0347e5d6ae7970d070410d0a4aac08b2dbd69442d278f4869aa636f13de19c1d03118dce2f540739c37cbeebd5fa53ebf31270033fa8393220d6c35672d00 WHIRLPOOL e52657d656a5ee3b2290270c9a3f0c54c462338f35dd6c0edf4611b91c2fb0e0693587b1d63a4a2b7cf36882c655a2a4508601d45a7f6333af98b0648861afbc
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13.ebuild
index fdd664e4e0d9..518bcdbab1ef 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13.ebuild
@@ -14,12 +14,12 @@ SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug doc pam systemd"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
 	>=x11-libs/gtk+-3.1.4:3[introspection]
-	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-extra/cinnamon-desktop-3.2.2:0=[systemd=]
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	>=gnome-base/libgnomekbd-3.6
 	>=dev-libs/dbus-glib-0.78
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild
new file mode 100644
index 000000000000..84a5f3aac86f
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python3_4 )
+
+inherit autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc pam systemd"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:4[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/adwaita-icon-theme
+	x11-libs/xapps
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="
+	!~gnome-extra/cinnamon-1.8.8.1
+	!systemd? ( sys-auth/consolekit )
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	python_fix_shebang screensavers
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug ' ') \
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+
+}
diff --git a/kde-apps/keditbookmarks/keditbookmarks-16.12.0.ebuild b/kde-apps/keditbookmarks/keditbookmarks-16.12.0.ebuild
index 95ce44bccaf8..9458dd6ac652 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-16.12.0.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-16.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,4 +32,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!<=kde-apps/konqueror-16.08.3:4
+"
diff --git a/kde-apps/krdc/metadata.xml b/kde-apps/krdc/metadata.xml
index ec0ea8d9bedc..2fdbf33d963d 100644
--- a/kde-apps/krdc/metadata.xml
+++ b/kde-apps/krdc/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="rdp">Enable runtime dependency for <pkg>net-misc/rdesktop</pkg></flag>
-	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-crashfix.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-crashfix.patch
new file mode 100644
index 000000000000..9e4bdd99f5c4
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-crashfix.patch
@@ -0,0 +1,57 @@
+commit d674ede6e5f22281fa2461546ddc25ff5f3a7015
+Author: Kai Uwe Broulik <kde@privat.broulik.de>
+Date:   Tue Jan 3 09:38:50 2017 +0100
+
+    [Panel Containment] Explicitly bind visible on both the container and the applet
+    
+    While trying to fix a random plasmashell crash I was getting fairly often (and I hoped
+    was fixed by David's last spacer fix) I found that the cause was actually in virtual desktop pager.
+    
+    The virtual desktop pager is hidden when there's just one desktop and it will not update its
+    models in this case to save resources. Back when I added this I already noticed that sometimes
+    the pager (usually after one "open and close panelcontroller" cycle) still thought it was visible.
+    It was even weirder than that, I found out that on teardown it suddenly thought it became visible.
+    This had it populate its model which in turn spawned QML items, all of this whilst the panel was
+    already in the process of destroying its children, leading to a crash.
+    
+    Differential Revision: https://phabricator.kde.org/D3897
+
+diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
+index e9afa86..5bb5283 100644
+--- a/containments/panel/contents/ui/main.qml
++++ b/containments/panel/contents/ui/main.qml
+@@ -54,20 +54,27 @@ DragDrop.DropArea {
+ 
+ //BEGIN functions
+ function addApplet(applet, x, y) {
++    // don't show applet if it choses to be hidden but still make it
++    // accessible in the panelcontroller
++    // Due to the nature of how "visible" propagates in QML, we need to
++    // explicitly set it on the container (so the Layout ignores it)
++    // as well as the applet (so it reliably knows about), otherwise it can
++    // happen that an applet erroneously thinks it's visible, or suddenly
++    // starts thinking that way on teardown (virtual desktop pager)
++    // leading to crashes
++    var visibleBinding = Qt.binding(function() {
++        return applet.status !== PlasmaCore.Types.HiddenStatus || (!plasmoid.immutable && plasmoid.userConfiguring);
++    })
++
+     var container = appletContainerComponent.createObject(root, {
+         applet: applet,
+-
+-        // don't show applet if it choses to be hidden but still make it
+-        // accessible in the panelcontroller
+-        visible: Qt.binding(function() {
+-            return applet.status !== PlasmaCore.Types.HiddenStatus || (!plasmoid.immutable && plasmoid.userConfiguring)
+-        })
++        visible: visibleBinding
+     });
+ 
+     applet.parent = container;
+     applet.anchors.fill = container;
+ 
+-    applet.visible = true;
++    applet.visible = visibleBinding;
+ 
+     // Is there a DND placeholder? Replace it!
+     if (dndSpacer.parent === currentLayout) {
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-hover-state.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-hover-state.patch
new file mode 100644
index 000000000000..5e645c51b063
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-hover-state.patch
@@ -0,0 +1,33 @@
+commit e80a4b87cfa98708724942794ca6f051974bb5c0
+Author: Eike Hein <hein@kde.org>
+Date:   Tue Jan 3 16:30:54 2017 +0900
+
+    Don't clear hover state while a child dialog is open.
+    
+    Otherwise it won't stay open.
+    
+    Fixes regression from 7585f295363532eff51f7e11ef6b62925117aba4.
+    
+    The bug number referenced in the original change is invalid, but
+    I don't think this should invalidate the intent of that fix. Kai
+    please let me know the correct bug number so I can double-check.
+    
+    BUG:374291
+    CCMAIL:kde@privat.broulik.de
+
+diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
+index 1fd8dbb..8936532 100644
+--- a/containments/desktop/package/contents/ui/FolderView.qml
++++ b/containments/desktop/package/contents/ui/FolderView.qml
+@@ -343,7 +343,10 @@ Item {
+         onContainsMouseChanged: {
+             if (!containsMouse && !main.rubberBand) {
+                 clearPressState();
+-                gridView.hoveredItem = null;
++
++                if (gridView.hoveredItem && !gridView.hoveredItem.popupDialog) {
++                    gridView.hoveredItem = null;
++                }
+             }
+         }
+ 
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-taskman-memleak.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-taskman-memleak.patch
new file mode 100644
index 000000000000..b112edced777
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-taskman-memleak.patch
@@ -0,0 +1,43 @@
+commit 58e932c607db27bea2872625661991fb16c79d13
+Author: Kai Uwe Broulik <kde@privat.broulik.de>
+Date:   Tue Jan 3 09:37:38 2017 +0100
+
+    [Task Manager] Parent QAction to "parent" instead of this
+    
+    This ensures the QAction is disposed of once the menu gets destroyed rather than
+    accumulating forever - the methods already took a "parent" argument,
+    which is passed the menu from QML side, for exactly that purpose.
+    
+    Differential Revision: https://phabricator.kde.org/D3816
+
+diff --git a/applets/taskmanager/plugin/backend.cpp b/applets/taskmanager/plugin/backend.cpp
+index 16f1f57..efbd095 100644
+--- a/applets/taskmanager/plugin/backend.cpp
++++ b/applets/taskmanager/plugin/backend.cpp
+@@ -142,7 +142,7 @@ QVariantList Backend::jumpListActions(const QUrl &launcherUrl, QObject *parent)
+             continue;
+         }
+ 
+-        QAction *action = new QAction(this);
++        QAction *action = new QAction(parent);
+         action->setText(name);
+         action->setIcon(QIcon::fromTheme(actionGroup.readEntry("Icon")));
+         action->setProperty("exec", exec);
+@@ -204,7 +204,7 @@ QVariantList Backend::recentDocumentActions(const QUrl &launcherUrl, QObject *pa
+             continue;
+         }
+ 
+-        QAction *action = new QAction(this);
++        QAction *action = new QAction(parent);
+         action->setText(url.fileName());
+         action->setIcon(QIcon::fromTheme(fileItem.iconName(), QIcon::fromTheme("unknown")));
+         action->setProperty("agent", storageId);
+@@ -219,7 +219,7 @@ QVariantList Backend::recentDocumentActions(const QUrl &launcherUrl, QObject *pa
+     }
+ 
+     if (actionCount > 0) {
+-        QAction *action = new QAction(this);
++        QAction *action = new QAction(parent);
+         action->setText(i18n("Forget Recent Documents"));
+         action->setProperty("agent", storageId);
+         connect(action, &QAction::triggered, this, &Backend::handleRecentDocumentAction);
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.5-r1.ebuild
new file mode 100644
index 000000000000..4444dc0aebde
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.5-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Plasma desktop"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus
+legacy-systray packagekit pulseaudio +qt4 scim +semantic-desktop"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kactivities-stats)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep sonnet)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5]
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	ibus? (
+		$(add_qt_dep qtx11extras)
+		app-i18n/ibus
+		dev-libs/glib:2
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
+	packagekit? ( >=app-admin/packagekit-qt-0.9.6 )
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libcanberra
+		media-sound/pulseaudio
+	)
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep oxygen)
+	$(add_qt_dep qtgraphicaleffects)
+	sys-apps/accountsservice
+	x11-apps/setxkbmap
+	legacy-systray? (
+		gtk2? ( dev-libs/libappindicator:2 )
+		gtk3? ( dev-libs/libappindicator:3 )
+		qt4? ( dev-libs/sni-qt )
+	)
+	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
+	qt4? ( kde-plasma/qguiplatformplugin_kde:4 )
+	!kde-apps/kcontrol
+	!kde-apps/kdepasswd:4
+	!kde-apps/knetattach[handbook]
+	!kde-base/plasma-desktop:4
+	!kde-plasma/plasma-workspace:4
+	!kde-plasma/solid-actions-kcm:4
+	!kde-plasma/systemsettings:4
+	!kde-misc/kcm_touchpad
+	!kde-misc/kcm-touchpad
+	!kde-plasma/kcm-touchpad
+	!<kde-plasma/kdeplasma-addons-5.5.50
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-proto/xproto
+	fontconfig? ( x11-libs/libXrender )
+	input_devices_evdev? ( x11-drivers/xf86-input-evdev )
+"
+
+REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
+
+PATCHES=(
+	# stable branch
+	"${FILESDIR}/${P}-hover-state.patch"
+	"${FILESDIR}/${P}-taskman-memleak.patch"
+	"${FILESDIR}/${P}-crashfix.patch"
+	 #master
+	"${FILESDIR}/${PN}-5.7.90-baloo-optional.patch"
+)
+
+pkg_setup() {
+	if has_version net-im/skype && use legacy-systray && use amd64; then
+		einfo
+		elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary."
+		einfo
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package fontconfig Fontconfig)
+		$(cmake-utils_use_find_package ibus IBus)
+		$(cmake-utils_use_find_package input_devices_evdev Evdev)
+		$(cmake-utils_use_find_package input_devices_synaptics Synaptics)
+		$(cmake-utils_use_find_package packagekit PackageKitQt5)
+		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+		$(cmake-utils_use_find_package scim SCIM)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-integration/files/plasma-integration-5.8.5-filedialog.patch b/kde-plasma/plasma-integration/files/plasma-integration-5.8.5-filedialog.patch
new file mode 100644
index 000000000000..148825d496d0
--- /dev/null
+++ b/kde-plasma/plasma-integration/files/plasma-integration-5.8.5-filedialog.patch
@@ -0,0 +1,71 @@
+commit 87b27476cc8a3865994da066ce06a3e836462719
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Dec 31 11:55:43 2016 +0100
+
+    Fix regression in which the Save dialog appears as an Open dialog
+    
+    7bbbd93cd3fc0abdffd3fa7f144cb50a33fafad9 makes the save dialog appear as Open dialog.
+    
+    Simplify the code in that commit so it does not regress anymore.
+    
+    Comes with a unit test
+    
+    New test fails without the patch, works with it. Kate Save As dialog no longer shows as Open dialog.
+    
+    REVIEW: 129732
+
+diff --git a/autotests/kfiledialog_unittest.cpp b/autotests/kfiledialog_unittest.cpp
+index 47a5543..d53c7e3 100644
+--- a/autotests/kfiledialog_unittest.cpp
++++ b/autotests/kfiledialog_unittest.cpp
+@@ -95,6 +95,29 @@ private Q_SLOTS:
+         QCOMPARE(dialog.directoryUrl(), directoryUrl);
+     }
+ 
++    void testGetSaveFileUrl()
++    {
++        QObject lambdaGuard;
++        QTemporaryFile tempFile(QDir::tempPath()+"/kfiledialogtest_XXXXXX");
++        tempFile.open();
++        const QString tempName = tempFile.fileName();
++        const QUrl url = QUrl::fromLocalFile(tempName);
++
++        // Need to use a lambda and not just QTest::qWaitForWindowExposed();
++        // because with the static getSaveFileUrl we do not have access
++        // to the QFileDialog object, so instead we hook to a signal
++        KFileWidget::OperationMode saveFileOperationMode = KFileWidget::Other;
++        connect(qApp, &QGuiApplication::focusWindowChanged, &lambdaGuard, [&saveFileOperationMode] {
++            KFileWidget *fileWidget = findFileWidget();
++            saveFileOperationMode = fileWidget->operationMode();
++            qApp->activeWindow()->close();
++        });
++
++        QFileDialog::getSaveFileUrl(0, QString(), url);
++
++        QCOMPARE(saveFileOperationMode, KFileWidget::Saving);
++    }
++
+     void testViewMode()
+     {
+         // Open a file dialog, and change view mode to tree
+diff --git a/src/platformtheme/kdeplatformfiledialoghelper.cpp b/src/platformtheme/kdeplatformfiledialoghelper.cpp
+index 990b983..05cfe35 100644
+--- a/src/platformtheme/kdeplatformfiledialoghelper.cpp
++++ b/src/platformtheme/kdeplatformfiledialoghelper.cpp
+@@ -365,15 +365,7 @@ void KDEPlatformFileDialogHelper::selectFile(const QUrl &filename)
+     // Qt 5 at least <= 5.8.0 does not derive the directory from the passed url
+     // and set the initialDirectory option accordingly, also not for known schemes
+     // like file://, so we have to do it ourselves
+-
+-    // Syntax-wise we have to use a copy ctor until Qt 5.7.x and clone() since Qt 5.8.
+-#if QT_VERSION < QT_VERSION_CHECK(5, 8, 0)
+-    QSharedPointer<QFileDialogOptions> opt(new QFileDialogOptions(*options()));
+-#else
+-    auto opt = options()->clone();
+-#endif
+-    opt->setInitialDirectory(m_dialog->directory());
+-    setOptions(opt);
++    options()->setInitialDirectory(m_dialog->directory());
+ }
+ 
+ void KDEPlatformFileDialogHelper::setDirectory(const QUrl &directory)
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.8.5-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.8.5-r1.ebuild
new file mode 100644
index 000000000000..80ee6ac8c210
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.8.5-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep breeze)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui '' '' '5=')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libXcursor
+"
+RDEPEND="${DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-filedialog.patch" )
diff --git a/lxde-base/lxappearance/lxappearance-0.6.2.ebuild b/lxde-base/lxappearance/lxappearance-0.6.2.ebuild
index 62c9df87a400..818c6cee2a12 100644
--- a/lxde-base/lxappearance/lxappearance-0.6.2.ebuild
+++ b/lxde-base/lxappearance/lxappearance-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="dbus"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/lxde-base/lxinput/lxinput-0.3.5.ebuild b/lxde-base/lxinput/lxinput-0.3.5.ebuild
index 0128a4fb8d43..73b9c34802e0 100644
--- a/lxde-base/lxinput/lxinput-0.3.5.ebuild
+++ b/lxde-base/lxinput/lxinput-0.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
diff --git a/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild b/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
index f276735f91c1..36e51db74cc3 100644
--- a/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
+++ b/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/lxde-base/lxpanel/lxpanel-0.8.2.ebuild b/lxde-base/lxpanel/lxpanel-0.8.2.ebuild
index ccd77492002a..f1d9ff9d9a9c 100644
--- a/lxde-base/lxpanel/lxpanel-0.8.2.ebuild
+++ b/lxde-base/lxpanel/lxpanel-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://lxde.org/"
 SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
 SLOT="0"
 IUSE="+alsa wifi"
 
diff --git a/lxde-base/lxrandr/lxrandr-0.3.1.ebuild b/lxde-base/lxrandr/lxrandr-0.3.1.ebuild
index 15b18295f0da..32cc8c8a7f1f 100644
--- a/lxde-base/lxrandr/lxrandr-0.3.1.ebuild
+++ b/lxde-base/lxrandr/lxrandr-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://lxde.org/"
 SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux"
 SLOT="0"
 IUSE=""
 
diff --git a/lxde-base/lxtask/lxtask-0.1.7.ebuild b/lxde-base/lxtask/lxtask-0.1.7.ebuild
index a91695e33aac..cbd55b558a9b 100644
--- a/lxde-base/lxtask/lxtask-0.1.7.ebuild
+++ b/lxde-base/lxtask/lxtask-0.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://lxde.sf.net/"
 SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~x86 ~arm-linux ~x86-linux"
 SLOT="0"
 IUSE=""
 
diff --git a/mail-client/thunderbird/files/mozilla_configure_regexp_esr.patch b/mail-client/thunderbird/files/mozilla_configure_regexp_esr.patch
new file mode 100644
index 000000000000..9e165ff9e88e
--- /dev/null
+++ b/mail-client/thunderbird/files/mozilla_configure_regexp_esr.patch
@@ -0,0 +1,32 @@
+From: Jory A. Pratt <anarchy@gentoo.org>
+
+Note: the first occurrence of :space: is [:space:] (with a single pair
+of []), where it should be [[:space:]] (with two pairs of []).
+
+This causes the sed command to fail (with the error message quoted in
+my original report), driving to failure the whole configure step.
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1329252
+
+diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
+--- a/build/autoconf/icu.m4
++++ b/build/autoconf/icu.m4
+@@ -68,17 +68,17 @@ if test -n "$USE_ICU"; then
+     icudir="$_topsrcdir/intl/icu/source"
+     if test ! -d "$icudir"; then
+         icudir="$_topsrcdir/../../intl/icu/source"
+         if test ! -d "$icudir"; then
+             AC_MSG_ERROR([Cannot find the ICU directory])
+         fi
+     fi
+ 
+-    version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
++    version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
+     if test x"$version" = x; then
+        AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
+     fi
+     MOZ_ICU_VERSION="$version"
+ 
+     if test "$OS_TARGET" = WINNT; then
+         MOZ_SHARED_ICU=1
+     fi
diff --git a/mail-client/thunderbird/files/update_h2_curve.patch b/mail-client/thunderbird/files/update_h2_curve.patch
new file mode 100644
index 000000000000..a1f0ffaeaf94
--- /dev/null
+++ b/mail-client/thunderbird/files/update_h2_curve.patch
@@ -0,0 +1,30 @@
+From: Franziskus Kiefer <franziskuskiefer@gmail.com>
+
+Update keybits in H2
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1290037
+
+diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp
+--- a/netwerk/protocol/http/Http2Session.cpp
++++ b/netwerk/protocol/http/Http2Session.cpp
+@@ -3516,18 +3516,18 @@ Http2Session::ConfirmTLSProfile()
+     RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
+   }
+ 
+   uint32_t keybits = ssl->GetKEAKeyBits();
+   if (kea == ssl_kea_dh && keybits < 2048) {
+     LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n",
+           this, keybits));
+     RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
+-  } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128
+-    LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n",
++  } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1.
++    LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n",
+           this, keybits));
+     RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
+   }
+ 
+   int16_t macAlgorithm = ssl->GetMACAlgorithmUsed();
+   LOG3(("Http2Session::ConfirmTLSProfile %p MAC Algortihm (aead==6) %d\n",
+         this, macAlgorithm));
+   if (macAlgorithm != nsISSLSocketControl::SSL_MAC_AEAD) {
diff --git a/mail-client/thunderbird/thunderbird-45.6.0.ebuild b/mail-client/thunderbird/thunderbird-45.6.0-r1.ebuild
similarity index 98%
rename from mail-client/thunderbird/thunderbird-45.6.0.ebuild
rename to mail-client/thunderbird/thunderbird-45.6.0-r1.ebuild
index 7c03d69a5fc3..a3f77f268f7d 100644
--- a/mail-client/thunderbird/thunderbird-45.6.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-45.6.0-r1.ebuild
@@ -130,7 +130,9 @@ src_prepare() {
 
 	# Apply our patchset from firefox to thunderbird as well
 	pushd "${S}"/mozilla &>/dev/null || die
-	eapply "${WORKDIR}/firefox"
+	eapply "${WORKDIR}/firefox" \
+		"${FILESDIR}"/mozilla_configure_regexp_esr.patch \
+		"${FILESDIR}"/update_h2_curve.patch
 	popd &>/dev/null || die
 
 	# Ensure that are plugins dir is enabled as default
diff --git a/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild b/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild
index 762fe3853dbb..3cf799207921 100644
--- a/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild
+++ b/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 FONT_S="${S}"
diff --git a/media-libs/flac/files/flac-1.3.2-honor-htmldir.patch b/media-libs/flac/files/flac-1.3.2-honor-htmldir.patch
new file mode 100644
index 000000000000..2f93a67cbbe3
--- /dev/null
+++ b/media-libs/flac/files/flac-1.3.2-honor-htmldir.patch
@@ -0,0 +1,55 @@
+HTML files should be installed to $(htmldir), and $(docdir) should
+not be changed, as this is a user flag in the GNU conventions.
+
+--- a/doc/html/images/Makefile.am
++++ b/doc/html/images/Makefile.am
+@@ -16,9 +16,9 @@
+ #  restrictive of those mentioned above.  See the file COPYING.Xiph in this
+ #  distribution.
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/images
++logosdir = $(htmldir)/images
+ 
+-doc_DATA = \
++logos_DATA = \
+ 	logo.svg \
+ 	logo130.gif
+ 
+--- a/doc/html/Makefile.am
++++ b/doc/html/Makefile.am
+@@ -18,9 +18,7 @@
+ 
+ SUBDIRS = images
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html
+-
+-doc_DATA = \
++html_DATA = \
+ 	changelog.html \
+ 	developers.html \
+ 	documentation.html \
+@@ -46,10 +44,10 @@
+ # The install targets don't copy whole directories so we have to
+ # handle 'api/' specially:
+ install-data-local:
+-	$(mkinstalldirs) $(DESTDIR)$(docdir)/api
+-	(cd $(builddir)/api && $(INSTALL_DATA) * $(DESTDIR)$(docdir)/api)
++	$(mkinstalldirs) $(DESTDIR)$(htmldir)/api
++	(cd $(builddir)/api && $(INSTALL_DATA) * $(DESTDIR)$(htmldir)/api)
+ uninstall-local:
+-	rm -rf $(DESTDIR)$(docdir)/api
++	rm -rf $(DESTDIR)$(htmldir)/api
+ distclean-local:
+ 	-rm -rf api
+ endif
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -31,8 +31,6 @@
+ 	mkdir -p html/api
+ endif
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+-
+ doc_DATA = \
+ 	FLAC.tag
+ 
diff --git a/media-libs/flac/flac-1.3.2.ebuild b/media-libs/flac/flac-1.3.2.ebuild
index 0e8a510dd8ad..5786d31794e5 100644
--- a/media-libs/flac/flac-1.3.2.ebuild
+++ b/media-libs/flac/flac-1.3.2.ebuild
@@ -15,11 +15,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="altivec +cxx debug ogg cpu_flags_x86_sse static-libs"
 
-RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	)"
+RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	abi_x86_32? ( dev-lang/nasm )
@@ -32,16 +28,15 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.3.2-asneeded.patch
 		"${FILESDIR}"/${PN}-1.3.0-dontbuild-tests.patch
 		"${FILESDIR}"/${PN}-1.3.2-dontbuild-examples.patch
+		"${FILESDIR}"/${PN}-1.3.2-honor-htmldir.patch
 	)
 
 	default
-
 	eautoreconf
 }
 
 multilib_src_configure() {
 	local myeconfargs=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
 		--disable-doxygen-docs
 		--disable-examples
 		--disable-xmms-plugin
@@ -51,6 +46,7 @@ multilib_src_configure() {
 		$(use_enable cxx cpplibs)
 		$(use_enable debug)
 		$(use_enable ogg)
+		$(use_enable static-libs static)
 
 		# cross-compile fix (bug #521446)
 		# no effect if ogg support is disabled
@@ -68,7 +64,6 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" \( -name "*.la" -o -name "*.a" \) -delete || die
-	fi
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libpng/libpng-1.6.27.ebuild b/media-libs/libpng/libpng-1.6.27.ebuild
index 5af2db2da6ca..bfa666455660 100644
--- a/media-libs/libpng/libpng-1.6.27.ebuild
+++ b/media-libs/libpng/libpng-1.6.27.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
index 895d54c63455..f46d3baaa1e1 100644
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.70.00.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )
diff --git a/media-sound/easytag/easytag-2.4.3.ebuild b/media-sound/easytag/easytag-2.4.3.ebuild
index c793b26f214b..b6e9257f4b4a 100644
--- a/media-sound/easytag/easytag-2.4.3.ebuild
+++ b/media-sound/easytag/easytag-2.4.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="flac mp3 mp4 opus speex test vorbis wavpack"
 REQUIRED_USE="
diff --git a/media-sound/jalv/files/jalv-1.6.0-qt-5.7.0.patch b/media-sound/jalv/files/jalv-1.6.0-qt-5.7.0.patch
new file mode 100644
index 000000000000..f6ca944b04c8
--- /dev/null
+++ b/media-sound/jalv/files/jalv-1.6.0-qt-5.7.0.patch
@@ -0,0 +1,31 @@
+From c32f3ca76a09c03fe9a022eb46e049e6fd5e2dbb Mon Sep 17 00:00:00 2001
+From: David Robillard <d@drobilla.net>
+Date: Sat, 7 Jan 2017 19:20:55 -0500
+Subject: Fix compilation with newer versions of Qt5
+
+
+diff --git a/wscript b/wscript
+index 24f5a2b..08df946 100644
+--- a/wscript
++++ b/wscript
+@@ -5,7 +5,7 @@ from waflib.extras import autowaf as autowaf
+ import waflib.Options as Options
+ 
+ # Version of this package (even if built as a child)
+-JALV_VERSION = '1.6.0'
++JALV_VERSION = '1.6.1'
+ 
+ # Variables for 'waf dist'
+ APPNAME = 'jalv'
+@@ -231,7 +231,7 @@ def build(bld):
+                   includes     = ['.', 'src'],
+                   lib          = ['pthread'],
+                   install_path = '${BINDIR}',
+-                  cxxflags     = ['-fPIC'])
++                  cxxflags     = ['-fPIC', '-std=c++11'])
+         autowaf.use_lib(bld, obj, libs + ' QT5')
+ 
+     # Man pages
+-- 
+cgit v0.10.2
+
diff --git a/media-sound/jalv/jalv-1.6.0.ebuild b/media-sound/jalv/jalv-1.6.0-r1.ebuild
similarity index 79%
rename from media-sound/jalv/jalv-1.6.0.ebuild
rename to media-sound/jalv/jalv-1.6.0-r1.ebuild
index 4e806bb6c991..a5822033c039 100644
--- a/media-sound/jalv/jalv-1.6.0.ebuild
+++ b/media-sound/jalv/jalv-1.6.0-r1.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 qmake-utils waf-utils
@@ -16,26 +16,32 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gtk gtk2 gtkmm portaudio qt4 qt5"
+IUSE="gtk gtk2 gtkmm portaudio qt5"
 
 RDEPEND=">=media-libs/lv2-1.6.0
-	>=media-libs/lilv-0.15.1
+	>=media-libs/lilv-0.24.0
 	>=dev-libs/serd-0.14.0
 	>=dev-libs/sord-0.12.0
 	>=media-libs/suil-0.6.0
-	>=media-libs/sratom-0.4.0
-	!portaudio? ( virtual/jack )
+	>=media-libs/sratom-0.6.0
 	gtk? ( >=x11-libs/gtk+-3.0.0:3 )
 	gtk2? ( >=x11-libs/gtk+-2.18.0:2 )
 	gtkmm? ( >=dev-cpp/gtkmm-2.20.0:2.4 )
 	portaudio? ( media-libs/portaudio )
-	qt5? ( dev-qt/qtwidgets:5 )
+	!portaudio? ( virtual/jack )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	virtual/pkgconfig"
 
-DOCS=( "AUTHORS" "NEWS" "README" )
+DOCS=( AUTHORS NEWS README )
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.7.0.patch" )
 
 src_configure() {
 	use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
diff --git a/media-tv/mythtv/mythtv-0.27.6_p20160318.ebuild b/media-tv/mythtv/mythtv-0.27.6_p20160318.ebuild
index d9eec65a82d0..ca4eaf4f04eb 100644
--- a/media-tv/mythtv/mythtv-0.27.6_p20160318.ebuild
+++ b/media-tv/mythtv/mythtv-0.27.6_p20160318.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/MythTV/mythtv/archive/${BACKPORTS}.tar.gz -> ${P}.ta
 
 SLOT="0/${PV}"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE_INPUT_DEVICES="input_devices_joystick"
 IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 2ee62eac5960..f00a66addd80 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Jan 2017 10:13:13 +0000
+Mon, 09 Jan 2017 08:13:22 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8fe8859a0fd5..f00a66addd80 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Jan 2017 10:13:14 +0000
+Mon, 09 Jan 2017 08:13:22 +0000
diff --git a/metadata/md5-cache/app-backup/kbackup-1.0 b/metadata/md5-cache/app-backup/kbackup-1.0
new file mode 100644
index 000000000000..c7469dfd2a6a
--- /dev/null
+++ b/metadata/md5-cache/app-backup/kbackup-1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.5.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Program that lets you back up any directories or files
+EAPI=6
+HOMEPAGE=http://kde-apps.org/content/show.php/KBackup?content=44998
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !app-backup/kbackup:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
+SLOT=5
+SRC_URI=http://members.aon.at/m.koller/kbackup-1.0.tar.bz2
+_eclasses_=cmake-utils	fa4d8052a1ccf4fbbfa76361bffebe42	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	cb60e5fcd45072e40188c7c37ce0a4fc	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=bf08e3cb7f691250436c0fe9ab873db0
diff --git a/metadata/md5-cache/app-emulation/rkt-1.18.0 b/metadata/md5-cache/app-emulation/rkt-1.18.0
deleted file mode 100644
index c274063f83e2..000000000000
--- a/metadata/md5-cache/app-emulation/rkt-1.18.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=dev-lang/go-1.5 app-arch/cpio app-crypt/trousers sys-fs/squashfs-tools dev-perl/Capture-Tiny rkt_stage1_src? ( >=sys-apps/util-linux-2.27 ) rkt_stage1_kvm_qemu? ( sys-apps/attr[static-libs(+)] sys-libs/libcap[static-libs(+)] sys-libs/zlib[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] ) !<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 virtual/pkgconfig
-DESCRIPTION=rkt is an App Container runtime for Linux
-EAPI=6
-HOMEPAGE=https://github.com/coreos/rkt
-IUSE=doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src +actool systemd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!app-emulation/rocket rkt_stage1_host? ( systemd? ( >=sys-apps/systemd-222 app-shells/bash:0 ) )
-REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm
-SLOT=0
-SRC_URI=https://github.com/coreos/rkt/archive/v1.18.0.tar.gz -> rkt-1.18.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1192.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1192.0.0.img ) rkt_stage1_kvm_lkvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/d62653e177597251c24494a6dda60acd6d846671.tar.gz -> kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz mirror://kernel/linux/kernel/v4.x/linux-4.3.1.tar.xz http://alpha.release.core-os.net/amd64-usr/1192.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1192.0.0.img ) rkt_stage1_kvm_qemu? ( http://wiki.qemu-project.org/download/qemu-2.6.1.tar.bz2 mirror://kernel/linux/kernel/v4.x/linux-4.3.1.tar.xz http://alpha.release.core-os.net/amd64-usr/1192.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1192.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v231.tar.gz -> systemd-231.tar.gz )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=97b6fb6de8a9791e803ec920c86a8806
diff --git a/metadata/md5-cache/app-emulation/rkt-1.19.0 b/metadata/md5-cache/app-emulation/rkt-1.19.0
deleted file mode 100644
index 0d005f1bb580..000000000000
--- a/metadata/md5-cache/app-emulation/rkt-1.19.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=dev-lang/go-1.5 app-arch/cpio app-crypt/trousers sys-fs/squashfs-tools dev-perl/Capture-Tiny rkt_stage1_src? ( >=sys-apps/util-linux-2.27 ) rkt_stage1_kvm_qemu? ( sys-apps/attr[static-libs(+)] sys-libs/libcap[static-libs(+)] sys-libs/zlib[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] ) !<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 virtual/pkgconfig
-DESCRIPTION=rkt is an App Container runtime for Linux
-EAPI=6
-HOMEPAGE=https://github.com/coreos/rkt
-IUSE=doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src +actool systemd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!app-emulation/rocket rkt_stage1_host? ( systemd? ( >=sys-apps/systemd-222 app-shells/bash:0 ) )
-REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm
-RESTRICT=test rkt_stage1_src? ( userpriv )
-SLOT=0
-SRC_URI=https://github.com/coreos/rkt/archive/v1.19.0.tar.gz -> rkt-1.19.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1192.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1192.0.0.img ) rkt_stage1_kvm_lkvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz -> kvmtool-1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz mirror://kernel/linux/kernel/v4.x/linux-4.8.6.tar.xz http://alpha.release.core-os.net/amd64-usr/1192.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1192.0.0.img ) rkt_stage1_kvm_qemu? ( http://wiki.qemu-project.org/download/qemu-2.7.0.tar.bz2 mirror://kernel/linux/kernel/v4.x/linux-4.8.6.tar.xz http://alpha.release.core-os.net/amd64-usr/1192.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1192.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v231.tar.gz -> systemd-231.tar.gz )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=de46cbbba3f70d955311d793988a1bf1
diff --git a/metadata/md5-cache/app-emulation/rkt-1.20.0 b/metadata/md5-cache/app-emulation/rkt-1.22.0
similarity index 93%
rename from metadata/md5-cache/app-emulation/rkt-1.20.0
rename to metadata/md5-cache/app-emulation/rkt-1.22.0
index e88de31b1e87..6b2927384c56 100644
--- a/metadata/md5-cache/app-emulation/rkt-1.20.0
+++ b/metadata/md5-cache/app-emulation/rkt-1.22.0
@@ -10,6 +10,6 @@ RDEPEND=!app-emulation/rocket rkt_stage1_host? ( systemd? ( >=sys-apps/systemd-2
 REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm
 RESTRICT=test rkt_stage1_src? ( userpriv )
 SLOT=0
-SRC_URI=https://github.com/coreos/rkt/archive/v1.20.0.tar.gz -> rkt-1.20.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1235.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1235.0.0.img ) rkt_stage1_kvm_lkvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz -> kvmtool-1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz mirror://kernel/linux/kernel/v4.x/linux-4.8.6.tar.xz http://alpha.release.core-os.net/amd64-usr/1235.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1235.0.0.img ) rkt_stage1_kvm_qemu? ( http://wiki.qemu-project.org/download/qemu-2.7.0.tar.bz2 mirror://kernel/linux/kernel/v4.x/linux-4.8.6.tar.xz http://alpha.release.core-os.net/amd64-usr/1235.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1235.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v231.tar.gz -> systemd-231.tar.gz )
+SRC_URI=https://github.com/coreos/rkt/archive/v1.22.0.tar.gz -> rkt-1.22.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1235.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1235.0.0.img ) rkt_stage1_kvm_lkvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz -> kvmtool-1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz mirror://kernel/linux/kernel/v4.x/linux-4.8.6.tar.xz http://alpha.release.core-os.net/amd64-usr/1235.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1235.0.0.img ) rkt_stage1_kvm_qemu? ( http://wiki.qemu-project.org/download/qemu-2.7.0.tar.bz2 mirror://kernel/linux/kernel/v4.x/linux-4.8.6.tar.xz http://alpha.release.core-os.net/amd64-usr/1235.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1235.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v231.tar.gz -> systemd-231.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=383398887958725b4d9b705c2f4139c3
+_md5_=781b8c4f9d6c2ddcb0c1c1b8b6df2dee
diff --git a/metadata/md5-cache/app-misc/sl-3.03-r3 b/metadata/md5-cache/app-misc/sl-3.03-r3
deleted file mode 100644
index 38b80e6a340d..000000000000
--- a/metadata/md5-cache/app-misc/sl-3.03-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=sys-libs/ncurses
-DESCRIPTION=sophisticated graphical program which corrects your miss typing
-EAPI=4
-HOMEPAGE=http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html http://www.izumix.org.uk/sl/
-IUSE=debug linguas_ja vanilla
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=freedist
-RDEPEND=sys-libs/ncurses
-REQUIRED_USE=debug? ( !vanilla )
-SLOT=0
-SRC_URI=http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/sl/sl.tar !vanilla? ( http://www.linet.gr.jp/~izumi/sl/sl5-1.patch http://www.sodan.ecc.u-tokyo.ac.jp/~okayama/sl/sl.en.1.gz )
-_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=5b3cba7947aefa9e16d645f5f2bb2389
diff --git a/metadata/md5-cache/app-misc/sl-5.02 b/metadata/md5-cache/app-misc/sl-5.02
index c8308ff6e001..669422699bd7 100644
--- a/metadata/md5-cache/app-misc/sl-5.02
+++ b/metadata/md5-cache/app-misc/sl-5.02
@@ -4,10 +4,10 @@ DESCRIPTION=sophisticated graphical program which corrects your miss typing
 EAPI=6
 HOMEPAGE=http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html https://github.com/mtoyoda/sl/
 IUSE=l10n_ja
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=freedist
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/mtoyoda/sl/archive/5.02.tar.gz -> sl-5.02.tar.gz
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2ed606f8db67e7d8b3ee107f7e14e171
+_md5_=3969a7f1af6d51fdcf33d352cb322edd
diff --git a/metadata/md5-cache/app-misc/task-2.5.1-r1 b/metadata/md5-cache/app-misc/task-2.5.1-r1
index 55960bbbd83c..52eb88134758 100644
--- a/metadata/md5-cache/app-misc/task-2.5.1-r1
+++ b/metadata/md5-cache/app-misc/task-2.5.1-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/readline:0 sync? ( net-libs/gnutls:0= ) elibc_glibc? ( sys-apps
 SLOT=0
 SRC_URI=http://taskwarrior.org/download/task-2.5.1.tar.gz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	cmake-utils	fa4d8052a1ccf4fbbfa76361bffebe42	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=04529561cf4a6d6acac52eb21a3e5876
+_md5_=f9eafcb6d3fd60ee80a3bff8cd57f157
diff --git a/metadata/md5-cache/app-misc/vcp-2.2-r2 b/metadata/md5-cache/app-misc/vcp-2.2-r2
new file mode 100644
index 000000000000..91b125e50f83
--- /dev/null
+++ b/metadata/md5-cache/app-misc/vcp-2.2-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=Copy files/directories in a curses interface
+EAPI=6
+HOMEPAGE=http://members.iinet.net.au/~lynx/vcp/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=http://members.iinet.net.au/~lynx/vcp/vcp-2.2.tar.gz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=327302422f31b1d3a494d35a0b651196
diff --git a/metadata/md5-cache/app-misc/when-1.1.33 b/metadata/md5-cache/app-misc/when-1.1.33
deleted file mode 100644
index 01d0d80ba043..000000000000
--- a/metadata/md5-cache/app-misc/when-1.1.33
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Extremely simple personal calendar program aimed at the Unix geek who wants something minimalistic
-EAPI=5
-HOMEPAGE=http://www.lightandmatter.com/when/when.html
-KEYWORDS=amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=Artistic
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=http://www.lightandmatter.com/when/when.tar.gz -> when-1.1.33.tar.gz
-_md5_=e94e5549febb3eb78b662824b91ef287
diff --git a/metadata/md5-cache/app-misc/when-1.1.35 b/metadata/md5-cache/app-misc/when-1.1.35
deleted file mode 100644
index 0adcdb3e4015..000000000000
--- a/metadata/md5-cache/app-misc/when-1.1.35
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Extremely simple personal calendar program aimed at the Unix geek who wants something minimalistic
-EAPI=5
-HOMEPAGE=http://www.lightandmatter.com/when/when.html
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=Artistic
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=http://www.lightandmatter.com/when/when.tar.gz -> when-1.1.35.tar.gz
-_md5_=dd60e836ce6828f45d4e056732d2435f
diff --git a/metadata/md5-cache/app-misc/when-1.1.36 b/metadata/md5-cache/app-misc/when-1.1.36
index b40415267a2c..0fcf57e5a210 100644
--- a/metadata/md5-cache/app-misc/when-1.1.36
+++ b/metadata/md5-cache/app-misc/when-1.1.36
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare test
 DEPEND=dev-lang/perl
-DESCRIPTION=Extremely simple personal calendar program aimed at the Unix geek who wants something minimalistic
+DESCRIPTION=Minimalistic personal calendar program
 EAPI=6
 HOMEPAGE=http://www.lightandmatter.com/when/when.html
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=Artistic
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://www.lightandmatter.com/when/when.tar.gz -> when-1.1.36.tar.gz
-_md5_=eb259edc5d30f8cf88a1b11b1140eb20
+_md5_=b8a03f859964f1fbaa08837e076acddd
diff --git a/metadata/md5-cache/app-office/projectlibre-bin-1.6.2 b/metadata/md5-cache/app-office/projectlibre-bin-1.6.2
new file mode 100644
index 000000000000..f5c8c36aaf60
--- /dev/null
+++ b/metadata/md5-cache/app-office/projectlibre-bin-1.6.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=An open source desktop alternative to Microsoft Project
+EAPI=6
+HOMEPAGE=http://www.projectlibre.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=CPAL-1.0
+RDEPEND=>=virtual/jre-1.8
+SLOT=0
+SRC_URI=mirror://sourceforge/projectlibre/projectlibre-1.6.2.tar.gz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=13b50d3aec383590eb7cfb3242d6dd9b
diff --git a/metadata/md5-cache/app-shells/mpv-bash-completion-0.17 b/metadata/md5-cache/app-shells/mpv-bash-completion-0.17
deleted file mode 100644
index 94fa6e4833f6..000000000000
--- a/metadata/md5-cache/app-shells/mpv-bash-completion-0.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=media-video/mpv[cli]
-DESCRIPTION=Bash completion for the mpv video player
-EAPI=6
-HOMEPAGE=https://2ion.github.io/mpv-bash-completion/
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=media-video/mpv[cli] >=app-shells/bash-completion-2.3-r1
-SLOT=0
-SRC_URI=https://github.com/2ion/mpv-bash-completion/archive/0.17.tar.gz -> mpv-bash-completion-0.17.tar.gz
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=5e183dcc0eb6240cbabc2522276b9e6d
diff --git a/metadata/md5-cache/app-text/a2ps-4.14-r5 b/metadata/md5-cache/app-text/a2ps-4.14-r5
index a7b00edea321..7dd638ab20ec 100644
--- a/metadata/md5-cache/app-text/a2ps-4.14-r5
+++ b/metadata/md5-cache/app-text/a2ps-4.14-r5
@@ -4,11 +4,11 @@ DESCRIPTION=Any to PostScript filter
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/a2ps/
 IUSE=emacs latex linguas_ja nls static-libs userland_BSD userland_GNU vanilla
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl app-text/libpaper >=app-text/psutils-1.17 app-text/wdiff emacs? ( virtual/emacs ) latex? ( virtual/latex-base ) nls? ( virtual/libintl ) userland_GNU? ( >=sys-apps/coreutils-6.10-r1 ) userland_BSD? ( sys-freebsd/freebsd-ubin )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/a2ps/a2ps-4.14.tar.gz linguas_ja? ( mirror://gentoo/a2ps-4.14-ja_nls.patch.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=24bbb922ec196b419a801405c6597433
+_md5_=5190c30ec4bd69e6dfa862f3aceecf90
diff --git a/metadata/md5-cache/dev-lang/c-intercal-29.0 b/metadata/md5-cache/dev-lang/c-intercal-29.0
deleted file mode 100644
index be443a21929b..000000000000
--- a/metadata/md5-cache/dev-lang/c-intercal-29.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=emacs? ( virtual/emacs )
-DESCRIPTION=C-INTERCAL - INTERCAL to binary (via C) compiler
-EAPI=4
-HOMEPAGE=http://c.intercal.org.uk/
-IUSE=emacs examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ FDL-1.2+
-RDEPEND=emacs? ( virtual/emacs )
-SLOT=0
-SRC_URI=http://overload.intercal.org.uk/c/intercal-0.29.pax.gz
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1e3e932681a9a722d08921ae282e7887
diff --git a/metadata/md5-cache/dev-lang/c-intercal-30.0 b/metadata/md5-cache/dev-lang/c-intercal-30.0
index c3a7923affd6..22bc5a6290d2 100644
--- a/metadata/md5-cache/dev-lang/c-intercal-30.0
+++ b/metadata/md5-cache/dev-lang/c-intercal-30.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=emacs? ( virtual/emacs ) !<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
+DEPEND=emacs? ( virtual/emacs ) sys-devel/flex virtual/yacc !<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=C-INTERCAL - INTERCAL to binary (via C) compiler
 EAPI=6
 HOMEPAGE=http://www.catb.org/~esr/intercal/
@@ -10,4 +10,4 @@ RDEPEND=emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/intercal/intercal-0.30.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ee305127b8ae7b5fc2bc835546268732
+_md5_=394278bfea810fb503e8baee7ab426b4
diff --git a/metadata/md5-cache/dev-lang/go-1.7.4 b/metadata/md5-cache/dev-lang/go-1.7.4
index 464e7d6c0af0..5b2840de334d 100644
--- a/metadata/md5-cache/dev-lang/go-1.7.4
+++ b/metadata/md5-cache/dev-lang/go-1.7.4
@@ -4,10 +4,10 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=6
 HOMEPAGE=http://www.golang.org
 IUSE=gccgo
-KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 SLOT=0/1.7.4
 SRC_URI=!gccgo? ( kernel_Darwin? ( x64-macos? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap.tbz ) ) kernel_FreeBSD? ( amd64-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap.tbz ) x86-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.tbz ) ) kernel_linux? ( amd64? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap.tbz ) arm? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap.tbz ) arm64? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap.tbz ) ppc64? ( https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap.tbz ) s390? ( https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap.tbz ) x86? ( https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.tbz ) ) kernel_SunOS? ( x64-solaris? ( https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap.tbz ) ) ) https://storage.googleapis.com/golang/go1.7.4.src.tar.gz
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=415ce9e1fbec009955036cf9e9ed268a
+_md5_=52ae4f35d338a8eb1ac256e8dd1084cc
diff --git a/metadata/md5-cache/dev-lang/python-3.6.0 b/metadata/md5-cache/dev-lang/python-3.6.0
new file mode 100644
index 000000000000..b238e90c081e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig !sys-devel/gcc[libffi(-)] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=5
+HOMEPAGE=https://www.python.org/
+IUSE=build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=PSF-2
+PDEPEND=>=app-eselect/eselect-python-20140125-r1
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+SLOT=3.6/3.6m
+SRC_URI=https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.0-0.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=faba246bae4387a4c27f68d9a2a5fda8
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.3.28 b/metadata/md5-cache/dev-lang/swi-prolog-7.3.28
deleted file mode 100644
index 8de0a4c3b60b..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.3.28
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline:= ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.5:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=free, small, and standard compliant Prolog compiler
-EAPI=5
-HOMEPAGE=http://www.swi-prolog.org/
-IUSE=archive berkdb debug doc +gmp hardened java libressl minimal odbc +readline ssl static-libs test uuid zlib X elibc_FreeBSD java
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD-2 LGPL-2.1
-RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline:= ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.5:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.3.28.tar.gz mirror://gentoo/swi-prolog-7.3.28-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8f1b2e3aeab96b572c106f3cb8a111d8
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.3.29 b/metadata/md5-cache/dev-lang/swi-prolog-7.3.32
similarity index 94%
rename from metadata/md5-cache/dev-lang/swi-prolog-7.3.29
rename to metadata/md5-cache/dev-lang/swi-prolog-7.3.32
index e5dc4d77eab9..d854ead66f35 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.3.29
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.3.32
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD-2 LGPL-2.1
 RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline:= ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.5:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.3.29.tar.gz
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.3.32.tar.gz
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=049c4bfafa58710b78fde7052ed607ee
+_md5_=a5e76f69b458ae0766b38114634f6aec
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.6.3 b/metadata/md5-cache/dev-libs/appstream-glib-0.6.3
index e6fa641a90ca..38ba9ce8c81e 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.6.3
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.6.3
@@ -10,4 +10,4 @@ RDEPEND=app-arch/gcab app-arch/libarchive dev-db/sqlite:3 >=dev-libs/glib-2.45.8
 SLOT=0/8
 SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.6.3.tar.xz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	017377e73405d964cd0137088cddb9c3	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8b27ef4c9a9ae18595f7d47fd4daab84
+_md5_=db44e7e7b3d8263c67f0ff016b4a9e8e
diff --git a/metadata/md5-cache/dev-libs/jansson-2.9 b/metadata/md5-cache/dev-libs/jansson-2.9
index 9fb2a68c7a31..3ca043e086e5 100644
--- a/metadata/md5-cache/dev-libs/jansson-2.9
+++ b/metadata/md5-cache/dev-libs/jansson-2.9
@@ -4,9 +4,9 @@ DESCRIPTION=C library for encoding, decoding and manipulating JSON data
 EAPI=6
 HOMEPAGE=http://www.digip.org/jansson/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.digip.org/jansson/releases/jansson-2.9.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=5c8d2d04b25a96f5bda1b0db1aea8e98
+_md5_=a12e05bad53d06d0737b0851fece7221
diff --git a/metadata/md5-cache/dev-libs/klibc-2.0.4-r1 b/metadata/md5-cache/dev-libs/klibc-2.0.4-r1
new file mode 100644
index 000000000000..45541d5b6dcb
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/klibc-2.0.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-lang/perl
+DESCRIPTION=A minimal libc subset for use with initramfs
+EAPI=6
+HOMEPAGE=http://www.zytor.com/mailman/listinfo/klibc/ https://www.kernel.org/pub/linux/libs/klibc/
+IUSE=debug test custom-cflags
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 LGPL-2 )
+RDEPEND=dev-lang/perl
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://kernel/linux/libs/klibc/2.0/klibc-2.0.4.tar.xz mirror://debian/pool/main/k/klibc/klibc_2.0.4-9.debian.tar.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://kernel/linux/kernel/v4.x/testing/linux-4.4.tar.xz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=534aed3ea73e357752deb272c56f9973
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.4-r1 b/metadata/md5-cache/dev-libs/libxml2-2.9.4-r1
index 56035319e67d..876040a1f80b 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.4-r1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=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(-)] ) readline? ( sys-libs/readline:= )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.4.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=905983c91484d7623d2c282716e8dabd
+_md5_=8d736f029612eccfdf37e4d848253037
diff --git a/metadata/md5-cache/dev-libs/nss-3.27.2 b/metadata/md5-cache/dev-libs/nss-3.27.2
index 5cdea476388f..32f3786f3cc0 100644
--- a/metadata/md5-cache/dev-libs/nss-3.27.2
+++ b/metadata/md5-cache/dev-libs/nss-3.27.2
@@ -4,11 +4,11 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp
 EAPI=6
 HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
 IUSE=cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_27_2_RTM/src/nss-3.27.2.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=06e47be6da6c9e60a1dd207cfa89c259
+_md5_=393c5bb8600ed417e19b11430ff25f7e
diff --git a/metadata/md5-cache/dev-libs/nss-3.28 b/metadata/md5-cache/dev-libs/nss-3.28
deleted file mode 100644
index ae12a2407751..000000000000
--- a/metadata/md5-cache/dev-libs/nss-3.28
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nspr-4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
-EAPI=6
-HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
-IUSE=cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-RDEPEND=>=dev-libs/nspr-4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_28_RTM/src/nss-3.28.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
-_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7ea10b889c9ca0bb8091f590370cc0ef
diff --git a/metadata/md5-cache/dev-libs/nss-3.28.1 b/metadata/md5-cache/dev-libs/nss-3.28.1
new file mode 100644
index 000000000000..01191e944efb
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nss-3.28.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nspr-4.13.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
+EAPI=6
+HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
+IUSE=cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+RDEPEND=>=dev-libs/nspr-4.13.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_28_1_RTM/src/nss-3.28.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=97ecc5ac7fc0f55101c3656be74ebeb7
diff --git a/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r1 b/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r1
index 24a08f9f1808..27e915fa2cb7 100644
--- a/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r1
+++ b/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Qt-based library for OAuth support
 EAPI=6
 HOMEPAGE=https://wiki.github.com/ayoy/qoauth
 IUSE=debug doc test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-crypt/qca:2[debug?,qt5] dev-qt/qtnetwork:5 app-crypt/qca:2[ssl] !dev-libs/qoauth:0
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/qoauth-2.0.1_pre20160315.tar.xz
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=76499152ea915f4c47641f08e931b23b
+_md5_=11b06858c8bcbd2bb2e53ac41a466283
diff --git a/metadata/md5-cache/dev-ml/lablgtk-2.18.5 b/metadata/md5-cache/dev-ml/lablgtk-2.18.5
index fed0c7787bb8..7b6dc239233f 100644
--- a/metadata/md5-cache/dev-ml/lablgtk-2.18.5
+++ b/metadata/md5-cache/dev-ml/lablgtk-2.18.5
@@ -4,10 +4,10 @@ DESCRIPTION=Objective CAML interface for Gtk+2
 EAPI=5
 HOMEPAGE=http://lablgtk.forge.ocamlcore.org/
 IUSE=debug examples glade gnomecanvas sourceview +ocamlopt opengl spell svg
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )
 RDEPEND=>=x11-libs/gtk+-2.10:2 >=dev-lang/ocaml-3.10:=[ocamlopt?] svg? ( >=gnome-base/librsvg-2.2:2 ) glade? ( >=gnome-base/libglade-2.0.1 ) gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 ) opengl? ( >=dev-ml/lablgl-0.98:= >=x11-libs/gtkglarea-1.9:2 ) spell? ( app-text/gtkspell:2 ) sourceview? ( x11-libs/gtksourceview:2.0 ) dev-ml/camlp4:=
 SLOT=2/2.18.5
 SRC_URI=https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz
 _eclasses_=findlib	9909e5ca0f77ff5b693885a3d7aeadb7	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=35df53d10b1906cda0f4a02eba37cfd8
+_md5_=ecb0111822beca3ebede25e0860b24fe
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_Ping-2.4.5-r1 b/metadata/md5-cache/dev-php/PEAR-Net_Ping-2.4.5-r1
deleted file mode 100644
index 78e3d013b0a4..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Net_Ping-2.4.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=OS independent wrapper class for executing ping calls
-EAPI=5
-HOMEPAGE=http://pear.php.net/Net_Ping
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=PHP-2.02
-RDEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Net_Ping-2.4.5.tgz
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	php-pear-r1	7d1434952f2d1483feac6ad812d605dd	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b47f04979014af18706feacc3ff87542
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_Ping-2.4.5-r2 b/metadata/md5-cache/dev-php/PEAR-Net_Ping-2.4.5-r2
new file mode 100644
index 000000000000..3207ce20d723
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Net_Ping-2.4.5-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=OS independent wrapper class for executing ping calls
+EAPI=6
+HOMEPAGE=http://pear.php.net/package/Net_Ping
+IUSE=examples
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=PHP-3.01
+RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
+SLOT=0
+SRC_URI=http://download.pear.php.net/package/Net_Ping-2.4.5.tgz
+_md5_=fa6a01c19009a5756f8ffcd8ff8f21e4
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.6.2 b/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.6.2
deleted file mode 100644
index 070362ea1993..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=An implementation of the SMTP protocol
-EAPI=5
-HOMEPAGE=http://pear.php.net/Net_SMTP
-IUSE=sasl
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=PHP-2.02
-RDEPEND=>=dev-php/PEAR-Net_Socket-1.0.7 sasl? ( >=dev-php/PEAR-Auth_SASL-1.0.1-r1 ) dev-lang/php:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Net_SMTP-1.6.2.tgz
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	php-pear-r1	7d1434952f2d1483feac6ad812d605dd	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b27651bab77e5731e3825bc4fa910d19
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.3.3 b/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.3.3
deleted file mode 100644
index 7cc31a59c905..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=Provides an API to talk to the timsieved server that comes with Cyrus IMAPd
-EAPI=5
-HOMEPAGE=http://pear.php.net/Net_Sieve
-IUSE=sasl
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD BSD-2
-RDEPEND=>=dev-php/PEAR-Net_Socket-1.0.6-r1 sasl? ( >=dev-php/PEAR-Auth_SASL-1.0 ) dev-lang/php:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Net_Sieve-1.3.3.tgz
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	php-pear-r1	7d1434952f2d1483feac6ad812d605dd	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7501c56f13693afc87d6ce7ed31970f2
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.10 b/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.10
new file mode 100644
index 000000000000..14b361560e68
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.10
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=PHP class to communicate with IRC networks
+EAPI=6
+HOMEPAGE=http://pear.php.net/package/Net_SmartIRC
+IUSE=doc examples
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
+SLOT=0
+SRC_URI=https://github.com/pear/Net_SmartIRC/archive/v1.1.10.tar.gz -> Net_SmartIRC-1.1.10.tar.gz
+_md5_=9219165364466201068e493c87f3a519
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.9 b/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.9
deleted file mode 100644
index d935636562fd..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Net_SmartIRC is a PHP class for communication with IRC networks
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Net_SmartIRC
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-php/PEAR-PEAR >=dev-lang/php-5.3:*
-SLOT=0
-SRC_URI=http://pear.php.net/get/Net_SmartIRC-1.1.9.tgz
-_md5_=ede76128e84ba7890d62ebdb27315175
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.0.14 b/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.0.14
deleted file mode 100644
index 2b5543ec3127..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.0.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php >=dev-php/pear-1.8.1
-DESCRIPTION=class interface to TCP sockets
-EAPI=4
-HOMEPAGE=http://pear.php.net/Net_Socket
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=PHP-2.02
-RDEPEND=dev-lang/php >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Net_Socket-1.0.14.tgz
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	php-pear-r1	7d1434952f2d1483feac6ad812d605dd	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=37495c5227b25fd7fb3c6fa8b785b09e
diff --git a/metadata/md5-cache/dev-php/PEAR-OLE-1.0.0_rc2 b/metadata/md5-cache/dev-php/PEAR-OLE-1.0.0_rc2
deleted file mode 100644
index 468a86960480..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-OLE-1.0.0_rc2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=Package for reading and writing OLE containers
-EAPI=5
-HOMEPAGE=http://pear.php.net/OLE
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=PHP-2.02 PHP-3
-RDEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/OLE-1.0.0RC2.tgz
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	php-pear-r1	7d1434952f2d1483feac6ad812d605dd	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ea3bd9a5aa9ce9ef5a249de4601d598c
diff --git a/metadata/md5-cache/dev-php/PEAR-OLE-1.0.0_rc2-r1 b/metadata/md5-cache/dev-php/PEAR-OLE-1.0.0_rc2-r1
new file mode 100644
index 000000000000..59c87784715e
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-OLE-1.0.0_rc2-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Package for reading and writing OLE containers
+EAPI=6
+HOMEPAGE=http://pear.php.net/package/OLE
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=PHP-3.01
+RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
+SLOT=0
+SRC_URI=http://download.pear.php.net/package/OLE-1.0.0RC2.tgz
+_md5_=2d5216aad94326808c9c7152a2f8da32
diff --git a/metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.0.4-r2 b/metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.0.4-r2
deleted file mode 100644
index bc38b5970faa..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.0.4-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/php:*[pcre(+)] >=dev-php/PEAR-PEAR-1.8.1
-DESCRIPTION=Graph datastructure manipulation library
-EAPI=5
-HOMEPAGE=http://pear.php.net/package/Structures_Graph
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=LGPL-2.1
-PDEPEND=dev-php/pear
-RDEPEND=dev-lang/php:*[pcre(+)] >=dev-php/PEAR-PEAR-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Structures_Graph-1.0.4.tgz
-_md5_=5fef65908ec481d4bf6e7c28c1220e18
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.2-r1 b/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.2-r1
new file mode 100644
index 000000000000..1855b23ec926
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Render text using FIGlet fonts
+EAPI=6
+HOMEPAGE=http://pear.php.net/package/Text_Figlet
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01 examples? ( GPL-2+ OFL-1.1 )
+RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
+SLOT=0
+SRC_URI=http://download.pear.php.net/package/Text_Figlet-1.0.2.tgz
+_md5_=bae102c58a1b066a9313d5cc0fa9a3f5
diff --git a/metadata/md5-cache/dev-php/PEAR-Var_Dump-1.0.4-r1 b/metadata/md5-cache/dev-php/PEAR-Var_Dump-1.0.4-r1
deleted file mode 100644
index 7efca98cf3fa..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Var_Dump-1.0.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=>=dev-lang/php-5.3 dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=Provides methods for dumping structured information about a variable
-EAPI=5
-HOMEPAGE=http://pear.php.net/Var_Dump
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=dev-lang/php-5.3 dev-lang/php:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Var_Dump-1.0.4.tgz
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	php-pear-r1	7d1434952f2d1483feac6ad812d605dd	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=9b2cb109c6dd2c4800ef3a77b9b8f136
diff --git a/metadata/md5-cache/dev-php/PEAR-Var_Dump-1.0.4-r2 b/metadata/md5-cache/dev-php/PEAR-Var_Dump-1.0.4-r2
new file mode 100644
index 000000000000..3613c4f358c8
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Var_Dump-1.0.4-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install test
+DEPEND=test? ( dev-lang/php:* dev-php/PEAR-PEAR )
+DESCRIPTION=Dump structured information about a variable
+EAPI=6
+HOMEPAGE=http://pear.php.net/package/Var_Dump
+IUSE=examples test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=PHP-3.01
+RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.pear.php.net/package/Var_Dump-1.0.4.tgz
+_md5_=85076afab0008ca605ecc681f9560c4c
diff --git a/metadata/md5-cache/dev-php/PEAR-XML_Util-1.2.3-r1 b/metadata/md5-cache/dev-php/PEAR-XML_Util-1.2.3-r1
deleted file mode 100644
index d6fba4aa1fdb..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-XML_Util-1.2.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/php:*[pcre(+)] >=dev-php/PEAR-PEAR-1.8.1
-DESCRIPTION=XML utility class
-EAPI=5
-HOMEPAGE=http://pear.php.net/package/XML_Util
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=PHP-2.02
-PDEPEND=dev-php/pear
-RDEPEND=dev-lang/php:*[pcre(+)] >=dev-php/PEAR-PEAR-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/XML_Util-1.2.3.tgz
-_md5_=162ef5ae4956428d1029ae50fe91bb57
diff --git a/metadata/md5-cache/dev-php/recaptcha-1.1.2 b/metadata/md5-cache/dev-php/recaptcha-1.1.2-r1
similarity index 88%
rename from metadata/md5-cache/dev-php/recaptcha-1.1.2
rename to metadata/md5-cache/dev-php/recaptcha-1.1.2-r1
index 006c57e22968..510e37ac1245 100644
--- a/metadata/md5-cache/dev-php/recaptcha-1.1.2
+++ b/metadata/md5-cache/dev-php/recaptcha-1.1.2-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install postinst test
 DEPEND=test? ( dev-php/phpunit )
 DESCRIPTION=PHP client library for Google's reCAPTCHA service
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/google/recaptcha
 IUSE=examples test
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ LICENSE=BSD
 RDEPEND=dev-lang/php
 SLOT=0
 SRC_URI=https://github.com/google/recaptcha/archive/1.1.2.tar.gz -> recaptcha-1.1.2.tar.gz
-_md5_=5a7913b017aa9cb038b70e149f00ad13
+_md5_=937229ac57ac2a71207c17d72d684a2d
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.12 b/metadata/md5-cache/dev-python/bottle-0.12.12
new file mode 100644
index 000000000000..b52c2d114166
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bottle-0.12.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=test? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A fast and simple micro-framework for small web-applications
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/bottle http://bottlepy.org/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/b/bottle/bottle-0.12.12.tar.gz
+_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	017377e73405d964cd0137088cddb9c3	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=3a6eff10fb5296b0a7b57817cffc5fc9
diff --git a/metadata/md5-cache/dev-python/jinja-2.9.2 b/metadata/md5-cache/dev-python/jinja-2.9.3
similarity index 71%
rename from metadata/md5-cache/dev-python/jinja-2.9.2
rename to metadata/md5-cache/dev-python/jinja-2.9.3
index 56cfd29cf237..0adfa5ee4026 100644
--- a/metadata/md5-cache/dev-python/jinja-2.9.2
+++ b/metadata/md5-cache/dev-python/jinja-2.9.3
@@ -1,14 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/markupsafe[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !dev-python/jinja:compat doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) python_targets_pypy3? ( virtual/pypy3:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-python/markupsafe[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !dev-python/jinja:compat doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) python_targets_pypy3? ( virtual/pypy3:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=A full-featured template engine for Python
 EAPI=5
 HOMEPAGE=http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2
-IUSE=doc examples python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD
 RDEPEND=dev-python/markupsafe[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !dev-python/jinja:compat python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) python_targets_pypy3? ( virtual/pypy3:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/J/Jinja2/Jinja2-2.9.2.tar.gz
+SRC_URI=https://github.com/pallets/jinja/archive/2.9.3.tar.gz -> jinja-2.9.3.tar.gz
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	017377e73405d964cd0137088cddb9c3	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c626b019f8271f5a9a9f41bafc8588b0
+_md5_=e28490ada335d44500be61c208b9932e
diff --git a/metadata/md5-cache/dev-python/ovs-2.6.1 b/metadata/md5-cache/dev-python/ovs-2.6.1
new file mode 100644
index 000000000000..dd3712b73a6f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ovs-2.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<net-misc/openvswitch-2.6.0-r2 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(-)] 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=OVS bindings for python.
+EAPI=6
+HOMEPAGE=https://github.com/openvswitch/ovs/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!<net-misc/openvswitch-2.6.0-r2 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=mirror://pypi/o/ovs/ovs-2.6.1.tar.gz
+_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=6ff78d8eb16e02a7d6ead3ab51249737
diff --git a/metadata/md5-cache/dev-python/pyside-tools-0.2.15-r1 b/metadata/md5-cache/dev-python/pyside-tools-0.2.15-r1
index 605e4b979a36..27e613d4993d 100644
--- a/metadata/md5-cache/dev-python/pyside-tools-0.2.15-r1
+++ b/metadata/md5-cache/dev-python/pyside-tools-0.2.15-r1
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyside-1.2.0[X,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/shiboken-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 test? ( virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.5.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=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(-)] >=dev-python/pyside-1.2.0[X,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/shiboken-1.2.0[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-qt/qtcore:4 dev-qt/qtgui:4 test? ( virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.5.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=PySide development tools (lupdate, rcc, uic)
-EAPI=5
+EAPI=6
 HOMEPAGE=https://wiki.qt.io/Pyside
-IUSE=test python_targets_python2_7 python_targets_python3_4 test
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
 KEYWORDS=amd64 x86
 LICENSE=BSD GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyside-1.2.0[X,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/shiboken-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-qt/qtcore:4 dev-qt/qtgui:4
+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(-)] >=dev-python/pyside-1.2.0[X,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/shiboken-1.2.0[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-qt/qtcore:4 dev-qt/qtgui:4
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/PySide/Tools/archive/0.2.15.tar.gz -> pyside-tools-0.2.15.tar.gz
 _eclasses_=cmake-utils	fa4d8052a1ccf4fbbfa76361bffebe42	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=355dd7b527cb291bbf5a672d16d32bc5
+_md5_=184688dfd3b2519adbc661cee4ad437c
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-3.2.1 b/metadata/md5-cache/dev-python/python-openstackclient-3.2.1
index 4c6c8d0013bf..7584a5e77d0b 100644
--- a/metadata/md5-cache/dev-python/python-openstackclient-3.2.1
+++ b/metadata/md5-cache/dev-python/python-openstackclient-3.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=A client for the OpenStack APIs
 EAPI=6
 HOMEPAGE=https://github.com/openstack/python-openstackclient
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.6[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-1.9.0[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/Babel-2.3.4[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/cliff-1.15.0[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/cliff-1.16.0[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/cliff-1.17.0[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/keystoneauth-2.10.0[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/openstacksdk-0.9.4[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/osc-lib-1.0.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(-)] >=dev-python/oslo-i18n-2.1.0[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/oslo-utils-3.16.0[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/python-glanceclient-2.3.0[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/python-glanceclient-2.4.0[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/python-keystoneclient-2.0.0[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/python-keystoneclient-2.1.0[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/python-novaclient-2.29.0[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/python-novaclient-2.33.0[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/python-cinderclient-1.6.1[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/python-cinderclient-1.7.0[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/python-cinderclient-1.7.1[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/requests-2.8.1[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/requests-2.9.0[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/stevedore-1.5.0[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=mirror://pypi/p/python-openstackclient/python-openstackclient-3.2.1.tar.gz
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a1a63d711665a376068d3b99a75c9fbf
+_md5_=38b4c72a0c6cdab10dda375d10f5cad4
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.9.4 b/metadata/md5-cache/dev-python/qscintilla-python-2.9.4
index 008448268cc0..1c26a001c74e 100644
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.9.4
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.9.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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(-)] >=dev-python/sip-4.18:=[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/PyQt4-4.11.3[X,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-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.9.4:=[qt4(-)]
+DEPEND=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(-)] >=dev-python/sip-4.19:=[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/PyQt4-4.11.3[X,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-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.9.4:=[qt4(-)]
 DESCRIPTION=Python bindings for Qscintilla
 EAPI=6
 HOMEPAGE=http://www.riverbankcomputing.com/software/qscintilla/intro
 IUSE=debug python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~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(-)] >=dev-python/sip-4.18:=[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/PyQt4-4.11.3[X,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-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.9.4:=[qt4(-)]
+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(-)] >=dev-python/sip-4.19:=[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/PyQt4-4.11.3[X,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-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.9.4:=[qt4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.9.4.tar.gz
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e74bafe6f2a4f6c7b1faa8219ad30ebf
+_md5_=26a2ba66be4132da27abaf0d61220fb1
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.15.4 b/metadata/md5-cache/dev-ruby/rcairo-1.15.4
new file mode 100644
index 000000000000..1cc1f96d6dc5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.15.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby20? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby20] dev-ruby/ruby-glib2[ruby_targets_ruby20] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby21] dev-ruby/ruby-glib2[ruby_targets_ruby21] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby22] dev-ruby/ruby-glib2[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby23] dev-ruby/ruby-glib2[ruby_targets_ruby23] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby23] ) ) 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=Ruby bindings for cairo
+EAPI=5
+HOMEPAGE=https://cairographics.org/rcairo/
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Ruby GPL-2 )
+RDEPEND=>=x11-libs/cairo-1.2.0[svg] 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/cairo-1.15.4.gem
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=7688b9172d5e6815036f30a74e18c3f7
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.6 b/metadata/md5-cache/dev-ruby/yard-0.9.6
new file mode 100644
index 000000000000..f34a2fe3d9d8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby20] dev-ruby/rdiscount[ruby_targets_ruby20] dev-ruby/bluecloth[ruby_targets_ruby20] dev-ruby/kramdown[ruby_targets_ruby20] ) ) ) ruby_targets_ruby21? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby21] dev-ruby/rdiscount[ruby_targets_ruby21] dev-ruby/bluecloth[ruby_targets_ruby21] dev-ruby/kramdown[ruby_targets_ruby21] ) ) ) ruby_targets_ruby22? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) ) ruby_targets_ruby23? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/kramdown[ruby_targets_ruby23] ) ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[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=Documentation generation tool for the Ruby programming language
+EAPI=5
+HOMEPAGE=http://yardoc.org/
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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_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=https://github.com/lsegal/yard/archive/v0.9.6.tar.gz -> yard-0.9.6-git.tgz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=61a2f7a9e0dcf7bfdd59868ac55379be
diff --git a/metadata/md5-cache/dev-vcs/kdesvn-2.0.0 b/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
index 94cbbc7dd19b..704fd66cb032 100644
--- a/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
+++ b/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=A frontend to the subversion vcs
 EAPI=6
 HOMEPAGE=http://kdesvn.alwins-world.de/ https://cgit.kde.org/kdesvn.git/
 IUSE=+man debug +handbook
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[sqlite] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion !dev-vcs/kdesvn:4 !kde-apps/kdesdk-kioslaves:4[subversion(-)] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdesvn/2.0.0/kdesvn-2.0.0.tar.xz
 _eclasses_=cmake-utils	fa4d8052a1ccf4fbbfa76361bffebe42	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	cb60e5fcd45072e40188c7c37ce0a4fc	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=465ece69c3fa0592046db93fa43fe5e8
+_md5_=00aa7dcab8d36a8177fd8ac9274b3c96
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.2.4 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.2.4
new file mode 100644
index 000000000000..64ca8b8f9ddf
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=dev-lang/python:3.4 >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 gnome-base/gnome-common x11-proto/randrproto x11-proto/xproto virtual/pkgconfig !<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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A collection of libraries and utilites used by Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+introspection systemd python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
+RDEPEND=dev-lang/python:3.4 >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) dev-python/pygobject:3[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)]
+SLOT=0/4
+SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/3.2.4.tar.gz -> cinnamon-desktop-3.2.4.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=17e5c709e3df500b81c6d3684341de03
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.2.13 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.2.13
index 056d05fc965c..c4eae09ff41e 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.2.13
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.2.13
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme x11-libs/xapps dev-lang/python:3.4 >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31:0= ) >=dev-util/intltool-0.35 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig x11-proto/xextproto x11-proto/randrproto x11-proto/scrnsaverproto x11-proto/xf86miscproto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 ) !<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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-3.2.2:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme x11-libs/xapps dev-lang/python:3.4 >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31:0= ) >=dev-util/intltool-0.35 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig x11-proto/xextproto x11-proto/randrproto x11-proto/scrnsaverproto x11-proto/xf86miscproto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 ) !<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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Screensaver for Cinnamon
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=debug doc pam systemd python_targets_python3_4
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=!~gnome-extra/cinnamon-1.8.8.1 !systemd? ( sys-auth/consolekit ) dev-python/pygobject:3[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)]
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/3.2.13.tar.gz -> cinnamon-screensaver-3.2.13.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=88534848068573b6e37b7a83afc158f8
+_md5_=b93ea4d0abb521c4225456b6b5903f22
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.2.6 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.2.6
new file mode 100644
index 000000000000..43db2959ffbf
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.2.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme x11-libs/xapps dev-lang/python:3.4 >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31:0= ) >=dev-util/intltool-0.35 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig x11-proto/xextproto x11-proto/randrproto x11-proto/scrnsaverproto x11-proto/xf86miscproto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 ) !<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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Screensaver for Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=debug doc pam systemd python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=!~gnome-extra/cinnamon-1.8.8.1 !systemd? ( sys-auth/consolekit ) dev-python/pygobject:3[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] dev-python/setproctitle[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)]
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/3.2.6.tar.gz -> cinnamon-screensaver-3.2.6.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=4d206c8f55c685524f37c7f845eb528f
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-16.12.0 b/metadata/md5-cache/kde-apps/keditbookmarks-16.12.0
index dfd5edcce60b..819c70e4e8e9 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-16.12.0
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-16.12.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug +handbook test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.28.0:5 >=kde-frameworks/kcompletion-5.28.0:5 >=kde-frameworks/kconfig-5.28.0:5 >=kde-frameworks/kconfigwidgets-5.28.0:5 >=kde-frameworks/kcoreaddons-5.28.0:5 >=kde-frameworks/ki18n-5.28.0:5 >=kde-frameworks/kiconthemes-5.28.0:5 >=kde-frameworks/kio-5.28.0:5 >=kde-frameworks/kparts-5.28.0:5 >=kde-frameworks/kservice-5.28.0:5 >=kde-frameworks/kwidgetsaddons-5.28.0:5 >=kde-frameworks/kwindowsystem-5.28.0:5 >=kde-frameworks/kxmlgui-5.28.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/keditbookmarks:4 >=dev-qt/qtcore-5.6.1:5
+RDEPEND=>=kde-frameworks/kbookmarks-5.28.0:5 >=kde-frameworks/kcompletion-5.28.0:5 >=kde-frameworks/kconfig-5.28.0:5 >=kde-frameworks/kconfigwidgets-5.28.0:5 >=kde-frameworks/kcoreaddons-5.28.0:5 >=kde-frameworks/ki18n-5.28.0:5 >=kde-frameworks/kiconthemes-5.28.0:5 >=kde-frameworks/kio-5.28.0:5 >=kde-frameworks/kparts-5.28.0:5 >=kde-frameworks/kservice-5.28.0:5 >=kde-frameworks/kwidgetsaddons-5.28.0:5 >=kde-frameworks/kwindowsystem-5.28.0:5 >=kde-frameworks/kxmlgui-5.28.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-3 !kde-apps/keditbookmarks:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/keditbookmarks-16.12.0.tar.xz
 _eclasses_=cmake-utils	fa4d8052a1ccf4fbbfa76361bffebe42	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	cb60e5fcd45072e40188c7c37ce0a4fc	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6a586a942ca22612860dc4a0a3c16081
+_md5_=7587497a1a3d1e8f743462541fbf04fe
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.8.5-r1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.8.5-r1
new file mode 100644
index 000000000000..c3f30e817d7c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.8.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.26.0:5 >=kde-frameworks/kactivities-5.26.0:5 >=kde-frameworks/kactivities-stats-5.26.0:5 >=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kauth-5.26.0:5 >=kde-frameworks/kbookmarks-5.26.0:5 >=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kdeclarative-5.26.0:5 >=kde-frameworks/kded-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/kemoticons-5.26.0:5 >=kde-frameworks/kglobalaccel-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/knotifyconfig-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kpeople-5.26.0:5 >=kde-frameworks/krunner-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-frameworks/plasma-5.26.0:5 >=kde-frameworks/solid-5.26.0:5 >=kde-frameworks/sonnet-5.26.0:5 >=kde-plasma/kwin-5.8.5:5 >=kde-plasma/plasma-workspace-5.8.5:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.6.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) packagekit? ( >=app-admin/packagekit-qt-0.9.6 ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.26.0:5 ) dev-libs/boost x11-proto/xproto fontconfig? ( x11-libs/libXrender ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) sys-devel/make >=dev-util/cmake-3.5.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma desktop
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus legacy-systray packagekit pulseaudio +qt4 scim +semantic-desktop test debug +handbook test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/attica-5.26.0:5 >=kde-frameworks/kactivities-5.26.0:5 >=kde-frameworks/kactivities-stats-5.26.0:5 >=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kauth-5.26.0:5 >=kde-frameworks/kbookmarks-5.26.0:5 >=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kdeclarative-5.26.0:5 >=kde-frameworks/kded-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/kemoticons-5.26.0:5 >=kde-frameworks/kglobalaccel-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/knotifyconfig-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kpeople-5.26.0:5 >=kde-frameworks/krunner-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-frameworks/plasma-5.26.0:5 >=kde-frameworks/solid-5.26.0:5 >=kde-frameworks/sonnet-5.26.0:5 >=kde-plasma/kwin-5.8.5:5 >=kde-plasma/plasma-workspace-5.8.5:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.6.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) packagekit? ( >=app-admin/packagekit-qt-0.9.6 ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.26.0:5 ) >=kde-plasma/breeze-5.8.5:5 >=kde-plasma/kde-cli-tools-5.8.5:5 >=kde-plasma/oxygen-5.8.5:5 >=dev-qt/qtgraphicaleffects-5.6.1:5 sys-apps/accountsservice x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.8.5:5 ) qt4? ( kde-plasma/qguiplatformplugin_kde:4 ) !kde-apps/kcontrol !kde-apps/kdepasswd:4 !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 !kde-misc/kcm_touchpad !kde-misc/kcm-touchpad !kde-plasma/kcm-touchpad !<kde-plasma/kdeplasma-addons-5.5.50 >=kde-frameworks/kf-env-3 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
+REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.8.5/plasma-desktop-5.8.5.tar.xz
+_eclasses_=cmake-utils	fa4d8052a1ccf4fbbfa76361bffebe42	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	cb60e5fcd45072e40188c7c37ce0a4fc	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=a6cc0f4dee92766a6888881fdfbb55b8
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.8.5-r1 b/metadata/md5-cache/kde-plasma/plasma-integration-5.8.5-r1
new file mode 100644
index 000000000000..2d0156acc75f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.8.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kwayland-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-plasma/breeze-5.8.5:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5= >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libXcursor sys-devel/make >=dev-util/cmake-3.5.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kwayland-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-plasma/breeze-5.8.5:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5= >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libXcursor media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-3 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.8.5/plasma-integration-5.8.5.tar.xz
+_eclasses_=cmake-utils	fa4d8052a1ccf4fbbfa76361bffebe42	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	cb60e5fcd45072e40188c7c37ce0a4fc	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=501938c7a32caea6fb5e9222a87a00a8
diff --git a/metadata/md5-cache/lxde-base/lxappearance-0.6.2 b/metadata/md5-cache/lxde-base/lxappearance-0.6.2
index b92f088a90d8..660d04290272 100644
--- a/metadata/md5-cache/lxde-base/lxappearance-0.6.2
+++ b/metadata/md5-cache/lxde-base/lxappearance-0.6.2
@@ -4,9 +4,9 @@ DESCRIPTION=LXDE GTK+ theme switcher
 EAPI=6
 HOMEPAGE=http://lxde.sourceforge.net
 IUSE=dbus
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:2 dbus? ( dev-libs/dbus-glib )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxappearance-0.6.2.tar.xz
-_md5_=e8297b08d54b51e113fb2ba6808f1f86
+_md5_=ac5c7968cc6bc5e2b5d1bd15bed01271
diff --git a/metadata/md5-cache/lxde-base/lxinput-0.3.5 b/metadata/md5-cache/lxde-base/lxinput-0.3.5
index a18b55bce667..0a92fe7fefde 100644
--- a/metadata/md5-cache/lxde-base/lxinput-0.3.5
+++ b/metadata/md5-cache/lxde-base/lxinput-0.3.5
@@ -3,9 +3,9 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig >=dev
 DESCRIPTION=LXDE keyboard and mouse configuration tool
 EAPI=6
 HOMEPAGE=http://lxde.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxinput-0.3.5.tar.xz
-_md5_=89b54462ee67c4119a4fa20b4da38686
+_md5_=df4b8153682267b022543074547f0fcc
diff --git a/metadata/md5-cache/lxde-base/lxmenu-data-0.1.5 b/metadata/md5-cache/lxde-base/lxmenu-data-0.1.5
index c0b12710738e..ef4000716ed7 100644
--- a/metadata/md5-cache/lxde-base/lxmenu-data-0.1.5
+++ b/metadata/md5-cache/lxde-base/lxmenu-data-0.1.5
@@ -3,8 +3,8 @@ DEPEND=sys-devel/gettext >=dev-util/intltool-0.40.0 virtual/pkgconfig
 DESCRIPTION=Provides files needed for LXDE application menus
 EAPI=6
 HOMEPAGE=http://lxde.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxmenu-data-0.1.5.tar.xz
-_md5_=b63161bb9b5798bf574ffbc0329c5a04
+_md5_=e1b8365d3415cd4eeabb272799a4b6af
diff --git a/metadata/md5-cache/lxde-base/lxpanel-0.8.2 b/metadata/md5-cache/lxde-base/lxpanel-0.8.2
index a17ac60de1b1..56673c0a3a47 100644
--- a/metadata/md5-cache/lxde-base/lxpanel-0.8.2
+++ b/metadata/md5-cache/lxde-base/lxpanel-0.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight X11 desktop panel for LXDE
 EAPI=6
 HOMEPAGE=http://lxde.org/
 IUSE=+alsa wifi
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/keybinder:0= x11-libs/gtk+:2 >=x11-libs/libfm-1.2.0[gtk] x11-libs/libwnck:1 x11-libs/libXmu x11-libs/libXpm x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/libX11 lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxpanel-0.8.2.tar.xz
 _eclasses_=readme.gentoo-r1	03878c06495db70bc36bd717383c09f7
-_md5_=fa682ebf5b5f4ee2a5794489c9eec86a
+_md5_=63282880523148be9643cd33951a04ea
diff --git a/metadata/md5-cache/lxde-base/lxrandr-0.3.1 b/metadata/md5-cache/lxde-base/lxrandr-0.3.1
index 9cb05889fce4..aa43dceffeee 100644
--- a/metadata/md5-cache/lxde-base/lxrandr-0.3.1
+++ b/metadata/md5-cache/lxde-base/lxrandr-0.3.1
@@ -3,9 +3,9 @@ DEPEND=x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr x11-proto/randrproto v
 DESCRIPTION=LXDE GUI interface to RandR extention
 EAPI=6
 HOMEPAGE=http://lxde.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxrandr-0.3.1.tar.xz
-_md5_=40424aee0554da01cd72e837fde81fef
+_md5_=af371ae2fd90a1d0b5bbac46437547af
diff --git a/metadata/md5-cache/lxde-base/lxtask-0.1.7 b/metadata/md5-cache/lxde-base/lxtask-0.1.7
index e56c2f3e06ca..85ae80a1c6b0 100644
--- a/metadata/md5-cache/lxde-base/lxtask-0.1.7
+++ b/metadata/md5-cache/lxde-base/lxtask-0.1.7
@@ -3,9 +3,9 @@ DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 virtual/pkgconfig sys-devel/gettext >=dev
 DESCRIPTION=LXDE Task manager
 EAPI=6
 HOMEPAGE=http://lxde.sf.net/
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~x86 ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ppc ~x86 ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxtask-0.1.7.tar.xz
-_md5_=52eb35514eb0d48600faae2513fd35c1
+_md5_=23f133a1b49a83ab2d3fdcf493f7a3cb
diff --git a/metadata/md5-cache/mail-client/thunderbird-45.6.0 b/metadata/md5-cache/mail-client/thunderbird-45.6.0-r1
similarity index 99%
rename from metadata/md5-cache/mail-client/thunderbird-45.6.0
rename to metadata/md5-cache/mail-client/thunderbird-45.6.0-r1
index 4ca18b31f713..66a1b9b79e5d 100644
--- a/metadata/md5-cache/mail-client/thunderbird-45.6.0
+++ b/metadata/md5-cache/mail-client/thunderbird-45.6.0-r1
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/ar.xpi -> thunderbird-45.6.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/ast.xpi -> thunderbird-45.6.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/be.xpi -> thunderbird-45.6.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/bg.xpi -> thunderbird-45.6.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-45.6.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/br.xpi -> thunderbird-45.6.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/ca.xpi -> thunderbird-45.6.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/cs.xpi -> thunderbird-45.6.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/cy.xpi -> thunderbird-45.6.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/da.xpi -> thunderbird-45.6.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/de.xpi -> thunderbird-45.6.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/el.xpi -> thunderbird-45.6.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/en-GB.xpi -> thunderbird-45.6.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/es-AR.xpi -> thunderbird-45.6.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/es-ES.xpi -> thunderbird-45.6.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/et.xpi -> thunderbird-45.6.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/eu.xpi -> thunderbird-45.6.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/fi.xpi -> thunderbird-45.6.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/fr.xpi -> thunderbird-45.6.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-45.6.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-45.6.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/gd.xpi -> thunderbird-45.6.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/gl.xpi -> thunderbird-45.6.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/he.xpi -> thunderbird-45.6.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/hr.xpi -> thunderbird-45.6.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/hsb.xpi -> thunderbird-45.6.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/hu.xpi -> thunderbird-45.6.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-45.6.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/id.xpi -> thunderbird-45.6.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/is.xpi -> thunderbird-45.6.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/it.xpi -> thunderbird-45.6.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/ja.xpi -> thunderbird-45.6.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/ko.xpi -> thunderbird-45.6.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/lt.xpi -> thunderbird-45.6.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-45.6.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/nl.xpi -> thunderbird-45.6.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-45.6.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-45.6.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/pl.xpi -> thunderbird-45.6.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-45.6.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-45.6.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/rm.xpi -> thunderbird-45.6.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/ro.xpi -> thunderbird-45.6.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/ru.xpi -> thunderbird-45.6.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/si.xpi -> thunderbird-45.6.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/sk.xpi -> thunderbird-45.6.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/sl.xpi -> thunderbird-45.6.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/sq.xpi -> thunderbird-45.6.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/sr.xpi -> thunderbird-45.6.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-45.6.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-45.6.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/tr.xpi -> thunderbird-45.6.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/uk.xpi -> thunderbird-45.6.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/vi.xpi -> thunderbird-45.6.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-45.6.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-45.6.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/45.6.0/source/thunderbird-45.6.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-4.7.6.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-2.6-r1.tar.xz ) crypt? ( http://www.enigmail.net/download/source/enigmail-1.9.1.tar.gz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-45.0-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-45.0-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-45.0-patches-07.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	makeedit	b8a216672495a247e3ea6a3412fa7ae8	mozconfig-v6.45	0042834b801be9fcd5b6c2a4657d2452	mozcoreconf-v4	3c687d11553a52e70dc3baad2d2a1864	mozextension	3d8ee4835f89ff39d4666656aa603433	mozlinguas-v2	b9f0deaff27b0dc5ca44cdd61be2a3fa	multilib	165fc17c38d1b11dac2008280dab6e80	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=59fe16ea4b435bac7e20e28d4d35de27
+_md5_=e8e86d1b2c7650cb9419710bdb353a5b
diff --git a/metadata/md5-cache/media-fonts/powerline-symbols-20150224 b/metadata/md5-cache/media-fonts/powerline-symbols-20150224
index 01d583bb4f31..37485cc066a1 100644
--- a/metadata/md5-cache/media-fonts/powerline-symbols-20150224
+++ b/metadata/md5-cache/media-fonts/powerline-symbols-20150224
@@ -4,9 +4,9 @@ DESCRIPTION=OpenType Unicode font with symbols for Powerline/Airline
 EAPI=5
 HOMEPAGE=https://github.com/powerline/powerline
 IUSE=X
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=MIT-with-advertising
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/powerline-symbols-20150224.tar.xz
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	font	cd7790315ca5b8c505e1e0513df6acce	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=8d75676afb93f6654809ecee73067b8b
+_md5_=433f90eda3da52973174a80f797503df
diff --git a/metadata/md5-cache/media-libs/flac-1.3.2 b/metadata/md5-cache/media-libs/flac-1.3.2
index 68947b1ac5a4..44003f23feca 100644
--- a/metadata/md5-cache/media-libs/flac-1.3.2
+++ b/metadata/md5-cache/media-libs/flac-1.3.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) app-arch/xz-utils abi_x86_32? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext ) virtual/pkgconfig !<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
+DEPEND=ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-arch/xz-utils abi_x86_32? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext ) virtual/pkgconfig !<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=free lossless audio encoder and decoder
 EAPI=6
 HOMEPAGE=http://flac.sourceforge.net
 IUSE=altivec +cxx debug ogg cpu_flags_x86_sse static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1
-RDEPEND=ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
+RDEPEND=ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/flac/flac-1.3.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d50364a97d090c162a6592768372c064
+_md5_=610fc78f94e7e0ed36b3fc05d7a3755d
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.27 b/metadata/md5-cache/media-libs/libpng-1.6.27
index 20afb133fe98..ab71febb49d3 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.27
+++ b/metadata/md5-cache/media-libs/libpng-1.6.27
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng neon static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=libpng
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.27.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.27-apng.patch.gz )
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=8cc66836d3cf2a5646a1245c60012ee9
+_md5_=cbcb9d63a081b916253078b35456b551
diff --git a/metadata/md5-cache/media-libs/netpbm-10.70.00 b/metadata/md5-cache/media-libs/netpbm-10.70.00
index 27f36f064462..2f338d4efa88 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.70.00
+++ b/metadata/md5-cache/media-libs/netpbm-10.70.00
@@ -4,10 +4,10 @@ DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) f
 EAPI=4
 HOMEPAGE=http://netpbm.sourceforge.net/
 IUSE=doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=mirror://gentoo/netpbm-10.70.00.tar.xz
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=96ea31a8f56fc7a6c154ca65dc88a91d
+_md5_=d042fea6424adf4e06e99249f77ca4cc
diff --git a/metadata/md5-cache/media-sound/easytag-2.4.3 b/metadata/md5-cache/media-sound/easytag-2.4.3
index fc53cbb3f298..fb791c103123 100644
--- a/metadata/md5-cache/media-sound/easytag-2.4.3
+++ b/metadata/md5-cache/media-sound/easytag-2.4.3
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media ta
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/EasyTAG
 IUSE=flac mp3 mp4 opus speex test vorbis wavpack
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38:2 media-libs/libcanberra[gtk3] >=x11-libs/gtk+-3.10:3 flac? ( >=media-libs/flac-1.3 ) mp3? ( >=media-libs/id3lib-3.8.3-r8 >=media-libs/libid3tag-0.15.1b-r4 ) mp4? ( >=media-libs/taglib-1.9.1[mp4(+)] ) opus? ( >=media-libs/opus-1.1 >=media-libs/opusfile-0.4 ) speex? ( >=media-libs/speex-1.2_rc1 ) vorbis? ( >=media-libs/libogg-1.3.1 >=media-libs/libvorbis-1.3.4 ) wavpack? ( >=media-sound/wavpack-4.70 )
 REQUIRED_USE=opus? ( vorbis ) speex? ( vorbis )
 SLOT=0
 SRC_URI=mirror://gnome/sources/easytag/2.4/easytag-2.4.3.tar.xz
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bbfd01fb573cac292c28b3983133b9a7
+_md5_=32871a07ea9bf38dacb4e93da6eb7cd3
diff --git a/metadata/md5-cache/media-sound/jalv-1.6.0 b/metadata/md5-cache/media-sound/jalv-1.6.0
deleted file mode 100644
index ef8ec28ab110..000000000000
--- a/metadata/md5-cache/media-sound/jalv-1.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-DEPEND=>=media-libs/lv2-1.6.0 >=media-libs/lilv-0.15.1 >=dev-libs/serd-0.14.0 >=dev-libs/sord-0.12.0 >=media-libs/suil-0.6.0 >=media-libs/sratom-0.4.0 !portaudio? ( virtual/jack ) gtk? ( >=x11-libs/gtk+-3.0.0:3 ) gtk2? ( >=x11-libs/gtk+-2.18.0:2 ) gtkmm? ( >=dev-cpp/gtkmm-2.20.0:2.4 ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtwidgets:5 ) || ( dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) virtual/pkgconfig
-DESCRIPTION=Simple but fully featured LV2 host for Jack
-EAPI=4
-HOMEPAGE=http://drobilla.net/software/jalv/
-IUSE=gtk gtk2 gtkmm portaudio qt4 qt5
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=>=media-libs/lv2-1.6.0 >=media-libs/lilv-0.15.1 >=dev-libs/serd-0.14.0 >=dev-libs/sord-0.12.0 >=media-libs/suil-0.6.0 >=media-libs/sratom-0.4.0 !portaudio? ( virtual/jack ) gtk? ( >=x11-libs/gtk+-3.0.0:3 ) gtk2? ( >=x11-libs/gtk+-2.18.0:2 ) gtkmm? ( >=dev-cpp/gtkmm-2.20.0:2.4 ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=http://download.drobilla.net/jalv-1.6.0.tar.bz2
-_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	waf-utils	c21174962af5ca8091b66f58612797ce
-_md5_=373276b3d60a3e9b81037618e192dfba
diff --git a/metadata/md5-cache/media-sound/jalv-1.6.0-r1 b/metadata/md5-cache/media-sound/jalv-1.6.0-r1
new file mode 100644
index 000000000000..dfa91f60d148
--- /dev/null
+++ b/metadata/md5-cache/media-sound/jalv-1.6.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install setup
+DEPEND=>=media-libs/lv2-1.6.0 >=media-libs/lilv-0.24.0 >=dev-libs/serd-0.14.0 >=dev-libs/sord-0.12.0 >=media-libs/suil-0.6.0 >=media-libs/sratom-0.6.0 gtk? ( >=x11-libs/gtk+-3.0.0:3 ) gtk2? ( >=x11-libs/gtk+-2.18.0:2 ) gtkmm? ( >=dev-cpp/gtkmm-2.20.0:2.4 ) portaudio? ( media-libs/portaudio ) !portaudio? ( virtual/jack ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) || ( dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) virtual/pkgconfig
+DESCRIPTION=Simple but fully featured LV2 host for Jack
+EAPI=6
+HOMEPAGE=http://drobilla.net/software/jalv/
+IUSE=gtk gtk2 gtkmm portaudio qt5
+KEYWORDS=~amd64
+LICENSE=ISC
+RDEPEND=>=media-libs/lv2-1.6.0 >=media-libs/lilv-0.24.0 >=dev-libs/serd-0.14.0 >=dev-libs/sord-0.12.0 >=media-libs/suil-0.6.0 >=media-libs/sratom-0.6.0 gtk? ( >=x11-libs/gtk+-3.0.0:3 ) gtk2? ( >=x11-libs/gtk+-2.18.0:2 ) gtkmm? ( >=dev-cpp/gtkmm-2.20.0:2.4 ) portaudio? ( media-libs/portaudio ) !portaudio? ( virtual/jack ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+SLOT=0
+SRC_URI=http://download.drobilla.net/jalv-1.6.0.tar.bz2
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	waf-utils	c21174962af5ca8091b66f58612797ce
+_md5_=1a17c381ba83cbb23b4c8e507284491d
diff --git a/metadata/md5-cache/media-tv/mythtv-0.27.6_p20160318 b/metadata/md5-cache/media-tv/mythtv-0.27.6_p20160318
index 00f96bd86764..18b83a0d6834 100644
--- a/metadata/md5-cache/media-tv/mythtv-0.27.6_p20160318
+++ b/metadata/md5-cache/media-tv/mythtv-0.27.6_p20160318
@@ -4,11 +4,11 @@ DESCRIPTION=Homebrew PVR project
 EAPI=5
 HOMEPAGE=http://www.mythtv.org
 IUSE=alsa altivec libass autostart bluray cec crystalhd debug dvb dvd egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python +theora vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf input_devices_joystick python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/freetype-2.0:= >=media-sound/lame-3.93.1 sys-libs/zlib:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXv:= x11-libs/libXrandr:= x11-libs/libXxf86vm:= >=dev-qt/qtcore-4.7.2:4= >=dev-qt/qtdbus-4.7.2:4= >=dev-qt/qtgui-4.7.2:4= >=dev-qt/qtscript-4.7.2:4= >=dev-qt/qtsql-4.7.2:4=[mysql] >=dev-qt/qtopengl-4.7.2:4=[egl?] >=dev-qt/qtwebkit-4.7.2:4= x11-misc/wmctrl:= virtual/mysql virtual/opengl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:0 ) cec? ( dev-libs/libcec:= ) dvb? ( media-libs/libdvb:= virtual/linuxtv-dvb-headers:= ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:0 ) egl? ( media-libs/mesa:=[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac:= <media-libs/libvpx-1.5.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( dev-perl/DBD-mysql dev-perl/Net-UPnP dev-perl/LWP-Protocol-https dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 >=dev-perl/libwww-perl-5 ) pulseaudio? ( media-sound/pulseaudio ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/mysql-python dev-python/lxml dev-python/urlgrabber ) theora? ( media-libs/libtheora:= media-libs/libogg:= ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau:= ) vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= ) xml? ( >=dev-libs/libxml2-2.6.0:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-libs/taglib:= dev-libs/glib:= media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts x11-apps/xinit autostart? ( net-dialup/mingetty x11-wm/evilwm x11-apps/xset ) dvd? ( media-libs/libdvdcss:= ) xmltv? ( >=media-tv/xmltv-0.5.43 )
 REQUIRED_USE=bluray? ( xml ) python? ( python_targets_python2_7 ) theora? ( vorbis )
 SLOT=0/0.27.6_p20160318
 SRC_URI=https://github.com/MythTV/mythtv/archive/b6ae90c071a9a8eac9873fae988d5eb2434f3160.tar.gz -> mythtv-0.27.6_p20160318.tar.gz
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd
-_md5_=43809ebc135ce81eb3f712de13aa0f9d
+_md5_=53e49de9eb60dbf0152c67149a84e3cc
diff --git a/metadata/md5-cache/net-dns/rbldnsd-0.998-r1 b/metadata/md5-cache/net-dns/rbldnsd-0.998-r2
similarity index 87%
rename from metadata/md5-cache/net-dns/rbldnsd-0.998-r1
rename to metadata/md5-cache/net-dns/rbldnsd-0.998-r2
index c3cee93beb51..6db7a7dd2c8c 100644
--- a/metadata/md5-cache/net-dns/rbldnsd-0.998-r1
+++ b/metadata/md5-cache/net-dns/rbldnsd-0.998-r2
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install postinst setup test
 DEPEND=zlib? ( sys-libs/zlib ) test? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pydns:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
 DESCRIPTION=DNS server designed to serve blacklist zones
 EAPI=6
-HOMEPAGE=http://www.corpit.ru/mjt/rbldnsd.html
+HOMEPAGE=https://rbldnsd.io/
 IUSE=ipv6 test zlib python_targets_python2_7
 KEYWORDS=~amd64 ~hppa ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=zlib? ( sys-libs/zlib )
 REQUIRED_USE=test? ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=http://www.corpit.ru/mjt/rbldnsd/rbldnsd-0.998.tar.gz
+SRC_URI=https://github.com/spamhaus/rbldnsd/archive/0.998.tar.gz -> rbldnsd-0.998.tar.gz
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=a4b6b20a9b239f664655497497b1b63f
+_md5_=d042ceaa8e08129b58722ef304e994ee
diff --git a/metadata/md5-cache/net-fs/samba-4.2.14 b/metadata/md5-cache/net-fs/samba-4.2.14
index d1d7f30284a5..37cd46937710 100644
--- a/metadata/md5-cache/net-fs/samba-4.2.14
+++ b/metadata/md5-cache/net-fs/samba-4.2.14
@@ -4,11 +4,11 @@ DESCRIPTION=Samba Suite Version 4
 EAPI=5
 HOMEPAGE=http://www.samba.org/
 IUSE=acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:= virtual/libiconv dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/socket_wrapper-1.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap >=sys-libs/ldb-1.1.24[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/nss_wrapper-1.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ntdb-1.0[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.6[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.28[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/uid_wrapper-1.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( virtual/pam ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
 REQUIRED_USE=addc? ( gnutls !system-mitkrb5 ) ads? ( acl gnutls ldap ) python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.2.14.tar.gz https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.2.12.tar.xz
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	waf-utils	c21174962af5ca8091b66f58612797ce
-_md5_=b7b2eb50369caa26ac66faa56511b2c3
+_md5_=dff322f3f7c41aca2f1e3d2962944939
diff --git a/metadata/md5-cache/net-im/choqok-1.6.0 b/metadata/md5-cache/net-im/choqok-1.6.0
index 0db240477eda..b79de1ca839a 100644
--- a/metadata/md5-cache/net-im/choqok-1.6.0
+++ b/metadata/md5-cache/net-im/choqok-1.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Free/Open Source micro-blogging client by KDE
 EAPI=6
 HOMEPAGE=http://choqok.gnufolks.org/
 IUSE=attica konqueror telepathy debug +handbook
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kemoticons-5.26.0:5 >=kde-frameworks/kglobalaccel-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/knotifyconfig-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-frameworks/sonnet-5.26.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 app-crypt/qca[qt5] dev-libs/qoauth:5 attica? ( >=kde-frameworks/attica-5.26.0:5 ) konqueror? ( >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kdewebkit-5.26.0:5 >=dev-qt/qtwebkit-5.6.1:5 ) telepathy? ( net-libs/telepathy-qt[qt5] ) !net-im/choqok:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/choqok/1.6/src/choqok-1.6.0.tar.xz
 _eclasses_=cmake-utils	fa4d8052a1ccf4fbbfa76361bffebe42	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	cb60e5fcd45072e40188c7c37ce0a4fc	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c896a62f3becbffccb301c058f1d0654
+_md5_=a2e0922345568ffca0a8597964d787c2
diff --git a/metadata/md5-cache/net-irc/irssi-9999 b/metadata/md5-cache/net-irc/irssi-9999
index 9eec487abc53..53e7c2a09480 100644
--- a/metadata/md5-cache/net-irc/irssi-9999
+++ b/metadata/md5-cache/net-irc/irssi-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig dev-lang/perl || ( www-client/lynx www-client/elinks ) !<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 dev-lang/perl:= >=dev-vcs/git-1.8.2.1
+DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig dev-lang/perl || ( www-client/lynx www-client/elinks ) !<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 dev-lang/perl:= >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A modular textUI IRC client with IPv6 support
 EAPI=6
 HOMEPAGE=http://irssi.org/
-IUSE=+perl selinux ssl socks5 +proxy libressl
+IUSE=+perl selinux socks5 +proxy libressl
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client ) dev-lang/perl:=
+RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client ) dev-lang/perl:=
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=681b31637cf170aa2e8ac2180233bfe1
+_md5_=22719c6c5d405c07af04cfe9cea41b7f
diff --git a/metadata/md5-cache/net-libs/liboauth-1.0.3 b/metadata/md5-cache/net-libs/liboauth-1.0.3
index e57547397877..263e95e566ab 100644
--- a/metadata/md5-cache/net-libs/liboauth-1.0.3
+++ b/metadata/md5-cache/net-libs/liboauth-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=C library implementing the OAuth secure authentication protocol
 EAPI=5
 HOMEPAGE=http://liboauth.sourceforge.net/
 IUSE=curl doc bindist +nss
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x64-macos
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x64-macos
 LICENSE=|| ( GPL-2 MIT )
 RDEPEND=nss? ( dev-libs/nss curl? ( || ( net-misc/curl[ssl,curl_ssl_nss] net-misc/curl[-ssl] ) ) ) !nss? ( dev-libs/openssl:0= curl? ( || ( net-misc/curl[ssl,curl_ssl_openssl] net-misc/curl[-ssl] ) ) ) net-misc/curl
 REQUIRED_USE=bindist? ( nss )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/liboauth/liboauth-1.0.3.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	017377e73405d964cd0137088cddb9c3	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c4a760a0a846648cd0746ed18bace5bb
+_md5_=a5d21d3ba9dbe6122a038d2430d4c9a8
diff --git a/metadata/md5-cache/net-mail/mailutils-3.1.1 b/metadata/md5-cache/net-mail/mailutils-3.1.1
new file mode 100644
index 000000000000..778016ec4da2
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailutils-3.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:= ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) virtual/pkgconfig !<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=A useful collection of mail servers, clients, and filters
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
+IUSE=berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd tokyocabinet python_targets_python2_7
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:= ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
+REQUIRED_USE=python? ( python_targets_python2_7 ) servers? ( tcpd )
+SLOT=0
+SRC_URI=mirror://gnu/mailutils/mailutils-3.1.1.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=b990f750d60588e7c7080770fa050bf1
diff --git a/metadata/md5-cache/net-misc/curl-7.52.1-r1 b/metadata/md5-cache/net-misc/curl-7.52.1-r1
index b7dbde2baa3e..39072d8d3603 100644
--- a/metadata/md5-cache/net-misc/curl-7.52.1-r1
+++ b/metadata/md5-cache/net-misc/curl-7.52.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=6
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm hppa ~mips ~ppc ppc64 x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~mips ~ppc ppc64 x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.52.1.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1fc2f6bbe0e3afdd58a061fa5d1b72c4
+_md5_=72a4b2fc76a6ffa3a72279431743d71d
diff --git a/metadata/md5-cache/net-misc/grive-0.5.1_pre20161004 b/metadata/md5-cache/net-misc/grive-0.5.1_pre20161004
new file mode 100644
index 000000000000..02b50b062392
--- /dev/null
+++ b/metadata/md5-cache/net-misc/grive-0.5.1_pre20161004
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc dev-libs/yajl sys-devel/make >=dev-util/cmake-3.5.2
+DESCRIPTION=An open source Linux client for Google Drive
+EAPI=5
+HOMEPAGE=https://github.com/vitalif/grive2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc dev-libs/yajl
+SLOT=0
+SRC_URI=https://github.com/vitalif/grive2/archive/7bbb01c3014cc996ec24a7e5c0684f24b604b735.tar.gz -> grive-0.5.1_pre20161004.tar.gz
+_eclasses_=cmake-utils	fa4d8052a1ccf4fbbfa76361bffebe42	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=2ddfc180f026acdb575102c34ec92e02
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.34 b/metadata/md5-cache/net-misc/memcached-1.4.34
new file mode 100644
index 000000000000..fab2d113dcda
--- /dev/null
+++ b/metadata/md5-cache/net-misc/memcached-1.4.34
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) !<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 virtual/pkgconfig
+DESCRIPTION=High-performance, distributed memory object caching system
+EAPI=5
+HOMEPAGE=http://memcached.org/
+IUSE=test slabs-reassign debug sasl selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached )
+SLOT=0
+SRC_URI=https://www.memcached.org/files/memcached-1.4.34.tar.gz https://www.memcached.org/files/old/memcached-1.4.34.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
+_md5_=94f71a1a007c35375fbaa21dcda0bb6d
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.6.1 b/metadata/md5-cache/net-misc/openvswitch-2.6.1
new file mode 100644
index 000000000000..5dc021b8e318
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openvswitch-2.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
+DEPEND=|| ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) ssl? ( dev-libs/openssl:0= ) 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(-)] ~dev-python/ovs-2.6.1 dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web dev-python/PyQt4[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/zope-interface[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(-)] debug? ( dev-lang/perl ) virtual/pkgconfig !<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 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DESCRIPTION=Production quality, multilayer virtual switch
+EAPI=6
+HOMEPAGE=http://openvswitch.org
+IUSE=debug modules monitor +ssl kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=|| ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) ssl? ( dev-libs/openssl:0= ) 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(-)] ~dev-python/ovs-2.6.1 dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web dev-python/PyQt4[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/zope-interface[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(-)] debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://openvswitch.org/releases/openvswitch-2.6.1.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	linux-mod	0ccff2c1a7d70cf1678059b64bcf9183	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=18f0268e43a4433107e27cff675c3b30
diff --git a/metadata/md5-cache/net-misc/quagga-1.1.0-r2 b/metadata/md5-cache/net-misc/quagga-1.1.0-r2
index c51922a103ed..14cc996177ca 100644
--- a/metadata/md5-cache/net-misc/quagga-1.1.0-r2
+++ b/metadata/md5-cache/net-misc/quagga-1.1.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
 EAPI=6
 HOMEPAGE=http://quagga.net/
 IUSE=bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam protobuf +readline snmp tcp-zebra
-KEYWORDS=alpha amd64 ~arm ~hppa ~ppc ~s390 ~sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ~ppc ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/iproute2
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-1.1.0.tar.gz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=709c973d4b5b3b3046694b50cc9af7ee
+_md5_=b1813298e75a105a710985a0d16e6412
diff --git a/metadata/md5-cache/net-misc/tor-0.2.8.12 b/metadata/md5-cache/net-misc/tor-0.2.8.12
index 8e1d07851f83..0a4323325131 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.8.12
+++ b/metadata/md5-cache/net-misc/tor-0.2.8.12
@@ -4,10 +4,10 @@ DESCRIPTION=Anonymizing overlay network for TCP
 EAPI=5
 HOMEPAGE=http://www.torproject.org/
 IUSE=-bufferevents libressl scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test web
-KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-macos
+KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-macos
 LICENSE=BSD GPL-2
 RDEPEND=app-text/asciidoc dev-libs/libevent sys-libs/zlib bufferevents? ( dev-libs/libevent[ssl] ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.2.8.12.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.2.8.12.tar.gz
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=05bf33879a6b0bf4d43776ef1810af81
+_md5_=23475f7c4a01f4d43c7e8196e05f2940
diff --git a/metadata/md5-cache/net-wireless/kismet-2016.01.1 b/metadata/md5-cache/net-wireless/kismet-2016.01.1
deleted file mode 100644
index c14f4cacf577..000000000000
--- a/metadata/md5-cache/net-wireless/kismet-2016.01.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare
-DEPEND=net-wireless/wireless-tools kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) client? ( sys-libs/ncurses:0= ) !arm? ( speech? ( app-accessibility/flite ) ) plugin-btscan? ( net-wireless/bluez ) plugin-dot15d4? ( virtual/libusb:0 ) plugin-spectools? ( net-wireless/spectools ) virtual/pkgconfig !<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=IEEE 802.11 wireless LAN sniffer
-EAPI=5
-HOMEPAGE=http://www.kismetwireless.net/
-IUSE=+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog +ruby selinux +suid
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=net-wireless/wireless-tools kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) client? ( sys-libs/ncurses:0= ) !arm? ( speech? ( app-accessibility/flite ) ) plugin-btscan? ( net-wireless/bluez ) plugin-dot15d4? ( virtual/libusb:0 ) plugin-spectools? ( net-wireless/spectools ) ruby? ( dev-lang/ruby:* ) selinux? ( sec-policy/selinux-kismet )
-SLOT=0/2016.01.1
-SRC_URI=http://www.kismetwireless.net/code/kismet-2016-01-R1.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=a716da6637ea0acb369baba7da146ada
diff --git a/metadata/md5-cache/net-wireless/kismet-2016.07.1 b/metadata/md5-cache/net-wireless/kismet-2016.07.1-r1
similarity index 95%
rename from metadata/md5-cache/net-wireless/kismet-2016.07.1
rename to metadata/md5-cache/net-wireless/kismet-2016.07.1-r1
index 80c2ee4458f7..0462294e2bd6 100644
--- a/metadata/md5-cache/net-wireless/kismet-2016.07.1
+++ b/metadata/md5-cache/net-wireless/kismet-2016.07.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=IEEE 802.11 wireless LAN sniffer
 EAPI=5
 HOMEPAGE=http://www.kismetwireless.net/
 IUSE=+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog +ruby selinux +suid
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=net-wireless/wireless-tools kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) client? ( sys-libs/ncurses:0= ) !arm? ( speech? ( app-accessibility/flite ) ) plugin-btscan? ( net-wireless/bluez ) plugin-dot15d4? ( virtual/libusb:0 ) plugin-spectools? ( net-wireless/spectools ) ruby? ( dev-lang/ruby:* ) selinux? ( sec-policy/selinux-kismet )
 SLOT=0/2016.07.1
 SRC_URI=http://www.kismetwireless.net/code/kismet-2016-07-R1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=32f5fd0ad84efb6404877650a942ea3f
+_md5_=3a9742817381d3938ce473b1e3f6f31d
diff --git a/metadata/md5-cache/sci-geosciences/qgis-2.12.1-r1 b/metadata/md5-cache/sci-geosciences/qgis-2.12.1-r1
deleted file mode 100644
index 2520f1aef9f4..000000000000
--- a/metadata/md5-cache/sci-geosciences/qgis-2.12.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-libs/expat sci-geosciences/gpsbabel >=sci-libs/gdal-1.6.1[geos,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] sci-libs/geos gsl? ( sci-libs/gsl ) sci-libs/libspatialindex sci-libs/proj dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 dev-qt/qtwebkit:4 dev-qt/designer:4 x11-libs/qscintilla:=[qt4(-)] || ( ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) ( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) ) grass? ( || ( >=sci-geosciences/grass-7.0.0 ) ) mapserver? ( dev-libs/fcgi ) postgres? ( dev-db/postgresql:* ) python? ( dev-python/PyQt4[X,sql,svg,webkit,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/qscintilla-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) dev-db/sqlite:3 dev-db/spatialite app-crypt/qca:2[qt4,ssl] sys-devel/bison sys-devel/flex >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=User friendly Geographic Information System
-EAPI=5
-HOMEPAGE=http://www.qgis.org/
-IUSE=examples grass gsl mapserver postgres python test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-libs/expat sci-geosciences/gpsbabel >=sci-libs/gdal-1.6.1[geos,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] sci-libs/geos gsl? ( sci-libs/gsl ) sci-libs/libspatialindex sci-libs/proj dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 dev-qt/qtwebkit:4 dev-qt/designer:4 x11-libs/qscintilla:=[qt4(-)] || ( ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) ( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) ) grass? ( || ( >=sci-geosciences/grass-7.0.0 ) ) mapserver? ( dev-libs/fcgi ) postgres? ( dev-db/postgresql:* ) python? ( dev-python/PyQt4[X,sql,svg,webkit,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/qscintilla-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) dev-db/sqlite:3 dev-db/spatialite app-crypt/qca:2[qt4,ssl]
-REQUIRED_USE=python? ( python_targets_python2_7 ) mapserver? ( python )
-SLOT=0
-SRC_URI=http://qgis.org/downloads/qgis-2.12.1.tar.bz2 examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )
-_eclasses_=cmake-utils	fa4d8052a1ccf4fbbfa76361bffebe42	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=87c079b9467975a4dfcdb8591b522dbb
diff --git a/metadata/md5-cache/sci-geosciences/qgis-2.12.2-r1 b/metadata/md5-cache/sci-geosciences/qgis-2.12.2-r1
deleted file mode 100644
index a6b5477d06f1..000000000000
--- a/metadata/md5-cache/sci-geosciences/qgis-2.12.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-libs/expat sci-geosciences/gpsbabel >=sci-libs/gdal-1.6.1[geos,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] sci-libs/geos gsl? ( sci-libs/gsl ) sci-libs/libspatialindex sci-libs/proj dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 dev-qt/qtwebkit:4 dev-qt/designer:4 x11-libs/qscintilla:=[qt4(-)] || ( ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) ( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) ) grass? ( || ( >=sci-geosciences/grass-7.0.0 ) ) mapserver? ( dev-libs/fcgi ) postgres? ( dev-db/postgresql:* ) python? ( dev-python/PyQt4[X,sql,svg,webkit,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/qscintilla-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) dev-db/sqlite:3 dev-db/spatialite app-crypt/qca:2[qt4,ssl] sys-devel/bison sys-devel/flex >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=User friendly Geographic Information System
-EAPI=5
-HOMEPAGE=http://www.qgis.org/
-IUSE=examples grass gsl mapserver postgres python test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-libs/expat sci-geosciences/gpsbabel >=sci-libs/gdal-1.6.1[geos,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] sci-libs/geos gsl? ( sci-libs/gsl ) sci-libs/libspatialindex sci-libs/proj dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 dev-qt/qtwebkit:4 dev-qt/designer:4 x11-libs/qscintilla:=[qt4(-)] || ( ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) ( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) ) grass? ( || ( >=sci-geosciences/grass-7.0.0 ) ) mapserver? ( dev-libs/fcgi ) postgres? ( dev-db/postgresql:* ) python? ( dev-python/PyQt4[X,sql,svg,webkit,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/qscintilla-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) dev-db/sqlite:3 dev-db/spatialite app-crypt/qca:2[qt4,ssl]
-REQUIRED_USE=python? ( python_targets_python2_7 ) mapserver? ( python )
-SLOT=0
-SRC_URI=http://qgis.org/downloads/qgis-2.12.2.tar.bz2 examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )
-_eclasses_=cmake-utils	fa4d8052a1ccf4fbbfa76361bffebe42	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=345e6aa2b8650275b4fa0d226fc7df3e
diff --git a/metadata/md5-cache/sci-libs/fftw-2.1.5-r9 b/metadata/md5-cache/sci-libs/fftw-2.1.5-r9
index 9186329dea8a..57fd6bdc512d 100644
--- a/metadata/md5-cache/sci-libs/fftw-2.1.5-r9
+++ b/metadata/md5-cache/sci-libs/fftw-2.1.5-r9
@@ -4,10 +4,10 @@ DESCRIPTION=Fast C library for the Discrete Fourier Transform
 EAPI=6
 HOMEPAGE=http://www.fftw.org
 IUSE=doc float fortran mpi openmp threads static-libs
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=mpi? ( virtual/mpi ) fortran? ( virtual/fortran )
 SLOT=2.1
 SRC_URI=http://www.fftw.org/fftw-2.1.5.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2f685ea43d2d3351b82f3a197bd99752
+_md5_=31dda32312d9b4c3837f0390dcab9b40
diff --git a/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20160725 b/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20160725
index 24b8292ea6b6..bad7e4b5d870 100644
--- a/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20160725
+++ b/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20160725
@@ -4,10 +4,10 @@ DESCRIPTION=Hardware Monitoring user-space utilities
 EAPI=6
 HOMEPAGE=http://www.lm-sensors.org/ https://github.com/groeck/lm-sensors
 IUSE=sensord static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1
 RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl !<sys-apps/openrc-0.21.7
 SLOT=0/4.4.0
 SRC_URI=https://github.com/groeck/lm-sensors/archive/45ffa15cf02e63f70ff3b85c23e22dfbab7e8f9c.tar.gz -> lm_sensors-3.4.0_p20160725.tar.gz
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2c7a2430347b6aa932af310b07e320cb
+_md5_=ffd155a834c240e6b08143c34ee6e93f
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.20 b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.20
index 6f582b799fdf..0a55940e7832 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.20
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.20
@@ -4,11 +4,11 @@ DESCRIPTION=PC/SC Architecture smartcard middleware library
 EAPI=6
 HOMEPAGE=http://pcsclite.alioth.debian.org/
 IUSE=python libusb policykit selinux +udev python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD ISC MIT GPL-3+ GPL-2
 RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-auth/polkit-0.111 ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) !<app-crypt/ccid-1.4.1-r1 !<sys-apps/baselayout-2 !<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-pcscd )
 REQUIRED_USE=^^ ( udev libusb ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://alioth.debian.org/download.php/file/4203/pcsc-lite-1.8.20.tar.bz2
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=35196e2a79c5c9b888566cab7154a7f0
+_md5_=bedb5026b1148e6214652ee03b3915b0
diff --git a/metadata/md5-cache/sys-cluster/swift-2.10.1 b/metadata/md5-cache/sys-cluster/swift-2.10.1
index 561c97598350..8a4c6383885c 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.10.1
+++ b/metadata/md5-cache/sys-cluster/swift-2.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=A highly available, distributed, and eventually consistent object/bl
 EAPI=5
 HOMEPAGE=https://launchpad.net/swift
 IUSE=proxy account container object +memcached python_targets_python2_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PyECLib-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/swift/swift-2.10.1.tar.gz
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	017377e73405d964cd0137088cddb9c3	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=39d2b98228591451a7b6c9463304c07d
+_md5_=b2b9b2718f96de2007162d924bcf8874
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.6-r2 b/metadata/md5-cache/sys-devel/libtool-2.4.6-r2
index fd2a2697e897..beaf97557ab1 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.6-r2
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.6-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A shared library tool for developers
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/libtool/
 IUSE=vanilla
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=6bc6bde10da0b2440962642d2fbe3a50
+_md5_=51a6b4582b2d310e90cd006a2cfe2cb5
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-3.2.4 b/metadata/md5-cache/sys-fs/xfsprogs-3.2.4
deleted file mode 100644
index 804be2af1a52..000000000000
--- a/metadata/md5-cache/sys-fs/xfsprogs-3.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3 static? ( >=sys-apps/util-linux-2.17.2[static-libs(+)] readline? ( sys-libs/readline[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses[static-libs] ) ) nls? ( sys-devel/gettext )
-DESCRIPTION=xfs filesystem utilities
-EAPI=4
-HOMEPAGE=http://oss.sgi.com/projects/xfs/
-IUSE=libedit nls readline static static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
-REQUIRED_USE=static? ( static-libs )
-SLOT=0
-SRC_URI=ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-3.2.4.tar.gz ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/xfsprogs-3.2.4.tar.gz
-_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=0c1fcfe85c4d9c702338b7a6671f5c3a
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-4.9.0 b/metadata/md5-cache/sys-fs/xfsprogs-4.9.0
new file mode 100644
index 000000000000..9a3aa27a1e97
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/xfsprogs-4.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3 static? ( >=sys-apps/util-linux-2.17.2[static-libs(+)] readline? ( sys-libs/readline:0=[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses:0=[static-libs] ) ) nls? ( sys-devel/gettext )
+DESCRIPTION=xfs filesystem utilities
+EAPI=5
+HOMEPAGE=http://oss.sgi.com/projects/xfs/
+IUSE=libedit nls readline static static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
+REQUIRED_USE=static? ( static-libs )
+SLOT=0
+SRC_URI=ftp://ftp.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.9.0.tar.xz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=52adaed6de379d9e10fb220d5f1cc04f
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.10_rc3 b/metadata/md5-cache/sys-kernel/git-sources-4.10_rc3
new file mode 100644
index 000000000000..373c9bed99bf
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.10_rc3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.10_rc3
+SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.10-rc3.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	kernel-2	d6e1dc6b6c76281d9b644966393069ef	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=beedcb9a52f895aa42075cbf50a36586
diff --git a/metadata/md5-cache/sys-libs/glibc-2.23-r3 b/metadata/md5-cache/sys-libs/glibc-2.23-r3
index 2c846fc2ac16..3105f02e4af5 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.23-r3
+++ b/metadata/md5-cache/sys-libs/glibc-2.23-r3
@@ -4,7 +4,7 @@ DESCRIPTION=GNU libc6 (also called glibc2) C library
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/libc/libc.html
 IUSE=audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.23.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.23.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.23.tar.xz mirror://gentoo/glibc-2.23.tar.xz mirror://gentoo/glibc-2.23-patches-7.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.23-patches-7.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.23-patches-7.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnuconfig	3920de1188fc7bfee873515453ed1d10	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	prefix	99dcca42e6528d8fe3c214bf5731aaf2	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7b86fb0c68316a6cb66ad8ff000a72c5
+_md5_=c548e993dbe64d95297e5082b97b37bb
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.15 b/metadata/md5-cache/sys-libs/musl-1.1.15
deleted file mode 100644
index 43852dc097a0..000000000000
--- a/metadata/md5-cache/sys-libs/musl-1.1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup
-DESCRIPTION=Light, fast and simple C library focused on standards-conformance and safety
-EAPI=6
-HOMEPAGE=http://www.musl-libc.org/
-IUSE=crosscompile_opts_headers-only
-KEYWORDS=-* amd64 arm ~mips ppc x86
-LICENSE=MIT LGPL-2 GPL-2
-SLOT=0
-SRC_URI=http://www.musl-libc.org/releases/musl-1.1.15.tar.gz http://dev.gentoo.org/~blueness/musl-misc/getconf.c http://dev.gentoo.org/~blueness/musl-misc/getent.c http://dev.gentoo.org/~blueness/musl-misc/iconv.c
-_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ad18bbef0e7e12cb20021759dc2c9f3d
diff --git a/metadata/md5-cache/virtual/python-cffi-0 b/metadata/md5-cache/virtual/python-cffi-0
index 636c22187f6f..7910c88f8ad5 100644
--- a/metadata/md5-cache/virtual/python-cffi-0
+++ b/metadata/md5-cache/virtual/python-cffi-0
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for the Python cffi package
 EAPI=6
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/cffi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/cffi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/cffi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] )
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 _eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=6b7da3243bed7d08bc2c122b57ec2847
+_md5_=af913c7f9cd028f66c902559eacddaf9
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.4.0 b/metadata/md5-cache/www-apps/icingaweb2-2.4.0
index 9d576eae713f..b4bcbf610670 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-2.4.0
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Icinga Web 2 - Frontend for icinga2
 EAPI=5
 HOMEPAGE=http://www.icinga.org/
 IUSE=apache2 ldap mysql nginx postgres apache2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick apache2? ( >=www-servers/apache-2.4.0 || ( dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] ) ) nginx? ( >=www-servers/nginx-1.7.0:* || ( dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] ) ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=^^ ( apache2 nginx )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.4.0 -> icingaweb2-2.4.0.tar.gz
 _eclasses_=depend.apache	7aeacf4ba074b9aa0047e2ba05c1010f	eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=bdeeee653a37ebeed4b5c9fb56c5b236
+_md5_=89b22d33dcf588ede2205b51bd0f9066
diff --git a/metadata/md5-cache/www-apps/icingaweb2-9999 b/metadata/md5-cache/www-apps/icingaweb2-9999
index 8e70997812e8..aa9e9a2d2d72 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-9999
+++ b/metadata/md5-cache/www-apps/icingaweb2-9999
@@ -9,4 +9,4 @@ RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick apache2? ( >=www-serve
 REQUIRED_USE=^^ ( apache2 nginx )
 SLOT=0
 _eclasses_=depend.apache	7aeacf4ba074b9aa0047e2ba05c1010f	eutils	017377e73405d964cd0137088cddb9c3	git-2	7af5d170bfc02983b4bcd3167dc5edd4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=de9e02f14d0a74541bfb6996ade8f89c
+_md5_=ba5a7aa81798b133e7c514dd9acb6ab8
diff --git a/metadata/md5-cache/www-client/chromium-57.0.2970.0 b/metadata/md5-cache/www-client/chromium-57.0.2970.0
index 4f1e147022e4..0656a5dde35c 100644
--- a/metadata/md5-cache/www-client/chromium-57.0.2970.0
+++ b/metadata/md5-cache/www-client/chromium-57.0.2970.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gconf? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git x11-libs/gtk+:2 x11-libs/gtk+:3 || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/ply[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:2 dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gconf? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git x11-libs/gtk+:2 x11-libs/gtk+:3 || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/ply[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=6
 HOMEPAGE=http://chromium.org/
 IUSE=component-build cups gconf gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gconf? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:2 dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gconf? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-57.0.2970.0.tar.xz
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	chromium-2	c30f482b868782938c772c21d9ede135	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	pax-utils	4c2654a34ebe732e85fda354f6ee642f	portability	bb1a0ed8ea152b957d17339f01d4d7f5	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8fbd6f43f92d49b60d99c8bf589022fa
+_md5_=8252fc7249926541a8df65ffe9c5cdc0
diff --git a/metadata/md5-cache/www-client/firefox-45.4.0 b/metadata/md5-cache/www-client/firefox-45.4.0
deleted file mode 100644
index 254da270e060..000000000000
--- a/metadata/md5-cache/www-client/firefox-45.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.21.1 >=dev-libs/nspr-4.12 selinux? ( sec-policy/selinux-mozilla ) pgo? ( >=sys-devel/gcc-4.5 ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.19:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 media-libs/libcanberra:*[pulseaudio?] kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 ffmpeg? ( virtual/ffmpeg ) gstreamer? ( >=media-libs/gstreamer-1.4.5:1.0 >=media-libs/gst-plugins-base-1.4.5:1.0 >=media-libs/gst-plugins-good-1.4.5:1.0 >=media-plugins/gst-plugins-libav-1.4.5:1.0 ) gstreamer-0? ( >=media-libs/gstreamer-0.10.25:0.10 media-plugins/gst-plugins-meta:0.10[ffmpeg] ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( =dev-libs/libevent-2.0*:0= ) system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=http://www.mozilla.com/firefox
-IUSE=bindist hardened +hwaccel pgo selinux +gmp-autoupdate test custom-cflags custom-optimization dbus debug ffmpeg +gstreamer gstreamer-0 +jemalloc3 neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi +jit pgo l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_be l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.21.1 >=dev-libs/nspr-4.12 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.19:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 media-libs/libcanberra:*[pulseaudio?] kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 ffmpeg? ( virtual/ffmpeg ) gstreamer? ( >=media-libs/gstreamer-1.4.5:1.0 >=media-libs/gst-plugins-base-1.4.5:1.0 >=media-libs/gst-plugins-good-1.4.5:1.0 >=media-plugins/gst-plugins-libav-1.4.5:1.0 ) gstreamer-0? ( >=media-libs/gstreamer-0.10.25:0.10 media-plugins/gst-plugins-meta:0.10[ffmpeg] ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( =dev-libs/libevent-2.0*:0= ) system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=?? ( gstreamer gstreamer-0 ) system-harfbuzz? ( system-icu )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/ach.xpi -> firefox-45.4.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/af.xpi -> firefox-45.4.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/an.xpi -> firefox-45.4.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/ar.xpi -> firefox-45.4.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/as.xpi -> firefox-45.4.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/ast.xpi -> firefox-45.4.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/az.xpi -> firefox-45.4.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/be.xpi -> firefox-45.4.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/bg.xpi -> firefox-45.4.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-45.4.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-45.4.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/br.xpi -> firefox-45.4.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/bs.xpi -> firefox-45.4.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/ca.xpi -> firefox-45.4.0esr-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/cs.xpi -> firefox-45.4.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/cy.xpi -> firefox-45.4.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/da.xpi -> firefox-45.4.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/de.xpi -> firefox-45.4.0esr-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/el.xpi -> firefox-45.4.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/en-GB.xpi -> firefox-45.4.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-45.4.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/eo.xpi -> firefox-45.4.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/es-AR.xpi -> firefox-45.4.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/es-CL.xpi -> firefox-45.4.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/es-ES.xpi -> firefox-45.4.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/es-MX.xpi -> firefox-45.4.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/et.xpi -> firefox-45.4.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/eu.xpi -> firefox-45.4.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/fa.xpi -> firefox-45.4.0esr-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/fi.xpi -> firefox-45.4.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/fr.xpi -> firefox-45.4.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-45.4.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-45.4.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/gd.xpi -> firefox-45.4.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/gl.xpi -> firefox-45.4.0esr-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-45.4.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/he.xpi -> firefox-45.4.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-45.4.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/hr.xpi -> firefox-45.4.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/hsb.xpi -> firefox-45.4.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/hu.xpi -> firefox-45.4.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-45.4.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/id.xpi -> firefox-45.4.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/is.xpi -> firefox-45.4.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/it.xpi -> firefox-45.4.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/ja.xpi -> firefox-45.4.0esr-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/kk.xpi -> firefox-45.4.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/km.xpi -> firefox-45.4.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/kn.xpi -> firefox-45.4.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/ko.xpi -> firefox-45.4.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/lt.xpi -> firefox-45.4.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/lv.xpi -> firefox-45.4.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/mai.xpi -> firefox-45.4.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/mk.xpi -> firefox-45.4.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/ml.xpi -> firefox-45.4.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/mr.xpi -> firefox-45.4.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/ms.xpi -> firefox-45.4.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-45.4.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/nl.xpi -> firefox-45.4.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-45.4.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/or.xpi -> firefox-45.4.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-45.4.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/pl.xpi -> firefox-45.4.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-45.4.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-45.4.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/rm.xpi -> firefox-45.4.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/ro.xpi -> firefox-45.4.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/ru.xpi -> firefox-45.4.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/si.xpi -> firefox-45.4.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/sk.xpi -> firefox-45.4.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/sl.xpi -> firefox-45.4.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/son.xpi -> firefox-45.4.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/sq.xpi -> firefox-45.4.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/sr.xpi -> firefox-45.4.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-45.4.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/ta.xpi -> firefox-45.4.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/te.xpi -> firefox-45.4.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/th.xpi -> firefox-45.4.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/tr.xpi -> firefox-45.4.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/uk.xpi -> firefox-45.4.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/uz.xpi -> firefox-45.4.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/vi.xpi -> firefox-45.4.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/xh.xpi -> firefox-45.4.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-45.4.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-45.4.0esr-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-45.0-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-45.0-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-45.0-patches-07.tar.xz https://archive.mozilla.org/pub/firefox/releases/45.4.0esr/source/firefox-45.4.0esr.source.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	mozconfig-v6.45	0042834b801be9fcd5b6c2a4657d2452	mozcoreconf-v4	3c687d11553a52e70dc3baad2d2a1864	mozextension	3d8ee4835f89ff39d4666656aa603433	mozlinguas-v2	b9f0deaff27b0dc5ca44cdd61be2a3fa	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=919781464ab7e980f4f4260e12dfc2c4
diff --git a/metadata/md5-cache/www-client/firefox-45.5.0 b/metadata/md5-cache/www-client/firefox-45.5.0
deleted file mode 100644
index 052dabf33148..000000000000
--- a/metadata/md5-cache/www-client/firefox-45.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.21.1 >=dev-libs/nspr-4.12 selinux? ( sec-policy/selinux-mozilla ) pgo? ( >=sys-devel/gcc-4.5 ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.19:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 media-libs/libcanberra:*[pulseaudio?] kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 ffmpeg? ( virtual/ffmpeg ) gstreamer? ( >=media-libs/gstreamer-1.4.5:1.0 >=media-libs/gst-plugins-base-1.4.5:1.0 >=media-libs/gst-plugins-good-1.4.5:1.0 >=media-plugins/gst-plugins-libav-1.4.5:1.0 ) gstreamer-0? ( >=media-libs/gstreamer-0.10.25:0.10 media-plugins/gst-plugins-meta:0.10[ffmpeg] ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( =dev-libs/libevent-2.0*:0= ) system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=http://www.mozilla.com/firefox
-IUSE=bindist hardened +hwaccel pgo selinux +gmp-autoupdate test custom-cflags custom-optimization dbus debug ffmpeg +gstreamer gstreamer-0 +jemalloc3 neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi +jit pgo l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_be l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.21.1 >=dev-libs/nspr-4.12 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.19:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 media-libs/libcanberra:*[pulseaudio?] kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 ffmpeg? ( virtual/ffmpeg ) gstreamer? ( >=media-libs/gstreamer-1.4.5:1.0 >=media-libs/gst-plugins-base-1.4.5:1.0 >=media-libs/gst-plugins-good-1.4.5:1.0 >=media-plugins/gst-plugins-libav-1.4.5:1.0 ) gstreamer-0? ( >=media-libs/gstreamer-0.10.25:0.10 media-plugins/gst-plugins-meta:0.10[ffmpeg] ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( =dev-libs/libevent-2.0*:0= ) system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=?? ( gstreamer gstreamer-0 ) system-harfbuzz? ( system-icu )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/ach.xpi -> firefox-45.5.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/af.xpi -> firefox-45.5.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/an.xpi -> firefox-45.5.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/ar.xpi -> firefox-45.5.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/as.xpi -> firefox-45.5.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/ast.xpi -> firefox-45.5.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/az.xpi -> firefox-45.5.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/be.xpi -> firefox-45.5.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/bg.xpi -> firefox-45.5.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-45.5.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-45.5.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/br.xpi -> firefox-45.5.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/bs.xpi -> firefox-45.5.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/ca.xpi -> firefox-45.5.0esr-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/cs.xpi -> firefox-45.5.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/cy.xpi -> firefox-45.5.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/da.xpi -> firefox-45.5.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/de.xpi -> firefox-45.5.0esr-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/el.xpi -> firefox-45.5.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/en-GB.xpi -> firefox-45.5.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-45.5.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/eo.xpi -> firefox-45.5.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/es-AR.xpi -> firefox-45.5.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/es-CL.xpi -> firefox-45.5.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/es-ES.xpi -> firefox-45.5.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/es-MX.xpi -> firefox-45.5.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/et.xpi -> firefox-45.5.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/eu.xpi -> firefox-45.5.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/fa.xpi -> firefox-45.5.0esr-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/fi.xpi -> firefox-45.5.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/fr.xpi -> firefox-45.5.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-45.5.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-45.5.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/gd.xpi -> firefox-45.5.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/gl.xpi -> firefox-45.5.0esr-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-45.5.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/he.xpi -> firefox-45.5.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-45.5.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/hr.xpi -> firefox-45.5.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/hsb.xpi -> firefox-45.5.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/hu.xpi -> firefox-45.5.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-45.5.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/id.xpi -> firefox-45.5.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/is.xpi -> firefox-45.5.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/it.xpi -> firefox-45.5.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/ja.xpi -> firefox-45.5.0esr-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/kk.xpi -> firefox-45.5.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/km.xpi -> firefox-45.5.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/kn.xpi -> firefox-45.5.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/ko.xpi -> firefox-45.5.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/lt.xpi -> firefox-45.5.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/lv.xpi -> firefox-45.5.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/mai.xpi -> firefox-45.5.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/mk.xpi -> firefox-45.5.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/ml.xpi -> firefox-45.5.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/mr.xpi -> firefox-45.5.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/ms.xpi -> firefox-45.5.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-45.5.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/nl.xpi -> firefox-45.5.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-45.5.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/or.xpi -> firefox-45.5.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-45.5.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/pl.xpi -> firefox-45.5.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-45.5.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-45.5.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/rm.xpi -> firefox-45.5.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/ro.xpi -> firefox-45.5.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/ru.xpi -> firefox-45.5.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/si.xpi -> firefox-45.5.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/sk.xpi -> firefox-45.5.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/sl.xpi -> firefox-45.5.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/son.xpi -> firefox-45.5.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/sq.xpi -> firefox-45.5.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/sr.xpi -> firefox-45.5.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-45.5.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/ta.xpi -> firefox-45.5.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/te.xpi -> firefox-45.5.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/th.xpi -> firefox-45.5.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/tr.xpi -> firefox-45.5.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/uk.xpi -> firefox-45.5.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/uz.xpi -> firefox-45.5.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/vi.xpi -> firefox-45.5.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/xh.xpi -> firefox-45.5.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-45.5.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-45.5.0esr-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-45.0-patches-08.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-45.0-patches-08.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-45.0-patches-08.tar.xz https://archive.mozilla.org/pub/firefox/releases/45.5.0esr/source/firefox-45.5.0esr.source.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	mozconfig-v6.45	0042834b801be9fcd5b6c2a4657d2452	mozcoreconf-v4	3c687d11553a52e70dc3baad2d2a1864	mozextension	3d8ee4835f89ff39d4666656aa603433	mozlinguas-v2	b9f0deaff27b0dc5ca44cdd61be2a3fa	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=15069437e61b9db7f62b73ed5311e91c
diff --git a/metadata/md5-cache/www-client/firefox-45.5.1 b/metadata/md5-cache/www-client/firefox-45.5.1
deleted file mode 100644
index 21faf138e9cd..000000000000
--- a/metadata/md5-cache/www-client/firefox-45.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.21.1 >=dev-libs/nspr-4.12 selinux? ( sec-policy/selinux-mozilla ) pgo? ( >=sys-devel/gcc-4.5 ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.19:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 media-libs/libcanberra:*[pulseaudio?] kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 ffmpeg? ( virtual/ffmpeg ) gstreamer? ( >=media-libs/gstreamer-1.4.5:1.0 >=media-libs/gst-plugins-base-1.4.5:1.0 >=media-libs/gst-plugins-good-1.4.5:1.0 >=media-plugins/gst-plugins-libav-1.4.5:1.0 ) gstreamer-0? ( >=media-libs/gstreamer-0.10.25:0.10 media-plugins/gst-plugins-meta:0.10[ffmpeg] ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( =dev-libs/libevent-2.0*:0= ) system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=http://www.mozilla.com/firefox
-IUSE=bindist hardened +hwaccel pgo selinux +gmp-autoupdate test custom-cflags custom-optimization dbus debug ffmpeg +gstreamer gstreamer-0 +jemalloc3 neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi +jit pgo l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_be l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.21.1 >=dev-libs/nspr-4.12 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.19:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 media-libs/libcanberra:*[pulseaudio?] kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 ffmpeg? ( virtual/ffmpeg ) gstreamer? ( >=media-libs/gstreamer-1.4.5:1.0 >=media-libs/gst-plugins-base-1.4.5:1.0 >=media-libs/gst-plugins-good-1.4.5:1.0 >=media-plugins/gst-plugins-libav-1.4.5:1.0 ) gstreamer-0? ( >=media-libs/gstreamer-0.10.25:0.10 media-plugins/gst-plugins-meta:0.10[ffmpeg] ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( =dev-libs/libevent-2.0*:0= ) system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=?? ( gstreamer gstreamer-0 ) system-harfbuzz? ( system-icu )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/ach.xpi -> firefox-45.5.1esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/af.xpi -> firefox-45.5.1esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/an.xpi -> firefox-45.5.1esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/ar.xpi -> firefox-45.5.1esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/as.xpi -> firefox-45.5.1esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/ast.xpi -> firefox-45.5.1esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/az.xpi -> firefox-45.5.1esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/be.xpi -> firefox-45.5.1esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/bg.xpi -> firefox-45.5.1esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-45.5.1esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-45.5.1esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/br.xpi -> firefox-45.5.1esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/bs.xpi -> firefox-45.5.1esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/ca.xpi -> firefox-45.5.1esr-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/cs.xpi -> firefox-45.5.1esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/cy.xpi -> firefox-45.5.1esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/da.xpi -> firefox-45.5.1esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/de.xpi -> firefox-45.5.1esr-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/el.xpi -> firefox-45.5.1esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/en-GB.xpi -> firefox-45.5.1esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-45.5.1esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/eo.xpi -> firefox-45.5.1esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/es-AR.xpi -> firefox-45.5.1esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/es-CL.xpi -> firefox-45.5.1esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/es-ES.xpi -> firefox-45.5.1esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/es-MX.xpi -> firefox-45.5.1esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/et.xpi -> firefox-45.5.1esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/eu.xpi -> firefox-45.5.1esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/fa.xpi -> firefox-45.5.1esr-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/fi.xpi -> firefox-45.5.1esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/fr.xpi -> firefox-45.5.1esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-45.5.1esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-45.5.1esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/gd.xpi -> firefox-45.5.1esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/gl.xpi -> firefox-45.5.1esr-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-45.5.1esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/he.xpi -> firefox-45.5.1esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-45.5.1esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/hr.xpi -> firefox-45.5.1esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/hsb.xpi -> firefox-45.5.1esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/hu.xpi -> firefox-45.5.1esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-45.5.1esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/id.xpi -> firefox-45.5.1esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/is.xpi -> firefox-45.5.1esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/it.xpi -> firefox-45.5.1esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/ja.xpi -> firefox-45.5.1esr-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/kk.xpi -> firefox-45.5.1esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/km.xpi -> firefox-45.5.1esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/kn.xpi -> firefox-45.5.1esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/ko.xpi -> firefox-45.5.1esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/lt.xpi -> firefox-45.5.1esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/lv.xpi -> firefox-45.5.1esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/mai.xpi -> firefox-45.5.1esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/mk.xpi -> firefox-45.5.1esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/ml.xpi -> firefox-45.5.1esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/mr.xpi -> firefox-45.5.1esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/ms.xpi -> firefox-45.5.1esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-45.5.1esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/nl.xpi -> firefox-45.5.1esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-45.5.1esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/or.xpi -> firefox-45.5.1esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-45.5.1esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/pl.xpi -> firefox-45.5.1esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-45.5.1esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-45.5.1esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/rm.xpi -> firefox-45.5.1esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/ro.xpi -> firefox-45.5.1esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/ru.xpi -> firefox-45.5.1esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/si.xpi -> firefox-45.5.1esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/sk.xpi -> firefox-45.5.1esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/sl.xpi -> firefox-45.5.1esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/son.xpi -> firefox-45.5.1esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/sq.xpi -> firefox-45.5.1esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/sr.xpi -> firefox-45.5.1esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-45.5.1esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/ta.xpi -> firefox-45.5.1esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/te.xpi -> firefox-45.5.1esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/th.xpi -> firefox-45.5.1esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/tr.xpi -> firefox-45.5.1esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/uk.xpi -> firefox-45.5.1esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/uz.xpi -> firefox-45.5.1esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/vi.xpi -> firefox-45.5.1esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/xh.xpi -> firefox-45.5.1esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-45.5.1esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-45.5.1esr-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-45.0-patches-08.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-45.0-patches-08.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-45.0-patches-08.tar.xz https://archive.mozilla.org/pub/firefox/releases/45.5.1esr/source/firefox-45.5.1esr.source.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	mozconfig-v6.45	0042834b801be9fcd5b6c2a4657d2452	mozcoreconf-v4	3c687d11553a52e70dc3baad2d2a1864	mozextension	3d8ee4835f89ff39d4666656aa603433	mozlinguas-v2	b9f0deaff27b0dc5ca44cdd61be2a3fa	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=15069437e61b9db7f62b73ed5311e91c
diff --git a/metadata/md5-cache/www-client/firefox-45.6.0 b/metadata/md5-cache/www-client/firefox-45.6.0-r1
similarity index 99%
rename from metadata/md5-cache/www-client/firefox-45.6.0
rename to metadata/md5-cache/www-client/firefox-45.6.0-r1
index a6b2469caa0d..6ab74ae54ef6 100644
--- a/metadata/md5-cache/www-client/firefox-45.6.0
+++ b/metadata/md5-cache/www-client/firefox-45.6.0-r1
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ach.xpi -> firefox-45.6.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/af.xpi -> firefox-45.6.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/an.xpi -> firefox-45.6.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ar.xpi -> firefox-45.6.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/as.xpi -> firefox-45.6.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ast.xpi -> firefox-45.6.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/az.xpi -> firefox-45.6.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/be.xpi -> firefox-45.6.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/bg.xpi -> firefox-45.6.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-45.6.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-45.6.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/br.xpi -> firefox-45.6.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/bs.xpi -> firefox-45.6.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ca.xpi -> firefox-45.6.0esr-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/cs.xpi -> firefox-45.6.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/cy.xpi -> firefox-45.6.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/da.xpi -> firefox-45.6.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/de.xpi -> firefox-45.6.0esr-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/el.xpi -> firefox-45.6.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/en-GB.xpi -> firefox-45.6.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-45.6.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/eo.xpi -> firefox-45.6.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/es-AR.xpi -> firefox-45.6.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/es-CL.xpi -> firefox-45.6.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/es-ES.xpi -> firefox-45.6.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/es-MX.xpi -> firefox-45.6.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/et.xpi -> firefox-45.6.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/eu.xpi -> firefox-45.6.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/fa.xpi -> firefox-45.6.0esr-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/fi.xpi -> firefox-45.6.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/fr.xpi -> firefox-45.6.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-45.6.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-45.6.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/gd.xpi -> firefox-45.6.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/gl.xpi -> firefox-45.6.0esr-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-45.6.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/he.xpi -> firefox-45.6.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-45.6.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/hr.xpi -> firefox-45.6.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/hsb.xpi -> firefox-45.6.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/hu.xpi -> firefox-45.6.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-45.6.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/id.xpi -> firefox-45.6.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/is.xpi -> firefox-45.6.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/it.xpi -> firefox-45.6.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ja.xpi -> firefox-45.6.0esr-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/kk.xpi -> firefox-45.6.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/km.xpi -> firefox-45.6.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/kn.xpi -> firefox-45.6.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ko.xpi -> firefox-45.6.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/lt.xpi -> firefox-45.6.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/lv.xpi -> firefox-45.6.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/mai.xpi -> firefox-45.6.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/mk.xpi -> firefox-45.6.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ml.xpi -> firefox-45.6.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/mr.xpi -> firefox-45.6.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ms.xpi -> firefox-45.6.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-45.6.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/nl.xpi -> firefox-45.6.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-45.6.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/or.xpi -> firefox-45.6.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-45.6.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/pl.xpi -> firefox-45.6.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-45.6.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-45.6.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/rm.xpi -> firefox-45.6.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ro.xpi -> firefox-45.6.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ru.xpi -> firefox-45.6.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/si.xpi -> firefox-45.6.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/sk.xpi -> firefox-45.6.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/sl.xpi -> firefox-45.6.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/son.xpi -> firefox-45.6.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/sq.xpi -> firefox-45.6.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/sr.xpi -> firefox-45.6.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-45.6.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ta.xpi -> firefox-45.6.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/te.xpi -> firefox-45.6.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/th.xpi -> firefox-45.6.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/tr.xpi -> firefox-45.6.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/uk.xpi -> firefox-45.6.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/uz.xpi -> firefox-45.6.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/vi.xpi -> firefox-45.6.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/xh.xpi -> firefox-45.6.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-45.6.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-45.6.0esr-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-45.0-patches-08.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-45.0-patches-08.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-45.0-patches-08.tar.xz https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/source/firefox-45.6.0esr.source.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	mozconfig-v6.45	0042834b801be9fcd5b6c2a4657d2452	mozcoreconf-v4	3c687d11553a52e70dc3baad2d2a1864	mozextension	3d8ee4835f89ff39d4666656aa603433	mozlinguas-v2	b9f0deaff27b0dc5ca44cdd61be2a3fa	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a723664f46b0b3ebc52ae7fa0b5a3099
+_md5_=d40843c7d8d601c05ea1c3db51da570e
diff --git a/metadata/md5-cache/www-client/firefox-50.1.0 b/metadata/md5-cache/www-client/firefox-50.1.0-r1
similarity index 99%
rename from metadata/md5-cache/www-client/firefox-50.1.0
rename to metadata/md5-cache/www-client/firefox-50.1.0-r1
index b35ef90ab29f..5cb9d45fc2eb 100644
--- a/metadata/md5-cache/www-client/firefox-50.1.0
+++ b/metadata/md5-cache/www-client/firefox-50.1.0-r1
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/ach.xpi -> firefox-50.1.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/af.xpi -> firefox-50.1.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/an.xpi -> firefox-50.1.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/ar.xpi -> firefox-50.1.0-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/as.xpi -> firefox-50.1.0-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/ast.xpi -> firefox-50.1.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/az.xpi -> firefox-50.1.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/be.xpi -> firefox-50.1.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/bg.xpi -> firefox-50.1.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/bn-BD.xpi -> firefox-50.1.0-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/bn-IN.xpi -> firefox-50.1.0-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/br.xpi -> firefox-50.1.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/bs.xpi -> firefox-50.1.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/ca.xpi -> firefox-50.1.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/cak.xpi -> firefox-50.1.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/cs.xpi -> firefox-50.1.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/cy.xpi -> firefox-50.1.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/da.xpi -> firefox-50.1.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/de.xpi -> firefox-50.1.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/dsb.xpi -> firefox-50.1.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/el.xpi -> firefox-50.1.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/en-GB.xpi -> firefox-50.1.0-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/en-ZA.xpi -> firefox-50.1.0-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/eo.xpi -> firefox-50.1.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/es-AR.xpi -> firefox-50.1.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/es-CL.xpi -> firefox-50.1.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/es-ES.xpi -> firefox-50.1.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/es-MX.xpi -> firefox-50.1.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/et.xpi -> firefox-50.1.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/eu.xpi -> firefox-50.1.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/fa.xpi -> firefox-50.1.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/ff.xpi -> firefox-50.1.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/fi.xpi -> firefox-50.1.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/fr.xpi -> firefox-50.1.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/fy-NL.xpi -> firefox-50.1.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/ga-IE.xpi -> firefox-50.1.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/gd.xpi -> firefox-50.1.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/gl.xpi -> firefox-50.1.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/gn.xpi -> firefox-50.1.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/gu-IN.xpi -> firefox-50.1.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/he.xpi -> firefox-50.1.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/hi-IN.xpi -> firefox-50.1.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/hr.xpi -> firefox-50.1.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/hsb.xpi -> firefox-50.1.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/hu.xpi -> firefox-50.1.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/hy-AM.xpi -> firefox-50.1.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/id.xpi -> firefox-50.1.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/is.xpi -> firefox-50.1.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/it.xpi -> firefox-50.1.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/ja.xpi -> firefox-50.1.0-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/kk.xpi -> firefox-50.1.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/km.xpi -> firefox-50.1.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/kn.xpi -> firefox-50.1.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/ko.xpi -> firefox-50.1.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/lij.xpi -> firefox-50.1.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/lt.xpi -> firefox-50.1.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/lv.xpi -> firefox-50.1.0-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/mai.xpi -> firefox-50.1.0-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/mk.xpi -> firefox-50.1.0-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/ml.xpi -> firefox-50.1.0-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/mr.xpi -> firefox-50.1.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/ms.xpi -> firefox-50.1.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/nb-NO.xpi -> firefox-50.1.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/nl.xpi -> firefox-50.1.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/nn-NO.xpi -> firefox-50.1.0-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/or.xpi -> firefox-50.1.0-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/pa-IN.xpi -> firefox-50.1.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/pl.xpi -> firefox-50.1.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/pt-BR.xpi -> firefox-50.1.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/pt-PT.xpi -> firefox-50.1.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/rm.xpi -> firefox-50.1.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/ro.xpi -> firefox-50.1.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/ru.xpi -> firefox-50.1.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/si.xpi -> firefox-50.1.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/sk.xpi -> firefox-50.1.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/sl.xpi -> firefox-50.1.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/son.xpi -> firefox-50.1.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/sq.xpi -> firefox-50.1.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/sr.xpi -> firefox-50.1.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/sv-SE.xpi -> firefox-50.1.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/ta.xpi -> firefox-50.1.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/te.xpi -> firefox-50.1.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/th.xpi -> firefox-50.1.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/tr.xpi -> firefox-50.1.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/uk.xpi -> firefox-50.1.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/uz.xpi -> firefox-50.1.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/vi.xpi -> firefox-50.1.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/xh.xpi -> firefox-50.1.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/zh-CN.xpi -> firefox-50.1.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xpi/zh-TW.xpi -> firefox-50.1.0-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/50.1.0/source/firefox-50.1.0.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-50.0-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-50.0-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-50.0-patches-02.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	mozconfig-v6.49	4e78f0a70d9c5d908da104ba3dfce356	mozcoreconf-v4	3c687d11553a52e70dc3baad2d2a1864	mozextension	3d8ee4835f89ff39d4666656aa603433	mozlinguas-v2	b9f0deaff27b0dc5ca44cdd61be2a3fa	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=07dcec9ca176b43b70f836037dd03df5
+_md5_=7c2e327c05593bce3aac689c65f423fa
diff --git a/metadata/md5-cache/www-client/firefox-bin-45.5.1 b/metadata/md5-cache/www-client/firefox-bin-45.5.1
deleted file mode 100644
index f51165baf639..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-45.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=5
-HOMEPAGE=http://www.mozilla.com/firefox
-IUSE=selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_be l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 >=media-libs/alsa-lib-1.0.16 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=l10n_ach? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/ach.xpi -> firefox-45.5.1esr-ach.xpi ) l10n_af? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/af.xpi -> firefox-45.5.1esr-af.xpi ) l10n_an? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/an.xpi -> firefox-45.5.1esr-an.xpi ) l10n_ar? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/ar.xpi -> firefox-45.5.1esr-ar.xpi ) l10n_as? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/as.xpi -> firefox-45.5.1esr-as.xpi ) l10n_ast? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/ast.xpi -> firefox-45.5.1esr-ast.xpi ) l10n_az? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/az.xpi -> firefox-45.5.1esr-az.xpi ) l10n_be? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/be.xpi -> firefox-45.5.1esr-be.xpi ) l10n_bg? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/bg.xpi -> firefox-45.5.1esr-bg.xpi ) l10n_bn-BD? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-45.5.1esr-bn-BD.xpi ) l10n_bn-IN? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-45.5.1esr-bn-IN.xpi ) l10n_br? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/br.xpi -> firefox-45.5.1esr-br.xpi ) l10n_bs? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/bs.xpi -> firefox-45.5.1esr-bs.xpi ) l10n_ca? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/ca.xpi -> firefox-45.5.1esr-ca.xpi ) l10n_cs? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/cs.xpi -> firefox-45.5.1esr-cs.xpi ) l10n_cy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/cy.xpi -> firefox-45.5.1esr-cy.xpi ) l10n_da? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/da.xpi -> firefox-45.5.1esr-da.xpi ) l10n_de? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/de.xpi -> firefox-45.5.1esr-de.xpi ) l10n_el? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/el.xpi -> firefox-45.5.1esr-el.xpi ) l10n_en-GB? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/en-GB.xpi -> firefox-45.5.1esr-en-GB.xpi ) l10n_en-ZA? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-45.5.1esr-en-ZA.xpi ) l10n_eo? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/eo.xpi -> firefox-45.5.1esr-eo.xpi ) l10n_es-AR? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/es-AR.xpi -> firefox-45.5.1esr-es-AR.xpi ) l10n_es-CL? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/es-CL.xpi -> firefox-45.5.1esr-es-CL.xpi ) l10n_es-ES? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/es-ES.xpi -> firefox-45.5.1esr-es-ES.xpi ) l10n_es-MX? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/es-MX.xpi -> firefox-45.5.1esr-es-MX.xpi ) l10n_et? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/et.xpi -> firefox-45.5.1esr-et.xpi ) l10n_eu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/eu.xpi -> firefox-45.5.1esr-eu.xpi ) l10n_fa? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/fa.xpi -> firefox-45.5.1esr-fa.xpi ) l10n_fi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/fi.xpi -> firefox-45.5.1esr-fi.xpi ) l10n_fr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/fr.xpi -> firefox-45.5.1esr-fr.xpi ) l10n_fy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-45.5.1esr-fy-NL.xpi ) l10n_ga? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-45.5.1esr-ga-IE.xpi ) l10n_gd? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/gd.xpi -> firefox-45.5.1esr-gd.xpi ) l10n_gl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/gl.xpi -> firefox-45.5.1esr-gl.xpi ) l10n_gu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-45.5.1esr-gu-IN.xpi ) l10n_he? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/he.xpi -> firefox-45.5.1esr-he.xpi ) l10n_hi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-45.5.1esr-hi-IN.xpi ) l10n_hr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/hr.xpi -> firefox-45.5.1esr-hr.xpi ) l10n_hsb? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/hsb.xpi -> firefox-45.5.1esr-hsb.xpi ) l10n_hu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/hu.xpi -> firefox-45.5.1esr-hu.xpi ) l10n_hy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-45.5.1esr-hy-AM.xpi ) l10n_id? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/id.xpi -> firefox-45.5.1esr-id.xpi ) l10n_is? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/is.xpi -> firefox-45.5.1esr-is.xpi ) l10n_it? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/it.xpi -> firefox-45.5.1esr-it.xpi ) l10n_ja? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/ja.xpi -> firefox-45.5.1esr-ja.xpi ) l10n_kk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/kk.xpi -> firefox-45.5.1esr-kk.xpi ) l10n_km? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/km.xpi -> firefox-45.5.1esr-km.xpi ) l10n_kn? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/kn.xpi -> firefox-45.5.1esr-kn.xpi ) l10n_ko? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/ko.xpi -> firefox-45.5.1esr-ko.xpi ) l10n_lt? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/lt.xpi -> firefox-45.5.1esr-lt.xpi ) l10n_lv? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/lv.xpi -> firefox-45.5.1esr-lv.xpi ) l10n_mai? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/mai.xpi -> firefox-45.5.1esr-mai.xpi ) l10n_mk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/mk.xpi -> firefox-45.5.1esr-mk.xpi ) l10n_ml? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/ml.xpi -> firefox-45.5.1esr-ml.xpi ) l10n_mr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/mr.xpi -> firefox-45.5.1esr-mr.xpi ) l10n_ms? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/ms.xpi -> firefox-45.5.1esr-ms.xpi ) l10n_nb? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-45.5.1esr-nb-NO.xpi ) l10n_nl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/nl.xpi -> firefox-45.5.1esr-nl.xpi ) l10n_nn? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-45.5.1esr-nn-NO.xpi ) l10n_or? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/or.xpi -> firefox-45.5.1esr-or.xpi ) l10n_pa? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-45.5.1esr-pa-IN.xpi ) l10n_pl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/pl.xpi -> firefox-45.5.1esr-pl.xpi ) l10n_pt-BR? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-45.5.1esr-pt-BR.xpi ) l10n_pt-PT? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-45.5.1esr-pt-PT.xpi ) l10n_rm? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/rm.xpi -> firefox-45.5.1esr-rm.xpi ) l10n_ro? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/ro.xpi -> firefox-45.5.1esr-ro.xpi ) l10n_ru? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/ru.xpi -> firefox-45.5.1esr-ru.xpi ) l10n_si? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/si.xpi -> firefox-45.5.1esr-si.xpi ) l10n_sk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/sk.xpi -> firefox-45.5.1esr-sk.xpi ) l10n_sl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/sl.xpi -> firefox-45.5.1esr-sl.xpi ) l10n_son? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/son.xpi -> firefox-45.5.1esr-son.xpi ) l10n_sq? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/sq.xpi -> firefox-45.5.1esr-sq.xpi ) l10n_sr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/sr.xpi -> firefox-45.5.1esr-sr.xpi ) l10n_sv? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-45.5.1esr-sv-SE.xpi ) l10n_ta? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/ta.xpi -> firefox-45.5.1esr-ta.xpi ) l10n_te? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/te.xpi -> firefox-45.5.1esr-te.xpi ) l10n_th? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/th.xpi -> firefox-45.5.1esr-th.xpi ) l10n_tr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/tr.xpi -> firefox-45.5.1esr-tr.xpi ) l10n_uk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/uk.xpi -> firefox-45.5.1esr-uk.xpi ) l10n_uz? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/uz.xpi -> firefox-45.5.1esr-uz.xpi ) l10n_vi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/vi.xpi -> firefox-45.5.1esr-vi.xpi ) l10n_xh? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/xh.xpi -> firefox-45.5.1esr-xh.xpi ) l10n_zh-CN? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-45.5.1esr-zh-CN.xpi ) l10n_zh-TW? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-45.5.1esr-zh-TW.xpi ) amd64? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-x86_64/en-US/firefox-45.5.1esr.tar.bz2 -> firefox-bin_x86_64-45.5.1.tar.bz2 ) x86? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/45.5.1esr/linux-i686/en-US/firefox-45.5.1esr.tar.bz2 -> firefox-bin_i686-45.5.1.tar.bz2 )
-_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	mozextension	3d8ee4835f89ff39d4666656aa603433	mozlinguas-v2	b9f0deaff27b0dc5ca44cdd61be2a3fa	multilib	165fc17c38d1b11dac2008280dab6e80	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ea4602387a642b0f8e82f644652eca35
diff --git a/metadata/md5-cache/www-client/seamonkey-2.46 b/metadata/md5-cache/www-client/seamonkey-2.46-r1
similarity index 100%
rename from metadata/md5-cache/www-client/seamonkey-2.46
rename to metadata/md5-cache/www-client/seamonkey-2.46-r1
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-375.26 b/metadata/md5-cache/x11-drivers/nvidia-drivers-375.26
index 8864261eb651..335b626c88e6 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-375.26
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-375.26
@@ -12,4 +12,4 @@ RESTRICT=bindist mirror
 SLOT=0/375
 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/375.26/NVIDIA-FreeBSD-x86_64-375.26.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/375.26/NVIDIA-Linux-x86_64-375.26.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-x86-ARM/375.26/NVIDIA-Linux-armv7l-gnueabihf-375.26.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/375.26/NVIDIA-FreeBSD-x86-375.26.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/375.26/NVIDIA-Linux-x86-375.26.run ) tools? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-375.26.tar.bz2 )
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	linux-mod	0ccff2c1a7d70cf1678059b64bcf9183	multilib	165fc17c38d1b11dac2008280dab6e80	nvidia-driver	fe3e559a49de32cd7df5ae282f98d107	portability	bb1a0ed8ea152b957d17339f01d4d7f5	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338	unpacker	45d07319df5f40ee6af58418b0f930be	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e1cc2af6546852575202e7cf73c37d4c
+_md5_=923ab0eba51eaf99a355ec2c72a025f3
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8fe8859a0fd5..f00a66addd80 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Jan 2017 10:13:14 +0000
+Mon, 09 Jan 2017 08:13:22 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 856aa0ed0363..c114d284143f 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jan  8 10:09:24 UTC 2017
+Mon Jan  9 08:09:33 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b2bc38f8adbd..da79ec7d0cc5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Jan 2017 10:30:01 +0000
+Mon, 09 Jan 2017 08:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1254f60e5f52..c8b15036ac92 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1483870201 Sun 08 Jan 2017 10:10:01 AM UTC
+1483949401 Mon 09 Jan 2017 08:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 2ee62eac5960..f00a66addd80 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Jan 2017 10:13:13 +0000
+Mon, 09 Jan 2017 08:13:22 +0000
diff --git a/net-analyzer/suricata/files/suricata-logrotate b/net-analyzer/suricata/files/suricata-logrotate
index a8edcc61329d..7b22283ec7cf 100644
--- a/net-analyzer/suricata/files/suricata-logrotate
+++ b/net-analyzer/suricata/files/suricata-logrotate
@@ -1,15 +1,10 @@
---- /usr/portage/net-analyzer/suricata/files/suricata-logrotate	2016-12-28 10:34:11.000000000 +0100
-+++ /usr/local/portage/net-analyzer/suricata/files/suricata-logrotate	2016-12-29 08:59:51.390256659 +0100
-@@ -1,6 +1,10 @@
--/var/log/suricata/* {
-+/var/log/suricata/*.log /var/log/suricata/*.json {
-+	rotate 3
- 	missingok
-+	nocompress
-+	create
-+	sharedscripts
- 	postrotate
--		/etc/init.d/suricata reload
-+		/etc/init.d/suricata relog
- 	endscript
- }
+/var/log/suricata/*.log /var/log/suricata/*.json {
+	rotate 3
+	missingok
+	nocompress
+	create
+	sharedscripts
+	postrotate
+		/etc/init.d/suricata relog
+	endscript
+}
diff --git a/net-dns/rbldnsd/files/rbldnsd-0.998-fix-huge-zone-OOM.patch b/net-dns/rbldnsd/files/rbldnsd-0.998-fix-huge-zone-OOM.patch
new file mode 100644
index 000000000000..7a4d2da7187f
--- /dev/null
+++ b/net-dns/rbldnsd/files/rbldnsd-0.998-fix-huge-zone-OOM.patch
@@ -0,0 +1,60 @@
+This upstream patch has been merged but not released. I (mjo) dropped
+a change to the NEWS file to prevent a pointless conflict.
+
+From a1295eefc78b6e8a3c220e164dbfad6dbecc6f6e Mon Sep 17 00:00:00 2001
+From: Antonio Mammita <am@spamteq.com>
+Date: Wed, 21 Dec 2016 16:54:06 +0100
+Subject: [PATCH] Fix for out of memory errors on huge zones. Thanks to Andrew
+ Clayton
+
+---
+ rbldnsd.h      | 6 +++---
+ rbldnsd_util.c | 6 +++---
+ 3 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/rbldnsd.h b/rbldnsd.h
+index 6acd8a0..f195a30 100644
+--- a/rbldnsd.h
++++ b/rbldnsd.h
+@@ -367,9 +367,9 @@ extern struct dataset *g_dsacl;	/* global acl */
+ extern const char *show_version; /* version.bind CH TXT */
+ 
+ void oom(void);
+-char *emalloc(unsigned size);
+-char *ezalloc(unsigned size); /* zero-fill */
+-char *erealloc(void *ptr, unsigned size);
++char *emalloc(size_t size);
++char *ezalloc(size_t size); /* zero-fill */
++char *erealloc(void *ptr, size_t size);
+ char *estrdup(const char *str);
+ char *ememdup(const void *buf, unsigned size);
+ 
+diff --git a/rbldnsd_util.c b/rbldnsd_util.c
+index d17b51b..c6d628d 100644
+--- a/rbldnsd_util.c
++++ b/rbldnsd_util.c
+@@ -460,21 +460,21 @@ dump_a_txt(const char *name, const char *rr,
+ 
+ #endif
+ 
+-char *emalloc(unsigned size) {
++char *emalloc(size_t size) {
+   void *ptr = malloc(size);
+   if (!ptr)
+     oom();
+   return ptr;
+ }
+ 
+-char *ezalloc(unsigned size) {
++char *ezalloc(size_t size) {
+   void *ptr = calloc(1, size);
+   if (!ptr)
+     oom();
+   return ptr;
+ }
+ 
+-char *erealloc(void *ptr, unsigned size) {
++char *erealloc(void *ptr, size_t size) {
+   void *nptr = realloc(ptr, size);
+   if (!nptr)
+     oom();
diff --git a/net-dns/rbldnsd/metadata.xml b/net-dns/rbldnsd/metadata.xml
index 94e81a35d538..6ae7879eb421 100644
--- a/net-dns/rbldnsd/metadata.xml
+++ b/net-dns/rbldnsd/metadata.xml
@@ -23,4 +23,8 @@
     operations, but its memory usage is very efficient, especially for
     repeated TXT values which are stored only once.
   </longdescription>
+
+  <upstream>
+    <remote-id type="github">spamhaus/rbldnsd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-dns/rbldnsd/rbldnsd-0.998-r1.ebuild b/net-dns/rbldnsd/rbldnsd-0.998-r2.ebuild
similarity index 87%
rename from net-dns/rbldnsd/rbldnsd-0.998-r1.ebuild
rename to net-dns/rbldnsd/rbldnsd-0.998-r2.ebuild
index d20b87d363b5..170b373122bd 100644
--- a/net-dns/rbldnsd/rbldnsd-0.998-r1.ebuild
+++ b/net-dns/rbldnsd/rbldnsd-0.998-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit toolchain-funcs user python-single-r1
 
 DESCRIPTION="DNS server designed to serve blacklist zones"
-HOMEPAGE="http://www.corpit.ru/mjt/rbldnsd.html"
-SRC_URI="http://www.corpit.ru/mjt/rbldnsd/${P}.tar.gz"
+HOMEPAGE="https://rbldnsd.io/"
+SRC_URI="https://github.com/spamhaus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/rbldnsd-0.997a-robust-ipv6-test-support.patch"
 	"${FILESDIR}/rbldnsd-0.997a-format-security-compile-fix.patch"
+	"${FILESDIR}/rbldnsd-0.998-fix-huge-zone-OOM.patch"
 )
 
 src_configure() {
diff --git a/net-fs/samba/samba-4.2.14.ebuild b/net-fs/samba/samba-4.2.14.ebuild
index d127590d2810..bb0fb5953d9a 100644
--- a/net-fs/samba/samba-4.2.14.ebuild
+++ b/net-fs/samba/samba-4.2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ SRC_PATH="stable"
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
 	https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.2.12.tar.xz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
diff --git a/net-im/choqok/choqok-1.6.0.ebuild b/net-im/choqok/choqok-1.6.0.ebuild
index aa49343a0fe7..9d7fa23f1fd3 100644
--- a/net-im/choqok/choqok-1.6.0.ebuild
+++ b/net-im/choqok/choqok-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://choqok.gnufolks.org/"
 [[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="attica konqueror telepathy"
 #qtnetwork
 DEPEND="
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 5b95edc34a73..83da796d7e54 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,14 +13,12 @@ HOMEPAGE="http://irssi.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+perl selinux ssl socks5 +proxy libressl"
+IUSE="+perl selinux socks5 +proxy libressl"
 
 CDEPEND="sys-libs/ncurses:0=
 	>=dev-libs/glib-2.6.0
-	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
 	perl? ( dev-lang/perl:= )
 	socks5? ( >=net-proxy/dante-1.1.18 )"
 
@@ -48,14 +46,11 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--with-ncurses="${EPREFIX}"/usr \
 		--with-perl-lib=vendor \
-		--enable-static \
 		--enable-true-color \
 		$(use_with proxy) \
 		$(use_with perl) \
-		$(use_with socks5 socks) \
-		$(use_enable ssl)
+		$(use_with socks5 socks)
 }
 
 src_install() {
diff --git a/net-libs/liboauth/liboauth-1.0.3.ebuild b/net-libs/liboauth/liboauth-1.0.3.ebuild
index 9346e420a408..d94bf5d922e0 100644
--- a/net-libs/liboauth/liboauth-1.0.3.ebuild
+++ b/net-libs/liboauth/liboauth-1.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 MIT )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x64-macos"
 IUSE="curl doc bindist +nss"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.0.1-doxygen-out-of-tree.patch )
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 0fbdd33c5b3a..b9411a880350 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,4 +1,5 @@
 DIST mailutils-2.99.98.tar.xz 2505252 SHA256 62e2c28aed77e451e05ed15e68b5abc3932bcc3d2d6caf9b4a6864258c6a7b1a SHA512 fc20d97b3eed0f0ff7f1d7885e59f8de6ffd5b4646cd06c3636bda4a6bc9f7a0d5acdc7bb3bb573cdc80d63dfdc0be6464033ef2f6d88514bd2190f6611a1083 WHIRLPOOL c0f6f4f9dc2d60074c06a6c8f604fa4d92df4dafd6e205df8c360e97663e96c9b64a02aab9af7eab0659abc39e8aed70bbb0761b7d5a21b5873beabbcd409030
 DIST mailutils-2.99.99.tar.xz 2796000 SHA256 fd7743673e81ceb864e0c5876f9304616ca3759d69c662c27d6e093a9919f31d SHA512 a65f9cde0732f27cdea69385b72806e0f44c774006ad7613039644e7a822f26789c46bb06127ca0fa13dbc3e4ad0382e0a7bee6124e240ff58b394ba8a125bfb WHIRLPOOL 7790095392c7111ed858c547145ceb70687c8dae11c1b7cdc4df319ebe28ea07d941d7936d20d6a4e191418f22914d1ef65da194e2e7573f53688a4ce82d9325
 DIST mailutils-3.0.tar.xz 2729524 SHA256 3226ca41a9e6b39a96cc212a3adfba82aafe2a03dcbbe452f67e1c61a76e7d3d SHA512 833e0142ed7431553db5bdc6cb3846a8d74d35b23825fcbeaa9d81b81b4823c9b825b8e0154615c719341297e0ff7ba219f022016fb745fadbebe4ff6dd0372d WHIRLPOOL 61df116765cdaa9942e89cec1229a23769ea15122912a599f0ad3a25a195a4a5d0da7103c4618cb0de16a90d99a3c0bd9a484c34ab2f3dc1c9a53d877602e784
+DIST mailutils-3.1.1.tar.xz 2759000 SHA256 e5a07994924f63d8f29efe94e63ba6b110ac70b2b7f61ffa6f54ae4c9287bc21 SHA512 68a6f530935118f60503550aff925c799fee4de77377e726548f418e05687b1c8f29210bcb97e1b1033f9414bdbceeaa41e65496b0648a6356c8363554955e8c WHIRLPOOL 37c475e488f1967658e0f204cd9a47d402976f2af31566de6f9b815a4c4e1cace83a9367e8e343eb575a7128653f3e82f114c4966b1b1ac32c7512aa2246baf2
 DIST mailutils-3.1.tar.xz 2755692 SHA256 af7833d88296967465c00392787dfa342eb1ac9cc6d554e354431f3ae64f5fce SHA512 538968bedf729564915924804368dbb0391cf44d5cff253874bfd5fcabdd5a576356efc54cd17f07cff52e56248f0fa99577961cfd7992c4f6f0fb27d8a58a96 WHIRLPOOL 3420297ec2e1494ebbf3f4152c15a039f059356ae511eae52aeb704809cd1775d423676dbca21f4d11652c563540e325f4372a9aa990a59767f623cd90f5c907
diff --git a/net-mail/mailutils/mailutils-3.1.1.ebuild b/net-mail/mailutils/mailutils-3.1.1.ebuild
new file mode 100644
index 000000000000..a39a4cf723f0
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.1.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
+#SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
+	mysql nls pam postgres python servers ssl static-libs +threads tcpd \
+	tokyocabinet"
+
+RDEPEND="!mail-client/nmh
+	!mail-filter/libsieve
+	!mail-client/mailx
+	!mail-client/nail
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	dev-libs/libltdl:0
+	virtual/mta
+	berkdb? ( sys-libs/db:= )
+	bidi? ( dev-libs/fribidi )
+	gdbm? ( sys-libs/gdbm )
+	guile? ( dev-scheme/guile:= )
+	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	nls? ( sys-devel/gettext )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( virtual/gsasl )
+	ssl? ( net-libs/gnutls:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tokyocabinet? ( dev-db/tokyocabinet )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	servers? ( tcpd )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable bytecompilation of Python modules.
+	echo "#!/bin/sh" > build-aux/py-compile
+	eapply "${FILESDIR}/${PN}-2.99.98-readline-6.3.patch" #503954
+	# bug 567976
+	sed -i -e /AM_GNU_GETTEXT_VERSION/s/0.18/0.19/ configure.ac || die
+	# add missing tests so that make check doesn't fail
+	cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
+	if use mysql; then
+		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+			sql/Makefile.am || die
+	fi
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# maildir is the Gentoo default
+	econf MU_DEFAULT_SCHEME=maildir \
+		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+		$(use_with berkdb berkeley-db) \
+		$(use_with bidi fribidi) \
+		$(use_enable ipv6) \
+		$(use_with gdbm) \
+		$(use_with sasl gsasl) \
+		$(use_with guile) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_with postgres) \
+		$(use_enable python) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with tokyocabinet) \
+		$(use_with kyotocabinet) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable servers build-servers) \
+		$(use_enable clients build-clients) \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug \
+		--disable-rpath
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	doins "${FILESDIR}/mailutils.rc"
+	keepdir /etc/mailutils.d/
+	insinto /etc/mailutils.d
+	doins "${FILESDIR}/mail"
+
+	if use python; then
+		python_optimize
+		if use static-libs; then
+			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+		fi
+	fi
+
+	if use servers; then
+		newinitd "${FILESDIR}"/imap4d.initd imap4d
+		newinitd "${FILESDIR}"/pop3d.initd pop3d
+		newinitd "${FILESDIR}"/comsatd.initd comsatd
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+
+	# compatibility link
+	use clients && dosym /usr/bin/mail /bin/mail
+
+	use static-libs || find "${D}" -name "*.la" -delete
+}
diff --git a/net-misc/curl/curl-7.52.1-r1.ebuild b/net-misc/curl/curl-7.52.1-r1.ebuild
index 20c3f023f15f..819d34475b5f 100644
--- a/net-misc/curl/curl-7.52.1-r1.ebuild
+++ b/net-misc/curl/curl-7.52.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ~ppc ppc64 x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~mips ~ppc ppc64 x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
index f19177ade283..13398b87f8c0 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -2,3 +2,4 @@ DIST grive-0.4.0_pre20150905.tar.gz 158858 SHA256 c488e9956a48fa5416e1f6082ede64
 DIST grive-0.4.0_pre20151011.tar.gz 160502 SHA256 0e480a0f5aa1ba008d8e7e3f8cb0198728f6c67bf1e588a66a6d68bb39cff573 SHA512 c5b59a8740ee0886d95f64278c1dd8e0c80df8c53b982f0720fd3a9caa82503ce0ef75987afeafa8735b4e88ef6fea6b5266671516165b288156b1ab543dc3f7 WHIRLPOOL 8c888a218732c9be77d5ae407074f59e0c61d4facb70a8caee97f25e1f46fc5c618aeb09510e23ad18e7604cc17f645df9a9245fac96e1f3dff7279b8f0d2626
 DIST grive-0.5.1_pre20160114.tar.gz 162888 SHA256 20c15d84894a2943c50e6a9c1c95d1d29b5ca7240427dcd32e96113e5246a420 SHA512 8d10a9c1f36149def23326f3edd4350b156c59d6c2caa3d9ea262d9f61e174f0af2264a0c8d57592625c0e7cd5f9e7e171d01ff0c6a879a5605e44bb4c9a62d7 WHIRLPOOL 782fd3160f8970b837b989129993cfdb4e12327df46806c66aa8a5417ef9295373fe7e6acebfe7c30a00c936be67d127d8b886cb7cd3b4bfd79c8b71437bc91c
 DIST grive-0.5.1_pre20160706.tar.gz 163646 SHA256 299257850a482a08f556992c5cc895e1335206a13f94c40eb6afeb203f3e9cd1 SHA512 05496c9d38b13804b5839cf6a5d64a588e670b0e6d2796fe7f7a66267ade34f22bde28cf34210a4f2d36f12671ba38c963b3fc3fa6f8f80ff8b143aace648b52 WHIRLPOOL 44f0d778dd7e8240f6dec2ce437016cef1cd2fc824fd2e0c1d406758facea46e356e0716d438dcd07992c35f722e807db531c639385ff03e38a5653ffd0567ea
+DIST grive-0.5.1_pre20161004.tar.gz 163085 SHA256 d3ca4b728ba38ff735afbd308effaf18a6c1586487e9e15c8b4854144eb916f7 SHA512 1de5c2956d898d0a67e28469d7cf054e83b63f6dca736a60f875fbaac3197bc425432c43db2472e87113df2fa5da49eff9e17cd33610ccda7ba5bf0c2d4966c0 WHIRLPOOL 76148f8fe94cb0f5846e178d3bc9f35d61bded9181cc2835ae78040ee1b37fedeca6e1d7e8db7a55ed6e9390aca4135fda4e7f1aaa40621d618aab908c33e075
diff --git a/net-misc/grive/grive-0.5.1_pre20161004.ebuild b/net-misc/grive/grive-0.5.1_pre20161004.ebuild
new file mode 100644
index 000000000000..3d31fa6dc756
--- /dev/null
+++ b/net-misc/grive/grive-0.5.1_pre20161004.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	COMMIT="7bbb01c3014cc996ec24a7e5c0684f24b604b735"
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
+	sys-libs/binutils-libs:0=
+	sys-libs/glibc
+	dev-libs/yajl
+"
+DEPEND="${RDEPEND}"
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 21913eae40cf..aa1211af48cf 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -1 +1,2 @@
 DIST memcached-1.4.33.tar.gz 389813 SHA256 83726c8d68258c56712373072abb25a449c257398075a39ec0867fd8ba69771d SHA512 00af5a2f46702fb8e606b1035cdaad125445d8eb701927a3ccccd7cd6c12e0811efb3ad917e3118043fd993b5c313f1aa0c4b2a471218e971a21fed7c896e136 WHIRLPOOL 05ee1d4ea931a1f1792283b1d947ffa48752cb6ad1417d06221f967b00e638f5fa21448080efc1de1adf7457bd202b6102ae1495ba1e01368fcba04565c95299
+DIST memcached-1.4.34.tar.gz 391131 SHA256 5064c87f91a37d822dfeab8768490c55fe686a742f07f67c7121101e48d87c79 SHA512 e91aa784674501313cd7464bad22f1898b998c836492a52efe68d097a01249a4fffd3b23b79af86957dd3dc11794f2bff476a4891b9cfa172ff9c29dfb50789f WHIRLPOOL 7e6025c3dd7e10d0bb65bb576aa47e901043a6d62c4240ce427d0b54cc92086fb4cb81b2d18ad0f4dc76b998600897a542ba7dd57904076161fa5cde733e57f3
diff --git a/net-misc/memcached/memcached-1.4.34.ebuild b/net-misc/memcached/memcached-1.4.34.ebuild
new file mode 100644
index 000000000000..b1f4d9796daa
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.34.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic systemd user
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+		 dev-lang/perl
+		 sasl? ( dev-libs/cyrus-sasl )
+		 selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index efed71d426e2..27b53e07ab07 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -3,3 +3,4 @@ DIST openvswitch-2.0.0.tar.gz 2708774 SHA256 5060e2be69cce01c15f67b481482cb1a0ea
 DIST openvswitch-2.1.3.tar.gz 3080126 SHA256 43a2562fe5e8e48e997bfdb04691ffaaaefe73069b5699654538bf2f16ebfb1a SHA512 ede64d37f8bf4a475ab3e4a1e0cd83ae1f29df318f7834b804d9f334710ba43b25b9f562f8c7e91041e24f3121fd03e9e09fc789f398d352a2dceaa0576013dd WHIRLPOOL ddd6c1c733a7a139d58d0492ea8c0efa40065443f763faffd5964e5578acfe9b02ec1dd009c52843759d8a93027eb89412e768ca3e70d9ceeb0d030e791a9b7e
 DIST openvswitch-2.5.0.tar.gz 4603077 SHA256 34da54fbad503205b1a66b48ca4312679e1ce5b04763a9fb86050b2b25d66f21 SHA512 32addb6ed8d4b78e6eb5b951de6b2390dacb3a66096ff8de6020e6d42d460e1038eec43c4057707942f8043ebcad848488d09c7aabfa4599d53782a9cc69f089 WHIRLPOOL 3b879ce376268bb65858f4c4b7193c54fc43a9903029f2000cee1a4f8739eae3ed5b2ad67c57de7ecfe3028874831796bd69a1b8a0599d9dad56f1b524302c5d
 DIST openvswitch-2.6.0.tar.gz 5386102 SHA256 c6f86b47b5847e739ca1c5a80059a804cd49e2b98eefef0fdbce1c4d93c7d0f1 SHA512 7bcf02a00b94924e7931642790f40a49b86338baa63405e9454bff20b82d5a53bbc43279c223946f082d050c73ce6caedcb8a1e52979c873262bc9e8ff84b42d WHIRLPOOL d275071d3491167d3672966381403e704580797eb53fb8d8da2de3c08efd614a709d70af256172670271601d8d90a1350f1c2fae0e9236f729b6c278d5038513
+DIST openvswitch-2.6.1.tar.gz 5399107 SHA256 307b20aba6a179bf13e5da9ac242933c31349073762473a9d4782619c8c1cf0c SHA512 c5a716d2d9ac5f353827a4ad1e26f4d0ddfc4d7bf1e8f696043c32676e77c068e3e0dd423348cc33d5507753d7a27ce24898b823dad3fbc6a8d79297fa088b39 WHIRLPOOL 1ab35852ad45fc99964c814923ea54b22ec6c4630b2aa6cb6aee7b96ca806095d0be60c1b08f926419efa79a3c7ce4d484efe497bb50a9596db69b6020175092
diff --git a/net-misc/openvswitch/openvswitch-2.6.1.ebuild b/net-misc/openvswitch/openvswitch-2.6.1.ebuild
new file mode 100644
index 000000000000..2276a70bc243
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.6.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2017 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 autotools eutils linux-info linux-mod python-r1 systemd
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="http://openvswitch.org"
+SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug modules monitor +ssl"
+
+RDEPEND="
+	|| (
+		>=sys-apps/openrc-0.10.5
+		sys-apps/systemd
+	)
+	ssl? ( dev-libs/openssl:0= )
+	${PYTHON_DEPS}
+	~dev-python/ovs-${PV}
+	dev-python/twisted-core
+	dev-python/twisted-conch
+	dev-python/twisted-web
+	dev-python/PyQt4[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		kernel_is le 4 7 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		linux-mod_pkg_setup
+	else
+		CONFIG_CHECK+=" ~OPENVSWITCH"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Never build kernelmodules, doing this manually
+	sed -i \
+		-e '/^SUBDIRS/d' \
+		datapath/Makefile.in || die "sed failed"
+	eautoreconf
+	default
+}
+
+src_configure() {
+	set_arch_to_kernel
+	#monitor ist statically enabled for bug 596206
+	#use monitor || export ovs_cv_python="no"
+	#pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
+
+	local linux_config
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+	econf ${linux_config} \
+		--with-rundir=/var/run/openvswitch \
+		--with-logdir=/var/log/openvswitch \
+		--with-pkidir=/etc/ssl/openvswitch \
+		--with-dbdir=/var/lib/openvswitch \
+		$(use_enable ssl) \
+		$(use_enable !debug ndebug)
+}
+
+src_compile() {
+	default
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	default
+
+	local SCRIPT
+	for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+		sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" || die
+		python_foreach_impl python_doscript utilities/"${SCRIPT}"
+	done
+
+	python_foreach_impl python_optimize "${ED%/}"/usr/share/ovsdbmonitor
+
+	rm -r "${ED%/}"/usr/share/openvswitch/python || die
+
+	keepdir /var/{lib,log}/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED%/}"/var/run || die
+	# monitor is statically enabled for bug 596206
+	#if ! use monitor ; then
+	#	rm -r "${ED%/}"/usr/share/ovsdbmonitor || die
+	#fi
+
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+	systemd_dounit "${FILESDIR}/ovsdb-server.service"
+	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
+	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+	use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+	use modules && linux-mod_pkg_postinst
+
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.9.0 ${pv} ; then
+			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
+			ewarn "    /etc/openvswitch"
+			ewarn "to"
+			ewarn "    /var/lib/openvswitch"
+			ewarn "Please copy/move the database manually before running the schema upgrade."
+			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
+		fi
+	done
+
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in /var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
+	if [[ -e "${db}" ]] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		ovsdb-tool convert "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		ovsdb-tool create "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+	fi
+}
diff --git a/net-misc/quagga/quagga-1.1.0-r2.ebuild b/net-misc/quagga/quagga-1.1.0-r2.ebuild
index 906005624710..24f0acc2e9c8 100644
--- a/net-misc/quagga/quagga-1.1.0-r2.ebuild
+++ b/net-misc/quagga/quagga-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ppc ~s390 ~sparc x86"
 
 IUSE="bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam protobuf +readline snmp tcp-zebra"
 
diff --git a/net-misc/tor/tor-0.2.8.12.ebuild b/net-misc/tor/tor-0.2.8.12.ebuild
index 549c5314c2b5..39ff36c98c07 100644
--- a/net-misc/tor/tor-0.2.8.12.ebuild
+++ b/net-misc/tor/tor-0.2.8.12.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-macos"
 IUSE="-bufferevents libressl scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test web"
 
 DEPEND="
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 1a66178ab031..713fb4a1c1c4 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,3 +1,2 @@
 DIST kismet-2013-03-R1.tar.gz 899372 SHA256 1c1e9f6b550de1f248363d4c9ce1d24fdc20d041ead5a53cec88eb1b07353082 SHA512 7e992f5ef3db4c5fa298bd4aabfe216668baade948b83996850c010c6c92bfa2fea37d7006a532eb6bace015624f536cc45ed8b3b3ed4a6a1cac7a137ac86d36 WHIRLPOOL 694796f7dd0f4ffd70e64d67eba30bf7b206189dadb8e773a302af9f417a8219b45e547bfcaf59db3f502e0f5ab18af6d642e66dbe8277d8af48daeb35b40843
-DIST kismet-2016-01-R1.tar.xz 703308 SHA256 162f1796996836b2d44126ccbe877a88a7f4a0e50f6729da897fc5a8ec4776b9 SHA512 cfbfb2cefd8df4a4fd09333eb6b0becd56cd7c3a1804d555d28b1d55379186e51804334560531d05e760d31e446c4b89d32ce2bd2c0705473f67f04611c0434e WHIRLPOOL 7ba136a9a138a43768c07668f92b6836d4345bb382935527e0576d5d4aedceb6135bc5b2a38fdfe5b7c488fadc17d759b0960c8cc8a461338adb3417024cb491
 DIST kismet-2016-07-R1.tar.xz 709364 SHA256 bdb21f153311f1ff3b16621bf0d6740f66369bf0982b0a289c9a12af8847e237 SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416 WHIRLPOOL 33bbe6e3353c87907e2a58326ccd84ff973e474a884c29f01c29439de673d2050c50348bf001799da25f0b156c3527d3c5f93cdcdccfd830c9e2eb40cce9aa8b
diff --git a/net-wireless/kismet/files/kismet-2016.07.1-ruby-fixes.patch b/net-wireless/kismet/files/kismet-2016.07.1-ruby-fixes.patch
new file mode 100644
index 000000000000..bdfde9fbc7c2
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2016.07.1-ruby-fixes.patch
@@ -0,0 +1,78 @@
+diff --git a/ruby/kismet.rb b/ruby/kismet.rb
+index 5b18b23..7eab708 100755
+--- a/ruby/kismet.rb
++++ b/ruby/kismet.rb
+@@ -61,8 +61,6 @@ class Kismet
+ 		rescue Exception => e
+ 			pp e
+ 
+-			break if @die
+-
+ 			puts "write error: #{$!}"
+ 		end
+ 	end
+diff --git a/ruby/kismet_addsource.rb b/ruby/kismet_addsource.rb
+index 057a514..d3ae968 100755
+--- a/ruby/kismet_addsource.rb
++++ b/ruby/kismet_addsource.rb
+@@ -20,7 +20,7 @@
+ 
+ require 'socket'
+ require 'time'
+-require 'kismet'
++require_relative 'kismet'
+ require 'pp'
+ require 'optparse'
+ 
+diff --git a/ruby/kismet_alert_syslog.rb b/ruby/kismet_alert_syslog.rb
+index 6969247..27373a9 100755
+--- a/ruby/kismet_alert_syslog.rb
++++ b/ruby/kismet_alert_syslog.rb
+@@ -20,7 +20,7 @@
+ 
+ require 'socket'
+ require 'time'
+-require 'kismet'
++require_relative 'kismet'
+ require 'pp'
+ require "getopt/long"
+ require 'syslog'
+diff --git a/ruby/kismet_list.rb b/ruby/kismet_list.rb
+index ec8f0f9..7adffe6 100755
+--- a/ruby/kismet_list.rb
++++ b/ruby/kismet_list.rb
+@@ -20,7 +20,7 @@
+ 
+ require 'socket'
+ require 'time'
+-require 'kismet'
++require_relative 'kismet'
+ 
+ def bssidcb(proto, fields)
+ 	puts "Kismet saw network #{fields['bssid']} manuf #{fields['manuf']} on channel #{fields['channel']}"
+diff --git a/ruby/kismet_shootout.rb b/ruby/kismet_shootout.rb
+index 25021b9..61f70b0 100755
+--- a/ruby/kismet_shootout.rb
++++ b/ruby/kismet_shootout.rb
+@@ -21,7 +21,7 @@
+ 
+ require 'socket'
+ require 'time'
+-require 'kismet'
++require_relative 'kismet'
+ require 'pp'
+ require 'optparse'
+ 
+diff --git a/ruby/kismet_sql.rb b/ruby/kismet_sql.rb
+index 9fe581d..b878979 100755
+--- a/ruby/kismet_sql.rb
++++ b/ruby/kismet_sql.rb
+@@ -22,7 +22,7 @@
+ 
+ require 'socket'
+ require 'time'
+-require 'kismet'
++require_relative 'kismet'
+ require 'pp'
+ require "getopt/long"
+ require "sqlite3"
diff --git a/net-wireless/kismet/kismet-2016.01.1.ebuild b/net-wireless/kismet/kismet-2016.01.1.ebuild
deleted file mode 100644
index 01dd3f3307c9..000000000000
--- a/net-wireless/kismet/kismet-2016.01.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils multilib user
-
-MY_P=${P/\./-}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git"
-	SRC_URI=""
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="http://www.kismetwireless.net/"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog +ruby selinux +suid"
-
-CDEPEND="net-wireless/wireless-tools
-	kernel_linux? ( sys-libs/libcap
-			dev-libs/libnl:3
-			net-libs/libpcap
-			)
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	client? ( sys-libs/ncurses:0= )
-	!arm? ( speech? ( app-accessibility/flite ) )
-	plugin-btscan? ( net-wireless/bluez )
-	plugin-dot15d4? ( virtual/libusb:0 )
-	plugin-spectools? ( net-wireless/spectools )
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	ruby? ( dev-lang/ruby:* )
-	selinux? ( sec-policy/selinux-kismet )
-"
-
-src_prepare() {
-	epatch -p1 "${FILESDIR}"/${P}-tinfo.patch
-
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet.conf.in
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
-
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable client) \
-		$(use_enable pcre)
-}
-
-src_compile() {
-	emake
-
-	if use plugin-autowep; then
-		cd "${S}"/restricted-plugin-autowep
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-btscan; then
-		cd "${S}"/plugin-btscan
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-dot15d4; then
-		cd "${S}"/plugin-dot15d4
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/restricted-plugin-ptw
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-syslog; then
-		cd "${S}"/plugin-syslog
-		KIS_SRC_DIR="${S}" emake
-	fi
-}
-
-src_install() {
-	if use plugin-autowep; then
-		cd "${S}"/restricted-plugin-autowep
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-btscan; then
-		cd "${S}"/plugin-btscan
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-dot15d4; then
-		cd "${S}"/plugin-dot15d4
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/restricted-plugin-ptw
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-syslog; then
-		cd "${S}"/plugin-syslog
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use ruby; then
-		cd "${S}"/ruby
-		dobin *.rb
-	fi
-
-	cd "${S}"
-	emake DESTDIR="${D}" commoninstall
-
-	##dragorn would prefer I set fire to my head than do this, but it works
-	##all external kismet plugins (read: kismet-ubertooth) must be rebuilt when kismet is
-	##is there an automatic way to force this?
-	# install headers for external plugins
-	insinto /usr/include/kismet
-	doins *.h
-	doins Makefile.inc
-	#todo write a plugin finder that tells you what needs to be rebuilt when kismet is updated, etc
-
-	dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
-	newinitd "${FILESDIR}"/${PN}.initd kismet
-	newconfd "${FILESDIR}"/${PN}.confd kismet
-
-	insinto /etc
-	doins conf/kismet{,_drone}.conf
-
-	if use suid; then
-	dobin kismet_capture
-	fi
-}
-
-pkg_preinst() {
-	if use suid; then
-		enewgroup kismet
-		fowners root:kismet /usr/bin/kismet_capture
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_capture
-		elog "Kismet has been installed with a setuid-root helper binary"
-		elog "to enable minimal-root operation.  Users need to be part of"
-		elog "the 'kismet' group to perform captures from physical devices."
-	fi
-	if ! use suid; then
-		ewarn "It is highly discouraged to run a sniffer as root,"
-		ewarn "Please consider enabling the suid use flag and adding"
-		ewarn "your user to the kismet group."
-	fi
-}
diff --git a/net-wireless/kismet/kismet-2016.07.1.ebuild b/net-wireless/kismet/kismet-2016.07.1-r1.ebuild
similarity index 97%
rename from net-wireless/kismet/kismet-2016.07.1.ebuild
rename to net-wireless/kismet/kismet-2016.07.1-r1.ebuild
index 18490cf7071b..3298e7af5d38 100644
--- a/net-wireless/kismet/kismet-2016.07.1.ebuild
+++ b/net-wireless/kismet/kismet-2016.07.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc x86"
 fi
 
 DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
@@ -58,6 +58,7 @@ src_prepare() {
 	sed -i -e 's| -s||g' \
 		-e 's|@mangrp@|root|g' Makefile.in
 
+	epatch "${FILESDIR}/${P}-ruby-fixes.patch"
 	epatch_user
 	eautoreconf
 }
diff --git a/profiles/package.mask b/profiles/package.mask
index 05dbaff69d2d..23bb7472405c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Mike Gilbert <floppym@gentoo.org> (08 Jan 2017)
+# Masked pending testing and eclass/profile support.
+dev-lang/python:3.6
+
+# Chris Reffett <creffett@gentoo.org> (08 Jan 2017)
+# Superseded by projectlibre-bin, please migrate to that.
+# Masked for removal in 30 days.
+app-office/openproj-bin
+
 # Michael Orlitzky <mjo@gentoo.org> (07 Jan 2017)
 # Places unauthenticated HTTP data into root's SSH authorized_keys
 # file. Nope. Masked for removal in 30 days. Bug 603346.
@@ -123,10 +132,6 @@ games-rpg/valyriatear
 # EAPI.
 net-libs/qtweetlib
 
-# Lars Wendler <polynomial-c@gentoo.org> (24 Dec 2016)
-# Fails with Google TLS certificates and possibly others (bug #603622).
-=dev-libs/nss-3.28
-
 # Göktürk Yüksek <gokturk@gentoo.org> (22 Dec 2016)
 # Dead upstream, no more hosted on googlecode
 # No reverse dependencies. Masked for removal in 30 days.
diff --git a/profiles/use.desc b/profiles/use.desc
index c540b4fb68e8..0c2510a6f0db 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -284,7 +284,6 @@ qt5 - Add support for the Qt 5 application and UI framework
 quicktime - Add support for OpenQuickTime
 radius - Add support for RADIUS authentication
 raw - Add support for raw image formats
-rdesktop - Add support for the remote desktop protocol, usually used to connect to Windows servers
 rdp - Enables RDP/Remote Desktop support
 readline - Enable support for libreadline, a GNU line-editing library that almost everyone wants
 recode - Enable support for the GNU recode library
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b97d54a65938..3ce39ece26b9 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3310,7 +3310,6 @@ kde-apps/kopete:yahoo - Enable yahoo protocol support.
 kde-apps/kopete:zeroconf - Enable Link-Local Messaging via the bonjour protocol.
 kde-apps/kpimtextedit:designer - Build plugins for dev-qt/designer
 kde-apps/kpimtextedit:speech - Enable text-to-speech support
-kde-apps/krdc:rdp - Enable runtime dependency for net-misc/rdesktop
 kde-apps/krfb:ktp - Enable displaying of KDE Telepathy contacts
 kde-apps/krfb:telepathy - Enable desktop sharing through a telepathy client
 kde-apps/kstars:fits - Enable support for NASA's sci-libs/cfitsio library
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index cb89ae5b98ee..b7bd640914e3 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,6 +1,4 @@
 DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab SHA512 475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c WHIRLPOOL ef1fc2832bd20398afdee9eb4c1e81baa3c8c792acc76c0b609a74ae0d61301b00f105221fa27b74b26c68fd8b5d849ea7612e960a8684b885cb8f31d0c71a1c
-DIST qgis-2.12.1.tar.bz2 69088412 SHA256 96b9bb6ef62ec042b938e4b3112cc8e2e96caad36d6615b484ad757a65e80429 SHA512 647ad827f6b139a301a5fd1387333842d0187390db1906a37713b41a24bd97e37624ba2b1b500b473132d17e0d856efd0a033b2159930d005c9f74845547958e WHIRLPOOL 05895935df656937b3a1848a07eee8ee96692a8a34d30515d143b2f08cd652640b5116a81025e822497cc26d0e6f6347a6344657272a4c6c6de5d128792b98ad
-DIST qgis-2.12.2.tar.bz2 69110973 SHA256 5fd0e944497d663d836d30670874a80c2e0ae8214d014d08f11e0d2dac2b4931 SHA512 75681f99af713439157df573bea009fc6972e4d869ecd44857101051fda35baae09504426fc726ba0c8d833eb2bf69a4de3f9d6b75e25fb4fde620a8bfce8fd1 WHIRLPOOL 4d9cffb7a861c92a4640b2a156dbb02865c5218c057e48ab8e2ff2ccbb334bb8a42b48c00b517ace279ca9638047037043ceb44cda56e22eec9b045a82ab346f
 DIST qgis-2.14.5.tar.bz2 74336261 SHA256 acc1bc1b1c838503e072b3c80de075185f6059d75bb8a686da7a6ab9264b514d SHA512 d493c83a96eeea2e52199c9a8812989ea89c3357e2f984fdc92f0a05b240770f7ed2d77b1bdbb0e57975c37916acbd6cc4115db5fe11f63897957e8baf6a5586 WHIRLPOOL 3cecafad597ae793acd97648987bb130f17bfc8392cde5fd55f093f54786312a2389cdc754c67b47eb0b9512dc981f95cd85cc5dbaaf178c674a477273e83927
 DIST qgis-2.18.2.tar.bz2 83593908 SHA256 e218ecc2c0b983a95bba0dc46788661e803cf870f5740cbcfaa1ea39a71f02a0 SHA512 b78bc4f109015f943fa019f0c03208496626d8eae1887eddf975f5fdf81f455db47428b8051a3d02ae46e0482bd7c955871b7d5ead5a70205f6525f085dcbf7f WHIRLPOOL 97629355706241f84152142793881cbd973a269b3fdf5aa9786b4c0d49af7d26c089461638472a977d1a649f6881599467579706837f1ab69e7be3e5cae96cfb
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
diff --git a/sci-geosciences/qgis/qgis-2.12.1-r1.ebuild b/sci-geosciences/qgis/qgis-2.12.1-r1.ebuild
deleted file mode 100644
index a243e54b5cb1..000000000000
--- a/sci-geosciences/qgis/qgis-2.12.1-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils multilib gnome2-utils cmake-utils python-single-r1
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="
-	http://qgis.org/downloads/qgis-${PV}.tar.bz2
-	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples grass gsl mapserver postgres python test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-		mapserver? ( python )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/expat
-	sci-geosciences/gpsbabel
-	>=sci-libs/gdal-1.6.1[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	gsl? ( sci-libs/gsl )
-	sci-libs/libspatialindex
-	sci-libs/proj
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	dev-qt/qtsql:4
-	dev-qt/qtwebkit:4
-	dev-qt/designer:4
-	x11-libs/qscintilla:=[qt4(-)]
-	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
-		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
-	)
-	grass? ( || ( >=sci-geosciences/grass-7.0.0 ) )
-	mapserver? ( dev-libs/fcgi )
-	postgres? ( dev-db/postgresql:* )
-	python? (
-		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
-		dev-python/sip[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		${PYTHON_DEPS}
-	)
-	dev-db/sqlite:3
-	dev-db/spatialite
-	app-crypt/qca:2[qt4,ssl]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DQGIS_MANUAL_SUBDIR=/share/man/"
-		"-DBUILD_SHARED_LIBS=ON"
-		"-DQGIS_LIB_SUBDIR=$(get_libdir)"
-		"-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
-		"-DWITH_INTERNAL_QWTPOLAR=OFF"
-		"-DPEDANTIC=OFF"
-		"-DWITH_APIDOC=OFF"
-		"-DWITH_SPATIALITE=ON"
-		"-DWITH_INTERNAL_SPATIALITE=OFF"
-		$(cmake-utils_use_with postgres POSTGRESQL)
-		$(cmake-utils_use_with grass GRASS)
-		$(cmake-utils_use_with mapserver SERVER)
-		$(cmake-utils_use_with python BINDINGS)
-		$(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
-		$(cmake-utils_use_with python PYSPATIALITE)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_enable test TESTS)
-		$(usex grass "-DGRASS_PREFIX=/usr/" "")
-	)
-
-	if has_version '>=x11-libs/qwtpolar-1' &&  has_version 'x11-libs/qwt:5' ; then
-		elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
-		if has_version '>=x11-libs/qwt-6.1.2' ; then
-			mycmakeargs+=(
-				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
-				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so"
-			)
-		else
-			mycmakeargs+=(
-				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
-				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so"
-			)
-		fi
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc BUGS ChangeLog CODING
-
-	newicon -s 128 images/icons/qgis-icon.png qgis.png
-	make_desktop_entry qgis "QGIS " qgis
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${WORKDIR}"/qgis_sample_data/*
-	fi
-
-	python_optimize "${D}"/usr/share/qgis/python/plugins \
-		"${D}"/$(python_get_sitedir)/qgis
-
-	if use grass; then
-		python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
-		python_optimize "${D}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	else
-		if use python ; then
-			elog "Support of PostgreSQL is disabled."
-			elog "But some installed python-plugins needs import psycopg2 module."
-			elog "If you do not need this modules just disable them in main menu."
-			elog "Or you need to set USE=postgres"
-		fi
-	fi
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sci-geosciences/qgis/qgis-2.12.2-r1.ebuild b/sci-geosciences/qgis/qgis-2.12.2-r1.ebuild
deleted file mode 100644
index 3616eadb191b..000000000000
--- a/sci-geosciences/qgis/qgis-2.12.2-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils multilib gnome2-utils cmake-utils python-single-r1
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="
-	http://qgis.org/downloads/qgis-${PV}.tar.bz2
-	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples grass gsl mapserver postgres python test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-		mapserver? ( python )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/expat
-	sci-geosciences/gpsbabel
-	>=sci-libs/gdal-1.6.1[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	gsl? ( sci-libs/gsl )
-	sci-libs/libspatialindex
-	sci-libs/proj
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	dev-qt/qtsql:4
-	dev-qt/qtwebkit:4
-	dev-qt/designer:4
-	x11-libs/qscintilla:=[qt4(-)]
-	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
-		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
-	)
-	grass? ( || ( >=sci-geosciences/grass-7.0.0 ) )
-	mapserver? ( dev-libs/fcgi )
-	postgres? ( dev-db/postgresql:* )
-	python? (
-		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
-		dev-python/sip[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		${PYTHON_DEPS}
-	)
-	dev-db/sqlite:3
-	dev-db/spatialite
-	app-crypt/qca:2[qt4,ssl]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.12.0-no-pyqtconfig.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DQGIS_MANUAL_SUBDIR=/share/man/"
-		"-DBUILD_SHARED_LIBS=ON"
-		"-DQGIS_LIB_SUBDIR=$(get_libdir)"
-		"-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
-		"-DWITH_INTERNAL_DATEUTIL=OFF"
-		"-DWITH_INTERNAL_HTTPLIB2=OFF"
-		"-DWITH_INTERNAL_JINJA2=OFF"
-		"-DWITH_INTERNAL_MARKUPSAFE=OFF"
-		"-DWITH_INTERNAL_PYGMENTS=OFF"
-		"-DWITH_INTERNAL_PYTZ=OFF"
-		"-DWITH_INTERNAL_QWTPOLAR=OFF"
-		"-DWITH_INTERNAL_SIX=OFF"
-		"-DPEDANTIC=OFF"
-		"-DWITH_APIDOC=OFF"
-		"-DWITH_SPATIALITE=ON"
-		"-DWITH_INTERNAL_SPATIALITE=OFF"
-		$(cmake-utils_use_with postgres POSTGRESQL)
-		$(cmake-utils_use_with grass GRASS)
-		$(cmake-utils_use_with mapserver SERVER)
-		$(cmake-utils_use_with python BINDINGS)
-		$(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
-		$(cmake-utils_use_with python PYSPATIALITE)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_enable test TESTS)
-		$(usex grass "-DGRASS_PREFIX=/usr/" "")
-	)
-
-	if has_version '>=x11-libs/qwtpolar-1' &&  has_version 'x11-libs/qwt:5' ; then
-		elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
-		if has_version '>=x11-libs/qwt-6.1.2' ; then
-			mycmakeargs+=(
-				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
-				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so"
-			)
-		else
-			mycmakeargs+=(
-				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
-				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so"
-			)
-		fi
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc BUGS ChangeLog CODING
-
-	newicon -s 128 images/icons/qgis-icon.png qgis.png
-	make_desktop_entry qgis "QGIS " qgis
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${WORKDIR}"/qgis_sample_data/*
-	fi
-
-	python_optimize "${D}"/usr/share/qgis/python \
-		"${D}"/$(python_get_sitedir)/qgis \
-		"${D}"/$(python_get_sitedir)/pyspatialite
-
-	if use grass; then
-		python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
-		python_optimize "${D}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	else
-		if use python ; then
-			elog "Support of PostgreSQL is disabled."
-			elog "But some installed python-plugins needs import psycopg2 module."
-			elog "If you do not need this modules just disable them in main menu."
-			elog "Or you need to set USE=postgres"
-		fi
-	fi
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
index 71fe48fe3959..c3e2532c4e0c 100644
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org"
 SRC_URI="http://www.fftw.org/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 LICENSE="GPL-2+"
 SLOT="2.1"
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20160725.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20160725.ebuild
index 83be2176aeb8..11f7b5584d33 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20160725.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20160725.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/4.4.0"
 
-KEYWORDS="alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="sensord static-libs"
 
 COMMON_DEPS="
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.20.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.20.ebuild
index 26ec1ca6528a..63f904e215b8 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.20.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.20.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-cluster/swift/swift-2.10.1.ebuild b/sys-cluster/swift/swift-2.10.1.ebuild
index 52716bf282f9..1450feb2f8af 100644
--- a/sys-cluster/swift/swift-2.10.1.ebuild
+++ b/sys-cluster/swift/swift-2.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="proxy account container object +memcached"
 REQUIRED_USE="|| ( proxy account container object )"
 
diff --git a/sys-devel/libtool/libtool-2.4.6-r2.ebuild b/sys-devel/libtool/libtool-2.4.6-r2.ebuild
index fea991d0d81c..2e709fc4649a 100644
--- a/sys-devel/libtool/libtool-2.4.6-r2.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 318a5f4e228f..19da7ac29bc4 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,4 +1,4 @@
-DIST xfsprogs-3.2.4.tar.gz 1482424 SHA256 dde65ead82d3cbfa9b4ded9796b6d22095d7d759a22d41ae6f1a4ec458bb0465 SHA512 fb1ea5beb933b86970cac198fa4e296457f0f5b30bd72fda54452644730277929dee28f11f35a154910e4a19857455ecffdd21b3df456023e0da95e2fd0aa0eb WHIRLPOOL dec87905b5a5af053e71e88f1670470c00b94a758dbb77773adbc601db61b4efaaba306f344a4334b11680973d5153fcc7f8b5d59c4698f21d654570e8355fe9
 DIST xfsprogs-4.5.0.tar.gz 1524382 SHA256 e49beb314984efbd0d758abb5c6137db3bb60a88e59e1e94c00defb536cf89f8 SHA512 19c95551dc91ec46916f9a7e3d7976907664d32dd5fdc26af0ca62ca74c4b3c10f9e843aac8214ea9d1c0bf140c9f4e321d059808af01a623abedd5067011314 WHIRLPOOL 54d742635df024a63181da76c3220671610068363af85be2677521f20342595a5cebb2fd169945572351901ee2c9384f79f54a381ab3620dde22d863aa66d469
 DIST xfsprogs-4.7.0.tar.gz 1534909 SHA256 88580bb3e6847c3edef436703a4fae403fc19b20739db4c31166ee4b256178d7 SHA512 5184f1dbc3989f3c1f1b103d5cbd70462db107cfe113424166581ebcfaad4041c9c78f5d038f4bd4728ff99a2f9705219582ba9bfd10745354a1cab0b7dfe613 WHIRLPOOL 8157b2e8df5946acacc22ed761e38b382ef464f4984971148069b2f215418f4e23ac142721394439c041c236cbd460e0b56ff071d1c10e343070147709f42af3
 DIST xfsprogs-4.8.0.tar.xz 1088376 SHA256 82ce9cb3a55f4e208e8fe3471ff0aff0602b8300f3e50bdf05cc7e11549686f9 SHA512 9c83763ae4925980969e66827edef41774e4dc09ae42637630167b5e0329675517ea7b50de751fcb9485fbcf8e470d24dd20b51475bcb56723dae6ee9fb140c7 WHIRLPOOL dc9f9b5c0b4e9b61f023fb972137126f22909c77908990e1beb391689fe6512a7810d9bd1ccfc0cfe4cd5379d99c123ddc9d0b6194e0a81e946e2304f964f180
+DIST xfsprogs-4.9.0.tar.xz 1087940 SHA256 f1e60a9a54583dba82fa506dd9b59bdec110a968f80f507bf5f93b263af7a4df SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7 WHIRLPOOL a9b582a42967ce1e314cd0ac3518792c2e10f7bb1370151a68a09a8e21e40cc6818b9778dfdd248961c3a1a08a70424f0150219488a18bc5d60e5669702c472f
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch
deleted file mode 100644
index 118874a5e998..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-use libtool to do all installing.  do not use the manual file install as
-that'll copy files directly from the .libs/ subdir which might have rpaths
-that we do not want.
-
---- xfsprogs-3.2.2/include/buildmacros
-+++ xfsprogs-3.2.2/include/buildmacros
-@@ -70,18 +70,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
--	cd $(TOPDIR)/$(LIBNAME)/.libs; \
--	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
--	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
--	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
--	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
--	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
--	if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
--	     "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))"; ]; then \
--		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
--		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
--		../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
--	fi
-+	set -e; cd $(TOPDIR)/$(LIBNAME); \
-+	$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+	env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
---- xfsprogs-3.2.2/libdisk/Makefile
-+++ xfsprogs-3.2.2/libdisk/Makefile
-@@ -31,6 +31,7 @@
- install: default
- 
- install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- install-qa: install-dev
- 
---- xfsprogs-3.2.2/libhandle/Makefile
-+++ xfsprogs-3.2.2/libhandle/Makefile
-@@ -20,7 +20,6 @@
- include $(BUILDRULES)
- 
- install: default
--	$(INSTALL_LTLIB)
- 
- install-dev: default
- 	$(INSTALL_LTLIB_DEV)
---- xfsprogs-3.2.2/libxcmd/Makefile
-+++ xfsprogs-3.2.2/libxcmd/Makefile
-@@ -34,6 +34,11 @@
- 
- include $(BUILDRULES)
- 
--install install-dev install-qa: default
-+install: default
-+
-+ install-dev: default
-+	$(INSTALL_LTLIB_DEV)
-+
-+install-qa: default
- 
- -include .ltdep
---- xfsprogs-3.2.2/libxfs/Makefile
-+++ xfsprogs-3.2.2/libxfs/Makefile
-@@ -86,6 +86,7 @@
- install: default
- 
- install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- install-qa: default
- 
---- xfsprogs-3.2.2/libxlog/Makefile
-+++ xfsprogs-3.2.2/libxlog/Makefile
-@@ -12,6 +12,8 @@
- 
- CFILES = xfs_log_recover.c util.c
- 
-+LTLIBS = $(LIBUUID) $(LIBXFS)
-+
- # don't want to link xfs_repair with a debug libxlog.
- DEBUG = -DNDEBUG
- 
-@@ -19,6 +21,11 @@
- 
- include $(BUILDRULES)
- 
--install install-dev install-qa: default
-+install: default
-+
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
-+
-+install-qa: default
- 
- -include .ltdep
---- xfsprogs-3.2.2/Makefile
-+++ xfsprogs-3.2.2/Makefile
-@@ -63,6 +63,8 @@
- mkfs: libxfs
- quota: libxcmd
- repair: libxfs libxlog
-+libxlog: libxfs
-+libxlog-install-dev: libxfs-install-dev
- 
- ifneq ($(ENABLE_BLKID), yes)
- mkfs: libdisk
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch
new file mode 100644
index 000000000000..f4232b3445e4
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch
@@ -0,0 +1,143 @@
+--- xfsprogs-4.9.0/configure
++++ xfsprogs-4.9.0/configure
+@@ -861,6 +861,7 @@
+ enable_blkid
+ enable_gettext
+ enable_shared
++BUILD_CFLAGS
+ BUILD_CC
+ CPP
+ OTOOL64
+@@ -960,7 +961,9 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP'
++CPP
++BUILD_CC
++BUILD_CFLAGS'
+ 
+ 
+ # Initialize some variables set by options.
+@@ -1616,6 +1619,9 @@
+   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+               you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
++  BUILD_CC    C compiler for build tools
++  BUILD_CFLAGS
++              C compiler flags for build tools
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -11116,11 +11122,12 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-if test $cross_compiling = no; then
+-  BUILD_CC="$CC"
+ 
+-else
+-  for ac_prog in gcc cc
++if test "${BUILD_CC+set}" != "set"; then
++  if test $cross_compiling = no; then
++    BUILD_CC="$CC"
++  else
++    for ac_prog in gcc cc
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -11162,6 +11169,15 @@
+   test -n "$BUILD_CC" && break
+ done
+ 
++  fi
++fi
++
++if test "${BUILD_CFLAGS+set}" != "set"; then
++  if test $cross_compiling = no; then
++    BUILD_CFLAGS="$CFLAGS"
++  else
++    BUILD_CFLAGS="-g -O2"
++  fi
+ fi
+ 
+ # Check whether --enable-shared was given.
+--- xfsprogs-4.9.0/configure.ac
++++ xfsprogs-4.9.0/configure.ac
+@@ -9,11 +9,21 @@
+ AC_PROG_LIBTOOL
+ 
+ AC_PROG_CC
+-if test $cross_compiling = no; then
+-  BUILD_CC="$CC"
+-  AC_SUBST(BUILD_CC)
+-else
+-  AC_CHECK_PROGS(BUILD_CC, gcc cc)
++AC_ARG_VAR(BUILD_CC, [C compiler for build tools])
++if test "${BUILD_CC+set}" != "set"; then
++  if test $cross_compiling = no; then
++    BUILD_CC="$CC"
++  else
++    AC_CHECK_PROGS(BUILD_CC, gcc cc)
++  fi
++fi
++AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools])
++if test "${BUILD_CFLAGS+set}" != "set"; then
++  if test $cross_compiling = no; then
++    BUILD_CFLAGS="$CFLAGS"
++  else
++    BUILD_CFLAGS="-g -O2"
++  fi
+ fi
+ 
+ AC_ARG_ENABLE(shared,
+--- xfsprogs-4.9.0/include/builddefs.in
++++ xfsprogs-4.9.0/include/builddefs.in
+@@ -26,6 +26,7 @@
+ LOADERFLAGS = @LDFLAGS@
+ LTLDFLAGS = @LDFLAGS@
+ CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64
++BUILD_CFLAGS = @BUILD_CFLAGS@
+ 
+ LIBRT = @librt@
+ LIBUUID = @libuuid@
+@@ -154,7 +155,7 @@
+ endif
+ 
+ 
+-GCFLAGS = $(OPTIMIZER) $(DEBUG) \
++GCFLAGS = $(DEBUG) \
+ 	  -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\"  \
+ 	  -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(TOPDIR)/libxfs
+ 
+@@ -162,8 +163,9 @@
+ GCFLAGS += -DENABLE_GETTEXT
+ endif
+ 
++BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS)
+ # First, Global, Platform, Local CFLAGS
+-CFLAGS += $(FCFLAGS) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
++CFLAGS += $(FCFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
+ 
+ include $(TOPDIR)/include/buildmacros
+ 
+--- xfsprogs-4.9.0/libxfs/Makefile
++++ xfsprogs-4.9.0/libxfs/Makefile
+@@ -124,7 +124,7 @@
+ 
+ crc32table.h: gen_crc32table.c
+ 	@echo "    [CC]     gen_crc32table"
+-	$(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $<
++	$(Q) $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table $<
+ 	@echo "    [GENERATE] $@"
+ 	$(Q) ./gen_crc32table > crc32table.h
+ 
+@@ -135,7 +135,7 @@
+ # disk.
+ crc32selftest: gen_crc32table.c crc32table.h crc32.c
+ 	@echo "    [TEST]    CRC32"
+-	$(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
++	$(Q) $(BUILD_CC) $(BUILD_CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
+ 	$(Q) ./$@
+ 
+ # set up include/xfs header directory
diff --git a/sys-fs/xfsprogs/xfsprogs-3.2.4.ebuild b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
similarity index 59%
rename from sys-fs/xfsprogs/xfsprogs-3.2.4.ebuild
rename to sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
index f94f0102f61e..7227b27e4cde 100644
--- a/sys-fs/xfsprogs/xfsprogs-3.2.4.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
@@ -1,34 +1,39 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=5
 
 inherit eutils toolchain-funcs multilib
 
 DESCRIPTION="xfs filesystem utilities"
 HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
-	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
+SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="libedit nls readline static static-libs"
 REQUIRED_USE="static? ( static-libs )"
 
 LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
-	readline? ( sys-libs/readline[static-libs(+)] )
+	readline? ( sys-libs/readline:0=[static-libs(+)] )
 	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	!<sys-fs/xfsdump-3"
 DEPEND="${RDEPEND}
 	static? (
 		${LIB_DEPEND}
-		readline? ( sys-libs/ncurses[static-libs] )
+		readline? ( sys-libs/ncurses:0=[static-libs] )
 	)
 	nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.0-sharedlibs.patch
+	"${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
+	"${FILESDIR}"/${PN}-4.9.0-cross-compile.patch
+)
+
 pkg_setup() {
 	if use readline && use libedit ; then
 		ewarn "You have USE='readline libedit' but these are exclusive."
@@ -37,28 +42,22 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.2-sharedlibs.patch
+	epatch "${PATCHES[@]}"
 
+	# LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
+	# Clear out -static from all flags since we want to link against dynamic xfs libs.
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		-e "1iLLDFLAGS += $(usex static '-all-static' '')" \
 		include/builddefs.in || die
-	sed -i \
-		-e '1iLLDFLAGS = -static' \
-		{estimate,fsr}/Makefile || die
-	sed -i \
-		-e "/LLDFLAGS/s:-static-libtool-libs:$(use static && echo -all-static):" \
-		$(find -name Makefile) || die
-
-	# libdisk has broken blkid conditional checking
-	sed -i \
-		-e '/LIB_SUBDIRS/s:libdisk::' \
-		Makefile || die
+	find -name Makefile -exec \
+		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
 
-	# TODO: write a patch for configure.in to use pkg-config for the uuid-part
+	# TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
 	if use static && use readline ; then
 		sed -i \
-			-e 's|-lreadline|\0 -lncurses|' \
-			-e 's|-lblkid|\0 -luuid|' \
+			-e 's|-lreadline|& -lncurses|' \
+			-e 's|-lblkid|& -luuid|' \
 			configure || die
 	fi
 }
@@ -76,8 +75,6 @@ src_configure() {
 	fi
 
 	econf \
-		--bindir=/usr/bin \
-		--libexecdir=/usr/$(get_libdir) \
 		$(use_enable nls gettext) \
 		$(use_enable readline) \
 		$(usex readline --disable-editline $(use_enable libedit editline)) \
@@ -88,11 +85,11 @@ src_configure() {
 
 src_install() {
 	emake DIST_ROOT="${ED}" install
-	# parallel install fails on these targets for >=xfsprogs-3.2.0
-	emake -j1 DIST_ROOT="${ED}" install-{dev,qa}
+	# parallel install fails on this target for >=xfsprogs-3.2.0
+	emake -j1 DIST_ROOT="${ED}" install-dev
 
 	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript -a xfs xlog
+	gen_usr_ldscript -a handle xcmd xfs xlog
 	# removing unnecessary .la files if not needed
 	use static-libs || find "${ED}" -name '*.la' -delete
 }
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 1ca8adfa4665..11fb0a005b02 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,3 +1,4 @@
 DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a
 DIST patch-4.10-rc1.xz 7387972 SHA256 6b269bd7bf6a13733269f89b1205db7f76434dc9aa96cc5a1537decc5d2f5053 SHA512 1ea3cb9e808c8ad0ca28bf430c5ed1e6b8039f195b1ebe42429bddad0b0afcf1a1a619cb20eb0da614f2180cc94e9658a94d45432f8a4d402a955c7f0b0c5289 WHIRLPOOL 8cc1ddc34fc1644831e1d55d40099c2651f3bc38e2ebb64ec3476e2e5963c57513912e2455a2ef763390a9aa17e64557b4a92472218f49bb7583a465441c18cd
 DIST patch-4.10-rc2.xz 7392684 SHA256 358f373a71caabb9597bfe1b3f3fb9a8e71d303d5eca2a6d6534167141290a99 SHA512 45ec25c586aa89e4e8dd53cf01a88e25331e379a2532a7059eb182a634279c92e23d057c71df10ceb374fcc51c3a4eed6769261a7e2b9c5cd0112a81161ff597 WHIRLPOOL 41f2f4453b1a16390b2819500dc1ec36f3a7c6993a753dc420cea21b1466e3ce536a08ad580aaafe986827e407bc2503337e6e967549f1044cf4a93693a8837e
+DIST patch-4.10-rc3.xz 7431972 SHA256 cc5f910e05edbc4b4cd16beca39274d49c96954d09447101bd477725158b49eb SHA512 3573b198b6ee488d6c573dd09c534548a08bcf8a017a94f74d127a58a018c9e97056006fccd555aa49513cc3f98ad5c1cb6545a7e261d3ccaea21456b53f2dd5 WHIRLPOOL 80a1316f9a7399f079e99ac8ed7f6e0cc0a014942b2ad108714c5b07291266343e1b8e960267dd9888305f0220cf41d03dca3d7fede622ce381820678d85b367
diff --git a/sys-kernel/git-sources/git-sources-4.10_rc3.ebuild b/sys-kernel/git-sources/git-sources-4.10_rc3.ebuild
new file mode 100644
index 000000000000..05f9017871b5
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.10_rc3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="4.9"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-libs/glibc/glibc-2.23-r3.ebuild b/sys-libs/glibc/glibc-2.23-r3.ebuild
index fad02142f975..ff6806491846 100644
--- a/sys-libs/glibc/glibc-2.23-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.23-r3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
diff --git a/sys-libs/musl/musl-1.1.15.ebuild b/sys-libs/musl/musl-1.1.15.ebuild
deleted file mode 100644
index 52c5992ed28f..000000000000
--- a/sys-libs/musl/musl-1.1.15.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.musl-libc.org/musl"
-	inherit git-r3
-	SRC_URI="
-	http://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	http://dev.gentoo.org/~blueness/musl-misc/getent.c
-	http://dev.gentoo.org/~blueness/musl-misc/iconv.c"
-	KEYWORDS=""
-else
-	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
-	http://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	http://dev.gentoo.org/~blueness/musl-misc/getent.c
-	http://dev.gentoo.org/~blueness/musl-misc/iconv.c"
-	KEYWORDS="-* amd64 arm ~mips ppc x86"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crosscompile_opts_headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-musl_endian() {
-	# XXX: this wont work for bi-endian, but we dont have any
-	touch "${T}"/endian.s || die
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "";;
-		*" LSB "*) echo "el";;
-		*)         echo "nfc";; # We shouldn't be here
-	esac
-}
-
-pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
-		case ${CHOST} in
-		*-musl*) ;;
-		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
-		esac
-	fi
-}
-
-src_configure() {
-	tc-getCC ${CTARGET}
-	just_headers && export CC=true
-
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	./configure \
-		--target=${CTARGET} \
-		--prefix=${sysroot}/usr \
-		--syslibdir=${sysroot}/lib \
-		--disable-gcc-wrapper
-}
-
-src_compile() {
-	emake obj/include/bits/alltypes.h
-	just_headers && return 0
-
-	emake
-	$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf
-	$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent
-	$(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv
-}
-
-src_install() {
-	local target="install"
-	just_headers && target="install-headers"
-	emake DESTDIR="${D}" ${target}
-	just_headers && return 0
-
-	# musl provides ldd via a sym link to its ld.so
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
-	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
-
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		# TODO: We may be able to simplify this code by obtianing the arch name with
-		# /usr/lib/libc.so 2>&1 | sed -n 's/^.*(\(.*\))$/\1/;1p'
-		local target=$(tc-arch) arch
-		local endian=$(musl_endian)
-		case ${target} in
-			amd64) arch="x86_64";;
-			arm)   arch="armhf";; # We only have hardfloat right now
-			mips)  arch="mips${endian}";;
-			ppc)   arch="powerpc";;
-			x86)   arch="i386";;
-		esac
-		cp "${FILESDIR}"/ldconfig.in "${T}" || die
-		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
-		into /
-		dosbin "${T}"/ldconfig
-		into /usr
-		dobin "${T}"/getconf
-		dobin "${T}"/getent
-		dobin "${T}"/iconv
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl || die
-	fi
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	[ "${ROOT}" != "/" ] && return 0
-
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/virtual/python-cffi/python-cffi-0.ebuild b/virtual/python-cffi/python-cffi-0.ebuild
index 2f77ffc9699d..adef4d95b25a 100644
--- a/virtual/python-cffi/python-cffi-0.ebuild
+++ b/virtual/python-cffi/python-cffi-0.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/www-apps/icingaweb2/icingaweb2-2.4.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.4.0.ebuild
index 0da8152fa387..20dd498d7f20 100644
--- a/www-apps/icingaweb2/icingaweb2-2.4.0.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 ldap mysql nginx postgres"
 REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=net-analyzer/icinga2-2.1.1
 		dev-php/pecl-imagick
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild
index d6795167584f..799ce70a9f33 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -73,6 +73,7 @@ src_install() {
 	insinto "/usr/share/${PN}"
 	doins -r "${S}"/*
 	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
 }
 
 pkg_postinst() {
diff --git a/www-client/chromium/chromium-57.0.2970.0.ebuild b/www-client/chromium/chromium-57.0.2970.0.ebuild
index 5c95a45be5d9..01935c63638c 100644
--- a/www-client/chromium/chromium-57.0.2970.0.ebuild
+++ b/www-client/chromium/chromium-57.0.2970.0.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	cups? ( >=net-print/cups-1.3.11:= )
 	>=dev-libs/elfutils-0.149
 	dev-libs/expat:=
-	dev-libs/glib:=
+	dev-libs/glib:2
 	dev-libs/icu:=
 	>=dev-libs/jsoncpp-0.5.0-r1:=
 	dev-libs/libxml2:=[icu]
@@ -59,7 +59,7 @@ COMMON_DEPEND="
 	>=sys-libs/libcap-2.22:=
 	virtual/udev
 	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
+	x11-libs/gdk-pixbuf:2
 	x11-libs/libdrm
 	x11-libs/libX11:=
 	x11-libs/libXcomposite:=
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index be519f31c3d3..587a69594131 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -1,88 +1,3 @@
-DIST firefox-45.5.1esr-ach.xpi 426529 SHA256 172a8c5cb771d6427bc4c9141711821286e8fe0a2a5ef5b322dedccf8a4b60ba SHA512 e0fd45b738b78179d49506d5a9ad3142756efb08e43dcb9b835e2d4fa5239c1bca40c952ad20ff46e6129715cd2630ac7f20e0e9acfad838347d00c321336172 WHIRLPOOL 23ba2ac256d48dde06177964c825176d269fe284d76369c8a4692c4dbd6f158a0fc3c9d233c2eec8165b448da8b6a99687ccf99e8c8369c257a8c585748047a4
-DIST firefox-45.5.1esr-af.xpi 439353 SHA256 04a1cc52ff79d7ab5371a83efb2217dd4a2b27807dbdc055b0a7080ce6c5d0d0 SHA512 2a6996370763210936c1b57661c14c4f5cbd7ddecf6c65876e883bf86cb16fafaf194349b4eafbfe323f45498703d1cb284f27637965af3ecc61f77be7e56a74 WHIRLPOOL ddcff87b4429b90fde0bee64c3659ae4eb1b38ac7d4b6dc69bea7d948ae7baead41c893ee5eef4c5c829d2a7d98d4667a3adbfab422ca4f2a76ba6789e75aa2e
-DIST firefox-45.5.1esr-an.xpi 449036 SHA256 6900690ee5f194f3392ea9fc7d9d6b5b9fbcb420ee10ff21b53062e5dd16da6d SHA512 7e64ac152ca007d7d660206c10ce5c76333bfac049ce8136319d2c5e60e8da1a2833c1f2a5dba142d9c0ed6a884adeb38d4b28e27fc2702b08b8af9e1c5afcd0 WHIRLPOOL a9248715a06c4d1b4b1dcd0eed279c6d2d4c1c010f37680d53507a8f579fc49df46b70b98c864df331aee3348ca21540787dd95626de7638ee1794b50abc3791
-DIST firefox-45.5.1esr-ar.xpi 474961 SHA256 320c41dbdc50cd778bb524767306323b29c33bac64c3a28bcc021a72e7b175b4 SHA512 76a0f855b4043345c6fa394c9975ee3c226f86478a435afb8f376635d782a4a086244a5ca6026cd50dd2f5d34319a07fb9d045d91c02a06603ebdee755c9323b WHIRLPOOL 7867e7d6334788997a7ca22f5b8956d117528c204f949d4913304bfa7c188672205d4702733076eb53651a9c56fea457637787843722a4efc88bbf5b2fa9ea28
-DIST firefox-45.5.1esr-as.xpi 483095 SHA256 2bea2356abef2c556197f1d07b427722bbbc15b697505ec622b98d1fec0af4f8 SHA512 fd3f4553211ef62ccc01e167c367f05aba5b0e4e16becaccc2e846a17e2bc36f0f257a4b980bba77abce35de7e7ef02fb41800e2fbbb3a7aa31c6da3e7253c4a WHIRLPOOL db34a742b7287eece002bd987e81ebf193081c5fca01271484d633623d05e9e714c29c603cad633e16204a717db6ecfc0f2cca4136bee47ca6a62d4b0b50ad07
-DIST firefox-45.5.1esr-ast.xpi 419249 SHA256 05fa6961b2be007719c72eef010d0c8b612c41ca34ecba3c6e878f4bfdaa92d9 SHA512 87c6bb52df991240ffc3391db3e4393e23782411b66d7581acfd2bf2cb4345473ccd0a7ccaca34c51a1bdfc3e6a99378f9dfbe5673e8b8bbb5018b879442dd41 WHIRLPOOL d0349fe66f22724752d2ff4df231df63d2d91a87dc663398c1385384512140026eab2bde9442cd0a4deb0f87688175a79b566585d7d21343c2232399e00d2137
-DIST firefox-45.5.1esr-az.xpi 464018 SHA256 96da29f386a990c177f09fdcb6f7a2de19c3fe8cb137668104b8484a277962ef SHA512 cd39817a7af2cebba3ad87788ccb534c75b18db337df8e68f4930dcaffa1b75564227e07ce9e9288b411f55b4b819e68084c74a7c8eacd83b9e915b88eb07fcf WHIRLPOOL 8c105f2151617eb4dac6ca467c2ddb3f9eebe54e66627da9a3a3fce85e49e91310b1c7f3946dba3fa49dfaeabadd6723df79d8938680b6101443c45d180ec942
-DIST firefox-45.5.1esr-be.xpi 442619 SHA256 abf50e17d78c016d4bd28951c9b0a44785bd727f2b336aa6a1c380f2b115389f SHA512 407a71295d9d99f240f3c6130b920a71aa8423c63b359d04f5b538d6271e0e90eccf2e560488394625e715dc7722c5f82711a4d5232c310c014a818c3c128789 WHIRLPOOL 7ded20b8878aa561c3548f393b81c0c042f940be74f508eedda7ee6cb1c746de9e2f69b1641cb0256108730319e20836ed0ec3f2a2ddfc0277716672467a20bb
-DIST firefox-45.5.1esr-bg.xpi 460810 SHA256 027ec38f12e038834bd9c4d5938257e2856364768bed7452d9d0a99bff95ca97 SHA512 769ac6f1fd5771101de1bb65567cd8b62c36386e7f6e0a740525531f83df2d89b2f6e71b83dc4c4207e38a2ee6b5b0fcaac0531a2671bab6bf7d105edab5e554 WHIRLPOOL baa3022450f08fc522be3d0997d9aa9bd55745c84a25123f4164c16a5a4fd84ace63a9dea327a019347f8df450b7cfd6dabae957e13299b38fd6b046b552212a
-DIST firefox-45.5.1esr-bn-BD.xpi 515642 SHA256 1ba09838893f1923db07f937f659217c630d6bd8ee6940e356b6ac9f5962608b SHA512 2a67ee8a04c865c9b3a447cbbca16b5c5c0d23d95f39a0e17fc90bcd4a2ffb7d22fc3e06d34793d800f56fdab279bab0f17ff762007a863994810544001bcad4 WHIRLPOOL 79340ed459f0456d20a72ebc5d69dd806cddbf35cf21c2b85d97cbac069f02c30647197367a82e077c69f0afe15a807946709e4a28c7c1de661ecbcab56b7738
-DIST firefox-45.5.1esr-bn-IN.xpi 494075 SHA256 41983f3463e23851d9783eb49aff5a5a887a987382122942d43edb8c6ca5b688 SHA512 899507b41b20a12e12ca62951ac266a45ddc8912e9a967cc5f7e8e03b03d759606d31c4a23307fcc9c0e0ee572950fb3c1aeea4eeebc2dcf2c6e054d37a9a56f WHIRLPOOL fc5a4b354ff39745d4729c4f586f8012c437791eef8f25d5b994f612892a15eb805876c2eaf421a537c3ac525ec4ffcfb07048460253e9745653a3880ae3e84a
-DIST firefox-45.5.1esr-br.xpi 436390 SHA256 697f91adab0ad879ab41b9073533284b73bb42a75d103adf80dc2bf3df16a9d4 SHA512 ffc633b714dd269923a563db31f03a5c971d572012c044071026da90496e90c6d5e6f9d976cc4131cee5ff0c0d533c040bda17c70629d3a437ce22fdb9fd86f9 WHIRLPOOL be1b90b846b5af19e3416a2c4901c5d7b5244d49112c7057d5e6e8b0a6756c6066170c1cfbec666fe1b4b8c816be2af87a7e95241539362f0193310394057497
-DIST firefox-45.5.1esr-bs.xpi 442997 SHA256 94d9dbb9863b76764c3f84686b003ef95d20c85fe893ab4a581f3cbdd87f4e91 SHA512 9334b9e63663082ac27b4845d104f4145cfbbe9a5231d515a7bf541f3936381048f6e4bc490f4b01f5e32d570e00e61749a45ed1fe1eb1d29b3f7a9f0fd5dfdd WHIRLPOOL f15ef0406e59a24047bdb3fc33196ba0b258d466bd41284a69fce2aaa04ee35b12f65bad18e368b83b53ada7b33567783cadcdb4bdcf8b584262dee6822c58b2
-DIST firefox-45.5.1esr-ca.xpi 436832 SHA256 3703c88885ab75b8a187ad98eaf31dcf4fbb8cb8d3c97d5efb6b3900a0ec5955 SHA512 72fbd0b8db3b331100161d767588a3718f20611dc6b83e6cd57912ae34bc44acef37904f2c5a13027d926a5cc13cf2b26e3e5219c6f89fca7463bd74e2bffa70 WHIRLPOOL c187800743b14b64d3700540bb66eca002a97743d461b5b61110ce364d7665dbb5dc65ae1ee5853a1f15477c58fea52dd132bcf2b37a2e4c5366142a5b0d7c59
-DIST firefox-45.5.1esr-cs.xpi 443482 SHA256 0786a95dea8d77e42078484f65f2e6f1810b9c35585044a687bbe135604c83b9 SHA512 55e44751ae407b67fdb0722ee6e391bef9248bfb56515db546daf043801ca5108eb6fdff4a2c840d9ef72c9391133f8578647958bd399c87570871682aec2a85 WHIRLPOOL d90515788362fc689f009e1753953ee1b0721feff91371fab1fed85069c0abd3a0f8add7b3c35065771b1ac8930d47f6f9e24af9f4353e57968aef2ad1dfc668
-DIST firefox-45.5.1esr-cy.xpi 438907 SHA256 c373c4ab74165e94bb09730741bbfd3b88c54635535500798d403fd00b186dea SHA512 357f8f99101fdce56f1e81611d05a55354b5c83e2b37f962ef54b61f9b157be599cb9ef816ed9c34df7cf30cbcc1e27ffb3deddd8cc2418951726618a793516c WHIRLPOOL a428c2d2b440dc8dfed71ebe7b6f2ce77b485f375d34a7f54f3a02bc072ed34a0bdafc2c574cc58920624b899b5a1263f568bc8e89d4f975778054cd4642ef41
-DIST firefox-45.5.1esr-da.xpi 430078 SHA256 357a5a05bdda778076023c3b95cebe60ae253053c01795a74488672f4d531b91 SHA512 a17f47d1b0712b6f93d6a06bfd98e1c53fa51c2779ad6a31034414656312aef56c8975a5d23d63a86bfc224dfa86309d4469c85d2f5f306f85a2c6bb2c368142 WHIRLPOOL a9d69af5f5648fe2b809c13b6513e3b6f268a8ca9cef7e5c5a2cc593a7fab94469fbf5f483c9b542cce66bb6db84669fccba967c1eba29561317293f5464bae0
-DIST firefox-45.5.1esr-de.xpi 445482 SHA256 cb10bd76505ad2f217bf29b7779dfdbdfb959cb42ad552c4e2bde78380e8d9f6 SHA512 45ef50ec92961a7bcc67dcd7c15aafbc02ddbbb1aeb0f0d3297dfeb6cee9ea96812e4cb1f90e0d7022cc42654da230709a0b198cb7dda17760b9fc637243532d WHIRLPOOL 888eb6939d41050dc9de93da398a55fe94dba2d03818bc5be5c7727c9fb1fecbb0d6cc4d8be98337a461abd1aa61af9ac392d4d1ef4d297d00a501cd8e18cc9f
-DIST firefox-45.5.1esr-el.xpi 470867 SHA256 26dd726a8f2f5a9d8260a1bb157fffb0fe97962788a92e8f211435d325afe84f SHA512 11bc7af71963411cbb48ccb8a4bbb2189934928dc515fbc5dd2d2f8ed16ffc8dcf89f0599c6a70979a90a6813a08df8fa10a3fe9d224c4d231b45b183a9a2b92 WHIRLPOOL cad088ece1941fde1f1d0fc8991c80bc9878aaf1b6dd86e3a8986f7618f84d326ff63117d00f6dfdc8ef52c7ab185f85ed1c0b50e8a1a1648201dea1ac6e11b4
-DIST firefox-45.5.1esr-en-GB.xpi 423870 SHA256 54ebe8d284782bc256b26fa9256de99a2b338430845a2e2634a8a21d445bc403 SHA512 afba55443a43f7b8921446b5fddeb4e4025e4081b26996d23cc8e9e2fa8bdb55f8583d96e08e69d2f21db934716dcf4ea02714c514ea36430a00e5fffb0b1857 WHIRLPOOL 6a6ebcb7b2c17e878f757fa3361b04f88f1f9d97baa3617e78577be948ea4ad014b7879af45ec416252358d69816682e3fee2188d75641509f870386a354e474
-DIST firefox-45.5.1esr-en-ZA.xpi 420776 SHA256 327be0ebd57bd9e5de8e20fc6e89ef6a0c9f56a227f50e9f74254f817169a48e SHA512 4653623982d17fa122057a9cca1ee783c51ab297d20dd4b0fe9c06e5739221c999f81f95f29349c197667080208ab771c42e69ee75801f9a7e329e92097c394a WHIRLPOOL 1d2a5b699b46b175ea34af8ba3efdad3de1e14a91b6e3594a64526ff7c6788e7d3aa3f1a31b96d5f61e182d38fcc5ebe5ab39e3928adb6068f3bfdb87c7c99ed
-DIST firefox-45.5.1esr-eo.xpi 440960 SHA256 fefd83295e99065d7a8117d7a0e300baf694f019b90ee221a723a44e82a8d9b0 SHA512 4e9c173001462aa1f2a27b6c7b1c378b3e58560c9d600435f788af0e010f671ef180f359ffeb0097f5a0264e9176d415f3cc8b462c525c38ee3ef9a61cfd73d4 WHIRLPOOL 0a12027be96b9e83c9cb75ab1632734fabb0538ba670cf4cbd2dee6a410c7bc62355f7c3573f39417f32523682530cdf77727e4bf870a84290bfb44f42980e91
-DIST firefox-45.5.1esr-es-AR.xpi 441481 SHA256 cd3636a291b5b97e7a424d051e86dd8d524758991400749135b6ad22ccaf6d33 SHA512 8c0f718517dbb8bf41ed7a114867c361b14ee1d7979e145bc288f6a31a4eaf74cf5e19272b4c0b2fc7d2267999eacbca9f48629850050f92f7c3aecdbca5b742 WHIRLPOOL 0f0aa05abbfaba89ea70e27c56dbddbe824e8ebab176e584692fdcdeebbffb1f5636410f76329c8263967019754f81f6ccf54d320424a450d597c36db6cca01b
-DIST firefox-45.5.1esr-es-CL.xpi 368763 SHA256 ef9c2ace7a74f1f9fa8ffd2f7af6dcdf6f1798b799be871bba6242b8ce078d74 SHA512 41ce76a47cae0e70601771e9a3d898502d83a8eef3a8921f6c1eb616c2a0d0e2eb5cbcbfd3895780e286bee59590a428657df5653d6c2c05e4bd0a2cfa528d66 WHIRLPOOL 9ff3028d2e2e20aea32e4ce90e998a25da1cb9ba8f464251d47a792c696b3f48ec1959ed5d11efb724531345d509626431b37e462ce13eb4f400c0ea2d3fbdd8
-DIST firefox-45.5.1esr-es-ES.xpi 353716 SHA256 b23501e76d1e9422340ba817e223939d9f3655d69d63d80d527bb988f1d76b31 SHA512 e056877cb64250c955a8ffcc9299d17f32b338e847ed1463d0bf7374feae0ee4f460416800a5206c8dd118cfb6e0f672d0629c3d6c1cad52b5e1c0ff96a0d85e WHIRLPOOL f58c54489b21e02d4f3e3583278c8d80f1a3062f3b0518bca7607adf0d1caf1db70393a09eb2a07e973b0cb9dd837e66a6d6f558720628db4662e866afd24739
-DIST firefox-45.5.1esr-es-MX.xpi 449394 SHA256 16c444c562ab9336558ed70c3da71826c06f4f4660dd394cd5150034382e3232 SHA512 fb288b23a43a6296b6463e5648df67494a9a4145b59e8920ac74bb1601a5a88d6a21c745b8e11f0e30615d4d08529e4fbe89410686bf04764a9bfe8571295620 WHIRLPOOL c313fdb0e9af7d80219863d5eaf920568281339a5e4327071bcf33e3e9fecaf31764521454df90f497289745db101ec1bb2e9c8735a0d87350c89888c3bc20e0
-DIST firefox-45.5.1esr-et.xpi 433352 SHA256 62070863641bb8163b0570a22a41293c1382f7755157bc418a445a580d818f07 SHA512 221d0c3e8749454b3c96d9f2d2986bf60a2c5c97e454f8d69ad056ce813c36850653c1353fd72d106b1d3a1f2cb0c09c7a6ee86c9f188913232102fbd26caaad WHIRLPOOL 83b75c3af15fdebc02c277626ab0b3b0a5ea856da805c2439220dd96d582ab8d28281b7d4ba6af5a19f84e3b33bc0868ddda89ae242dd983721def9af42f40e1
-DIST firefox-45.5.1esr-eu.xpi 441357 SHA256 e2c78a08058def239a95be921b154538e9c65b0bf17b894323df3ebddfbdaa54 SHA512 fd0e1e624a57563c6ad1d6ce42807b1bfa2a04f65f6cb40d2d78cd93644e92b33526c5c594299f54449168cd1b93f3eb16e836b87a8d9603cc498cc54b0bf4f8 WHIRLPOOL 51c466e42e3e526aff6049d2dedf8a4035a7609bca03d67e71684fc6a4654e42d73e05d998ec9dc6472408d22a502a7d7dd816d09d8a20fbe350171315a8c7c6
-DIST firefox-45.5.1esr-fa.xpi 491941 SHA256 5d592a7043007991787d5bd348280d91458595cc2c7aeabd7d84f785b8d499f5 SHA512 a3c37cf43ae0a6c26c86f672cc4009b815b92872ad7e9ee65a1a7b2f676deae032ef818e5c7057609ddb45bdadd52254a36d705fd77f65a305ffe46854a3b03e WHIRLPOOL 4ec18882c45abf7de3d7a506aea5b7dfefe46725f3f83bb260eba96b18c269c22b57f5ca9d3e1b5552b36ad0d1407b222cad48e7ab24b0116ee3aa077b6630bd
-DIST firefox-45.5.1esr-fi.xpi 438347 SHA256 95830ab1777a7abbdb5e830b6444f3ae4189e353ee3f1c91c88b75bd1eb09b50 SHA512 12334025c7ebd14de04037d4472093add354b1fb503909634fecd944847e073a13e688adca4a74fc3777f8a80c4f2b06395d6cc34b1941b2ffbae189d3b4d718 WHIRLPOOL 7a9ffb08b66730e546d40ebae89425b5c2d6ffda7e13c2456ff3c0e13237c4b06483bb2e349bb3d2bec0e725dee014ead8fdc6c2f897bcb4f0505e2ebb52cd65
-DIST firefox-45.5.1esr-fr.xpi 450037 SHA256 1ddf11a5b3ea9d07270eaf70fb766b75e123c5d45bb6c0bb4d1c94047deea9cb SHA512 afbde309210d7a05d10a9ab747ea5883695fbc0d0e8d729c862bfd4015f9ce577f1b839a8629337ea60b1e6d33f7255c181c02078e25317e910042dd6b4287e1 WHIRLPOOL e0211fec54eccd3ed95b99f9856365ae2e710402d6def244a2b6dd546173d88949bb2b1cb6c18833d8c52af4f10e7b223957b81bbea8d85ed94a8ef7789580a8
-DIST firefox-45.5.1esr-fy-NL.xpi 447779 SHA256 37cdf7d49c7b0bd74f13cc5343146bb2f113cd3df22e99ec352aaa89dbcf2938 SHA512 e5baeff58f2e8fdab38197886cf5eaaf6cb23d6f8cceb274237003bbc609084fab1c8129a3e098b1e978b861ccce0a84e08da660f3021221a87d1bce00740f3f WHIRLPOOL fffd00331f8ed8ae4770d325c562cd7c06f815dcc488550b12f719a8765be8ee0cf51a2da288e3565577e1187914c0dc263bf213bc98518940cf849b49d29493
-DIST firefox-45.5.1esr-ga-IE.xpi 460056 SHA256 3fa23e7bdb71b43ba8ca5ec9eb8fccbba1a0daaee4598350bdf6a08fb12867ce SHA512 111b28f0e8aac2211444526a50ae564ed5d01a6c6f88b873045ea22063237d56ec229ded1bd71e625b73624d54c00c71370f692063a94f3ebde459aa4fb0bdab WHIRLPOOL 24fc63c87fa86a8c6e1d3f26646b7737d0d39d4cbf397e98f86f34bb4fd89be8f6a94756ab33494debc1d9c4b30fd684e17ec3be546cee1768297087101b54cc
-DIST firefox-45.5.1esr-gd.xpi 449711 SHA256 3184ebcf00bccee3b57ffae3c1ca787d5cd248648425df61a4401e58acc43979 SHA512 89234e0bd078d6fbd83477243338face177a2fa949772b762c220fefe78ca52a12b7250a681955ebb45eaf237265c58ab45c82c2d83b0fe5b6ad64564f2bd260 WHIRLPOOL 8dfbde7af573784354ad44b52aee262a7c8fe8495eccdcadc84d06ad0d1f8f7463b3715b505dbcdc8cae98c35235a2ed507a7f250280edb6e477a47d50b512c9
-DIST firefox-45.5.1esr-gl.xpi 434804 SHA256 729f97a591c74dd823735623474e36d73415505091341913bcd2eea17f4b091f SHA512 484b11ed5e166aee28b6a4f6e2ea5a7796b98f2b25cd26c6a71fe66e14119a472986888c4a3e4fbb12f087c867390312c5c71f2c1ea6d7d4399a5e34b70ffa2e WHIRLPOOL 86acd1cd3fd98982057815b374913caf623e2c409871a79170a25d8f6a5d3a93715ad04577297368845f5ffb8068cc099c72a6cb0d7b6beaeb4e0a76918e6091
-DIST firefox-45.5.1esr-gu-IN.xpi 472567 SHA256 ef94734a82c95824408e2a94d0e3c0b72fc6a6172eaf0bc455404159a28ea8ac SHA512 d259a663838f8088f09297faf0667cb56188b55bdb97f8ded37e004cc1c665fd1abdcb77ddfa225c55956d60690c90dfcbf017e3f9c28bd4ff22352cadd45b34 WHIRLPOOL 5d27ed7177701230ee93f781c0c979bce2cca99dfd284618394fac47faf2c8a71368e00c02dd5ada297b988e002b9ac27463abc49408cad9deb6158c016e6643
-DIST firefox-45.5.1esr-he.xpi 454785 SHA256 3e359859650e3bc2909954efbf4dab9e38b007329cdbca3ca57c872cb2b29c4c SHA512 d32e6be8a7cbcda06d418fda717928448f9aa98c6cae3897a4d4cf33b92df05fb77815a50fca6575d08d59e2b9510b5adf554bb9851a011545b9aefdc77d1072 WHIRLPOOL 944c0042b6edb54baa8d31d3447e087ae629ff65ba6e11b465f70aff049a97cd8a50487018d2c6f5af9e454e0295e430bf739598300597df4280fa6b068ac83b
-DIST firefox-45.5.1esr-hi-IN.xpi 486991 SHA256 c579edc5c30e5b8cd0c4e8e988aad6fc3c84bef023a818920e18b78c52c4fcb8 SHA512 368d2821c4a7c76687e518b8800e229642cdd097d583349f363af59ceacf12ed019d478d1baf79e1f28e24d34d9ab8f3f53436c5bfca9d143f8dd83f0bd13853 WHIRLPOOL 2da9c40f9d790b153174907f89f60e79dc777fc9660fcefdbcbc073be25bced3ec8ebd4b3b61d1e7d9d4f0d684b2246ef8f6c35b7b055564386538879234bb12
-DIST firefox-45.5.1esr-hr.xpi 449068 SHA256 fd835c7ac82c1b112f4b9a509842aafa2bc25dfd7452870be07d9d04e220a0d3 SHA512 da91081a7d12966aa0da1dca85744b4fff35ffb378d7de3d975439d685fae48bc9d90e531c9023379fe0e601b92a75dc2766da24d931fbae2ab9c3efb7815974 WHIRLPOOL 116d170cf8b2c8f4f4adb63972eb2b95766ec29563a26597ae2e76a12c96907a5ed44a54a777d09381e1c182e471065128c26bf969a8d5be61a20242e1ea7443
-DIST firefox-45.5.1esr-hsb.xpi 461453 SHA256 d0cf5ae20865a6422d425be16e441911ee7f628e96993693202c3a1baf9cd454 SHA512 8f9355db0fd9bb12bf9ccaf5e04c72e9066b1e2e3688d6a05b87970fa91a82c649d6ff39ab20060b271bf009934642e9694275ba59aaebbe4725b3fa9f7d768a WHIRLPOOL 5ae5fac33d33ce70bd7ea242cdd6fdaa134dc1da60ecf384201dd33f5e11f74c4eb31e7e041a4e9674841b5266e1bbd2308f93074fe6638c5acb31824aa0ecd3
-DIST firefox-45.5.1esr-hu.xpi 449777 SHA256 bd2bd9395d42625c8eec9cf73a3c054b484b0309e5727f74b41197082a3d3d93 SHA512 fbc776365b94326e4b71b1d8d4fe02528ae175ff53e052158df32da17cddaa48199b021420cbc56b020c81cef7a5bfa1dcc7e019c2f8c36e75f38d350c023dae WHIRLPOOL 0e8418db524c157f84a9528b51262dd9564350b6e386f23e4712a0a63b21dc9c72c6bf2ce65c99bede9722ee4f7b366c0a6823609a02ad5199e015076f048aef
-DIST firefox-45.5.1esr-hy-AM.xpi 500039 SHA256 3579966a2a86dd271f710600dade51d71788725f4a78eca29a354e4e1ea0cdce SHA512 35556ad3b500701fb2c591b8dcc8233ae79b917794a45b90320b371b92f72fba6dc63bfa4f9afcf5bced9781bc6ee8f852f17e14cf559eca92226d3a661ad7e8 WHIRLPOOL 26ca49d9cece5d6e5e14cd714fb97ebc25836a5bd221fe8ddd712e15eaf913f1ac445a1a98c4995ec907532484e9e81510566652255dc192c02d9de4831e2331
-DIST firefox-45.5.1esr-id.xpi 427175 SHA256 aedfc36977b658f77b75db21d9fb21d6412209c80098c4944d0557213b736f11 SHA512 ac08c9d44c4bff09980370903b0b8a44153e5533ec1d77eebcbe4f5583bdda848ed3f8afd04e5ebe17349e11f157b6d18f508c8ab7da48ce3bca03436cfa0b8d WHIRLPOOL d3a55e57ec06841d4bc480fae9600715ba8f793959d55c21cb5cc76db2755f6b795815352ebd2a71dea7798f6d4ca012d8bc0e52419c2d51536c86a5cb6b4728
-DIST firefox-45.5.1esr-is.xpi 443214 SHA256 48cfd7ac429b58d9be92f019d24076c3406f23b5fd26da92d3e53c5aa3bd1c64 SHA512 d8c1fd978901bf149d6f438b0926aa1008884c4b404d4a007d9ecc766ef62a16f9b43d060e1c3ab12dd12a26a173ab8646b5a73722cf70d40f7def505bafc55a WHIRLPOOL f453fa3a2f7ec14a0b94bd37a8c4c73d553217536a0618ba36d6414866a9c2d990455044912652af05819b57c506b4e8a4ad815fd1e7e475c42612a5c95cb4b5
-DIST firefox-45.5.1esr-it.xpi 343724 SHA256 c5393d7d9a3d77cf7343a40712b62ef778c748c9a780d0f4073483a1bd46ae99 SHA512 a1e29e8985c1a92cd92b2712f59d093b7fb6f35f5014c2c5fb2a803015b142bada8ed758dd943d9a0115709f8ad07c1b020b940d2fb5e7be79a8cba62750664b WHIRLPOOL 5fd7055cc81f20b577844cdb677535cc20d710ead74b1a6aff874f60634d1a9417e15960b709164c67a55800a35666bbffcf5ec189441641cfc8b722c25818f2
-DIST firefox-45.5.1esr-ja.xpi 486331 SHA256 e988601279701e17ee8b4d93d48620526acc6bee55f10a7e1f663a6f2e85a539 SHA512 f4d9a38bfdf86372f09ccfd62066ea5f893e01c041838426a9adeb6c105df2cde3d75d7d0bfef11401c63de7993bb1e3731d3b252e5a0f1ee2938268e621ee89 WHIRLPOOL ca0e71c6d3d95e0440fb4bcdf5505dac5d8683e54c6eb39fc5b1394f0be614f04ac87e20053967b5b9afabcbff0625701e9b37d09f6ed232793738d52dfb170d
-DIST firefox-45.5.1esr-kk.xpi 498895 SHA256 118756171112229f652dde0b4d60b3ec22865ed0eb9986ca426a7a76073e101e SHA512 f779d57efddd2e8b745ea725ebbe39ef61b957845c8489227e5602af5bb7de20a34d0b0d3fd1eeba0220f62f2d077c1de86f73c0cec1bf247784525c2a8d40d8 WHIRLPOOL 56f67233d21f1ce39a41d545b7c813665bb4bb7d7f1ea138283436f2793b38b0dddf45603fa925cb91ef1d2cac0c94bc6d98861282d0179d466f604f452c90cc
-DIST firefox-45.5.1esr-km.xpi 504301 SHA256 f8db2c89f7cb0648d917d28250bdbc965d9ed171308d619521a39a6ca2bcd27d SHA512 cb93cd446e51c16a7b9bb104555950d01399d797975ee72cde3c039d431e9943c0908d9d2e01e39f9a35cdc38018f320c5d1c9ac10da49681a14a392ccd4235b WHIRLPOOL f971e85637fdffd69ecfc4673495111be2b3d2dc0c25408a61bf072b810ce9d94e8d1b62d188bd912e385136abca936df56238f728fe57282fb6871a2c16da79
-DIST firefox-45.5.1esr-kn.xpi 495881 SHA256 125890d7466872240603261f4bf653757cff2d39c0289b9aae4fdff8f92a42f1 SHA512 37117ddeed2d277ced65c9c537f1692f5005a090cf5092c9a04661762548150b5110ecc84ac0d7be8de4bc09f77025f4aa86265e1ab1497bd63b8be97a3ae10b WHIRLPOOL 47393b754192564847ef49d844219a2cc325a1f33f588ef4b8da1381d5d1a8a9159c195dae7a46b1a793df58209786a795761ca6739492dca26e832d80488502
-DIST firefox-45.5.1esr-ko.xpi 465289 SHA256 ae2063d06023d835f59bdccc98875bdf6e7b9141e16abf6380a5617c77e0a201 SHA512 5191d67767a23c6b7941f0777c78498c9bb439c74e50e409e423474ede6900211aee3420d1f825f0c730184045b1ac552fc7ed2f428b168754dec0be456f918b WHIRLPOOL bbb5ff80f10cdaaa6df6b604acd9014a2cbe39dc42f2abe1e4dfeea03a59b25f27a3a80e72a0716141f9c4526263a2a2785751094eb02f736dd0809494aef633
-DIST firefox-45.5.1esr-lt.xpi 454678 SHA256 1f57e527ec29d17e653e6849007838926841945c7052c4b63ee0d8c44119d9c2 SHA512 f8c016b9f05c1538bb13b98b47a54274c8680d34c7ddc18252935291a17c65146ef853f0bd757a900b321f7aff100aaa09079688d3f0056d7cc7ba9960a7f880 WHIRLPOOL 58c7d9c8dfb8602e8ff0fbe5983414f0d7c7b2907e77d0bf358c9fa3b79c153c1e1663f92a343c947a961f17b4a2b0300003b39ea4de05f771641060cef784bd
-DIST firefox-45.5.1esr-lv.xpi 445719 SHA256 0cff9a5cccae90ba6b1d5a8cd43e18388fe7c1a3ef7b2563ce85e759624f97e3 SHA512 06869b89dea34269b343d127a02d72c7f3b2029f22ce1abc1fc991418b02cb3933680094de48828da4a709c185b4ab54bfb853efc903851abfea9b2a6fdc707a WHIRLPOOL 6ac3638160985236bb152f8fa5b85d2eea0aacd50e7bc7341900826d86145a71089fdbeb18e07e8f2a200b37f4687322299d71101783a9fb912332d0ae3c7027
-DIST firefox-45.5.1esr-mai.xpi 492650 SHA256 eb6d35bcb9ab62fd9a38609c40299bbc79aacd1ef102c2fadaac5c9163afa57e SHA512 3302c1e0b4373bc3a6883963e629436a67b65a54dd849c1e9909ee11be2243aecb233e584fe4c50d53e354c179e5210fe93b1061313ceb012306ac16bd13d511 WHIRLPOOL 91f27a83e87d036c35d536693c479eeca41cfae320bfb5223e16ff7431469535d946c5aaa3378c47d4b0ab6b38fffd3bb80407ca5c3d28945fc871cf15797202
-DIST firefox-45.5.1esr-mk.xpi 476392 SHA256 ce9c64776e6e763f023cf3ac15e6d4463d3bde4ef61829413082269db97d2377 SHA512 16d4484c8e19b78320db59eac50d0ab4dd9034f96508212f875b23b2363734db3dc4ce700472def1a7c69b3c65963713201767547ff6231836a2b7763f98c33b WHIRLPOOL 0d009fce8c8853d01b3ea57cffa0cbf53dcbb2d015d49bc3d77b2dbc6a2b0b607cc41fb970c20efaa569ee422b1e5755a1c0eda4d242e43ef522c0db40ba1475
-DIST firefox-45.5.1esr-ml.xpi 498680 SHA256 bea1ec1d7cc230718db6ec04c8e217d1297e3b700259c2bb87de7bef73505102 SHA512 a1de7dca3c582859e8a6f8d5b17e6be34299948ca0221a98486f54313eabea82a4f5552dd7a267cd575d46d059129054fca5882163c0b2c98b884b9bd13db652 WHIRLPOOL 90c189b5a798b545ac6cdf5b303ab1fbf6083b180f4ac82f09b9e32d403c541ccf2e2870dbaf9a86596dc64a28efd09cbab891ec17bd2453e317c413d891e377
-DIST firefox-45.5.1esr-mr.xpi 503700 SHA256 72542cee0e1b8d07a948d518bdad1fd1543f95e59af9adbf578d741bb186f526 SHA512 f4fdb84349d47b361c7080043acf42caa32ddf3df4648afdadab516f7a65b06abd80f9a7f86c96edd5a3bfa30c691bc0fc3f9637d7c2729ef8d0aa8f05f6fa60 WHIRLPOOL 59c35f5da171e949aa4650d27c738eb30af6b08856e7bc7bb0da99391fee47d0535034a42d2ce8ab21b77d0560a92c1d596692cc01a26a5d9803513d3c9857c5
-DIST firefox-45.5.1esr-ms.xpi 440065 SHA256 5bc80a1f604e308dde247e1c4b0c916a4990148c4c505584dd8f344fd7bde943 SHA512 8ecb4d4f282220a91ffc20c4c6fd80ffc9d2ca169a2628e3f15f53bef02157cce29271b0f9c09e80749d82918a5f8433ab19c4fd42e21ae403b7b81d7f6d2d82 WHIRLPOOL a329866bd8ccddb9ffcbc3465b4a4f71adaacdf2f1299885985b235dd2e31d409dbfd19645f7825d599e9aa7c1d5824ee11ba9cbd82765e230d11c7b617acc04
-DIST firefox-45.5.1esr-nb-NO.xpi 435470 SHA256 daf747f93c2d610886ff4360fa8b2e3c3fc240f82bbcf4e92fa0830998e4ab32 SHA512 6b2d36813b821075332b17f9a267e2ebabf4fd1338f32c4ef1778120aed7cb0dbef4ca3321cc19605c942743daef210638e9e0a3941008e0cb60edb0c43ea452 WHIRLPOOL 912c4efb5c777a4ddf12daafb154cbb5b0d86ed60d4aec4da6167cb441a5b6d0f4db496fc4d677467ec9aa942a36698ed5ae3c4aa7082ff89f2e7fba912143ab
-DIST firefox-45.5.1esr-nl.xpi 435202 SHA256 05b4caf7827fe2081666bc23c35626477aabbd21af655ae1ee95d9b868dfb0ab SHA512 010616bf318e5e7a38d67be0156f1867e9d0fce8e8ccc27b907e44a548b878f8db1c41f0feb21c3f57b03a8b09ae7ede1092de7a56b5e0a9947bebe4c3f6e073 WHIRLPOOL 4d4be4d60cf5e66ca9675487586f71fb13ce74fb39f2da7d9f3ef8d0651a8804b710458d43f7fe25f5f7fc7006c74b2751427805a8873cffc82d8f9e2aec5361
-DIST firefox-45.5.1esr-nn-NO.xpi 432934 SHA256 cc92f63d0326c0ab462a6eaff22719645f5df75acaa509ccf219bf056d71c49b SHA512 b1c386f87ac6fb5783e27c655dc093305b1d920acd07e5a75ce8aadf1e07289c98a8c88128f4ab70b38ece17cba993df2981ef45da1aab471fe35e3bb94f2f42 WHIRLPOOL 09938aec6ee5a9a5122130a6bcc376226f50292698179e25913aed998588429fcc9e009cdd1da0ebb70d05f0ebe7592499c25d88d1c125b8561c6c9ec08cc85f
-DIST firefox-45.5.1esr-or.xpi 495922 SHA256 108b3ee326cb80395970661a8fba4e24e6a22b659cc3223f2c7492148e05dc7d SHA512 49ee4f1e38b01ee27c9fa1e94c44bfdf5bf26192748ae05fba7af4b72702999cbf13efe3aa49e47ef51bf030a1d589d5624419b4a8eba9f476f9b8100134102c WHIRLPOOL b964b073de187bf97b4e24c914970f8b5f53aa1cbac768378c1663229f4e51c64deddb629d11db78b4ebc6bbde29957ca14ca7cf7f18c621890ba6778a28ab0f
-DIST firefox-45.5.1esr-pa-IN.xpi 489551 SHA256 0b0babdc524dfd614680b85b22d77a88a6fc87e230e8a821cddfa00af9d56ba9 SHA512 bdffa9a01b2f1e1f585b02f26a40bdc2a604c0bb012cbff2f330022cc0b8f8cba8358df4adf3cc704b375fc3d8f7672461dc1c0855c50f792dc1057860385488 WHIRLPOOL e5813a308b0489dc8ca739d40f37350960288c634650e865c928dffabb7251dab1beea2ae7dd22134c53d67d13400d9a3295aab8e3e102cb20166ea53e6bc7ae
-DIST firefox-45.5.1esr-pl.xpi 383929 SHA256 7a8d586af73712f8187e777266576a158634615481b4a46f3afdc9b346d1e004 SHA512 c6fae1c57c431d0eeae1f6002091cfeb3cb2c43a85b8a9fd44021f30b88d35796e55265441b827e0c573785ba55d0326a5114add0cda94baf732d2b5a4a03ef3 WHIRLPOOL 47177492c4e12d8cf0200afef6dedf7d7b6079e283ec944a4e85652697a167bb8279b8a339d00dda27c041e2ee104f6ce7847c9c0e72a06d5d1c627f18326a69
-DIST firefox-45.5.1esr-pt-BR.xpi 450990 SHA256 9c6900b4bdb2c293471c4c898ad2db89d67de66f388771f7ae0f8bf4e3598e3e SHA512 553f1c2d3cfda8fcf0897ce28a6885cccaa7269b137f6e5f86b51a234a78c42d8fc4238e8e4470af4ebff28f7c3dda2b6b0aa4e0a8e8f69cee3f238b51885eaf WHIRLPOOL 9ae941029571eabb4a3e45641ca79f368952f661e0f8f7336c2e9c14749241f730436e19e0dca26f58f843d2107b707173e8f2571834ae596b26a89448f8058f
-DIST firefox-45.5.1esr-pt-PT.xpi 437023 SHA256 f9e608017d1fa1e3e4076efa20947496eb4c259fc5c90a7269222c4fcce50f53 SHA512 65a68088d2ee6521b654a1a8faff1d0184c78e00c186944881b04bde62f9d0479ab7d8aadd202d3d7a068474e1cbd7df5f0293870abd86833556ff58c07a80f4 WHIRLPOOL ae8774584bf2ea4aa5a71c928e97aa11ba324f54501e9051978e91694cdff51bbf5b4534b881a18802e926d9dac032e7f1d07e00af52356e58c31a6c2eff0b93
-DIST firefox-45.5.1esr-rm.xpi 437717 SHA256 b974a691a8eee4342aaee6bfb8917899125ddc3d8d80fc396eecace952ab1e54 SHA512 435d60cd0adbeac33b6a904c05f7513b6453633c67005ad1560ec5ca5809c94a302b8c19e3d5811bb0a59441fddcbe26bf8cc197e8b93654bb0addc26a90243d WHIRLPOOL 83e8014d2eb1c45f5a9588f861972f1d8b80f47aa03aa17b5a59bb70678b6b9f469d54246e20c8c3ce0e520ceac449ef120b6722d80610c2670c37016f20e1fc
-DIST firefox-45.5.1esr-ro.xpi 444062 SHA256 bcaf90c8a46072825bad4b3f13e88a6ab6882603a28255c2b923f2c97e607bd1 SHA512 5577c1dbe9c924fa6eee44afb679e285424e04e3ada1435c2aa9202027e45b8ad78364375cf217f907ee2b9cfd78542d712f0747852579849d1fa8d32e456a69 WHIRLPOOL ba9d550d59a3adf76e1d8508ad41495280a8455ee576426b972f7b7159b906ee48510e3d00a68d5c869f6d7cd7ed14eebfdd8a0b64af6d66f5d85f438b9ddc8f
-DIST firefox-45.5.1esr-ru.xpi 392738 SHA256 bbe862b7fe6435ec18d2671ea8d3bbd0a3976cf7258f4259f4d500d92d3965f8 SHA512 063787b7ad28364cf282eefc47c6fc2b6f97451a5c52f48994f377e09a7deca782317e5eee24572dad9cdaf8d3c1bf649fdb1b081caa7a099db7f443b106563c WHIRLPOOL 1fdc074f0fe06ca102cd71f01ac0b4b8045822909c7567212838161b5af5b09e35501bd2b628dde50c22ed9f7ffcdd9deef5124e6ffe7cd7188e25578f523c5d
-DIST firefox-45.5.1esr-si.xpi 482247 SHA256 ac140ec1ca39a0f02f1a9899d4be2f487c909e5e9ab43456b5a79796b5c12f70 SHA512 45d1d6a57d3e85889f18ea6d008644c480ffb2655bf066ab3edfc9d87011e2beed39bb1228463c8b09b599776dc88adbdcfd610fab9101cea53aed265851e5e8 WHIRLPOOL cb67ce055fe89f0ba53054ce5768fcb69398f56a3f3adfdd71290ea26366f1256c88a634c613d055570fbb0d467e1f3fa1d7e87960e64ff777c0a7fc110e562f
-DIST firefox-45.5.1esr-sk.xpi 453606 SHA256 8f85dc374f46dac6f622d0e22222d7e7a7536fa26bff799e1373fa3665999220 SHA512 1e69953bef31443f7d696210a846b9a397e1d97387daaac5bbd27ce6bc1bca069f1fc68dc1d2b2afad480e5b5e1e58d393f83b138b4ca176360b1443b0a0a3b5 WHIRLPOOL 867cc151103fee489d3a09cc05c9306ce08a5d6cd5535555fa9b7bd294ad514e7b0c3b3ad062591f9a2fe8a2ca5800997a6e7fce19d57dd28d607e180d1970e4
-DIST firefox-45.5.1esr-sl.xpi 444963 SHA256 8748e52bec3c524216046e9d76d402ef336da4cb068b48a588a9e5471a3ac4eb SHA512 a13eebcceaa094547d7b3c4c5cc7879c919858459d47861384b1639a4a7ca60543bb9ee2d1ad4b3a7c188b87da613f94192a5231cddca90fb36d35d2678bf6ea WHIRLPOOL 794e372761ab567994376ec8b56a89d01741e0587ba1d5d52062ddc56721c77ba42d57aee82a520bb94be910ef2bb0e49eb84a979962c2dd6e30aca442eb536d
-DIST firefox-45.5.1esr-son.xpi 433513 SHA256 63d6827d7c747f98082d43c7ec674bb986738a5eefe39763a06c28eff78ea48e SHA512 237ff8e9b2cad6c2a4e8ceaf2b5aae97cde13c348c65593051036e22951d3ba68fa549276e4a63645868a0aa64bb4e63f20612fd2296b23290225808e388c504 WHIRLPOOL acfcff03afba21ac1f960ec9aae3bbf77fb64c9a72c46f727295d583c46d134b7a580308f3a0843a193dd6f750e4d1bc33a9f5775a096edf28c014e0a48eb92a
-DIST firefox-45.5.1esr-sq.xpi 452186 SHA256 b336e6a490d2fb5d6e7dd1f82d76fadf624f2a2b90ab7439e46f68f04b07f8d6 SHA512 ce34fe57e74d3b94f54abbbedec8103f19ae197e1956efa46b12871ee7afd0b70dc24d8a4e257f2175e3e9aec835724709eb6bf227241be54633957843cd78cc WHIRLPOOL 208853574679af592336498a1632a6587973214617d1b2fe0aca6663910727ab62c7f65beee969326ec9990ddc2bb16990118a3c63ea370f853a63df4f794369
-DIST firefox-45.5.1esr-sr.xpi 464478 SHA256 f08448a95f8fb2b0e959ae8eab09bcad64d170b1f9f4986552fad0795dd47256 SHA512 56146720e652e2105ce306c0141017afc227da2cc99472e4db175df7cc3b69942f61e0123c565fe16704c376690b95e14441f9b195e84338d15a5f0b55c54b65 WHIRLPOOL f50d08c56728abcd1e7ed53ad99dc1dde45635e8609f3aba49241e46a639f8160e1d595da26b28aca680e998f3e0c5b9b2d4bd04795327bade812bb94f928680
-DIST firefox-45.5.1esr-sv-SE.xpi 444214 SHA256 37a6b468044452752eb39d25316d3748c7aca3baf8f641246a578074b67666e3 SHA512 8d33ac8d9246d9ff4ac87e74e48d93571fb7243bfbdc5d750efaf1eca9d67ee168a9631ed499120dbc9f3603046cff80f8fca448f0f5897e9f9b50a44efe4d9a WHIRLPOOL 79faa21774254fbfd6385547da55aa02d0c33257de458cdb8a855708747f2f477d3e56eebda421c693469aa49a72d6f4530f394a4fd0db89acd12c0079a984aa
-DIST firefox-45.5.1esr-ta.xpi 483119 SHA256 dfb7e7947ed7cbbd7becb0d3a33b096481052343842d47f3f507ed8da094ab8e SHA512 1ec5cb935cb3b20524a926eb2c40fd71644fc58e271f6d19ccff530dd081449a4e49a1c84262e03916da62cb084a42b2692351533be44d3357297e93474df97a WHIRLPOOL 331b451363524eaecf4d29fc3a5d8d4d2f44093f409f2cec5963b0e387d5385dcaee78cc294ba133c0bcfb2180878c3f31491427f63ec536a8cdf868f01a61c5
-DIST firefox-45.5.1esr-te.xpi 492469 SHA256 d1fecb274f34acc257d58c23417abe47b6222952a1da3e6670f4b69a418e4e88 SHA512 689709dbfa9fb55542372766bfebde53d9538c34a353644481cd110f71700814be993df654491cc4eee4e96f9c288f76ed3757e361e8d6724e54f1727e4263ce WHIRLPOOL c0d443ad65600e157221270744d953ce893b397c50cc0f0df092a190c05a27574072348bbd88176ecf1a05369c3d923e4b54868b02730b14b8f65e7162aa190d
-DIST firefox-45.5.1esr-th.xpi 477651 SHA256 7692a802fe24043c4e890f31dd907c347159fed2e98c9cf7c9e227d11ffe872f SHA512 ff9315dc45f40d3371c2a460c43b0a23f04cbbaeccac7ff57d59c60ed8fbe795d4a02f86f9ddbf8479a273f70cf2bdfb9751cd848ac0df5dfb8c72d7cafdf749 WHIRLPOOL 621e1f799e6175065d51f94176d3d3e93a8155b4bdc12f21f64357276e65911f2dbe1a8a61afa2eae4b52d9ef5fddce04f5124ec3775046a5c1ae8fb5772141c
-DIST firefox-45.5.1esr-tr.xpi 451166 SHA256 4391d231bf7d54727d8611357b2283634c74545568a07b2711ace36819ab250a SHA512 39202c3633f4e653ceefa6c270880824e2270406b5642bb12531da26e8a5c10be20bc507605a5e80a74654435af2da54f923da63371f4cad21a8850a381e62a1 WHIRLPOOL 7898d3052d26e86941c77bffe1f6b805de31f253d888abe9179f1d3c95ac7e0199dc61f0d334959a0e8e3002aeee788dc197a9af38765882bb824becdd5c776c
-DIST firefox-45.5.1esr-uk.xpi 494781 SHA256 7f59bdf3cdec6c0042341ad6b395ff7cdf3417841bdbe405cf87bf957e7de123 SHA512 3d8bdbf7af9c28e67a0aac99fa3d78f1cf4b2381668c2ed1fe0cc35c7d2dabb04af61cb60f081f28020f06036de4ca6eeba2e93f6e20b0c18c6399a7055bd539 WHIRLPOOL 9b8f6d2c30d2fb5d6963bf98f3d5e4c346a1cb1ec661912d8dba582d77ed675672c2fe0312a56118f20c0881b75f6862fa11faac9d50b513a641e60b3bcabba0
-DIST firefox-45.5.1esr-uz.xpi 443802 SHA256 7d44d131f9f8e134bfc07d368be77d293a6b56aaaa3c818395749a04b15d2812 SHA512 f1736edf43d6cfed5164ec186aaf3836207f6dd9f0bf1835ebf15a86ec4ee31aca95231d416aeee27a1b11ad0624ac6aec4003df44808f3a0b375b3bb1a8743c WHIRLPOOL 8effb5428d3f72a484aa21d2fbd52f177aa6b8d5fcce6b9231acc90096b24b95fbff23a907088e23093d63f712b0f27d0032acca88f939048dfa35d743692c45
-DIST firefox-45.5.1esr-vi.xpi 450778 SHA256 e131146d1a02c86fb5a5e3da02b173ebaf14c665fe7b086c482892fc913d225e SHA512 5671c1a0220bba0c08425be2ce79e680e028742761cb524b9d34ed9f4515d0cf87e466c4ca7a8f8b2245b667f8e2f503b675169dd1a91221d4de4f2d0aeecbb7 WHIRLPOOL a850e53fd48381b9b949d884d906f109cf0a7962daebaeb140bf261e22e0ad44880852d705806d2330439ecf54c71e9fd3eec155c41597374c2a69fce57579c2
-DIST firefox-45.5.1esr-xh.xpi 432918 SHA256 5558cb4f9704bc592babd1d8966e7bbaa684039615b4e7a9b528235ced01fe9f SHA512 883fff37ad42bd8576413d98f5fcab5ad548618528c069a39b4c92eb21f25276d26c962fc9d8f19d49d5f980a63301e62353f97b16dd1482ba1b3af915bc194a WHIRLPOOL 5ded6fe669387cbf76e880b8282c1f82cbe65e6a71bf0713329290d4d3551ab03e2a419d1ffa3a93cb6e5e251ca3fc4179175281252b968fb85ab6166ca2ba6c
-DIST firefox-45.5.1esr-zh-CN.xpi 475797 SHA256 e0cde1825e0e59dc9d7ca9a820c506978fd142d43f563c75cb7121485e436344 SHA512 0291a0bb1ec051e1504b410809903d7bfe7d1cbe6494fbc25fc65f954f65c62ba359e985f572ee18e19a775ee052f71938bd076c5b2549bc264212614c24172b WHIRLPOOL 43dd909ed4e3d15c30360e7e2e7674fb8248c70f81f67aeeb5f3fc744052b9bb0563d7a1d927f75a9e655571f0e5a760e1d3ef5ee6c6035c3f123214e2d0b9d9
-DIST firefox-45.5.1esr-zh-TW.xpi 466529 SHA256 d408a34d2889e9ea2b5add8cdfc3d57279f90073a1bc83c7d6a96033a0b73020 SHA512 ab99dc7c0630e3b63716c072b95ffcfa109116ab395c57a14a1260e326a7d957060e271af1d1e8d49a9382acaddc2c65d1a58214cc1901d755cc89b09b402931 WHIRLPOOL e6594d444cfdc839f1144416ebcc4a5ae203f0d8c213e16effbb32bc5997adf785c31fa1bf387ad7624a12d3b01e981019497022cb774426abc0393dc0a3cbf3
 DIST firefox-45.6.0esr-ach.xpi 426530 SHA256 a26ca317025b57f8465fee3052c97d013755f8a1096ae1258adaeb7aa44a3e8f SHA512 b2709f5085eb87726bd70869d34776e35db065dbb20080e1d64d70332298a10c369c0dd88b9847140b7f7534b67b4953703da906ac82bb7a08dbe019b41b4310 WHIRLPOOL f5474cc8c693809db00d0e712e26b137a16321ebdf23a444ab42069c54fd2eb98631423e56419b62ded357189a214af702f970e77fbf53df4f3cf84edfc5f359
 DIST firefox-45.6.0esr-af.xpi 439354 SHA256 38726e81586b9e76dcc0e363ce7ff8a0f8499ac75d7111bb46d32672f792041c SHA512 8142fefef28ab70bcc949e4cde81dad544997aeffd1a9d914272f355d3d4736eb201bda6505371cc4e609c485816ed997fecb48e1ff1c505edc5fe1e4eeb5b6c WHIRLPOOL 037f0f874e30a49c3535503cf8d8486727f05cc48724c561634b99a136a8f4c89ee4b53154f7c4783ced0a8be455325d3c7afb2a2fbfbe19bb28de9de666c25d
 DIST firefox-45.6.0esr-an.xpi 449036 SHA256 59550c5311cbd4ae6947f772062573519dff438588ec418ae93c3f129f1ea287 SHA512 ec91ca579d060fc420dd4ac17b32ad9796743cf4876dd9f356e9ba661dcdd3867e0c730f30246134ed6b7e8cdb3187764f366507c1d1c8ba30becaeb8dcc0e9d WHIRLPOOL 8b79399c247f55bd835cc78216211132f1522da06ca1c3cdbee882f9851202bc65e8b5737043f2a17bf98eb35fb722327be419942692487f5f771b17826b415d
@@ -253,9 +168,7 @@ DIST firefox-50.1.0-vi.xpi 447653 SHA256 5fb86b8039a3ec5f5d29887dbbcf6ddd843c681
 DIST firefox-50.1.0-xh.xpi 437879 SHA256 5dee657d054ec57f480523ce6ee6b02e63b4173edda319cafc0ed246d9368a52 SHA512 c9d1588db2cafbec25e5d00e3a2e4724788764d14881f9c6e2a78bcf3567efaf0abe06c4225f2207e0b3473055e9f31754e1c689ac82fd675d1dd90d5946315b WHIRLPOOL d79427c7acd60663feb9df6175e2aa256a9a760d5caf3973320d43db87dcdf80adc40152fa186538520ad190ff56f48a08e127b71ed3048c8352352f1cde7022
 DIST firefox-50.1.0-zh-CN.xpi 457904 SHA256 258db702f1ada9105bcd6b11e8ddf8197246dff9bc18ee2ab0eb9e4b5ea3f6b2 SHA512 59892d3f2ff64afb5258dd62fbcc89dd660eff59eb0a8912cd869eaa685764d5bb53d4e9b4af16509d0608fadb344453f8c2a7f5ec61b63d8c7449b57251bb25 WHIRLPOOL 2c5305f6bfd7261ae6860996a787c2dcada557d97218595585be59ce1fa3d2abe659f4bd71ae1c1a92e236a18aaecc84b9abeb2ee052c3cf0316fbd9fc4f1292
 DIST firefox-50.1.0-zh-TW.xpi 469091 SHA256 ce6729051516187b63af735a0470a4904183499f03dddd849b314a94d4629bcb SHA512 2e91ea070e3103508d3ff6d7d6d3bd0b578c1dcac9c96368a7b4db99d11b2a25554e2ad63dcb11a7a8e5913bde3d351974691592e08d975f2098d020bca95d42 WHIRLPOOL 3fd8af8f453d917198caad639edaa2ebf2872a6d1ae6f364e1bea7719f95296c04b39e4ceaa51c2164b60d1d571106402e686198ac441feee1bd5f8e9b40b62c
-DIST firefox-bin_i686-45.5.1.tar.bz2 52340474 SHA256 c60ced5a2d4279a7cbe012a3142d3eae48bf79bcf2ea268704c401fc79964233 SHA512 67772f922bc7ef3254da2439307b3ca336abee9ed73cc064fbd8c56ae3e3325294393aa77668a76f95f9c47f210d818aa5293e8aa7a6a782c58d48ee61e63d24 WHIRLPOOL 84a7600de8e1b3c157b81366dbbfc2fb3bb102c24c207fbd69ffcd671046bc2832b09816d520ac6bc860591cc866b2ff754f4c536a9ce82da47548acdf50ffb6
 DIST firefox-bin_i686-45.6.0.tar.bz2 52341247 SHA256 dcee8c2fdd0b55395c18bb75ec06bad95b6665f45ef33123f679a68f0a732d82 SHA512 978c2d9159064d51ea16211341ddc6b3703a889089aec5f4317f4ae0f2bcdb0e57074446447bd968e6dc3f9a63f186f3e8a97e651f0eb6a412ad7ee05877d025 WHIRLPOOL 18a38e1752710eb27ca499450de54206f1465dcf1d6d7c8df837f17fcf0490eca53be07ce00e3d0e1e9d4810847aad73f265ec38cb054d1a4732ed1892acade0
 DIST firefox-bin_i686-50.1.0.tar.bz2 57582182 SHA256 1b25bbab2a3a8fd2db02df030e73d00c3603f448cd6dcd1043b8c2dce79e3c3c SHA512 b1667f7c235b3fdbd3a2c3ee6ddd7976b4142983393b0b8e0443896cd0929d7a43ca484ba5922340410fa3c4868f555a4ab581c9664281a31b912c1922a1dce5 WHIRLPOOL a73ea76a5123d45b5223444f33003e8ba7e14c5486c0147f6950029e111695c3aafeba283d442db583a214cef5bfde8dca77794f38a7d9977d4f99f68c78bb3a
-DIST firefox-bin_x86_64-45.5.1.tar.bz2 51705931 SHA256 1d7c516de60e8e4f133d848820ee743256cad712047653527917b2bd0b4d4825 SHA512 2e4b1f0384cc25283721ec5978c8098cee8bd5313939ab95b2ebc16c9d42c95161715411b613380fdeee6aa66e048045e3d035b79e82cb78dd1d51cc820fc27c WHIRLPOOL 8f1a3e16760668008b9c2a6837ff04269978abf129c864e12b2a438e70b1df9e678d97928ecd66db3aae60011a6911a982c8a3b8bd178499ef94256604f1818e
 DIST firefox-bin_x86_64-45.6.0.tar.bz2 51714357 SHA256 534582c138aadc588fd4fbd3a6b030182c8efce99644a882e7e135dafff0880f SHA512 0c86f906738765ef2da572a5e3de2d6dc1d29c64308081dfa7c375c704feec2a758d7ba40eab02c019d8a9b39cb86fc99109089459eb7f0c537c053f490dac1a WHIRLPOOL fd3180fef0458dbeb2986a1fd3a2bc5f050348064615c3f31676358f9507902b8f2be92931706441c063ba2202e45d81d8fe3657f7a3bebf92b1418868eb3d35
 DIST firefox-bin_x86_64-50.1.0.tar.bz2 56788006 SHA256 3b7030ee82944036c1e32803a9cca96a08becc9fda6f2c77d1687163fc2810f3 SHA512 f81b63d9737c672958674096a69c941351caa335d481dbe39ebbe051153f0680f2d3ab4832267eb27ede36b8ce8242e43374ebb49d5cd3a0c44a813efa8c7a22 WHIRLPOOL 7a8d35e0aafe69f57f23220cf681bf1225467c53e711bc77603d04dc32842b82e8090f2220944d422a4333979b625847cb02752450eb70bc0e17ddfdb131a4c5
diff --git a/www-client/firefox-bin/firefox-bin-45.5.1.ebuild b/www-client/firefox-bin/firefox-bin-45.5.1.ebuild
deleted file mode 100644
index f909fa4e4d66..000000000000
--- a/www-client/firefox-bin/firefox-bin-45.5.1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MOZ_ESR=1
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-# Not officially supported as of yet
-# csb
-MOZ_LANGS=( ach af an ar as ast az be bg bn-BD bn-IN br bs ca cs cy da de el en
-en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
-gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr ms
-nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-MOZ_PN="${PN/-bin}"
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases"
-
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas-v2 nsplugins
-
-DESCRIPTION="Firefox Web Browser"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mozilla.com/firefox"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="selinux startup-notification"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/atk
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.72
-	>=dev-libs/glib-2.26:2
-	>=media-libs/alsa-lib-1.0.16
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	virtual/freedesktop-icon-theme
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	opt/${MOZ_PN}/crashreporter
-	opt/${MOZ_PN}/webapprt-stub
-	opt/${MOZ_PN}/plugin-container
-	opt/${MOZ_PN}/mozilla-xremote-client
-	opt/${MOZ_PN}/updater
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
-
-	local size sizes icon_path icon name
-	sizes="16 32 48"
-	icon_path="${S}/browser/chrome/icons/default"
-	icon="${PN}"
-	name="Mozilla Firefox"
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png" || die
-	done
-	# The 128x128 icon has a different name
-	insinto /usr/share/icons/hicolor/128x128/apps
-	newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
-	domenu "${FILESDIR}"/${PN}.desktop
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification; then
-		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
-	fi
-
-	# Install firefox in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
-
-	# Fix prefs that make no sense for a system-wide install
-	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	doins "${FILESDIR}"/local-settings.js
-	# Copy preferences file so we can do a simple rename.
-	cp "${FILESDIR}"/all-gentoo-1.js \
-		"${ED}"${MOZILLA_FIVE_HOME}/all-gentoo.js || die
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local LANG=${linguas%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		elog "Setting default locale to ${LANG}"
-		echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
-			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
-			die "sed failed to change locale"
-	fi
-
-	# Create /usr/bin/firefox-bin
-	dodir /usr/bin/
-	cat <<-EOF >"${ED}"usr/bin/${PN}
-	#!/bin/sh
-	unset LD_PRELOAD
-	LD_LIBRARY_PATH="/opt/firefox/"
-	GTK_PATH=/usr/lib/gtk-2.0/
-	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
-	EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
-	doins "${T}"/10${PN} || die
-
-	# Plugins dir
-	share_plugins_dir
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-	einfo "For HTML5 video you need media-video/ffmpeg installed.  Please note"
-	einfo "that gstreamer:0.10 will also be used, if available."
-
-	# Drop requirement of curl not built with nss as it's not necessary anymore
-	#if has_version 'net-misc/curl[nss]'; then
-	#	einfo
-	#	einfo "Crashreporter won't be able to send reports"
-	#	einfo "if you have curl emerged with the nss USE-flag"
-	#	einfo
-	#fi
-
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 3443d17ec8ad..d21047d7baa0 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,263 +1,4 @@
-DIST firefox-45.0-patches-07.tar.xz 21016 SHA256 76a70ebb3f9c0515c0632170dfeedf0bfb60f248bee579514940148bb3e2b1c5 SHA512 304d6ed4b4c9ac58f3762263207167a9a32532fd48f17d9cc86f5106f7ec98273f402e3779b810b455ceea77d84313ffc8f236fa6fdc6cd5ef21e8159beec552 WHIRLPOOL a50d54d1e3b5c0fb0e8b32c8d69cdeb99a8fbfa90ac51dfa01163ab0228499b08d3ef37b27391d0d5179d80e937447029c2f976f014bf97d0da3e4bc1b58eaf7
 DIST firefox-45.0-patches-08.tar.xz 22260 SHA256 279cf82e6aacf9aafb24f18499bb88f7ea6e7ebaffa606282a3453100849d1a2 SHA512 692fe8e85594cf5670143708a00746e0c9ce1aecf0c7a7bf90e0168cad2265624e8c9220734523ce7d4d9892361072a2e9ba61a15b20ecda4a4ebbbf8e43222d WHIRLPOOL 1e676c6894750f8aff5feeee9cb35503b71a94064ef5296887ab33e5cb99ba835f64ddfa7466ad638bea27e6b17e8fc8d74623934f558b0bfdc446049aa21d0a
-DIST firefox-45.4.0esr-ach.xpi 426529 SHA256 f43825621ccd7920710608686aa813594afd1d3b19bff8eb49bd32143b81a856 SHA512 941560b81d39ab3ffc7f671b768bab010faab147dfc571522e7362d246e2b5cadc636af6c00692f285122ae2520861f45e69897d1727c9bb110c0a343289a9e6 WHIRLPOOL 53f387c0d38c076cfc5c58ff7467096370959017ef13531d8abe7f6c5a502889148dd3caf1a3598e693c452dc1caa9d3448c33355f375d2a0755ece2a10f4ad8
-DIST firefox-45.4.0esr-af.xpi 439353 SHA256 93166fd1be0a9b870b3043c752ce7326f7a15a20c38daa40655ed0a6440a8afb SHA512 70b2a20c7fc8d29d750eb28ff63e03101bf84c6282952dc412e85decee141d476eb85ab23f9eb656e8ca6e90705e4ac95d1e2110375695e8ea8d7047707fbe74 WHIRLPOOL 6e10cd75163bc5c724ab132abb51c8226236e089cf8b09b9ad7bdb14abc7294ac89255696aac2a0f0c9556ee6292c83acc8154b88c153d976b42c6dc4b94ac7a
-DIST firefox-45.4.0esr-an.xpi 449036 SHA256 350c7e992de73a4aed0573f679b819e8f79a4f0ed6a98d8a05eaeb8f1eae82b4 SHA512 7279885dbdbee9083c48aef08ad40b6f740d3e9962164d75390203bc71f19a825e87af59a1a3a9495ea7457fe54b266c0ec7316db41465522a0811e303fef25e WHIRLPOOL bbe23b91eeec40d1b8b3ed3389c3a9be374bf7312230e069e5883f697c4c73cd5e199c047011b3c5eb7ecc3825909419bf3fed77c2ced9669ddf57f608c602e0
-DIST firefox-45.4.0esr-ar.xpi 474961 SHA256 6f9593b7f17d6917d4a3ef1d553675e8d2e7742068692228564b1fc8ea5f0afe SHA512 1aad129b62ce42a6b668974404a92f982302b20e145d08a9cb30348d9019eaa65708131589b9aeacf9e37ae211c2ef8d238555ea5ec6f64be1accbec449e11e2 WHIRLPOOL f9b61a3c7f93a8769a43f6a0d37a5e3575dab31504fbc5b2125444bd8b3324fe9e8b857b11872cb9eda8ae1f67329c88fd1909929dd76ebbb36900d2e05f9c29
-DIST firefox-45.4.0esr-as.xpi 483096 SHA256 339bb60ab5d0621e4f26aeceae22ebb93ad7bc6d6870b3d9a21c47f36dd9ccb4 SHA512 f23b2552f9b6f7becaeac634690ad124d36d7508a6b1cd25e34c358e3403ef2a149ee679d48463ae6b538cf9ce43d57d01324a8cbb1087d6c01d682e461cef6a WHIRLPOOL 2761fef3c6c38b139e1d441b6a1286182b02bc13d316a529479f3d7be06e016e8b818021d0023dfb94917c8f0607b46d406f04f74b555dd5dd6d8d00c8b3b035
-DIST firefox-45.4.0esr-ast.xpi 419249 SHA256 b991d439abe7795122711996c4626d784e51794abe8f2307f469296c407e6045 SHA512 02e37737cea6563accccfdf67e186d6cd100a0477a2df29f3cb0ab917768661c79516f3d87803a1b8e1b8d426b887a76e3b8c27c4fd9be142f91f0b408cdd532 WHIRLPOOL e37b1391261c5f4ea04ee664152d643e8d1eafb00339d517d398f8b74a8eaa279112744f72c2190834090e0e70aaa885116c0b89adc0807bc974cd4acbcf04b6
-DIST firefox-45.4.0esr-az.xpi 464018 SHA256 2516100c734bb9efa1143b5043b7c3ba71a2bc8722ceb916fdf9a9485bc813d4 SHA512 b077ce424abfbbdb33bba71367d8adc97ccc9c20ee3c0c9fc25acb36da6bd3ccebcf76a32f698e6bdc9ad71beaceb5cf5cba12c265886ea723611d9c23b77526 WHIRLPOOL 28d81dc920a7624150e48033500147d3922e810b47752b77ebf7286490879a0ee0748dba68c2c2ca9035e4a272d25c9f4c9c1eafae5622ce7dd18946e2b35e5c
-DIST firefox-45.4.0esr-be.xpi 442619 SHA256 16bf04ab6b305a7431bb5e38d9b06e1525f3dd630154ba1eabf6e6ff1039c8cd SHA512 691c699e5cb166064545114c35e8b2fe837934edfbcec827b9761eca6120dcfb6b97e7a4d4ed4afc4e8d675b22b61af144d17b210579d9e6f28f9e7158cd833e WHIRLPOOL e590b67671de8e4a7547eff8388d95496e02ae60adc34a09142654ff56e8dd736af02da03b099fbf3469e17bd4b5593435bc2a7fcc9ffd125ddb0e20c4998a35
-DIST firefox-45.4.0esr-bg.xpi 460809 SHA256 4b8b75bbada127bb585acf10164d0448dda66447895a5fd2fdda140498634b7e SHA512 5e5165742578c8f36a3a72629ea71ccd77c61f3b113b64d17d58fc2a0fc566f969ccbed0ceeb31244bb010f07a512ff9f6af193f62e8f859f7e82ac475108f19 WHIRLPOOL 6c70f18c843b820a6ee99331d71d9b8fb20ec0921d49f821c5c4f6787121c22889bf134b35e7ad9ff4438422ea893f3f7380b3552209ce256e6596a4c6a3bb2e
-DIST firefox-45.4.0esr-bn-BD.xpi 515643 SHA256 ccc725acfd3aa01010b98e94590e97ed6e45c6e8c3e83c1e255c09a660009003 SHA512 f80aba83f6b39c52cf32179c73a4f0a94b9a2d3276997d53aca51378ccb3d6935385a4ddb0f39a888c87d5d43dd1c212605c70acec43985662c91232aac6740a WHIRLPOOL c66575455ea4a1a238b9f6319ff2c4f8960c9a1091d75a493f88f07587106189180f9c195f169386c4780b52ffee2d517bce22d1070145926e7271dcabca1863
-DIST firefox-45.4.0esr-bn-IN.xpi 494076 SHA256 486a3cd531c5999551fd3e0f21294130c03f02d6c20358bde7829bae8573e81a SHA512 abc75499373de235a7da79777a307ddef121ede125d4e0914bf62ddfe11cef9c932e4dcc95cc012c7c8c8a8a5bff95e3369799158a8a19947e28ee9f5fed30dc WHIRLPOOL 86cb8ea106734d827a537d8dbaa3939567be380b54e98a795e2f11537b354861de2b3568b242de428be9ef3dc347715dd3cb7854b41987c588acc14daaff4d12
-DIST firefox-45.4.0esr-br.xpi 436390 SHA256 c40dac8236f491df2a9d7cde5d3ebf7d9feb1b8b29c85963c7b3529607ab586c SHA512 8ff0e5f86e240204781453a02403ca448b0178c1236d01a434fa0090abc4c223efc32bb96c4077ff19cadbe038bb3ab279b703d25f575d7f1d6738e777f6e204 WHIRLPOOL 29a7d3346cc8bf3f1758e1bb3aa316f6a00162bbe5508d1a82f5d915ccbe277bf2fca82a7afb0d213af6cfd8ca78b7dee9f1dc3823bbefbc3ac67c2a8a4a5bb1
-DIST firefox-45.4.0esr-bs.xpi 442998 SHA256 cfc6bc28e9a56fa58239365b5f1d2a60c562fec9d8d5b71c59617a9291833d41 SHA512 713a1cc0422e916ed3da65da42acadba360db18776548c67c1878353e8d93cceb7ca8edd4f6384ad9ab75c53ebfb45a7d4681cb67ea2d71485d5723dafa0ca56 WHIRLPOOL 492055945d5965cdf0ca98520c667e73eaf6eec29feb3a26227796a74c1c87a8963bdfc1084c08c6430410c2b9e3425d3869004587542f8ab6c0217107b3f807
-DIST firefox-45.4.0esr-ca.xpi 436832 SHA256 aa94f2b5a0d8519b9bf793cbb073ea6486cf4d3c692a87fcc6e7f0285b80e9ca SHA512 3d218a420ec3b6a20f9985422af7dd1daf4bd23c5855e78a79ec8ef4d3f94639153802e51e0a74c2d1ceabbe9c8c76b2995f95f5123ec6f2a3cb2d15a817c523 WHIRLPOOL 5de01a25b44234814c32101aee1f53872538b42c95ed1c8f6cf4e1eb13f2bdfb8f2edee08eff9d959ee56b14c0b5b6b0c619adbd04450a0d5e44ffcf94924d08
-DIST firefox-45.4.0esr-cs.xpi 443482 SHA256 fb448ee61f89bf2d6ee79cb05c6c10dfd8ece18f1f61dea390bf4db43740d8ba SHA512 fb624c067fea795efec8b73dea0a9ce73feeedf702c8f9360654d82c3b50cc6208419d5b43f5550d916269b233ca3376d0ca4635dfc07fc1015ffa682fbf5850 WHIRLPOOL 6114a7bc0137cf0a1c7daac86d47ff335a2514a92646af9406cd622d0d039d0ccb4a412053d93b9f569144817a36e3df64c18e3edf529feec450136be86cdbb8
-DIST firefox-45.4.0esr-cy.xpi 438907 SHA256 aa453a43538c32c36c21e49af9800fb814e79c0b64b31905fd29b4360ae9d4ba SHA512 f067e058948d64e6a2c22feffb107119d84231df2f4ca3a64ef4fa76f7fba1cd8b012944dbf2f092c89235d8b677799a860702bb43e28ec3b493fe443478c113 WHIRLPOOL 0b49d790aa0b66b979a926524cf031cff0612615c4acfd64c0de6980876ac7ebd8842d55c561d43e7c4694a0fe650d80f968824ada038acfa93630de0513a575
-DIST firefox-45.4.0esr-da.xpi 430078 SHA256 087bc37a4d9004273c83ffe94195077e440b1de5213f83736f16bbd3c3300e9b SHA512 952bcd15a58a5439403dc453f318a09e57d181ac408669253c3aa4188581281af5e5bc5ebaef2356d249c072a40daad1371b4bcff6c8ced6bfd8f8acbf60ac26 WHIRLPOOL 0e38ad6b5d1a2258981f841429d9b7f8d5644a88803cfe4def4a3c6552e48d00fc46862aab16d8aaf70704d4de78039ca00a24d094ee8efccf16b8a4c20ff180
-DIST firefox-45.4.0esr-de.xpi 445481 SHA256 e5f3cceaeb70eea4e6b2a2c9c503598ce4a5f29dc422efedc117737171f5f3f0 SHA512 30b782eb959e053787c3d9908e13335032a58c1dbd13a0c70bad5412a1b3ba4b893e7745e62ebf5424b1798cb7cecfc2b82c210fd6534f8ec22a411208f6c0ce WHIRLPOOL 7afa65426a0c6417d3947f09b1bca14ddb6f57e63ef52ea6fc0de91b6f201e6e389c03abdec7aa548d330fab9a9b5f3185182576b4138497e10d33a0804ead7b
-DIST firefox-45.4.0esr-el.xpi 470866 SHA256 982816ee82a4e5f1a7fca5416718965deec097d9c2f2a6a81ac489ff352912bf SHA512 83ae1e4d655732562ef3244ec530d668bc706297a6f4462e131dc072169ade62c082bc1e8be6d03540f97093edc285046e9b97c8eefb03c000c5ba23befa091d WHIRLPOOL a927178738b5902a317d555726659420404a74ea155f256354da520dfbc0a5762f5ddb1007db59c3493de7a17a5e9fce08434226acb70fd0d1feb23598a935ce
-DIST firefox-45.4.0esr-en-GB.xpi 423871 SHA256 76b26b33e7be5318e5ee4e5028d4ab8d9197887103bc2fbe690a78965f5f01c7 SHA512 09e6b17f88cd688bfca49cb5fa6196aef87c004b6456624f26b19d0c2e1de7e33ccd996ab144b654fcd1d8415f6c9ffb3272fc8c7aadcf63342e5012f38a2826 WHIRLPOOL b726cfd0d375c026a5ad8a8a9c69b94a76b6768d65c2ea3ef14e811f323c910443d363aeba5c90fe7964c53db0a409415d1b7a9b3a2b083bd56c88bb8b17af03
-DIST firefox-45.4.0esr-en-ZA.xpi 420776 SHA256 5b16e570c4a9172cad97906cd19f5a7b8a6d4ecd6ea03fdb90bbbac62e0f463e SHA512 d27e133ad306fe36f8574e0a771d812a9d622e4e35ed0f6ae3f171c525b475fbee4ad1b9bd945697b0d597ddc0d4444eca1f56291d32bf449375f35c16ef2912 WHIRLPOOL 1caebe5480a858a728d6ae62cfe4e51280bd806960e16f31d83af5d578c104d8fd0ef9791566881562625f74caa3a35d5efa5dda826161eeea61c51629cafe05
-DIST firefox-45.4.0esr-eo.xpi 440960 SHA256 1a6fcd26badc0d328bb2f895be2de6ea8e43dcb90a92dadf8f7d9a0ef5608c8a SHA512 7458d275bd2930d1ef3380f853ad50757997cdd92d81180f163216002d1dc663f02af3a6130842c0850d5ffb5c7ba768eb33fbfcb27952f168cc4ac0102ee762 WHIRLPOOL e48d766cb2b9c43bebcdb4f3f790fa67863c2c0d1a0150f81c166deb5b47906892a13b20df804cc57fe93dacd237fcce92dd5875efb8c3a173f1e985e06af385
-DIST firefox-45.4.0esr-es-AR.xpi 441481 SHA256 aceb9e5f099da923ac01a2f6aa7e3a49289b3e537eb7be362ad0cec86bedcd35 SHA512 d7e314497dc61f2cf6f34ecebaa5f0ac8428c1face73c5ccf26bd0edacb22de570741a34798860bc3fdc22a4c467ed52eec364865b05d5f72057478b072d3b1e WHIRLPOOL 9d78fc6ed6fa7cf9c43b1caf49e2af126f1b05ec4f15874e6032c2d86b87330db5f5967cd9504f78b1a9db54d83c1348e66c8b9ead275494d6c397bdfd51368e
-DIST firefox-45.4.0esr-es-CL.xpi 368763 SHA256 e3f6ad6caee0ad3efb22f6f9f7c2b2d96fa3991facc0a739f5dc699465151264 SHA512 198d3899e86bfe6a98aeb3b5bb0db9f0e439d51ac2485238e5351357b8378207155546509bab37ee1b21881a65fae727d0422f6e6e6dc2a9a827c232fddca597 WHIRLPOOL 8138ef6be7d25aa8c668742c97d9d02ce2d6c20a2023e69ae756340fc72eba987d6b40926d7810803e6690f0703e07e51528acb3ad529bfbbfc61114477f9695
-DIST firefox-45.4.0esr-es-ES.xpi 353716 SHA256 e847c88605618aa4436b3c42ced29e9fa0d05a0a6ee27df77101a8522ee9030c SHA512 8b7977ffd0ec9f16a682a72912816e144fc60c43257f0446dd18f7331b42474becd637f5d65929b8112dc183d41e886864d2156d7071ed0116180dd61b0d7c81 WHIRLPOOL 0a5e8bd6d8069dcd1d1e9304dc702e5650ad47853fd08a2abb9ab0980854481edfe02856969bb529adcf9258d3ef4ebb8a01875846ef0929898a2bed70ce27ba
-DIST firefox-45.4.0esr-es-MX.xpi 449395 SHA256 6a87bd0106b3be8782f2d60748f21616c203259f9ce3254866cbe523ccf82986 SHA512 733f7f390076146071c63b514c4e14d5ee0bab66d313c208026370552a87a3fd76a02c5ba1cd40a96c3d48f5f7df733328aab51eac5f863ffef335d6e6b517d6 WHIRLPOOL f1f48906d87c47625e0e51168a56e948e09da3f70af5be0dfab617d27e1d6fb784932eb46bee6bc7012d6964404fb34c11b73054c9df6a48a1fc8203199427c4
-DIST firefox-45.4.0esr-et.xpi 433352 SHA256 3ea5d48958000130616f9fb15bbbba977e976df0f4fa635652a7f187f39ed651 SHA512 ae3ab24df240ace94544f5a016ba52f85c553860ad2487c2f499b53a501e95c3c2c9b6ce6ee57a3946b8211b24c02cd749079a9a085dc4392eaac60378fdc605 WHIRLPOOL cc634bb2d5c27905823a4ca224cfa8589045ae2ffaa10cba779aaea944d50f96eb9742d420dd542c8047f9b1cd9885a585363d5ce7cb4489fa1c6353c712de37
-DIST firefox-45.4.0esr-eu.xpi 441357 SHA256 674692d81505b16b461a81ef876f6fd6e908f9bcd372f98693e9a682669f624d SHA512 b7eb44278d032166c4a0e219ad61efd92a6ca441cc9024652c68fbbb2ded623297dbab917ba1ac3793c7416b74927ad7c80865fad26472bd33134a9376f93d1c WHIRLPOOL 41fdbba89f11199bc931371f3658360a758b6fd63e673195773cc89f404af14020028652879ff6241e56b1a9293a905f31e3a91361ab213d791a781713de31b5
-DIST firefox-45.4.0esr-fa.xpi 491941 SHA256 ae692c0ea519c3ac6c4113b5efd87c884c0ddf2e837a49d5b9edfa3b6577ba24 SHA512 dfdee376774bbc5fabba827d9f09c6a6a257b06b7d16b861a44c9bb4477f6b12b18b6fa15b39e3d10d89d10089c70645f30f69ceca3dcd407438ba3f0393c250 WHIRLPOOL 42a2ab17c28ac1b10b4d5526da0c1de5a00ed21204007781a8594930bbcef77e9b7ad2c76e955af66d9b5dbe873a1b76fdf6c493b7acc72a3513341f2f93e368
-DIST firefox-45.4.0esr-fi.xpi 438347 SHA256 6f29b281e0f4a21bebe17cb81b55c6ae2af360d1520bd28f206a47a2ebbbff61 SHA512 943f08b234dfd9f3d4df7bb897b5b01c1902c8ef53ff0c4399a75bfe4210df74cd14ac30602afd403f3e1d26f15c5400cda308de27f93c4d79259f906db4dd7a WHIRLPOOL 0b1c2cc4890151b3efa61ca615f60e26af8890dd48f516239eef82a6b3fbe868884c6822c22cd0531de03311aaaa5b1a8f3e40a2e507118540d0ec08c12d34a9
-DIST firefox-45.4.0esr-fr.xpi 450037 SHA256 e93efa05d41f6fc283b8f5f5db03c1a0b40b9278ccfe83f5ae43038af4ce4b55 SHA512 a23397f99137b3314341dc9fe5c903dc053a8a45db866257814a558646e391a32ae6b2f85e990bdff3e462d9a3839f3efab3e4f3de2b4bca34e9411c0614baf6 WHIRLPOOL 39bc251c39ff79c94549e74e175f6730eed9515c67061cf0895037fc4b04e95efef424eb158597d29e964eecdb3cfd43cdac1a5c817213b8d3d71c5a66e9863e
-DIST firefox-45.4.0esr-fy-NL.xpi 447777 SHA256 3d1dd9e247b6926a3f6d0e7ce8fa9d30fd88ff3abfdfec0076126bafa54fd3d3 SHA512 20e776ec0df6d5e624c1f5ce0f62c65241956d1c2cae9a592e59aee65fe2eb2d83220a22b5a35e770df3ab7929a9a8243fbb197ed7345bb77414250d04ef99da WHIRLPOOL 60ede19c62fb2f1e2597636146234e9ec5fc81ab1ebaf0fe616ff53e4576ff71cf9e71b82c669f4944680557d99f684d8ff2aca1876a5691e50eb1bf687b05aa
-DIST firefox-45.4.0esr-ga-IE.xpi 460055 SHA256 cf9433091912c71acb7564ac021bdd094d07b490f110f7b8f4244c6eb35a09bf SHA512 3b188a4c87240125fcb9328d80cfbeb48fd07b2413632d20c660eb5baa28763c7589b9603833d64d4eae5b5fa69e53552ea15731fd5a04b1d9e50d1d77d1c83f WHIRLPOOL 4f398e7201a37f4285adee4aadcd4819dbcb39d9a39cc671c098bcac651483bf88826095f4fbe2f7d0f861900c7e8499c7d4e7a9acfb3c6d4ec941e9ca9f6323
-DIST firefox-45.4.0esr-gd.xpi 449711 SHA256 58ff55ceb7e881854135c1d750b5dd8a903187e4a7c74febb2764a5fa00bd315 SHA512 e309c75c00b6efb74958205539cf6ce618f7f1a39bf4ce995054582a8c261ff50f880bfcd6888a33eb2361037dd0b15c61df3504620ddd586ae46a2df0153017 WHIRLPOOL 321f9cd3afa4471d0e2a93f6fe870c5c3210281b528c2d64101c016b5039239001238cdf07f5c18909b7b53c624262bbf986a9b8b66f4df078a3db5389ce93ab
-DIST firefox-45.4.0esr-gl.xpi 434804 SHA256 ecdd8338c3b43f3dd00a62ea3039ad989ad11cac4c6555a7198a52531303f643 SHA512 411aca81b5fc9a81b286842897a5d3ab16a4375d9479733f79a38cc7d16c7fe74dd05ab731213c0647b38548f6aaa9f05b3ab754708807db5d40e3a163a08b81 WHIRLPOOL 4987cb5796e9dee2c48aa6fef1749e8bfad49ec82cd28f64c4277436cd1efadfc0b540f4e210a5d4d0a315c8c32b4650b52a22eae59633a88205b591416cb1d5
-DIST firefox-45.4.0esr-gu-IN.xpi 472566 SHA256 9381b0464c16c878dc2f373d1164a7507cb8db7d9e1fc8b51e2045e4865be5ca SHA512 be55b1fe27db742413a2c6556be60e26f5d64f539b713b79004057fc9676cb9eaf1b4a2efbbc0158f71768f3c67570332d002520f8db5c9ef721de95eecf2f25 WHIRLPOOL c23f9aebb61f5cd4f5faa7fd2db5f0a45bd0d7457de2b51602e01da336ced70a2568e7bb94f4e9a5ee6f86ac6927894feeadaf2e2dcea2427b321dcbf758411f
-DIST firefox-45.4.0esr-he.xpi 454785 SHA256 cd6b55c50638ef23bc0e2604be4429c333c9c5ec614df87b565fbd2c64e3d768 SHA512 2f766edd72be809505ef3c0a781437ce6bb767fa569a5b6e607aa4c52d7a98fc77e4559a21220e28a1dabe3e1ac1e4be73641f70052264d3f764c476718a625f WHIRLPOOL 22d109350097125c8134fc0503f457e507e5644576d31e35efedbbceb844ee3b5bf373896773bd132681d2b8e37e285e8a01031bdd3bdd891ac6f903a75e3b1b
-DIST firefox-45.4.0esr-hi-IN.xpi 486991 SHA256 85f24ea43d8b8965613f140e1fd89c04f52df49e727f10da18ccd7c40ad61bc9 SHA512 d5e5948d80df5e473733358de9da06c377a973a5dca54c0e9eff3672b0942e833114d344687817491c7d36501740f68f637d3162ae1c2645d8bb3e5a5c93f36a WHIRLPOOL f74d372df1de5a596d74d3cfaa708c14afc79e0b3d8e76f04b9301baeee3cac57485439888d6014bd5733750591f27dccdd88260e718e98b7bbfc784c0479384
-DIST firefox-45.4.0esr-hr.xpi 449068 SHA256 d669460b7f669c09bf114a66fd855c7bd68e0199e393a0767347b8d8d33e62e1 SHA512 263732e9ecdae9ba95a311c2a5984c23da2f141c1233a9c44e85fab83abc6eedf5f72ade67704a76a934c8ac03ba1f3101382172bcebe240959422c4bc0c5d74 WHIRLPOOL 79668ecd4423067f481f3ce661931b8b135cc587aedf04ffa03ef0b1efaed7f5c66b6396467528d762bc9735306b7dbe6a066f9b2f6a3ff2ae6474189f04db85
-DIST firefox-45.4.0esr-hsb.xpi 461454 SHA256 e75994fb29d63d8efbb23ede2d4672d43f0e6b981623f4e394179eb7099603e9 SHA512 98bbe69b7d6f3365fef03cdb011c9428cb08cf4029797e5bf7e0cd751c6f88e58c493751cefaf221cc35309eb53c1cbb9efb2e1575b164e346171c777932e24e WHIRLPOOL 63de0b0e668a0c22c980dfe168348ad75fd653c48b99c8d2977d31dc3a29cc7864fd109ec9d5bae2a0032cfbc1df776476c1bc6525a25a63a59cf7b0234a2788
-DIST firefox-45.4.0esr-hu.xpi 449777 SHA256 e5faf70dff5dce51eb5d0844493758bfa863e4c2fd22e56346fdf2bba3715285 SHA512 d6d2719fdc156a17504c4f23e38bc19b6cca2ae7ba0a258c30c63c19afa9ca3dde72573ac258f3270371437ce11eccc2c6409b6b05ba9b068ebce954142a1df6 WHIRLPOOL a0f244c75b9c9d281244a62498b7760733a7a2de5a81da6530eddcec4d8e9233fe70f59db19449b4644ee15b7f0daa5ec352dd1c8a866805935125ecec180b05
-DIST firefox-45.4.0esr-hy-AM.xpi 500040 SHA256 1506ca20942ba8176a3adc7a2f8f82c78fe8ca58a41c98d7043b9fa0be963ad0 SHA512 a9f04bb12dede13e008402fd62da01669e67fdc86cb13b49632b2e37c7ab3032894d7ca1a5d053f42de04137119ccf163fe0c82b545cea158ee3db6e4d61c3bf WHIRLPOOL f46dbd8ba75db7d6c4e15ac34eccc4a0e8c1c7e76f373469d530b88fa964915d15077b76cb827e9d3de298f8c9bd2726d3e61eec16788cd78536742d13e9d92a
-DIST firefox-45.4.0esr-id.xpi 427175 SHA256 4649c3fb879875aadc28d94ac585cb239aa267903fc3506bc84330f37073ca4b SHA512 816c90b86015855761b759b70a45c7c453cced2ba6884290278c7bee1ad4081c0f2161a96007bd036d335799d8e0c0ad4723b77a8f532bb88e1350d23dc726ea WHIRLPOOL 46b9e6bbf682e700973000bb5b4e6c863f317b79254d866cfa85fd56ad42d2a8055f6d7424ef63a2481b5f86f060c8d3fb25e7623e7fe1f35377c7b0b32d44d5
-DIST firefox-45.4.0esr-is.xpi 443209 SHA256 4238fdb1f60caa6e5d3cd05c6fbe6dd109bffc9981731ee1bc67f79fc33320a3 SHA512 2cafcd8a19ec6319071b71ecf2259d7594153179c31aabf9424b0e7f83c152031ffaabfad9a989cecdb13f7c0a16f50228b07dbbbebb107a3ed21da168ba14bb WHIRLPOOL 447f964c0aea55cd31424a1b914cab15987091f4c33da9f893a85162bf300c3e36586e07946c7e53955b8d07515c6924fcff239380673f9d580387e01a8a39a2
-DIST firefox-45.4.0esr-it.xpi 343724 SHA256 19681a2c4a29115c1c23d2eb533545ee5523df50e6154bb3e78079aaed3ce1fe SHA512 ff27fb5c4d230f48098c985f35eff4448e237cd338c23150ce2e056f69742db6ca062b45a3664553ced7dcb8a4a377013026a1d24971f22d7a921b8c14b0ad29 WHIRLPOOL bca85f330fd689c513d892ffd20f15710d1e9c1103a95ecb0a35b0d6164e48abee38280fd82907c939f339d5795d156066bfbcc6896864f56f659fa5e3a3c38e
-DIST firefox-45.4.0esr-ja.xpi 486331 SHA256 bfb8f237438bfce780d08832437ca9f381d679d52f3d05329114881b790fb3e3 SHA512 74062caa3d8e4a59ad4d80aa34996b866a713e5f3006de8bca38885820df2f3b395a0cb339b845085d75370a4fb6a274010ecae2682b5aaa27693e292d3cba84 WHIRLPOOL 67351cf61cb592216a229ba99f53cd9ee8da8eda3870e972752943915835d237b00aae6d4aba01bf3c474580db5bc406b52a2225bbb79a6bac2fa7ee11d6623f
-DIST firefox-45.4.0esr-kk.xpi 498895 SHA256 dc9a2e668acbcf9ad7e3ea0fbd300578958c5ea809a32857d5d910ac937d398f SHA512 af819bc011eb03b8a295b2116386333a2f4d44ecb1a47979e60013bf385645692d60b3cc87076db559cddf33249e7cf737ee4076048ee40f61096bd959e913ef WHIRLPOOL 01d532d333bc7faac026cb9d6d5d9a72c71a52d845aad00a6efedef376fcb2c0734761ab2b13023f3ad0d1511da76ff967ff4c9829f974391aa80ed0f6661c0f
-DIST firefox-45.4.0esr-km.xpi 504301 SHA256 09690c3d240996b8250f39fa067bf94e085d0dc92b6a723dbbad43812b2030c1 SHA512 eb653408b15fc9e4e6ee099d2f4652f1813cf611d0e27fe0a27c92fa26e1478a2d04d1a2027ae3df497f39ba027689224ee1542df3c05c98cea091e27c7dcde9 WHIRLPOOL 58c080b25ed5e4ed20c8b2a4156310372eb2516d3d0adc5ab0e8eb51505b1dc19222a753c94e43d06465828ba210fe8c080b1bce5788efb1b9cb3e114d951fc7
-DIST firefox-45.4.0esr-kn.xpi 495880 SHA256 1caef936831ccdc2476338a82d242de38d8b95d01da045fd4e1c83a635bd4d1a SHA512 f6e709eadcf32682f96054165db9c1dc915edf1f80df07e2f61f33299441b6d96d8926ef612c26346d0dad0f3b36fca5b7d908b42662e3ce8d6b110fdd4816a8 WHIRLPOOL d9895e61d3ffc01f8c2f9d73ce3a70f12e1d81d02d14b16229aa6daac4e5b8ca63438ca4527e305625cbb37216280b1723a3b3dc284478d3f1420e86ffbfc69a
-DIST firefox-45.4.0esr-ko.xpi 465289 SHA256 6911af52b3158060b3c9d908a9b8644546860b201318c3eb9e8998b4225a467d SHA512 018e634e9dca4ffb239cfffd2a9adf96ec9654940d042de6dff658e247bfc970e74d731a946ed065054f63959e5ba6ba8db5e5f37554b212e53504fa15db026a WHIRLPOOL 5de6b6af4a5857439573d293688e2b78e535bf474ddbd3b3529888af970f623e2c7bcdc5554f7667fd6b55e9513276f292009cddb06aaf915c7b86ca56f1fa74
-DIST firefox-45.4.0esr-lt.xpi 454678 SHA256 12425fdf610cfa47eacd57c46c052c3b47d70db690b9ab879827c799a339c558 SHA512 1c60248fc9ad3e001be22fea8735e3ccbedecaf6e83677da6064adb024ae77e433f4532a1725fe2de5ee40821938bf54512ee24e5338e6a6f9764fc272c8a253 WHIRLPOOL a41e06b863f0998cc871459ed9ceac4b4d7a2d7a08aa1617149ce2c04fff8a35e04ff59642380c34155264cce73bb4d974d6ed0a51f5bde520a4d52e7f3ba8d2
-DIST firefox-45.4.0esr-lv.xpi 445720 SHA256 215ae965deb8f9c0c48d9d6aa92410bd2248b603698607575a9f8609eb4804e1 SHA512 48f80b6c3098ca187ff9f5a0cac8dfba4ccb88d4330c9d228c2e4aa7b9048b3bbd8dc43450f4afba2604cad8d61b72ea79c2821b92663f6f0300ddbfd80a9bdb WHIRLPOOL a126ce0133b4ab3d25aa57323cb3e35e618860744509c4ab443eff37688d83816b8dec0faf3599c79b7e6fa58e7272c7c193998c7c7ec9d7ffe62495646fbbd5
-DIST firefox-45.4.0esr-mai.xpi 492650 SHA256 94fb864c77fd9290dcc3bd04cb1eadbcf968670045eaa3eb9dcac05c3184acf6 SHA512 63507977da8c07061e5ea2fe543e50ee9c9d1bfddce811086faeef86fd23c2cdea685071d4ba65236bffb08d9abf3f0754fe65a3cfceb8015d3b4018e6001ad0 WHIRLPOOL 16e63634bfacf7b9665224cde6245ac3f0227698c00065f71d6d5845d3ca512292246cdb8fa72dec0606adb8c4b5c17f961f18dd29fffa8f89669b32f1a59053
-DIST firefox-45.4.0esr-mk.xpi 476391 SHA256 86f3dfc67c95edc145edbd9c74d43d0ea851152efcbf9668e09815bb7bdcff08 SHA512 348fa00539ed78ba1719d33e37e6650a68e3bd0e8ffcc1bb7bf0b68a8257dea54fc7da77eefe26a68ed8915c579d2dd830910c9f49fda721f464e25d31e0da5f WHIRLPOOL b296be0e9243547c4de59d7887b47f326b68343a88bc958213e6f956290772e8e55b5c7ca6310ffa5b3872d7f8b843e702a53ab79d57f2fdb716b1ff973dd08d
-DIST firefox-45.4.0esr-ml.xpi 498681 SHA256 58ef5156b28ceda053c1493eccbd752781418b78244e23e0c39d37d987988c2f SHA512 14e83ba96e25aab9f8f12269e99620f2f9904aec3982ee5963cf99208f98c4f01996a9df92d267933d3d875bdb6da7ae51632d3fcc5de569b1a1d41f1880bbe5 WHIRLPOOL 010ac2ce47ff0cb80a474dc4dd90369430ca9c5da34c20fcbe3e4313847e9848e1723d5889622e20fa26c609a1841d8161c62c3b46fa96ac91741cbab9226fbf
-DIST firefox-45.4.0esr-mr.xpi 503700 SHA256 b8425659021b1c2f289c0bf5c55001ff3258f7196019ccc71cf4f813ca4a00e6 SHA512 3cc98174d27060ee30c2109713d949186df772d91104f446d0ae84a76fa4c9bc87f0dc7e48c80c4de93a873e547501163c45921bb3c3f62e2e71190432c882d4 WHIRLPOOL 0e043c741481f72c2083b19cadeb6b4c49d367536b97a6166707bcd966e2e62e123a4d720a72329ba47bd1d93506beaad8bc540c1559895b67fb87ba9c411570
-DIST firefox-45.4.0esr-ms.xpi 440064 SHA256 88d5757a8acc259751ff04e1f9a94c4f59cf4e280ba2134d64caca372ed0d58e SHA512 bf4c727d3d0dc56e0dad738fbd878188ae2ff1d6ab2b85b636c9cc509a801c5b7a9f1fdc072f1b4fe4a3e3e2c43171b9e4f000efc3ca796dc84a5981b5a94803 WHIRLPOOL ee4d19d3546370c87883a7e87d3476992955c0850d64112df9a1877c7deeb6ccccb82d1235548fc8ddce972f4b0f568ec9509633d39ae05e076c02090c1f674e
-DIST firefox-45.4.0esr-nb-NO.xpi 435470 SHA256 4a2003808403b49618c0ab33cd3def7382d0b97fdf56336c5d390cd8fcc65751 SHA512 dee95e5fa4caedb4dec80aa75e270cd21961227f576362b7e733fd6e02bfdb0261aa3290ea43688ab5b6922f46bdf400fc5453b1f996cb3beb94baebe57baf1d WHIRLPOOL 065f7bac1b6698b9d6fced689b760a8dfad62f08b5da840d80904f0e76b8e9421c2a54ce1074e2cbac277f835d0242b6e911b2124a3991226d1bf6df29298b28
-DIST firefox-45.4.0esr-nl.xpi 435202 SHA256 771bbc2e649be9f9529fa745021ecd40edf8f89f688b1547eaf59d33c4ad22ed SHA512 0f39c702e07d7e069c5c64b62ac8ce7a65afb28b0fecb5ca4178a6451f59ef8adc3c7bf6b985cefdcaeca619fcc5affe54e02bc9d9bb946540d8482060641673 WHIRLPOOL 99ea86d4a30277626cd66dc78d534510f6d421121b16113b3c48a738171c226e18173bbfaa85a94da5602c867d6d0138f8190d7c9ed7b619699993b7ff08d0d1
-DIST firefox-45.4.0esr-nn-NO.xpi 432934 SHA256 81fffe653e75481c4cf580d95407f9a963df563ec3b489644aa7dd51a310d097 SHA512 e38ab1b1c0ae842f4080a05a82080a0a17b8a972a57579e74e5c9aa1a347373e769faa3de8152026ecaa980783e5a553f12a70f18be6b454c017f90ec38c6f2c WHIRLPOOL 1d6b706cfa576e089fe947ed9209fe1862fd0cab28173ca6142a8d5e8940b629d3bc2eef423b1bd7ff2741b540876b0fe7bb84d67bda18557476fd623d319d55
-DIST firefox-45.4.0esr-or.xpi 495922 SHA256 331de883dc3c17f986662f81472c39d156d2ac75c686857f65cb57e6d0d71e34 SHA512 8416c19495ceb94016dd4ae7eec95c8ece8357fb12f37dd5bfe389c32ec95403f46dc460496201e7edcaaf1f6447625e8ae0cb0c20c3c85f26a4ebe31b66f541 WHIRLPOOL 280471a1243fb7f8c32c8f810630d0e7fa8798cd7850110fa82fc3cb42942e221699a72988ee16b1e75b157b08c4c249fbd30668498236d1d6a512de5c2472be
-DIST firefox-45.4.0esr-pa-IN.xpi 489550 SHA256 181b9e600cc89229060cf59c5d0a6c2bee24084c749dc57feb67278aa2d3d4c8 SHA512 f16e6a30a852ddb30f153c18b0ba17bc618bb5270d39aade6229ebbb95ceaf52c96ca25402edc4754152d9b43c6715d2269b2c56f3474e67133586156447f2d5 WHIRLPOOL 6df02617894760ffa7b268ba5f4d0c2084e6888992ab19700583de50459b65ea248a8debb1742c0b4ff58fcc1f2fb28725f767e22b3774ae68ed40db67b90f47
-DIST firefox-45.4.0esr-pl.xpi 383929 SHA256 e5ffe9711bddc494c5d97388bfa2484e7da9f2fdc812d81ae65d461e9aac6061 SHA512 af7b1ad865846d22a1b4a11a4edd77444581f9cf86b59a6267f39d59fc3ebaee4add9a76fe568b54fc88e78f31eadc39f690dd07c931fcded829b9d5bc9099e4 WHIRLPOOL 8226238b98f9f6a24b0af40257b4b1d373beee7616b2c05141d72b8165366140c1f08c2984e2f56d4ef28df7caab347bb2edab0cbc38b4922ae66f10a756db2c
-DIST firefox-45.4.0esr-pt-BR.xpi 450991 SHA256 db83433dbe974388999092ca49027730da198ce86042aacdaf33be58bfc52e60 SHA512 1baa974bf07ef2ea46dea031055c8fc412e7ef2a5e960db4a9f0f46bdfca89230825d94f32510ac4579c4d7c270a60c1ee061625895979bc1e1e0cc1723e2f4d WHIRLPOOL 56f7704cef4300f1b43dd433f56f42768d8eaea876bd4c7e3598b523b7a28691a7d2c1ae7e196ece08891b70c1c9a3344675fa6bb2ab221898e7c6f4b2c531ba
-DIST firefox-45.4.0esr-pt-PT.xpi 437022 SHA256 eb64e48eaff38c53aa75f1f742778ebb8c6e259bf86e24a1e573c513efc39712 SHA512 5eff44f1dd9cbde27a40d66d2a67e5b0b8d3ff049facba4dcb46a298f5b2cc062c07bf5e40d3bb79ef0a0fe3cacaa9dc718737a10b0598ca865f6ac94db73366 WHIRLPOOL 95972a45525a540d363b5fe4169f86137259d03c2c97c55b6c4b1636d0bff33c6b1684a192de84a3f923a9a2e682a5dad472509bf13ba48f72f05829cbda4129
-DIST firefox-45.4.0esr-rm.xpi 437717 SHA256 88ee595011b2f7f1031de96ffc384991b53d3a5ee3cae16231ec559c6722c47c SHA512 bb057a0fa17824cc69d57bafaf875ef3cfcedc98d6b894ddc1daa7e71407f97befb9ec98f2b5fd1fbb78b1e5d981e119da4b849faacf59dfdf342138bf5c307c WHIRLPOOL 1cbf3e0b64ab2def752368d4fd5e370e30f30f35e30b7a64814a59d62b55f460498e66bdabf2e8cf6ffb44059313052cb914d0e65acad8b0b53f0f712b351857
-DIST firefox-45.4.0esr-ro.xpi 444062 SHA256 3badd245dd69cb828e3fa5ba3d550152fc109ffa23f5ca6025828c25fd5def49 SHA512 9665b7541ad2a7b6e021b861503f814fa86a34cc5c346f50903c5dd69fc9e7b13aa3294bc2dc34aaca532d38e354d75d72e6103c6ffb10c25154165fdc979fb0 WHIRLPOOL 011ae0fa4d038253bb2162cec26f6fe0cc11e66d873822e85655208240b217f1ff5fc0411f352b4079e818bf4b05f872317a88e1e04d41603dd4b60d88bc3e8b
-DIST firefox-45.4.0esr-ru.xpi 392738 SHA256 4c2a3a157e7f40c27e37864585a5b5c75cda15a722ee5891c6fa5ac5094f2a56 SHA512 361b39c031cb4dc3a5acc4b555ea2286efc8baca6ad381088cedb21e4c00e84ac9b6b993bf9e77ea32c5995c907f36165d97371b5f3528613268396b7b9b0eb2 WHIRLPOOL 5889ac2b1011cc2b83560592c4e1ef4f0443a2f191893920823f1dd59b3d9c41c167d66400fe86cf26061647c3641f1630bf867ea9480debcf78eb1cd48f2268
-DIST firefox-45.4.0esr-si.xpi 482248 SHA256 85f65e476bf0a6e4fcbd08d73ce1dd6c6d82a3cbb2d3eb95c7dfaddcded21d19 SHA512 746ecd612a6709e83ac53cdad3f1ee34a1a30b7780ab204d63e18f671b15f6d8e8de17ecff0f298f5d23d6940ee2eb370aad18db116662c2ad227969263d9e55 WHIRLPOOL 04a60815f2cc1c97f339f41be84b9784d14f781cb22cfe5cfb42186ed2dc7f8fd2c206c051f285842cdff130be01609516717631e90e338b36a0aa0a90f2bd3e
-DIST firefox-45.4.0esr-sk.xpi 453606 SHA256 07dc2468781b2d26ccc5901527cd46fe22d4a65909180515b2776dcf93ca81db SHA512 8d7575b876530b3868c95cdfef259bcf6013f527f761ba58fe5f79ced17f4407496814159ff8a9c9e583caaa82d0bbfe041c0e28707f8b207d5dc8cb531eebbe WHIRLPOOL 82ba72e97dab35c738b14a94966cb7717625232257dc9e7d8842a9f068d94ce6f5e3564b09e3d295e1aa5bd3b9e2623447dd140e9023728ae2236b2f4bf8a737
-DIST firefox-45.4.0esr-sl.xpi 444963 SHA256 30301e0f05f988570f90a92894d9f4c782840f780a6c71278cbf495d4405ef44 SHA512 4941ccc70b40da79ca4088f6705febd6d2e1b886cd87296f5ca5d18c4f9e0556a8835e348c59a34625082cea1dca3ba30f909ef1067c74dc740e582d34e5eccf WHIRLPOOL 359c156eb9d3a57178b9f2c68a6d931051869d7b6e50101820cf75142f6f993be7940386c488c569c874849b287c277528650c9112aef0119e6609d2e7aa6fe6
-DIST firefox-45.4.0esr-son.xpi 433513 SHA256 bc5ef59a203170392f94de355b068a1bff197b9c0ea5e1e252c40b2170888762 SHA512 56c64deddc14a7f64de170572df9668bc920d5332ee5268ac10e2e92fbd87a4ea64819617e703cc3a273b64196e46ded897c9959a19cacb4383940afaf6e9047 WHIRLPOOL e0b3f744bdbad6f7bb517614bdf4f23508bdda337ef6b1fefe5657405f8ca525e3837b3fcd0c238904535ff6fe5b0fda1cebcba7b8dbcce0346c099d1833adf1
-DIST firefox-45.4.0esr-sq.xpi 452186 SHA256 ae880d4e2b5933f983b6f4ba0164626a8ed957d05e74213f2f9491bcf532731d SHA512 72fabe39fb063653b2fb758620fb3e5ebf2b9517d1b0a9a8217a885adfaac667fc364238ef0159b23ee7a127e18a52ebd3b49689514bc9e7e1d8690e323a3b0d WHIRLPOOL d128be36c44b6865a865c682ec2bb55fcc7adbab785756ce054a71dfbf449800942f62d9c496b772a0eb57a3eb6ebebd4e7b31c6fd1344ab6780b102afba8816
-DIST firefox-45.4.0esr-sr.xpi 464478 SHA256 1e8b42b0d978e6d69ad503b59d2aa5630989ae4ab6eb2f8fb7d8afe845c507d1 SHA512 1a3621bec0b699d04c9c9c8162a02f3d4c937be22fc727bcf49c45867033f77a9592c477bef61f5295291630fb7a5c88063486b08d247216228e46757218969c WHIRLPOOL b5d3d1782f0dcea421234f3ff8ec33425101e1c6e04150d1914320a5504bf979cde07513b8fa99570abe7ab0fbf311cedc8743c91e026f850c7789723de74679
-DIST firefox-45.4.0esr-sv-SE.xpi 444212 SHA256 ce8b6213f798b1ab1de1be34246db564dea7a99f53cab8777d55f5fa66806abe SHA512 30a2372170d3df06d4b8150b08a829ea797601371edf48041912ad83d0d40c15bdab1163269c762d79e479259d7ed404b238a98ac7cbd61f288178422f99496d WHIRLPOOL 65805ed55ac36491d4849448be162088d5ebedc8b18b8585990dcd23b457080956b12983a4ff1503bd0ece1b132e2843c9a017967cd3e3d8ad53aae0389b6afc
-DIST firefox-45.4.0esr-ta.xpi 483117 SHA256 a3b51c2b08d48cb66b74b048a2bbb8503ebb5770b5a6ebdf804ebc2d4d13ceb8 SHA512 886ad99af7b0d94f2520be148627b7052317c3b190a8202547327fbcab54dc35bfb4f474a0afa370c740e7341be0c331964dc406c02a20791f677fa1038a4e7b WHIRLPOOL 6051d8d911db7e13345bf44fce707a6e30486e0b0a33de4d11c03ff5050da479b58e37efc215b032c7bb9441167a73f3509912647f111c42f024f36923d43e84
-DIST firefox-45.4.0esr-te.xpi 492471 SHA256 8d328b269a82a2b6e4cd9d0908039b9b6ed12554b2a7840b535049e242f1fe37 SHA512 910d552a4da0ee37c17735f6b06fe5ba325bf5b2aff7b92f21d719547ac5ba9acfe5e00c1d2c27b90bba52ec0be96adbc2e9c117cee29997a4625a0f31f2fc5d WHIRLPOOL fbc8a0c0f8983aca0945aba0ce3948c477d320d3886c9aa3b4addb6889ea7143ac83b87bac274488e66397d4df4418bfd8f76fa9ff8f126118411c2e17b7fbce
-DIST firefox-45.4.0esr-th.xpi 477650 SHA256 e9b1b10d61dc1e04339dc0a14c6f317211504f19ae74464d3549db602a3c8315 SHA512 ff2cb62ee997f26c8d1e7ff7268c66284a7cb28cddc9c74e542cf05aa3d4bf88f388f42ac6d1ad392d26baf56ec1de05d6b1682692296947c49599a4f2520cf6 WHIRLPOOL c956281a70f4faba071bc97bac34e78d0f665ad8140ed5ec3c1519688cf2f288b0a65d8b23dc9e1e5324b72b080bcfb2031947db38c57b6bd16f7e602ca98202
-DIST firefox-45.4.0esr-tr.xpi 451166 SHA256 051b39fa1bdb6bf56163486a5976441f01b9fa4f6552192ac35382570e4fa09d SHA512 54d946371ed66a273350de1acc8ebb27b975645b033e452a1833f151eb43c6e0fef3b000908352193dbed6f62b2e11983206baf4448d77736239334facb689ba WHIRLPOOL ae257aefb5c241f10bb79b8158b46e4208ac65952d223c6dd28fca8e14077ed0c2abd0ced36c12bfe518752229dd2c75bacd87244a92b297fb7740560e7afff1
-DIST firefox-45.4.0esr-uk.xpi 494780 SHA256 13b7f42b8a673ce9781fe036d897caf0489fdf0b3271949dbb2cd43099d2add0 SHA512 98a067d8e2bf49aa3b912c10acb8e0f547431dd2d438652e7f09e01d29c1da3a437e677f8f46dcdb702c7893a77e7f7be187c7725c24b466ffa5b01c1055d426 WHIRLPOOL 33953dbbc89ef6678a77e0da571408ec216b2523a20063f0adcc883ba20708681b2bd451497e33d310bbaade635e821f2137e41db756b41cc3150b1f0d0856a0
-DIST firefox-45.4.0esr-uz.xpi 443803 SHA256 8671bf3490a4f6c98687c595f3184c847c7f644311a51bcccfd8a042e7626aff SHA512 145291f1106e1ce9bdc4493a9a026bda1d33ca0340a2fc61fdb1c2b6d764701fbf1cbe4e3a1d17aff66e627b00f7440b500e0a17014774ae66c8580ba045d8a1 WHIRLPOOL 85800f1d0c45c51c2445863f0d8813c8c4bebb9f8373cf5b7732f99fa64eb8a82d7530e2203d05f4f1c5b36f29ba6f3029bed7c9ded2da2d4dbbc476ab59fcd3
-DIST firefox-45.4.0esr-vi.xpi 450778 SHA256 9959b5849a55f2ab0648fbb6cddd156d1913c99d4e1689733ca1cec54d34a788 SHA512 5083272473539c52ac458570bf415e37dcb73cee08865b86a6d4cd74dcd3f0dd47f8cbe4d7028325b927b888781af83c706f230c332d0e2ddde1c2c530cf47db WHIRLPOOL 9fab38275f8d969c51d31a715ac6756e0bac44a223b718931d0e52f54c2390b7a76f358d15cbb59b23efd11d27f824f3c1d078ed272db4dea1441f88a12ec9a8
-DIST firefox-45.4.0esr-xh.xpi 432918 SHA256 081483fa67eceecd0aec32b8ff4eeaa6f4121975d3dc30b8450fdc0fba17633a SHA512 a1cd2ed7edc6b9591b4e164225b336eaaaf49f629f034fa7ad6eec8d24a4d223272760c502d5aa553ad2018194f5eb4fd86826854f6ed184d41a0a896fa55110 WHIRLPOOL 72f33b6d109f3e44a5cc8ca617db30e93af1887372241c23b22e70ed2056164c5a7bf2bcd841998b55774e83eb50dc9b165eb310dad110805a372aeed6bdb657
-DIST firefox-45.4.0esr-zh-CN.xpi 475797 SHA256 89b3e8f69876246aaa7f52ea21a7fbecedd3845413ecd69ab28dd638d1b4c399 SHA512 97d7b1fa74b1ec457ad13d40ed725ddccccfc701578d5503db7530aa599c66d18dd9494353b8cfd694363c44edd7779490d0874a818fcc08f5e81d2dbd821783 WHIRLPOOL 6754a636368c1f245c7f03e6a94c3afda6390fa7aa4e84d93e9ee36d7e89c80154565449296ea82a5973d114c268b15855969d83b2088d645d26e22b86696b83
-DIST firefox-45.4.0esr-zh-TW.xpi 466529 SHA256 c86a2cd29730ef4f780423ca7fc9a1eeaed447ed45b19493f6ef03a44b618b1f SHA512 a4d4c9133b3a7be0e26f9e6f93f19ae1d5838c3a737dbbef4aeb715df4e3dee9ac13f00359aaa9c5b2ac5fbab6e383179e8669e1d24a42a699f2780063e090a8 WHIRLPOOL 8fb329bfee9e60bb5cb5fe7c2919f92bb6364ce1819a46b11ad9c7e428d5f923e2996b34baf01dcbf32c8bc2473fe4a38118001034c9a17d58fc386252d7dd3a
-DIST firefox-45.4.0esr.source.tar.xz 185182396 SHA256 cfd90096b9e1019b9de4fe061ece8c65f668b8a24bcbb657ce6b3c940ef83ad0 SHA512 2955e02f829a10186a8b22320fb97d4b0fc2b45721fcffa6295653fd760d516ae72b5656547685ba1e0699b381e28044996d9ee12a8738842b4e6b8acd296715 WHIRLPOOL 7b5b077160c40afd4e513ef4fa4204a90978fb62d5ae658c244e25c609d1e77b105ee03190836318dda63e341a5e44b7e718e2bd8732900723a323617a424236
-DIST firefox-45.5.0esr-ach.xpi 426530 SHA256 e43517f42ea355d0a6ee6a38ddda69a714ffaac1c3b574c2fc8394f6790b5f02 SHA512 79613f01d187f7fba2de8aa17fa2fe8ead64e5c37a741d34ba27b6de786dcc32cfb96dddd9a629f4f5b6ff7728bd90052be1235e410961e422179a74381c49b4 WHIRLPOOL 52a37a42248ebb449d3a9260e5dfafa000405f20b91c355462660605876a0ee40bc5f69bccf4bea1d935c9c64e72428a21426a3539a09ae0908c5a9aebba9491
-DIST firefox-45.5.0esr-af.xpi 439354 SHA256 2604d3b6a13ab9cca4d6c65f9ff28065537fb100a4b2e13b4cd17112443c0bb8 SHA512 00b24d8f681a04546706373ca935571283a3ffb72e92a90cccf1a7c1d6a291c1fb4d82eb9eb75e9d085bbe15463062c4cf939d8fcf49fc14a2086f80ea542251 WHIRLPOOL 632c5f6708fa3a190cef2de70dfe03400d4d4b9820bfe8ab58e2b2a0d1d58c8dff3fb0ade0ffac19319bf8cd0185c4084feb86f9039049afe8e9c688d8b33506
-DIST firefox-45.5.0esr-an.xpi 449036 SHA256 95560e6f609d23bdd310a9b02aeeb17a3eb1d18df63058d9e92c163a4d1ba2c5 SHA512 9173b4f23d81cb0298164cb3e49a1ce1190cabab4ad8e4a965d4eff1293bd367bacbc429bc6c4c3a6b92efb1a14eff111be832959086aec36eb4a2dad6f7bacb WHIRLPOOL 53ddddc34ecaf8e656e7fdf7b3d2cc10fecb9862d310152f347c3e536df1b3ab1d08978df0c5bb19e6b84709a1a659245d733b9374e9a2f7228de99d32274c9c
-DIST firefox-45.5.0esr-ar.xpi 474961 SHA256 111a0aa525bf69099ffabbb84328fe04c3e3e3ca4eab72e4772dc6fdf6993827 SHA512 a4f29a747e91148fcc34b9f7c1ff8b2d6aeeee1a1e823636f7cc96a22d8fb7737be93762e3b81c5dbf623d0462705276c6c7f5ef26178884f35c6a99bde7c570 WHIRLPOOL cb0fc30ecbb31172025b07175d36e3064de59e84b6a5c04d7467d7da6dcb816cb86c0cd9fa57c34cf448c84b9652c43a4ec5ba06cf4fb9bc4b19aa2e0af3a447
-DIST firefox-45.5.0esr-as.xpi 483096 SHA256 aee9f10429c2c6d81de348b74ae6a781eb3acdb092244ed7b92ab10fb7e0b192 SHA512 b4516e92f6e828232bb361556e6eaf9665ce5702e7f51897b0f0a2501455d9baa744e73931e6fd7d2ee2621aae58541ed361a060af48df5f58bc492844e56bde WHIRLPOOL 3e5c79b0521caa669d27732dcb89e472160986515bef52696fea1b015b2e11e3811eef0849f2e932fe83177415290ddd768931275077fdd8cea6687d9714c880
-DIST firefox-45.5.0esr-ast.xpi 419250 SHA256 6f8c9a404d5a5f9da1deab0f96dd0c1c3a6a86ca249f375fc4ee9cf1e1cab9b4 SHA512 cfe9f7e5dde7c4a7e876263d8e45693f5c0c1a6ae9c52f1efc016c1ab335954b518a1a92febab8a7bf7e53ff9871b83e7b8924c86f937233ad1ff8dd4acd186f WHIRLPOOL 5239efd6696970747a58a438dc2d3f4b602b715339b38e96deb07c5b24090160476a6050aaf57817d0bdfb7e96513610f590b7a3b8bb51a3ea23a7cc4cd8ca3c
-DIST firefox-45.5.0esr-az.xpi 464018 SHA256 ebec9a55abb4b6a397041935dfe53628ae3588dce1104e4692f24b2336f31f75 SHA512 cabeabbc8a2498781fa8ecc6825eb7365f910f8f73ce341630af9d8462eab9170262bb85b6d449468cf406f6fa6b0928d1ae9c5556f9eac009f8713d1ab70764 WHIRLPOOL 107a120758b7a479d133a32c15a4b77d74c754f488c071be50dda1775a4eb470dd901c44c1cdb1a18b371bc83929d6cda928f606e1ab24e9161b97998710367e
-DIST firefox-45.5.0esr-be.xpi 442619 SHA256 924b48069cba5fcfab56f81f99f14414c4cbeb00fab4747c143d1b0624edad96 SHA512 152bc43740a141d409b387be781d7b8c01beb96d078ff274a34ca120b4b77dc504534c6bbac29d16320cc0f89fe8f71d45953a2d0fa864bb8f90a4c74dc6e178 WHIRLPOOL 13dcb33795a464f87df5c8d8091166f9124408f9a87ae633566466236b5bc0fef88c75c1bc29d9c1436d2e0220e3bf2524d00a826bca1ea37a985c24d828e5c9
-DIST firefox-45.5.0esr-bg.xpi 460809 SHA256 d37437dd9ad8c79e96f10ec652454b0d5e8dc36a90c41761fc7ed5fa812d8180 SHA512 cc5bff640cb5f4867401ab09d01b534d169df512df5fd2c97b88a2bb4241d738b598982f27b722c86d115dbd8ae9f4b531197bfd8c446f8bbf9dde2cf47f3df1 WHIRLPOOL 530535820ffba35a05ab67ce992bb257ebf0900fe191d390db954a30064f5999bde5d8a71290d2d265579bafad116c8360f12f4cb94472eec460eb6f4faa99ee
-DIST firefox-45.5.0esr-bn-BD.xpi 515643 SHA256 c91b8cefe387c834bbc904065a64d9276b2a06d1ec7b6f2d34a1050c31a5a91d SHA512 689e10a475b9f3861f435cf1f543016afef9423b6c1454f067d9922f6ad3694e51f8404fd2901b0d86dbad0f8b07a4fb99db20411e472b21f19a975adce69adb WHIRLPOOL ee2f1f6d4fdcd24f77b72424af8e88d8dde7728659326a6e40f7b5590441be88dc8200aa6cb423d9c61607a5be9cceb4908998cf79628c84adac8040b84a88fc
-DIST firefox-45.5.0esr-bn-IN.xpi 494076 SHA256 830cbd4f99d35889e971715d08d90d03f8e421caa91bfa430f1796c22e94bfd1 SHA512 7668b340c51c76c68a0b65375141e55d5c7b15921d3e44eed33fc8057bf3da541a0f6283020ef462b1fd18cd3a6901a5c4c28386e1b03f9c4de2e2ada513aef3 WHIRLPOOL ea6ee6325a548e049363300763468870af1fe70de035d27d5bc21e6ecbb45739f9e992634fd3b217fc8a791b82e8ded8f809439682989daf2e0a9c7ef2ec6465
-DIST firefox-45.5.0esr-br.xpi 436390 SHA256 5794ffdcc82ab7225163a3d4704ded4b88f3b4d7f5b55accc90d73c4d8784598 SHA512 768bdfe83eaab94b61697d708d0014dbc41c375fc1f847f7a29ce1ebcc16d5cf243932779cbcdb956676eff2b79fb09dbcf37a4ce8fc33131cbd044cc59940cb WHIRLPOOL 24456829f4170afd36a4406bae47e30c646d9c6fe0ba54849b1340521a89b3149f3087f48d683d3775984d7ee0347793beedce8688cf7ca9ca83f35e92c7cc54
-DIST firefox-45.5.0esr-bs.xpi 442998 SHA256 3caab4bf9b192dd7b1883fe6dd1a66e5d1ef85a0f99527360161be396c4176f7 SHA512 ac4b4ae151471fde50eb00f4989d2817e14a505a3f6abb3a82852864c5ada1784389f1412c590d6d84eb302e5b56339a73924ef8bc4add7d936b560b1ca446ad WHIRLPOOL a87d84ec32191c6430a3a8573d40a15ae7fe19c57b072fdf5ae0078b5f75c6304de6a3d31968b95326df12bc7bdb4f8f0ad841c9d019f94d17a588099dff9b19
-DIST firefox-45.5.0esr-ca.xpi 436832 SHA256 be44a1e446b72078b0c9dcb378f14a2ed7b37750315b8d9900e881ce90d55102 SHA512 546cf5646cf9c659ab218ac1ee47dba39038b1273113b43d788bcce87612dd37371944705b016de683a64aeefc0cb6f38e4c98dd6e7c6ce0b6f5c3a7bb2faad0 WHIRLPOOL 45be39514f508d03daeb499159ecc392222cc4487009e71fa385ece1f76d0c233e31d8b0bf3a3c11d4a58edd97d3ffc20a9cb0e84c8c9514d358162fea25c3eb
-DIST firefox-45.5.0esr-cs.xpi 443482 SHA256 1287b72d997f8e1f9d831129102c92b457d15db326a163a0cf29d2bbfadab639 SHA512 6a929ac648f6d4bbbbe38fe58d76b7b74fbeaa0660c23a1838284bee333b6221a7eebf2aaeb9ef27ad42595cc49c893e737ff6cfcc16d69096ecc467e2ea5a59 WHIRLPOOL 8c525be49ec30320a87a6d12b99c123d37079f1c96bd4494e98114eb1dee950e01809caabb82b98acaef1e7c53390ac7ef0a7bbb3610c74b8255cda219188694
-DIST firefox-45.5.0esr-cy.xpi 438908 SHA256 67db58070b41e9f57a4faf1219bf3ce2635cbb6697df42425673696c1ba05f40 SHA512 2328d0e171982d7bf2c872b96b63c2711302a8f782339f9d3e0c5f28765202aa56639abcaffee343a92be6d0f2c391f831cb097d1d2ad16b01910112b5b82dc2 WHIRLPOOL fb775609e5889f54e648948cc71f8897752d7a297f324c8e4a52aeba728b206944da7f4605bd847fc2abb29d4340a5db1e83c8e04fc07af920c62d4eb5e66576
-DIST firefox-45.5.0esr-da.xpi 430078 SHA256 3aef7bd85f26e2bf2c1926eeb0c31a5efdd2880b3db5e84ce2464edf802ea175 SHA512 c09388cc245664c65024c0dbc0c3d5a647ba854c229196cf86a3c02e79561419cf56260a34a5ba58cc0b44d71c3e09c9e8eef202b7d8aa404158264a7f0da6b0 WHIRLPOOL 42ab68ccf90b43193eccd9e7dc78e68a0031cc330f82ee7548c3003c8f36353825d30e33fa7de0502984b63e97ea8e808a888451f6d6ef73007db557a5e62b38
-DIST firefox-45.5.0esr-de.xpi 445482 SHA256 8c4ebdd879f32fb3ad76ab7aa1738bfa6faf0ed8e1300859ffa70ca48e7c6708 SHA512 af57c686b09116a902f8c241456511fb6cb85b4f0ec2434a399ad962b921b917ed8345635075087308dbeb4ad1c134794161eeb217c196f741607c09712b0e88 WHIRLPOOL 8d0c67ed2bec57490507594eb847e7d403f08e878a10ccc702eaaad9c03053122f9cf8d9ef36f919e543a2245ce5f663da63a5d7f24cba34a1d4134ff3195793
-DIST firefox-45.5.0esr-el.xpi 470867 SHA256 fa37e644cfc3aba100ffd86e09a71587f2b93f9f2dc0f37b0d563740f90779cf SHA512 eda1ad9dd28619c010fe76a0102dc2a856129913ea137a8eee7e6c54857629058135e464a4e8fe814005f5872888e99baeb88e7b2d02282b919eca2a05508eb2 WHIRLPOOL 363c1ad31c14ad425f5470f21dbd45f9867d616a48b90296be98bc25bcc0e39e63029e6d1359e3e70c86bf6ea34434962d19251d61357ed0a999cfcacb0f84e5
-DIST firefox-45.5.0esr-en-GB.xpi 423871 SHA256 b2cda715c8b7af012c2a92641ddb06f256711a4aad087265700c1385bdb15490 SHA512 69ce431f58d2a41365a2baeb5960434d27fe799a544f811c9124180aa7a342594efe547a8d22d847484587f9d5fed8eed2aec4718c164e0f75547877604773cc WHIRLPOOL 71e933d3eafa99db0c897a4d22447d5e83b60368197dec6604eb179e12da5f6e26c80badc98411a9f33d17c38f50214f4e696e0f0d8a3a234d96cf2bcced5bbb
-DIST firefox-45.5.0esr-en-ZA.xpi 420776 SHA256 cb0f3a8c035310e62c8de1c34e5b38afb80d9d2328fc11b6aaef3282bef54a3b SHA512 f0673ff13b61d63c56db9d96ffa2d71c38bcd6d6167c818f058c855f6f7b0c95b3fd6d171820d69499c985b0cf040c6a901fc479e67fd57b13b282c5ad2abde0 WHIRLPOOL 35e956ed4b49f969a91bbf63d183a925124d127bf66c9bab78da4ea0e4245d079c1da0bfa483a5d79c5acaeee4beb2b2e2a71012a5a63ece81caa4371e86766e
-DIST firefox-45.5.0esr-eo.xpi 440960 SHA256 e26467fc2c6fcd2cc0295c6c5100df9504648bf855f00fdbfc0f52741a70264e SHA512 9d63efee273a2d1e67658bbbbc9f967f8a780250ccaaca6f8abd5f9fdda56f2e302e07ef49c63007068bef575b485e03305d818fd6d42cab8a342c28b0d41cb7 WHIRLPOOL dd646af6d1f966f5b087947c97013f0cc75079864378f33d82283d0a6880bcbe7d0bf2576816cace983b2713600876c1b903381508464e404852ecfccd67f632
-DIST firefox-45.5.0esr-es-AR.xpi 441482 SHA256 2db36bf5dad04a9d08a678284945edf92eaff2f973977e3630b5def227e11e2e SHA512 3db9e535c557056f3d66b4664faf6eb72db0b7349b29821ca05a05317658aa4bfe128f443d658874d0649b0577d5c35eb8c6e20af942114ced3ea7c997f710d9 WHIRLPOOL 9ecb731886f7268e5a16425ce9ffc0281b719d5ffea6770d51c96d84e88046f10ae5a2f2a20f31d11627f1273b6327c142b94460d3ae98d6d9b487b5b11e5a08
-DIST firefox-45.5.0esr-es-CL.xpi 368763 SHA256 6f09da22397aad11b0f7d0a06dd24a529b277ebae57205bd54bc35307f8a6915 SHA512 1cdbb98016c6f3d5c117a47c3537dae3f57bf2a79dbc45e05c3aeca880ac18936fea67133c8f764c93060d822a282146ed096bc3ddab9f164b0bd17c23c66f0a WHIRLPOOL 596ec1b006b529b29a0beddee8af6443003741296f2761a548cf69c4aec16cfde3dee016661642253cfc0365b91515e88aa3b26cfa836f99067c84910640d032
-DIST firefox-45.5.0esr-es-ES.xpi 353716 SHA256 24cf77f10fd4d8cd2e466668d88c8f1c62423e833f68ebd525819be47a5f811f SHA512 46c7d22e80d545cada6132222ffa804eb8b3c7ddb92db1eac8597086cec5d1dea46de69bf3510a668a8e14de39c5a50a98172376597c435daade61933b5a4b87 WHIRLPOOL b9481c1abf26d769ac6d83aada6469b76b2f674c1e79eb0633795a57b8e9b85a2e5e9dbe2e4e6bcd37e01cc9fa884d1ae2ed26e4aa12da52cfa102efdceb55f2
-DIST firefox-45.5.0esr-es-MX.xpi 449395 SHA256 f63a159bfe5839f8ab2d5c15c425f9512fceaf4c12f32db3d52ce3b2e8584ecb SHA512 fdb137bd01aa2972b4dc10cb713d543b634bf06397309359e11e0070be7582a31ed71442d18910258d6219f8847a903278d3c51bbabe6c6ddd9508f84c386d37 WHIRLPOOL e5e447227cc7c70b530a826302269e5e4c9ec174d286dfcfbbf430effd7efcd3a000d605edb0e562195b20d2344af81675dc746398db69f3155b301280b68c3d
-DIST firefox-45.5.0esr-et.xpi 433352 SHA256 6fc35b5e5b986d482f3be4f41ea273bdda2f7b537070316e94de84deee7988a5 SHA512 7fb7c29bdf46a189be83b789c00b574ace4cf186934c2b66ee21cd55f97a7759a1bb5bac574e189e3670b0061d8d0ffee2b9c46773bcf583f4849c0435d2e3cd WHIRLPOOL 7e0e82683c41a3454769e8d02f4d322c10e258920d5fd3e9dd93d5e9379a7528c6affa1fd77bead25351a5cdcf73352286c668f4f2463db0def3f6217ba33074
-DIST firefox-45.5.0esr-eu.xpi 441357 SHA256 5380725ffcacde30b1426a512cb7f9fef13e918dce3ce34b3984dfc96874dbab SHA512 1111ed9edbd33f98f1489c639963cd2cf8e5315577b84120dca49ef709a7526324763e01804b63ebe83ed08a3a1a2bcf3c02020c8d28efd0fadc4c089cbca784 WHIRLPOOL 03932919421a315d479ed21e3d51422676fa8b2c6f53dccee331c30ed27d1d0092346fac41ea5f79376cd0a4227bbad46e8bc70e87dc3bd1c5e26271039fb6e6
-DIST firefox-45.5.0esr-fa.xpi 491941 SHA256 320d858140acd4a18366e36aa428d3c686a16b4e9a0b3231580f10bceaab1865 SHA512 1e91469fd52f2f75a55270a80294501212358c7417545663eb9552f798bf53e09e12e7e9186ad4f09a415dcc2e612088ad0260e0851ec5a5bff354d0f086ba0b WHIRLPOOL a2a5830edebc9905a07ddf922c23a9c0980ce66d23fc523bba41cae0b41ea88ef1e3d31ee3b428936526b99d0981d79f68168e45dbf476d9c9d58bf240d88a3b
-DIST firefox-45.5.0esr-fi.xpi 438347 SHA256 2b07967fa0945600557dd3932effbc6bd6496aad44f05e0f2889df3548723fc2 SHA512 d4d002103b8c73aa73942527bc9ded3df4f415c6952587c2d65b228f786ce89f10c69d1deda5cf76d63e2dc27746c75f5f1a65bcb0206f278a3f035569a7863d WHIRLPOOL e115309267bb305dfed73bbc8e50ec43ef01be9f26cc77c62210c6a8f7fd1e6843c3e4213f0c33d1543525f8cf08fafd6303dc9b7d353db780a335fd30059916
-DIST firefox-45.5.0esr-fr.xpi 450037 SHA256 ed4490375b73e7d17162ec6c9c438c6d264d411b2fd25952ef5a4fcbd7588c76 SHA512 47b15b4fbdfb2e58188fb178b9809fd412f307850611ea1b71a9a3018dead17cc1f52c4cece92fe78f14444e589855ec1daecc78ec993a7be9235ef70920c05d WHIRLPOOL 64b27d422fc8ffd1148e20e712b8e5a797c9754c349b1480cd7adb79f31a7aabea09a4f44f5b66d9e6b34f3f00b35f6104b1f344dc4c14700a66551f73d9621d
-DIST firefox-45.5.0esr-fy-NL.xpi 447779 SHA256 48c3b486a3ad05efed82072871bc1965cb6f49153eda697b814d6a2ef1a14265 SHA512 508407cad9f45dc42af5afc3d3ec0a464eb0d2bc4a974e9a3e9334da0c453e0a507ef8df66b47bde47d3967bb4f48cf76c541cd9b8942d82e768e693a20a07ad WHIRLPOOL a2663765f80ae2f835578d79b3831fb722eb2fcb90d85f473dec7de7a6dc5d0c87cafbbd4fce44352a0a6746de8873482f03fff599d60252ece7c83a205ba065
-DIST firefox-45.5.0esr-ga-IE.xpi 460056 SHA256 be941350d9cf948d775a2c72ce1f8cdc9645661565392259a545fd55e36347ae SHA512 5723ea81f91cf3e9f9369d9f8c3bc89aea1bae08735af8be190089925fdb0659751c942bcbaf2354d062c054155449647f85d4ec3dc59204af8c7e172bb30af2 WHIRLPOOL 8a137e7423a7aa91391d07c9df1a0431f07e3b2c1392c0acb90a7864c2e9f4c088a87b56379e121b91201911bfd3b5bf09c293b03d10d8f5b0d429185864caf5
-DIST firefox-45.5.0esr-gd.xpi 449711 SHA256 e90760a2dcf3a2967eaac603cc89983d0f11604aa4e6990c929a56777ea5bd22 SHA512 567802fe3f7276f57008fa28591d323f5c36829b0c4b5dd7f8f719025c665c215304ffb411276e2f8a49134ffd1b5bc9a579043d4f337d567ef6d1f7246f1e22 WHIRLPOOL fbb6da5bfd0a85bc4b6f131001fc12d14e49d100f4e155290e852c353d94fb43a52a647a4c0a8c1aed61a3feb5938aed4637d463b0bca5d978f290ed609ca3c2
-DIST firefox-45.5.0esr-gl.xpi 434804 SHA256 0a0fe864e41c913da9d46603648bb7dbc27052fbdb5e7ae6bd6ad22be44293b2 SHA512 5b62c633f90fa72ade3030cf3dc07ecedc308353a3cdd89366d42e6725946964e1a5825379530e3a9a17057b0e139f3e1970294cad91612a75f9800edae0f568 WHIRLPOOL 50816afef735374952cf7e1a7008101b3d3449d0b55bb33802fcf4d312a2837544b18d96a0fc2c56588808de91dc206d196aba16083186dd780ea0cf5a39d119
-DIST firefox-45.5.0esr-gu-IN.xpi 472567 SHA256 c8d315b207c40c98f4c224b15894945f33b979fd2f246a2d548456bb8b588244 SHA512 1e80ae99dfa96ac27503208fb79de3c43d25a7fc3134275f47cc8619d76046e06a33a07004e58ba707c6c010a0a05c028f636f965e8d14a28c308a31fce863cc WHIRLPOOL 049eae68ca55d7a617d9747664a0d435c941c6e1a201df9fc758ee8c768aa6959f0425cdefd24e02c9e16f16be33ec9a0eb61b5594a6a65f3a23c42f6c7530d0
-DIST firefox-45.5.0esr-he.xpi 454786 SHA256 dcda4f07ff5778fce9eb9fe914c403c13a734f45e4ae62b59f353fc663735f16 SHA512 252dcbabe622cf491453eee980a751d5cb7287fe9f8709eb43854d4ae60d4351da1f72d58322ba9e4caa68eb0a418f834ec98712b1ee0897ab2b44ae9c612104 WHIRLPOOL 69a17ed2d2bcb4f899b243b8b5348ba69c6af6be15da237b9ee4c4c18a6f12bc293c838b6bf0eb60995ef2d3c53ba3920efe6fa73ab42a0a77cb1bd76043ad84
-DIST firefox-45.5.0esr-hi-IN.xpi 486991 SHA256 e4644654101a9bab8b8762e635d39794612539da95b6db7054252a380a569b0d SHA512 8b9b55657bd3ca91cbdfcce250d39d03125a3e76677db34dfad42a33039df71850956dbca55499022bf861320892ce3647239e69a114254bd9bd64a3bb61f9b2 WHIRLPOOL 70f26c5bf3eabc929d5cd2a616d4693f71f1e5e71d8f3aff1bb716e75ae8e825cac0aa240ccaa62210bcf2d97afd2d01ea70fdca7582593103bacce111cf0033
-DIST firefox-45.5.0esr-hr.xpi 449069 SHA256 c97d9f0dc536919c3466b7699b0c59951333c675e0a6a9d5e89e3ac689c8bc65 SHA512 0dd1814f007372a74938bdd5cf50b9850d8a14ebeea1ac5b6ddfd00a8630fe4a6b6f5ec4d2190624d060bd4cd3b6572caa33f11de47c5a752cdefe4ecd42942a WHIRLPOOL 956d7c36f5424675f7608a708f7c91710fe68d2ad67d6e9eed45a9f67ddb86975f41b504eb63151dff65b2020ad380b46091c139547a9d83b6592c5fdeae5ca2
-DIST firefox-45.5.0esr-hsb.xpi 461454 SHA256 f343d2d50c64c4f3b835abaa91faea387da3092d42fd61e184974f2603633405 SHA512 026d2fb39041213c8ac806208c27ab77135c541b20912a9cb674e4a9de1d8b8f2d95bbb44205c7fc255d7f92c4320d0cc469acc0d7925b9f4ac4caf405bc9361 WHIRLPOOL 96a1a3ad528ad5132232146c1aa4683bc5e1127664a9517d0363593eb963e12ce3aa1e135d76b3839194e81b17fc0b334b8871f9ae4f393f383fa7d3ba6f2aee
-DIST firefox-45.5.0esr-hu.xpi 449777 SHA256 b69a8fa0b7aa6293c9a62075eeae912ffa1797179e2378378f936f775fa5f2c7 SHA512 99dbe9c4693e9bfbdcca91862fa22f5248689083e0251adb54c53fe0bfb2e28eee2b8deafe33f48ae7881d0ffacdb44bce1264a5ce6c3d44cb79ef2d06b7b7ac WHIRLPOOL 1f54d847b537ff697b1f08a01e05744f85764ed80ec3359279fab29a9abe8776ba142ea95f76e0f2178da41d68725efa53f919caac6b7721fbd3306869d4dc52
-DIST firefox-45.5.0esr-hy-AM.xpi 500040 SHA256 748f6820f68488b34f76f8e678e2f6c862c91993f1334f579a4198f3184e3a00 SHA512 9473962f278fd7f9b0bf676e4f4667b88cf2c006ae9d202cd1c291df4e6807c3ec2a692ed79627e98b3144933ed2ee7f9a72ca854062a669f2f81058e5485ef8 WHIRLPOOL 93e8aa7f941c03287bde88714552d15d7f9b95e5c51efe34c1e82793835aaaecca99d5c6e8f85e0696a59dab3ca0e19c4b20b37d4b4af3a8fd38018071a312c4
-DIST firefox-45.5.0esr-id.xpi 427176 SHA256 fc2b631f1f0afa0482358a91db769a3038b417080b737ff2e9f95f6e45ba84e8 SHA512 029f49a48f5d11699be2eebc6708d9d3ef50c7ec1c312ae61080f2531174c20dba91ed9edbd485f8e515453604200fe11415b4f92f8880194659f5da34b639f4 WHIRLPOOL cb591e761baf208ce735ec0bfc25cde796e17c7a51cc32a0b3c871140226567c48921ba9f6875e6d90eb238f43dd3fda8238253d052ec7acdfd5c4ac0d56c723
-DIST firefox-45.5.0esr-is.xpi 443210 SHA256 9770f788deb615f5cdd3a9bdc4493651da5d45db2abcffc156146d4f0fed7f50 SHA512 82a2ff0f407eee3ce964c27c82a7d0239849f59950473470cb2a8433ffe1dd125cc4d6790e87a924a883dfe16a5e42c9c6acaa88b4666fd95dd87ad74b1b49c5 WHIRLPOOL 558490899c8e00f030dee07aea690626a4810e51ebb7a8a08fb905d6464baa14eeb4c9673abf0b3f4eb2aa62e88f1c3dd09bdb5a4f000ddc9ce3fe4ff18ca9bb
-DIST firefox-45.5.0esr-it.xpi 343724 SHA256 475464a002c91a32a7f24e813020f8c5c8c95930a33e3c89652e0d672b94c7be SHA512 01102e38cb525ba9c24f45a5c8ceaf540d20b35a2f77224704be2fa8705da9227554d7eb763e6531dc8dd6aef02a1c793309c7d23ed64f9929b58d64ef13040f WHIRLPOOL ca4a1bb37f6ecee3ad3cf555e73ab1ae23771f177efa89690fde6aba72897b97daec11778343fae7236d3f8c7ecdca4acac7ded1ae5d92e836803dccd0543e21
-DIST firefox-45.5.0esr-ja.xpi 486331 SHA256 673a28ac9ac2e3c849937d147d974d311965ea60f3b4fc13add5936add8895a5 SHA512 e97d6b067b6adfc554af30901321228a361e65f5a278dd196a1992fc597252bbe5f0264e377797d822c03efca58267fd827435de2159f7dc58c8108e598e8edd WHIRLPOOL 3ba308a5a51a9e8493d7d18c5cbdc5059f20a2a81b962eafb3d468dd90e441262dbfd71987361ea1316be20ef86639b17cc02fc566ca6bd73c692b4771a40536
-DIST firefox-45.5.0esr-kk.xpi 498896 SHA256 397ccc6b0219f34ad7cb2d80982a088399906b4599aed3a99d08710101d148b1 SHA512 9fb1164129286e950c52cff6723a4cbf98c28f5b64c7d012a25550690605e502863117a0d60012e4d10330c9369c2f8310755b69e55c1c632fe284dbed536f07 WHIRLPOOL 72f361d0bdef6e84c5a81f621d1e8ba4be0e3e30f10e32ec3bffa16982057e0d5b71a7d1c77651fa7afee4d2bcbdc7c1c7faaa4d77b705f242be2484ab495481
-DIST firefox-45.5.0esr-km.xpi 504302 SHA256 407d705372bd48c0cc771115409e3fe0d463be75541dc5861bc5265333d7d761 SHA512 c6574424300b5af8d009630cef5fd06a242f61b19d87683068fa333e6de2557347425f5a6f3a410d5ae5fcd837b0c84f881d51f5920689567862d3df8469ecfb WHIRLPOOL f356f07ee77b1be6481cf63c8f01b19992c3564e66babade37fb8d2e6dcf6bf276843f89bcef43e58aa7e8528d6830dc70cc195c6e953a50233a023e5412a33a
-DIST firefox-45.5.0esr-kn.xpi 495881 SHA256 7749e45660483c57aadd39273c5a527194e6492363d9cfcdd7c353cd5a03f575 SHA512 fd3384a4759764b9a5809b13efaea8be069b9ad6b5485fe298738725ece40016885675b3efd73c3f8aa7e9d4c42be276c8f4c6f621426226d59a171323679478 WHIRLPOOL 7ca3022b6232e2463204288072d179049e1eb4c41200c9aa52cf2d66499ecd34f51a5664ee94ceeb71d3637190822a14b709d8075ad6198bd976842000354843
-DIST firefox-45.5.0esr-ko.xpi 465289 SHA256 23234d9cff72d3a95b61c061587187d60f68f377fbfa208967aac5ce51ec6460 SHA512 44997efbb09cd5b0f37ea825da8541261867ac6bf203ff87f3b5531687e3470c9b8997fc8a8ed887d8c59f3d432f82e04a454f2cdcd317f8e728547f1d98ca20 WHIRLPOOL 391a4b001ff8a12b68bb158f6b2c9afa4e378827558750b3386a77c1c019cf4d1cd14e7fe91e9ace048accaf70eb46f36a2c495adb0ed13009f24403143c3069
-DIST firefox-45.5.0esr-lt.xpi 454678 SHA256 fda155e7d1e14237933dc3545c44483bf8bd30ef5d233d32a585adaa42b0986d SHA512 dbddb7b2e1c029e4a57c30dbdf36ee007cb4053c40fae284d83b1eebe47fbc699fa48cc6ef4bd0a1665e9325ef01efb4673e78b6aaa8101410440721ba8259d9 WHIRLPOOL fc5e9cc23448757c1c7cf5e98cdb6632b3113ef2ea98223357d19a42ab3541456b20ddb9221c55761072f3e871566d2683cd9bca37236cc288e62ff0c4ba99d3
-DIST firefox-45.5.0esr-lv.xpi 445720 SHA256 43284894d624c9e91a9287af6f1fa57dfa311d8cc06e1db28efdf55dbe329d6a SHA512 9524ed5caeeff6e68b8c7c2b5c826ece467d45031a03dd2b246526a9b135caa8df78156b2b13e3a681cb676809a3cb691ec583d18e4146136e45127db3288deb WHIRLPOOL f3c9053d22a74cf75a38d9b7461214f31f81714d2cb5d358d0ce631ffe4ceadd699c48115deb82888eb0e4f4f4fda32ce923464de5eae3b315d37780355acf72
-DIST firefox-45.5.0esr-mai.xpi 492650 SHA256 2beba2cae1449a1fe747e52af968e0a02d1feae7075d5e5a68e2246607b00869 SHA512 0675d34537cc257d8203264d7e14f612351c31b6b6417bdadd0f05a5cbff807f7b3036cd9d822dcb9eb26f24108b93b4a4f73449b0c014b50afe2d22bc8c67e8 WHIRLPOOL 231837a5e9bc4d7574ff219f82773d015324f9f9dc254431d04f083c69add187feb3121475b21f5661c01ce98d57dba66e76daf33563ae97686e96f53ad2ff6d
-DIST firefox-45.5.0esr-mk.xpi 476392 SHA256 12787da528d04428c11dd8335d017416f2cf45039d24c66f7585a76ddb9c66db SHA512 5fb289f358b0a1baa6a568928069a608eac862f3a09685d427e2c2110e21413858f2a5beba4d1f4d26dc7d8aec1012d6bbe4a21835ffb320f8afcb9e1b61ac82 WHIRLPOOL 876172962a350e5435afe4c08d9ef2b42600b5d32221b7cf18c4dbe23824ff0dd8bd498a76ea6b81fd76e1c75aa7ba806cfde40cfce76aaabad0b16d2a9a438d
-DIST firefox-45.5.0esr-ml.xpi 498681 SHA256 26415536e8f0d6b76509b572f8b31938c68e78c3d0f9319350d6a56dd027b9ca SHA512 d6ceab34871e0d9baeb6d2cb67a269fb5a825fe97b6ecd72db01c61a98cc622afb26feac78917d04188a1e1ecbf4529f84315a80b71124a3cc64ad4f1ebc6f84 WHIRLPOOL 23b91ebe02d1a687140d27d21eccca7af150504af6e2c1d1ae6b8be56f2f143075a0800da14f5985c6a32e966724a8118b4db5c41c28486d60451c2487c9edae
-DIST firefox-45.5.0esr-mr.xpi 503700 SHA256 0b4015254bcf7ed69458d657ada0da64d4dff2336b6e19cb39b9829fc42c62ad SHA512 d7b113829f89293b2b839947906e23a8263ff89ff00076afc80d37a5bd2bd4b2ceae600741245e1c0097f26bd1620d2e4e263208f236e6b4387b7338ff76dcbd WHIRLPOOL f3a7e0cc89f029e303cbea4e35ae83d41c156646aa46d05795ed7b7078130b686dbfdd1e7121e977bd1a97c31202309b65b38991fec9cdf1ffff38f5bcaac25c
-DIST firefox-45.5.0esr-ms.xpi 440065 SHA256 f2efd99922a541ae3e0c26e11bc9aa439367f160ba72c068049279fe2f8c1a9c SHA512 90475f6a4e9a1f2797f326126a088ae3d34aaa39258691988fc11c5573e0e8cd934e874009a9adfdf2386ca68cbbafd16a50f4059736362a27e5c96bc1c745d1 WHIRLPOOL 7f5ebab619af388c3755145fb56c9f14976629e1fe4d48829bd0cbaae16e97f618d237337ff95f2a996ee30b982a507e2f4ca0fc5799d860233af78cb9f4d466
-DIST firefox-45.5.0esr-nb-NO.xpi 435471 SHA256 d12f4b1ca9be836b854409c12bbf23472176766ac9edb06530962c12367154b7 SHA512 efa813b2387f73e92630f1376ec3732f31869d420582f24a2b7d80561861c646b46f037d1aa6713fa66ade57be387b460ae6d53534c2c7d63619df3908defa73 WHIRLPOOL 40a97a21b4cb7b11b52156fa4607200bc11dc01e9d9c4d68e454583a5ef8bdc43ca453e0203407e86d21e50bb1c90219cf5cdd95b66da9559ebaf2ea28f2218a
-DIST firefox-45.5.0esr-nl.xpi 435202 SHA256 829199a1e474b085fb2e2fc74816121e330ffa82536ad27647568e3d87718b60 SHA512 de64eb1410a3c6da7b3a1ccdeae350dc9f5201ae0e340502ec65226801c1560a3e0b763d7f390da3d642fa3285bc0b7a96348cc1a10d8ca2acb34aa5e8882e74 WHIRLPOOL 36ce948e14cf1c53c0eecceda5f2589a251356c74cb13f2335d99cee06915b71a72b2ddf1a66372e4d90bb1d96ed551331c2fda639c47daccf0d6c9f3a2a10fc
-DIST firefox-45.5.0esr-nn-NO.xpi 432934 SHA256 e5cffec0e8eea3dcb8b6ac9fb76a78ee8e7f0607ab3b39b75d19ab6055bab399 SHA512 a96cec7726e3b8b22bfa55fd8ed70760562fda21210e5ae7aca1265b05a5493b0ddf9939501746394078bc7a40848638f588c91e182a7143b804ee10f016155c WHIRLPOOL 6e806cd6b108753adf65beed14b2bbf84bbb912df0e24731a36cc5778151f1c18ba56bbc3d82c5e6c8ce139330cc9cd2ff98d90d29d032e4d1f1ba6d676b27fd
-DIST firefox-45.5.0esr-or.xpi 495922 SHA256 85d40c52f830399a697adecc61a9705f687eacac8b0455c62016076511070259 SHA512 cd1af04bdcdb8449a27940e9fd9df06fd6867fde94f6c6ade886958aae70b48ffc58c227076d9ed765f28fbd2a2a72b10c03167c62514a15cd3b242d877b90e1 WHIRLPOOL 9eb760fe50f12c86f7a445b39dec4cf85a6b2bec5dd615d7a2b674e85a57a769955182143848afd7a6d355e50684999e10acc2ed5c22daee66b8a45780b3ac5f
-DIST firefox-45.5.0esr-pa-IN.xpi 489551 SHA256 99fbdff501bb4535955b9c3ed341670d7193dcd760b4b6c23634ca9063d203fa SHA512 9c3e6560dd1404ce341f613046ab92e5e06393617e4cd38230d149986d116f2bba37a6bc7dd0f365660d120815c6962758a5bb4b6310eb545b0e2f6c187f74e8 WHIRLPOOL 578353a6e6c37d9df4371945f38ece235be50f8e38c07eddcfe95f58dd5c0b40c8c73bea43daac840f11dd9211a5d043388025a1993f5ed8621cbfb61c50b885
-DIST firefox-45.5.0esr-pl.xpi 383929 SHA256 e9d930d7e1642afdfc016d1532dbec1b04a1273b32e0d9b6e1329407af13c464 SHA512 2d69dd46f4db46a3dcbbbfca4e25d0b67988cd80a30176d84421e2704792db7ed77605560a66880cda16f9e2306cabc2cd1a0c44a659a83c4c7b796c793a49c4 WHIRLPOOL 0b9e29322b55600af4fd8014774286ebfc54ed583477d5f3d1c1072b6c40b81238ab6c0cd9e523de559ee5a988b39884cea133dbfc3fdb39c8d958a4a8a4c10a
-DIST firefox-45.5.0esr-pt-BR.xpi 450991 SHA256 b8c730425ee14fe079a5b71109fe3a7cb5a76901fc2219b4e1e8ac9b7db1baf2 SHA512 5e9519e524b2a20538e6208247421f95da022f258744f582d5447ac8f50676efdfb98affeceef83392b86140ee3b40bbaa893917f8ddb8642c42a3e6643289ff WHIRLPOOL a917ef3a9df57fc70e542bb43c8bd8bb6f9dbd047d8caa04f232238fce68fa066ca091139b5be4141ab8af4990b49bbec416ae6ba9595cd6875be06a243da7df
-DIST firefox-45.5.0esr-pt-PT.xpi 437022 SHA256 54c5961f0b7940cd2fc3a7a0d391207abfdace09365745dfa27e7f0c3703499f SHA512 b2936ba813297ddfa88e5c3380fb1ed0dae5b51d1150e26aab1cbcc4980a101543c8af52c9a43bcc415ad8de5f83c10115eaa7be4a0d9820b698bbd75abd3d51 WHIRLPOOL 43079460303b9784d99157f5803d1db1f1f993476b7c5c24a91bab6b25fc8daddc5fb07a1764b60fa7e4b712c1261d5c3ea6b4736be4a24d452125f5b3b92ed1
-DIST firefox-45.5.0esr-rm.xpi 437718 SHA256 9b4ff53c4e6cd594c432225dde995c67fa38d5fba71b863b1c9c3a97fcf6cec5 SHA512 47db0f1e3bbc85b9e18efa9a1e8f0f18d9a569bdc5f4131e14291b7c7d2412e73326886199047e701dc1673a9ad2e7ab9490e8c2f6322f0cf8df3169b1bfa5ac WHIRLPOOL 7162dc6bb799b02d60a246c0bfb53ab450518340ca86b428d16bbc48b7f5314f0ec8859e6639bc21f35eedfdc03fcd8924ae545fedaacc88679127e6c63f2ed2
-DIST firefox-45.5.0esr-ro.xpi 444062 SHA256 af2f5a6b93ecb81c206e8942314fc906718dc89bc28c58ab6241a4e904b8f12f SHA512 f58f9ddb3c6c6f3d62ad98bf6e7131cf7a9be49f58a574978f28fb5c0e0eb584e7da1bba798420e0606407abb64a4ae481b48e62a9a6d568914d2d92a9e852e8 WHIRLPOOL ba415f1c95a4553fed0e4968fe928811a573e22052074c5e463fd6d145c201c89bf36bf5fe996ed88453845301d586fb38702311b5b01d06f2bd81d1408f1fcb
-DIST firefox-45.5.0esr-ru.xpi 392738 SHA256 c96d5860f7bad459976f394856fd64dae2ab5ee3e37421664c1347f40f93e500 SHA512 76e3f31ec97c95af7af403b4e194598aa39558d98e132578120f758641c1977fcbf728460ebb4be1cab4145cfff1091a0b27b6a692c971305e623161756e4af4 WHIRLPOOL 5436d85650ae5ac04513f6b30419846da2e47d769f887b903497b20121ec28d0cf479cd5e25fa442ce147fa9b61179543ace4d3de94e4c66ef2d3569cbaac6fc
-DIST firefox-45.5.0esr-si.xpi 482248 SHA256 4585ecd4c0bbc0cc55a7aed2fbf28f595ebfb80282f0db8cea82f9fd59f06486 SHA512 01132c528fdf7d8594982bede12eeaf9b1855cb89881e70efd19aeb61c70c2899af6dc22f36c111ce1decdf830836f7af8140e54fb6fbd94be07287e7caac63c WHIRLPOOL a79880d59630c0a8d42daf3b317a625a176e1b38d33efc5d2a7c3ae5b5c4d756347ff2b6d2e2817bb82c0e3bf85d63bbf7667e2b298c50d968d5c7e6c9213ed7
-DIST firefox-45.5.0esr-sk.xpi 453606 SHA256 795896b8386c7b9abd6db4404b6abdcee13ac093c71fc3841f40a9c9220cca2d SHA512 b76673210c95ab71f88d71a538082610a81aff5b07117309034d1aa3e84b114dfc4030c416a71fe22ec5536376fbb926c1369fef76922d382b7635126b13e3cf WHIRLPOOL b9b4d689cc0fec83c3994d773e6e8cb839af6b2821391bf10da26ad1103d1a67539dad85401c9453ecc24798be53eb8edde61dd97595facf4c1471f080748254
-DIST firefox-45.5.0esr-sl.xpi 444964 SHA256 b95084fc76094e397384d02970d23247edec756381c2f5fbb21075aee281cd32 SHA512 cd7432975526720b4a1b2c82ccfaa71ab2dc299294d64cb29b685a6bf4b2525c24a4c87df85c5c7f4e3fb87e0b08c735e65735b10063e2f6237900bb814fd145 WHIRLPOOL 24e76cd9b445930a2582deef0ea57a012a40f9b60e795ea06bd6214392f0cc71fa04f86fe31d22d7bcd4ab3d94b9c84df76022defb5bb9eb4c0a1264a320bf86
-DIST firefox-45.5.0esr-son.xpi 433513 SHA256 41a1627504b246c0758d075302fe804b5383003435fe1c45552e81d14e54a42d SHA512 519266b61169715c548285974134a407f29d933fb9c7b07a2c46e95d9a0482b0977f922db520a6a73172ea73406147d26496a1c98d8fdd55127d3a9bcc8f4fe0 WHIRLPOOL 3a2d8e21947c1beb89ad7221f33d0e14a34902d022fe4c7724c7ed1001f7dc34d9d7593e448ec6d091e28056a119e3fdc104ad9551b743300c77fd37c07d48e8
-DIST firefox-45.5.0esr-sq.xpi 452186 SHA256 7be642423869828ec63d681bac55abab3e93b7ea1a81d933e4860b60de5a3a3c SHA512 8760cab703a09dbc15bdce2459168be36edb03b1d0409d659b6972e9e3e90565bb596076237b0e6b15e643bd005eecd85dbbd911b3ead86c8623f7d966455304 WHIRLPOOL 80a623913f22528238271a96925ab5d7e6d1477ad046b95b39f61951bd7593dff16e22d5f708cda894ae93cbcd42acad16de7ce4ada9e43f731836bffed19018
-DIST firefox-45.5.0esr-sr.xpi 464479 SHA256 387a3c80e577df6bbb5b03623370a95341344450c3a8194e79df731564020e78 SHA512 f35c5f3ff4f0053d769d360cc1c998145883500ece522d4da09feb8d5941b3c1601a1d4fbf79e006e4c506c5f92328e944e1581a48f73782793044cc885fd303 WHIRLPOOL 8def489352ac4087bd60786b8127f5d0d5abf3cc26531e2d4063edcbf80b311d157c0d0fa07ffa2fac7a9f9e4128df96c7402aefd3fd182534ee111968ae9871
-DIST firefox-45.5.0esr-sv-SE.xpi 444213 SHA256 b5002cba6eb5899232cf77fe78b91fb27d7f5c7a88243aab22903db7f9a9a254 SHA512 9b1556c38c9e1c1f4ef8021f3bdd31ab00ee5034fc7ff3b8b84ee33d0ed627733178437c87c4086bfe7d7c0c7f0f8c0899d2162797e4ca8725eba61d74322b8d WHIRLPOOL d05e91275ae5b510e3ec599712cdb28cc1f617cb4be1870636ae9aaf25239e45c9f8ec1a6fe71b356398ad98b5497d082d7f6d8590c96305b90ca2dbebd4d3ef
-DIST firefox-45.5.0esr-ta.xpi 483118 SHA256 cc01074e1a87b4946127a174689aadc96140cecd079fba6d08857072fc265d03 SHA512 bde7ccce39c5e0c326efce28b5cdc2edeb06f1ba2b89e9d01601863787f482713002b8b73358ae78440c19886884d30a3630b7e7cb5cb8ba62943cba8cd4b686 WHIRLPOOL ec862a83162601876bdc5dd1ea739079b993834f3f61a861e8e708620c2e64b331f3b2ecac2f459ae84a30fe3e7ea9a07d658feb7f42041c179b2288b556bffe
-DIST firefox-45.5.0esr-te.xpi 492471 SHA256 60d74df3515eae0065159ca3cd1042eff96c51752bddf8b3c33a55b31a23aecd SHA512 9a1c9171c292aba77bab3861c8351ed12944d72e7790b2886ab91eb07d53afb9ff8236961c75658d4494a2b49af18a1a1b14d7994ca1b10b6e5bf442a75ccc65 WHIRLPOOL 5ae5cda884fca9e63bdb2e8c13d2b9119befce5b277baef279c2d49e7d2ab011d66d0af42df325e0b91e3234a77148f9ef8e0135840e89c55d9303d213b3888d
-DIST firefox-45.5.0esr-th.xpi 477650 SHA256 ab356c8147651c06e7158021d71706417e5d3ce40ba9f4081441c36fe2d297cf SHA512 478264251cef63a6da4210e46648adc5ddcdd98f349c51a942e37892c77ab38ea6f16834b79309e4bf65dc297b02982b7df3590e7b1301c557e489d8ca24dc59 WHIRLPOOL 73f5bd3c9ae3f3e35e8fb5dbad4733f6389146798432b6e878c71e3c209baecaed97c34bea2757d1b927de808dfd4616fdbea9eb05a31d940473af0c844f8ee5
-DIST firefox-45.5.0esr-tr.xpi 451166 SHA256 c4979c0bea9ffc9df3293256386b63d66db4dd28adf40424232b154eb51c9607 SHA512 ee064777191e6546e64befeff58903410668c2d78bd784873714fef3d499f954ccd1936405ec8448eca5eb47847405dcec51534f6919a47d8879d704ae684648 WHIRLPOOL 150095ebc3379f1e5e1f0882299370799bc0a490b6cfb7ce142aee25fa31914804454ddf0e762449ea429338f907a986998661b1321cb540bb0b55c29b231c61
-DIST firefox-45.5.0esr-uk.xpi 494781 SHA256 21a1f23773c37de215236bfed9edd12ef2bde327f1c5beb7b397ac7afa65355f SHA512 7ab2c25605c8a094f12ee16a9f4231e06e53fcabff782f0919b0a6fc45d79fa75ac1f06b98fa05c8b82408fb2142faf1048bbe27fdf9ee6af982b8e9382f32ca WHIRLPOOL e2fb333ec9556cee523393a8bb35161bf35aad761eabc370891f7460105c8b7f6d5af877c233c11dfec55177127e384d4b8882a41a8aad59a77b89b8ebb0e96c
-DIST firefox-45.5.0esr-uz.xpi 443803 SHA256 7a5a4e33ecfb101a7e6d7cff9c26af90be475034a0b5305b274626e8d258a725 SHA512 6bc3d97dbee1083f040052e6d1720b650c3617dd6b369ca8de01e65e9730292f460434c43d3ec057e84d5556f1ea3a620a8eba8d6e522fb398a4153d8b94e54f WHIRLPOOL 9996d7ac261173a7f5d0e01912bde5f3e5a2b3aec3b104e40d6c112c67e331f0150b60168ef88b48ce11174ff1aefe5ac9d552e7c4e33cb0dc72cd3f2cb6b720
-DIST firefox-45.5.0esr-vi.xpi 450778 SHA256 2188331a22ed6b17c1f7d36d6bd15539c4a9f8573b0e87070841d55a8de4c4dc SHA512 0990d7bb48053258ced2e1bd582aa5a3580a813b2668492de59026fb58eebb0a387a1014c8655371fb909adfebcbfe94554ab57139cb2f4266938a8e5cf2957d WHIRLPOOL 27c72b888e78ec268ee37a476dbb9794ddddc75eab7a64531314150b5105d8b8085e0b89b5174f19903f7f6e395fc7727550bf08dc00815f87fd0144a7237fe8
-DIST firefox-45.5.0esr-xh.xpi 432919 SHA256 c219e1a7553ff76375d6316386ad9e55ede8b118b67232ff9ee1a9483f388c0f SHA512 25c088e352491d708b4c5031f7c70d1034e46d828fa96e0177410c14bf5a684d568eb593508b8de11c878a88aa2c464e37e0af81c25b0cc05231ba003be5ea2a WHIRLPOOL 77b29279495166e5b8b29e319dc6830ccd05e31aa7d62431c81c4078abfc6345a956da93abfe02226026058693ece4d6708fbd16b0414cadab87132a2872f03f
-DIST firefox-45.5.0esr-zh-CN.xpi 475797 SHA256 b205019d0df1b9f24a71cba9bbcf570446d99fec938911f69ebad98893241093 SHA512 9fc14145dd67ff4f88d0f55e58fc3d2e2ac2d5668dfe0ab2aa22df7077829eed628437b53571fc9814a752b7fdbb587603ff37c7934740cb46d5b61b1275f726 WHIRLPOOL f3a5f85d347ff349207947ec9808ed44d2acc01fe5a4fc598ae78ff9806e8d9f288e8ea39ff8b4076d1a21b931f88a3063c7369c12fa8cc3f61434cdae0b9139
-DIST firefox-45.5.0esr-zh-TW.xpi 466529 SHA256 9be63d771c21d0b44435cc82d59f9e5705b854f0be1ae85d6b7d1f81251114c1 SHA512 19c7de6c0b8256a08a1e7dcd817bca7c1e0d002612d57ce3f61cd093154acacf31f3a55671b7780403683388321dd62ceb57566c302175a8ab175f2dcbd76350 WHIRLPOOL ec421ab6dae996dc100d9226ec3bc810db7c5c392a0abe6c3d496956c735d40a0ad06044491aa87ed1bd7cfb642f0f3f989be7b6f3db9acd0d1e6249844fddcd
-DIST firefox-45.5.0esr.source.tar.xz 184838132 SHA256 3e843ca257bf64e11e547e9afdbce797838eb6e01449d2f313c0d1d3117450f1 SHA512 fadac65fcad4bd4701026c9f3d87ba7dec304205e3c375769db7f7de9e596877deed9b21d3e8c34c1ce8ae689dd2979b3627742dfbec9bc0cb16a5cb1ce7507d WHIRLPOOL 1426ac5fcf2c7fbf057a02fc5fe3c1fe10e49e2214a8a97dc83a371c15b9c35058b0ffcd2c81cf1783a361bb1234eb308d65d4d3db4b9e5b36bd6ae2db29dcc3
-DIST firefox-45.5.1esr-ach.xpi 426529 SHA256 172a8c5cb771d6427bc4c9141711821286e8fe0a2a5ef5b322dedccf8a4b60ba SHA512 e0fd45b738b78179d49506d5a9ad3142756efb08e43dcb9b835e2d4fa5239c1bca40c952ad20ff46e6129715cd2630ac7f20e0e9acfad838347d00c321336172 WHIRLPOOL 23ba2ac256d48dde06177964c825176d269fe284d76369c8a4692c4dbd6f158a0fc3c9d233c2eec8165b448da8b6a99687ccf99e8c8369c257a8c585748047a4
-DIST firefox-45.5.1esr-af.xpi 439353 SHA256 04a1cc52ff79d7ab5371a83efb2217dd4a2b27807dbdc055b0a7080ce6c5d0d0 SHA512 2a6996370763210936c1b57661c14c4f5cbd7ddecf6c65876e883bf86cb16fafaf194349b4eafbfe323f45498703d1cb284f27637965af3ecc61f77be7e56a74 WHIRLPOOL ddcff87b4429b90fde0bee64c3659ae4eb1b38ac7d4b6dc69bea7d948ae7baead41c893ee5eef4c5c829d2a7d98d4667a3adbfab422ca4f2a76ba6789e75aa2e
-DIST firefox-45.5.1esr-an.xpi 449036 SHA256 6900690ee5f194f3392ea9fc7d9d6b5b9fbcb420ee10ff21b53062e5dd16da6d SHA512 7e64ac152ca007d7d660206c10ce5c76333bfac049ce8136319d2c5e60e8da1a2833c1f2a5dba142d9c0ed6a884adeb38d4b28e27fc2702b08b8af9e1c5afcd0 WHIRLPOOL a9248715a06c4d1b4b1dcd0eed279c6d2d4c1c010f37680d53507a8f579fc49df46b70b98c864df331aee3348ca21540787dd95626de7638ee1794b50abc3791
-DIST firefox-45.5.1esr-ar.xpi 474961 SHA256 320c41dbdc50cd778bb524767306323b29c33bac64c3a28bcc021a72e7b175b4 SHA512 76a0f855b4043345c6fa394c9975ee3c226f86478a435afb8f376635d782a4a086244a5ca6026cd50dd2f5d34319a07fb9d045d91c02a06603ebdee755c9323b WHIRLPOOL 7867e7d6334788997a7ca22f5b8956d117528c204f949d4913304bfa7c188672205d4702733076eb53651a9c56fea457637787843722a4efc88bbf5b2fa9ea28
-DIST firefox-45.5.1esr-as.xpi 483095 SHA256 2bea2356abef2c556197f1d07b427722bbbc15b697505ec622b98d1fec0af4f8 SHA512 fd3f4553211ef62ccc01e167c367f05aba5b0e4e16becaccc2e846a17e2bc36f0f257a4b980bba77abce35de7e7ef02fb41800e2fbbb3a7aa31c6da3e7253c4a WHIRLPOOL db34a742b7287eece002bd987e81ebf193081c5fca01271484d633623d05e9e714c29c603cad633e16204a717db6ecfc0f2cca4136bee47ca6a62d4b0b50ad07
-DIST firefox-45.5.1esr-ast.xpi 419249 SHA256 05fa6961b2be007719c72eef010d0c8b612c41ca34ecba3c6e878f4bfdaa92d9 SHA512 87c6bb52df991240ffc3391db3e4393e23782411b66d7581acfd2bf2cb4345473ccd0a7ccaca34c51a1bdfc3e6a99378f9dfbe5673e8b8bbb5018b879442dd41 WHIRLPOOL d0349fe66f22724752d2ff4df231df63d2d91a87dc663398c1385384512140026eab2bde9442cd0a4deb0f87688175a79b566585d7d21343c2232399e00d2137
-DIST firefox-45.5.1esr-az.xpi 464018 SHA256 96da29f386a990c177f09fdcb6f7a2de19c3fe8cb137668104b8484a277962ef SHA512 cd39817a7af2cebba3ad87788ccb534c75b18db337df8e68f4930dcaffa1b75564227e07ce9e9288b411f55b4b819e68084c74a7c8eacd83b9e915b88eb07fcf WHIRLPOOL 8c105f2151617eb4dac6ca467c2ddb3f9eebe54e66627da9a3a3fce85e49e91310b1c7f3946dba3fa49dfaeabadd6723df79d8938680b6101443c45d180ec942
-DIST firefox-45.5.1esr-be.xpi 442619 SHA256 abf50e17d78c016d4bd28951c9b0a44785bd727f2b336aa6a1c380f2b115389f SHA512 407a71295d9d99f240f3c6130b920a71aa8423c63b359d04f5b538d6271e0e90eccf2e560488394625e715dc7722c5f82711a4d5232c310c014a818c3c128789 WHIRLPOOL 7ded20b8878aa561c3548f393b81c0c042f940be74f508eedda7ee6cb1c746de9e2f69b1641cb0256108730319e20836ed0ec3f2a2ddfc0277716672467a20bb
-DIST firefox-45.5.1esr-bg.xpi 460810 SHA256 027ec38f12e038834bd9c4d5938257e2856364768bed7452d9d0a99bff95ca97 SHA512 769ac6f1fd5771101de1bb65567cd8b62c36386e7f6e0a740525531f83df2d89b2f6e71b83dc4c4207e38a2ee6b5b0fcaac0531a2671bab6bf7d105edab5e554 WHIRLPOOL baa3022450f08fc522be3d0997d9aa9bd55745c84a25123f4164c16a5a4fd84ace63a9dea327a019347f8df450b7cfd6dabae957e13299b38fd6b046b552212a
-DIST firefox-45.5.1esr-bn-BD.xpi 515642 SHA256 1ba09838893f1923db07f937f659217c630d6bd8ee6940e356b6ac9f5962608b SHA512 2a67ee8a04c865c9b3a447cbbca16b5c5c0d23d95f39a0e17fc90bcd4a2ffb7d22fc3e06d34793d800f56fdab279bab0f17ff762007a863994810544001bcad4 WHIRLPOOL 79340ed459f0456d20a72ebc5d69dd806cddbf35cf21c2b85d97cbac069f02c30647197367a82e077c69f0afe15a807946709e4a28c7c1de661ecbcab56b7738
-DIST firefox-45.5.1esr-bn-IN.xpi 494075 SHA256 41983f3463e23851d9783eb49aff5a5a887a987382122942d43edb8c6ca5b688 SHA512 899507b41b20a12e12ca62951ac266a45ddc8912e9a967cc5f7e8e03b03d759606d31c4a23307fcc9c0e0ee572950fb3c1aeea4eeebc2dcf2c6e054d37a9a56f WHIRLPOOL fc5a4b354ff39745d4729c4f586f8012c437791eef8f25d5b994f612892a15eb805876c2eaf421a537c3ac525ec4ffcfb07048460253e9745653a3880ae3e84a
-DIST firefox-45.5.1esr-br.xpi 436390 SHA256 697f91adab0ad879ab41b9073533284b73bb42a75d103adf80dc2bf3df16a9d4 SHA512 ffc633b714dd269923a563db31f03a5c971d572012c044071026da90496e90c6d5e6f9d976cc4131cee5ff0c0d533c040bda17c70629d3a437ce22fdb9fd86f9 WHIRLPOOL be1b90b846b5af19e3416a2c4901c5d7b5244d49112c7057d5e6e8b0a6756c6066170c1cfbec666fe1b4b8c816be2af87a7e95241539362f0193310394057497
-DIST firefox-45.5.1esr-bs.xpi 442997 SHA256 94d9dbb9863b76764c3f84686b003ef95d20c85fe893ab4a581f3cbdd87f4e91 SHA512 9334b9e63663082ac27b4845d104f4145cfbbe9a5231d515a7bf541f3936381048f6e4bc490f4b01f5e32d570e00e61749a45ed1fe1eb1d29b3f7a9f0fd5dfdd WHIRLPOOL f15ef0406e59a24047bdb3fc33196ba0b258d466bd41284a69fce2aaa04ee35b12f65bad18e368b83b53ada7b33567783cadcdb4bdcf8b584262dee6822c58b2
-DIST firefox-45.5.1esr-ca.xpi 436832 SHA256 3703c88885ab75b8a187ad98eaf31dcf4fbb8cb8d3c97d5efb6b3900a0ec5955 SHA512 72fbd0b8db3b331100161d767588a3718f20611dc6b83e6cd57912ae34bc44acef37904f2c5a13027d926a5cc13cf2b26e3e5219c6f89fca7463bd74e2bffa70 WHIRLPOOL c187800743b14b64d3700540bb66eca002a97743d461b5b61110ce364d7665dbb5dc65ae1ee5853a1f15477c58fea52dd132bcf2b37a2e4c5366142a5b0d7c59
-DIST firefox-45.5.1esr-cs.xpi 443482 SHA256 0786a95dea8d77e42078484f65f2e6f1810b9c35585044a687bbe135604c83b9 SHA512 55e44751ae407b67fdb0722ee6e391bef9248bfb56515db546daf043801ca5108eb6fdff4a2c840d9ef72c9391133f8578647958bd399c87570871682aec2a85 WHIRLPOOL d90515788362fc689f009e1753953ee1b0721feff91371fab1fed85069c0abd3a0f8add7b3c35065771b1ac8930d47f6f9e24af9f4353e57968aef2ad1dfc668
-DIST firefox-45.5.1esr-cy.xpi 438907 SHA256 c373c4ab74165e94bb09730741bbfd3b88c54635535500798d403fd00b186dea SHA512 357f8f99101fdce56f1e81611d05a55354b5c83e2b37f962ef54b61f9b157be599cb9ef816ed9c34df7cf30cbcc1e27ffb3deddd8cc2418951726618a793516c WHIRLPOOL a428c2d2b440dc8dfed71ebe7b6f2ce77b485f375d34a7f54f3a02bc072ed34a0bdafc2c574cc58920624b899b5a1263f568bc8e89d4f975778054cd4642ef41
-DIST firefox-45.5.1esr-da.xpi 430078 SHA256 357a5a05bdda778076023c3b95cebe60ae253053c01795a74488672f4d531b91 SHA512 a17f47d1b0712b6f93d6a06bfd98e1c53fa51c2779ad6a31034414656312aef56c8975a5d23d63a86bfc224dfa86309d4469c85d2f5f306f85a2c6bb2c368142 WHIRLPOOL a9d69af5f5648fe2b809c13b6513e3b6f268a8ca9cef7e5c5a2cc593a7fab94469fbf5f483c9b542cce66bb6db84669fccba967c1eba29561317293f5464bae0
-DIST firefox-45.5.1esr-de.xpi 445482 SHA256 cb10bd76505ad2f217bf29b7779dfdbdfb959cb42ad552c4e2bde78380e8d9f6 SHA512 45ef50ec92961a7bcc67dcd7c15aafbc02ddbbb1aeb0f0d3297dfeb6cee9ea96812e4cb1f90e0d7022cc42654da230709a0b198cb7dda17760b9fc637243532d WHIRLPOOL 888eb6939d41050dc9de93da398a55fe94dba2d03818bc5be5c7727c9fb1fecbb0d6cc4d8be98337a461abd1aa61af9ac392d4d1ef4d297d00a501cd8e18cc9f
-DIST firefox-45.5.1esr-el.xpi 470867 SHA256 26dd726a8f2f5a9d8260a1bb157fffb0fe97962788a92e8f211435d325afe84f SHA512 11bc7af71963411cbb48ccb8a4bbb2189934928dc515fbc5dd2d2f8ed16ffc8dcf89f0599c6a70979a90a6813a08df8fa10a3fe9d224c4d231b45b183a9a2b92 WHIRLPOOL cad088ece1941fde1f1d0fc8991c80bc9878aaf1b6dd86e3a8986f7618f84d326ff63117d00f6dfdc8ef52c7ab185f85ed1c0b50e8a1a1648201dea1ac6e11b4
-DIST firefox-45.5.1esr-en-GB.xpi 423870 SHA256 54ebe8d284782bc256b26fa9256de99a2b338430845a2e2634a8a21d445bc403 SHA512 afba55443a43f7b8921446b5fddeb4e4025e4081b26996d23cc8e9e2fa8bdb55f8583d96e08e69d2f21db934716dcf4ea02714c514ea36430a00e5fffb0b1857 WHIRLPOOL 6a6ebcb7b2c17e878f757fa3361b04f88f1f9d97baa3617e78577be948ea4ad014b7879af45ec416252358d69816682e3fee2188d75641509f870386a354e474
-DIST firefox-45.5.1esr-en-ZA.xpi 420776 SHA256 327be0ebd57bd9e5de8e20fc6e89ef6a0c9f56a227f50e9f74254f817169a48e SHA512 4653623982d17fa122057a9cca1ee783c51ab297d20dd4b0fe9c06e5739221c999f81f95f29349c197667080208ab771c42e69ee75801f9a7e329e92097c394a WHIRLPOOL 1d2a5b699b46b175ea34af8ba3efdad3de1e14a91b6e3594a64526ff7c6788e7d3aa3f1a31b96d5f61e182d38fcc5ebe5ab39e3928adb6068f3bfdb87c7c99ed
-DIST firefox-45.5.1esr-eo.xpi 440960 SHA256 fefd83295e99065d7a8117d7a0e300baf694f019b90ee221a723a44e82a8d9b0 SHA512 4e9c173001462aa1f2a27b6c7b1c378b3e58560c9d600435f788af0e010f671ef180f359ffeb0097f5a0264e9176d415f3cc8b462c525c38ee3ef9a61cfd73d4 WHIRLPOOL 0a12027be96b9e83c9cb75ab1632734fabb0538ba670cf4cbd2dee6a410c7bc62355f7c3573f39417f32523682530cdf77727e4bf870a84290bfb44f42980e91
-DIST firefox-45.5.1esr-es-AR.xpi 441481 SHA256 cd3636a291b5b97e7a424d051e86dd8d524758991400749135b6ad22ccaf6d33 SHA512 8c0f718517dbb8bf41ed7a114867c361b14ee1d7979e145bc288f6a31a4eaf74cf5e19272b4c0b2fc7d2267999eacbca9f48629850050f92f7c3aecdbca5b742 WHIRLPOOL 0f0aa05abbfaba89ea70e27c56dbddbe824e8ebab176e584692fdcdeebbffb1f5636410f76329c8263967019754f81f6ccf54d320424a450d597c36db6cca01b
-DIST firefox-45.5.1esr-es-CL.xpi 368763 SHA256 ef9c2ace7a74f1f9fa8ffd2f7af6dcdf6f1798b799be871bba6242b8ce078d74 SHA512 41ce76a47cae0e70601771e9a3d898502d83a8eef3a8921f6c1eb616c2a0d0e2eb5cbcbfd3895780e286bee59590a428657df5653d6c2c05e4bd0a2cfa528d66 WHIRLPOOL 9ff3028d2e2e20aea32e4ce90e998a25da1cb9ba8f464251d47a792c696b3f48ec1959ed5d11efb724531345d509626431b37e462ce13eb4f400c0ea2d3fbdd8
-DIST firefox-45.5.1esr-es-ES.xpi 353716 SHA256 b23501e76d1e9422340ba817e223939d9f3655d69d63d80d527bb988f1d76b31 SHA512 e056877cb64250c955a8ffcc9299d17f32b338e847ed1463d0bf7374feae0ee4f460416800a5206c8dd118cfb6e0f672d0629c3d6c1cad52b5e1c0ff96a0d85e WHIRLPOOL f58c54489b21e02d4f3e3583278c8d80f1a3062f3b0518bca7607adf0d1caf1db70393a09eb2a07e973b0cb9dd837e66a6d6f558720628db4662e866afd24739
-DIST firefox-45.5.1esr-es-MX.xpi 449394 SHA256 16c444c562ab9336558ed70c3da71826c06f4f4660dd394cd5150034382e3232 SHA512 fb288b23a43a6296b6463e5648df67494a9a4145b59e8920ac74bb1601a5a88d6a21c745b8e11f0e30615d4d08529e4fbe89410686bf04764a9bfe8571295620 WHIRLPOOL c313fdb0e9af7d80219863d5eaf920568281339a5e4327071bcf33e3e9fecaf31764521454df90f497289745db101ec1bb2e9c8735a0d87350c89888c3bc20e0
-DIST firefox-45.5.1esr-et.xpi 433352 SHA256 62070863641bb8163b0570a22a41293c1382f7755157bc418a445a580d818f07 SHA512 221d0c3e8749454b3c96d9f2d2986bf60a2c5c97e454f8d69ad056ce813c36850653c1353fd72d106b1d3a1f2cb0c09c7a6ee86c9f188913232102fbd26caaad WHIRLPOOL 83b75c3af15fdebc02c277626ab0b3b0a5ea856da805c2439220dd96d582ab8d28281b7d4ba6af5a19f84e3b33bc0868ddda89ae242dd983721def9af42f40e1
-DIST firefox-45.5.1esr-eu.xpi 441357 SHA256 e2c78a08058def239a95be921b154538e9c65b0bf17b894323df3ebddfbdaa54 SHA512 fd0e1e624a57563c6ad1d6ce42807b1bfa2a04f65f6cb40d2d78cd93644e92b33526c5c594299f54449168cd1b93f3eb16e836b87a8d9603cc498cc54b0bf4f8 WHIRLPOOL 51c466e42e3e526aff6049d2dedf8a4035a7609bca03d67e71684fc6a4654e42d73e05d998ec9dc6472408d22a502a7d7dd816d09d8a20fbe350171315a8c7c6
-DIST firefox-45.5.1esr-fa.xpi 491941 SHA256 5d592a7043007991787d5bd348280d91458595cc2c7aeabd7d84f785b8d499f5 SHA512 a3c37cf43ae0a6c26c86f672cc4009b815b92872ad7e9ee65a1a7b2f676deae032ef818e5c7057609ddb45bdadd52254a36d705fd77f65a305ffe46854a3b03e WHIRLPOOL 4ec18882c45abf7de3d7a506aea5b7dfefe46725f3f83bb260eba96b18c269c22b57f5ca9d3e1b5552b36ad0d1407b222cad48e7ab24b0116ee3aa077b6630bd
-DIST firefox-45.5.1esr-fi.xpi 438347 SHA256 95830ab1777a7abbdb5e830b6444f3ae4189e353ee3f1c91c88b75bd1eb09b50 SHA512 12334025c7ebd14de04037d4472093add354b1fb503909634fecd944847e073a13e688adca4a74fc3777f8a80c4f2b06395d6cc34b1941b2ffbae189d3b4d718 WHIRLPOOL 7a9ffb08b66730e546d40ebae89425b5c2d6ffda7e13c2456ff3c0e13237c4b06483bb2e349bb3d2bec0e725dee014ead8fdc6c2f897bcb4f0505e2ebb52cd65
-DIST firefox-45.5.1esr-fr.xpi 450037 SHA256 1ddf11a5b3ea9d07270eaf70fb766b75e123c5d45bb6c0bb4d1c94047deea9cb SHA512 afbde309210d7a05d10a9ab747ea5883695fbc0d0e8d729c862bfd4015f9ce577f1b839a8629337ea60b1e6d33f7255c181c02078e25317e910042dd6b4287e1 WHIRLPOOL e0211fec54eccd3ed95b99f9856365ae2e710402d6def244a2b6dd546173d88949bb2b1cb6c18833d8c52af4f10e7b223957b81bbea8d85ed94a8ef7789580a8
-DIST firefox-45.5.1esr-fy-NL.xpi 447779 SHA256 37cdf7d49c7b0bd74f13cc5343146bb2f113cd3df22e99ec352aaa89dbcf2938 SHA512 e5baeff58f2e8fdab38197886cf5eaaf6cb23d6f8cceb274237003bbc609084fab1c8129a3e098b1e978b861ccce0a84e08da660f3021221a87d1bce00740f3f WHIRLPOOL fffd00331f8ed8ae4770d325c562cd7c06f815dcc488550b12f719a8765be8ee0cf51a2da288e3565577e1187914c0dc263bf213bc98518940cf849b49d29493
-DIST firefox-45.5.1esr-ga-IE.xpi 460056 SHA256 3fa23e7bdb71b43ba8ca5ec9eb8fccbba1a0daaee4598350bdf6a08fb12867ce SHA512 111b28f0e8aac2211444526a50ae564ed5d01a6c6f88b873045ea22063237d56ec229ded1bd71e625b73624d54c00c71370f692063a94f3ebde459aa4fb0bdab WHIRLPOOL 24fc63c87fa86a8c6e1d3f26646b7737d0d39d4cbf397e98f86f34bb4fd89be8f6a94756ab33494debc1d9c4b30fd684e17ec3be546cee1768297087101b54cc
-DIST firefox-45.5.1esr-gd.xpi 449711 SHA256 3184ebcf00bccee3b57ffae3c1ca787d5cd248648425df61a4401e58acc43979 SHA512 89234e0bd078d6fbd83477243338face177a2fa949772b762c220fefe78ca52a12b7250a681955ebb45eaf237265c58ab45c82c2d83b0fe5b6ad64564f2bd260 WHIRLPOOL 8dfbde7af573784354ad44b52aee262a7c8fe8495eccdcadc84d06ad0d1f8f7463b3715b505dbcdc8cae98c35235a2ed507a7f250280edb6e477a47d50b512c9
-DIST firefox-45.5.1esr-gl.xpi 434804 SHA256 729f97a591c74dd823735623474e36d73415505091341913bcd2eea17f4b091f SHA512 484b11ed5e166aee28b6a4f6e2ea5a7796b98f2b25cd26c6a71fe66e14119a472986888c4a3e4fbb12f087c867390312c5c71f2c1ea6d7d4399a5e34b70ffa2e WHIRLPOOL 86acd1cd3fd98982057815b374913caf623e2c409871a79170a25d8f6a5d3a93715ad04577297368845f5ffb8068cc099c72a6cb0d7b6beaeb4e0a76918e6091
-DIST firefox-45.5.1esr-gu-IN.xpi 472567 SHA256 ef94734a82c95824408e2a94d0e3c0b72fc6a6172eaf0bc455404159a28ea8ac SHA512 d259a663838f8088f09297faf0667cb56188b55bdb97f8ded37e004cc1c665fd1abdcb77ddfa225c55956d60690c90dfcbf017e3f9c28bd4ff22352cadd45b34 WHIRLPOOL 5d27ed7177701230ee93f781c0c979bce2cca99dfd284618394fac47faf2c8a71368e00c02dd5ada297b988e002b9ac27463abc49408cad9deb6158c016e6643
-DIST firefox-45.5.1esr-he.xpi 454785 SHA256 3e359859650e3bc2909954efbf4dab9e38b007329cdbca3ca57c872cb2b29c4c SHA512 d32e6be8a7cbcda06d418fda717928448f9aa98c6cae3897a4d4cf33b92df05fb77815a50fca6575d08d59e2b9510b5adf554bb9851a011545b9aefdc77d1072 WHIRLPOOL 944c0042b6edb54baa8d31d3447e087ae629ff65ba6e11b465f70aff049a97cd8a50487018d2c6f5af9e454e0295e430bf739598300597df4280fa6b068ac83b
-DIST firefox-45.5.1esr-hi-IN.xpi 486991 SHA256 c579edc5c30e5b8cd0c4e8e988aad6fc3c84bef023a818920e18b78c52c4fcb8 SHA512 368d2821c4a7c76687e518b8800e229642cdd097d583349f363af59ceacf12ed019d478d1baf79e1f28e24d34d9ab8f3f53436c5bfca9d143f8dd83f0bd13853 WHIRLPOOL 2da9c40f9d790b153174907f89f60e79dc777fc9660fcefdbcbc073be25bced3ec8ebd4b3b61d1e7d9d4f0d684b2246ef8f6c35b7b055564386538879234bb12
-DIST firefox-45.5.1esr-hr.xpi 449068 SHA256 fd835c7ac82c1b112f4b9a509842aafa2bc25dfd7452870be07d9d04e220a0d3 SHA512 da91081a7d12966aa0da1dca85744b4fff35ffb378d7de3d975439d685fae48bc9d90e531c9023379fe0e601b92a75dc2766da24d931fbae2ab9c3efb7815974 WHIRLPOOL 116d170cf8b2c8f4f4adb63972eb2b95766ec29563a26597ae2e76a12c96907a5ed44a54a777d09381e1c182e471065128c26bf969a8d5be61a20242e1ea7443
-DIST firefox-45.5.1esr-hsb.xpi 461453 SHA256 d0cf5ae20865a6422d425be16e441911ee7f628e96993693202c3a1baf9cd454 SHA512 8f9355db0fd9bb12bf9ccaf5e04c72e9066b1e2e3688d6a05b87970fa91a82c649d6ff39ab20060b271bf009934642e9694275ba59aaebbe4725b3fa9f7d768a WHIRLPOOL 5ae5fac33d33ce70bd7ea242cdd6fdaa134dc1da60ecf384201dd33f5e11f74c4eb31e7e041a4e9674841b5266e1bbd2308f93074fe6638c5acb31824aa0ecd3
-DIST firefox-45.5.1esr-hu.xpi 449777 SHA256 bd2bd9395d42625c8eec9cf73a3c054b484b0309e5727f74b41197082a3d3d93 SHA512 fbc776365b94326e4b71b1d8d4fe02528ae175ff53e052158df32da17cddaa48199b021420cbc56b020c81cef7a5bfa1dcc7e019c2f8c36e75f38d350c023dae WHIRLPOOL 0e8418db524c157f84a9528b51262dd9564350b6e386f23e4712a0a63b21dc9c72c6bf2ce65c99bede9722ee4f7b366c0a6823609a02ad5199e015076f048aef
-DIST firefox-45.5.1esr-hy-AM.xpi 500039 SHA256 3579966a2a86dd271f710600dade51d71788725f4a78eca29a354e4e1ea0cdce SHA512 35556ad3b500701fb2c591b8dcc8233ae79b917794a45b90320b371b92f72fba6dc63bfa4f9afcf5bced9781bc6ee8f852f17e14cf559eca92226d3a661ad7e8 WHIRLPOOL 26ca49d9cece5d6e5e14cd714fb97ebc25836a5bd221fe8ddd712e15eaf913f1ac445a1a98c4995ec907532484e9e81510566652255dc192c02d9de4831e2331
-DIST firefox-45.5.1esr-id.xpi 427175 SHA256 aedfc36977b658f77b75db21d9fb21d6412209c80098c4944d0557213b736f11 SHA512 ac08c9d44c4bff09980370903b0b8a44153e5533ec1d77eebcbe4f5583bdda848ed3f8afd04e5ebe17349e11f157b6d18f508c8ab7da48ce3bca03436cfa0b8d WHIRLPOOL d3a55e57ec06841d4bc480fae9600715ba8f793959d55c21cb5cc76db2755f6b795815352ebd2a71dea7798f6d4ca012d8bc0e52419c2d51536c86a5cb6b4728
-DIST firefox-45.5.1esr-is.xpi 443214 SHA256 48cfd7ac429b58d9be92f019d24076c3406f23b5fd26da92d3e53c5aa3bd1c64 SHA512 d8c1fd978901bf149d6f438b0926aa1008884c4b404d4a007d9ecc766ef62a16f9b43d060e1c3ab12dd12a26a173ab8646b5a73722cf70d40f7def505bafc55a WHIRLPOOL f453fa3a2f7ec14a0b94bd37a8c4c73d553217536a0618ba36d6414866a9c2d990455044912652af05819b57c506b4e8a4ad815fd1e7e475c42612a5c95cb4b5
-DIST firefox-45.5.1esr-it.xpi 343724 SHA256 c5393d7d9a3d77cf7343a40712b62ef778c748c9a780d0f4073483a1bd46ae99 SHA512 a1e29e8985c1a92cd92b2712f59d093b7fb6f35f5014c2c5fb2a803015b142bada8ed758dd943d9a0115709f8ad07c1b020b940d2fb5e7be79a8cba62750664b WHIRLPOOL 5fd7055cc81f20b577844cdb677535cc20d710ead74b1a6aff874f60634d1a9417e15960b709164c67a55800a35666bbffcf5ec189441641cfc8b722c25818f2
-DIST firefox-45.5.1esr-ja.xpi 486331 SHA256 e988601279701e17ee8b4d93d48620526acc6bee55f10a7e1f663a6f2e85a539 SHA512 f4d9a38bfdf86372f09ccfd62066ea5f893e01c041838426a9adeb6c105df2cde3d75d7d0bfef11401c63de7993bb1e3731d3b252e5a0f1ee2938268e621ee89 WHIRLPOOL ca0e71c6d3d95e0440fb4bcdf5505dac5d8683e54c6eb39fc5b1394f0be614f04ac87e20053967b5b9afabcbff0625701e9b37d09f6ed232793738d52dfb170d
-DIST firefox-45.5.1esr-kk.xpi 498895 SHA256 118756171112229f652dde0b4d60b3ec22865ed0eb9986ca426a7a76073e101e SHA512 f779d57efddd2e8b745ea725ebbe39ef61b957845c8489227e5602af5bb7de20a34d0b0d3fd1eeba0220f62f2d077c1de86f73c0cec1bf247784525c2a8d40d8 WHIRLPOOL 56f67233d21f1ce39a41d545b7c813665bb4bb7d7f1ea138283436f2793b38b0dddf45603fa925cb91ef1d2cac0c94bc6d98861282d0179d466f604f452c90cc
-DIST firefox-45.5.1esr-km.xpi 504301 SHA256 f8db2c89f7cb0648d917d28250bdbc965d9ed171308d619521a39a6ca2bcd27d SHA512 cb93cd446e51c16a7b9bb104555950d01399d797975ee72cde3c039d431e9943c0908d9d2e01e39f9a35cdc38018f320c5d1c9ac10da49681a14a392ccd4235b WHIRLPOOL f971e85637fdffd69ecfc4673495111be2b3d2dc0c25408a61bf072b810ce9d94e8d1b62d188bd912e385136abca936df56238f728fe57282fb6871a2c16da79
-DIST firefox-45.5.1esr-kn.xpi 495881 SHA256 125890d7466872240603261f4bf653757cff2d39c0289b9aae4fdff8f92a42f1 SHA512 37117ddeed2d277ced65c9c537f1692f5005a090cf5092c9a04661762548150b5110ecc84ac0d7be8de4bc09f77025f4aa86265e1ab1497bd63b8be97a3ae10b WHIRLPOOL 47393b754192564847ef49d844219a2cc325a1f33f588ef4b8da1381d5d1a8a9159c195dae7a46b1a793df58209786a795761ca6739492dca26e832d80488502
-DIST firefox-45.5.1esr-ko.xpi 465289 SHA256 ae2063d06023d835f59bdccc98875bdf6e7b9141e16abf6380a5617c77e0a201 SHA512 5191d67767a23c6b7941f0777c78498c9bb439c74e50e409e423474ede6900211aee3420d1f825f0c730184045b1ac552fc7ed2f428b168754dec0be456f918b WHIRLPOOL bbb5ff80f10cdaaa6df6b604acd9014a2cbe39dc42f2abe1e4dfeea03a59b25f27a3a80e72a0716141f9c4526263a2a2785751094eb02f736dd0809494aef633
-DIST firefox-45.5.1esr-lt.xpi 454678 SHA256 1f57e527ec29d17e653e6849007838926841945c7052c4b63ee0d8c44119d9c2 SHA512 f8c016b9f05c1538bb13b98b47a54274c8680d34c7ddc18252935291a17c65146ef853f0bd757a900b321f7aff100aaa09079688d3f0056d7cc7ba9960a7f880 WHIRLPOOL 58c7d9c8dfb8602e8ff0fbe5983414f0d7c7b2907e77d0bf358c9fa3b79c153c1e1663f92a343c947a961f17b4a2b0300003b39ea4de05f771641060cef784bd
-DIST firefox-45.5.1esr-lv.xpi 445719 SHA256 0cff9a5cccae90ba6b1d5a8cd43e18388fe7c1a3ef7b2563ce85e759624f97e3 SHA512 06869b89dea34269b343d127a02d72c7f3b2029f22ce1abc1fc991418b02cb3933680094de48828da4a709c185b4ab54bfb853efc903851abfea9b2a6fdc707a WHIRLPOOL 6ac3638160985236bb152f8fa5b85d2eea0aacd50e7bc7341900826d86145a71089fdbeb18e07e8f2a200b37f4687322299d71101783a9fb912332d0ae3c7027
-DIST firefox-45.5.1esr-mai.xpi 492650 SHA256 eb6d35bcb9ab62fd9a38609c40299bbc79aacd1ef102c2fadaac5c9163afa57e SHA512 3302c1e0b4373bc3a6883963e629436a67b65a54dd849c1e9909ee11be2243aecb233e584fe4c50d53e354c179e5210fe93b1061313ceb012306ac16bd13d511 WHIRLPOOL 91f27a83e87d036c35d536693c479eeca41cfae320bfb5223e16ff7431469535d946c5aaa3378c47d4b0ab6b38fffd3bb80407ca5c3d28945fc871cf15797202
-DIST firefox-45.5.1esr-mk.xpi 476392 SHA256 ce9c64776e6e763f023cf3ac15e6d4463d3bde4ef61829413082269db97d2377 SHA512 16d4484c8e19b78320db59eac50d0ab4dd9034f96508212f875b23b2363734db3dc4ce700472def1a7c69b3c65963713201767547ff6231836a2b7763f98c33b WHIRLPOOL 0d009fce8c8853d01b3ea57cffa0cbf53dcbb2d015d49bc3d77b2dbc6a2b0b607cc41fb970c20efaa569ee422b1e5755a1c0eda4d242e43ef522c0db40ba1475
-DIST firefox-45.5.1esr-ml.xpi 498680 SHA256 bea1ec1d7cc230718db6ec04c8e217d1297e3b700259c2bb87de7bef73505102 SHA512 a1de7dca3c582859e8a6f8d5b17e6be34299948ca0221a98486f54313eabea82a4f5552dd7a267cd575d46d059129054fca5882163c0b2c98b884b9bd13db652 WHIRLPOOL 90c189b5a798b545ac6cdf5b303ab1fbf6083b180f4ac82f09b9e32d403c541ccf2e2870dbaf9a86596dc64a28efd09cbab891ec17bd2453e317c413d891e377
-DIST firefox-45.5.1esr-mr.xpi 503700 SHA256 72542cee0e1b8d07a948d518bdad1fd1543f95e59af9adbf578d741bb186f526 SHA512 f4fdb84349d47b361c7080043acf42caa32ddf3df4648afdadab516f7a65b06abd80f9a7f86c96edd5a3bfa30c691bc0fc3f9637d7c2729ef8d0aa8f05f6fa60 WHIRLPOOL 59c35f5da171e949aa4650d27c738eb30af6b08856e7bc7bb0da99391fee47d0535034a42d2ce8ab21b77d0560a92c1d596692cc01a26a5d9803513d3c9857c5
-DIST firefox-45.5.1esr-ms.xpi 440065 SHA256 5bc80a1f604e308dde247e1c4b0c916a4990148c4c505584dd8f344fd7bde943 SHA512 8ecb4d4f282220a91ffc20c4c6fd80ffc9d2ca169a2628e3f15f53bef02157cce29271b0f9c09e80749d82918a5f8433ab19c4fd42e21ae403b7b81d7f6d2d82 WHIRLPOOL a329866bd8ccddb9ffcbc3465b4a4f71adaacdf2f1299885985b235dd2e31d409dbfd19645f7825d599e9aa7c1d5824ee11ba9cbd82765e230d11c7b617acc04
-DIST firefox-45.5.1esr-nb-NO.xpi 435470 SHA256 daf747f93c2d610886ff4360fa8b2e3c3fc240f82bbcf4e92fa0830998e4ab32 SHA512 6b2d36813b821075332b17f9a267e2ebabf4fd1338f32c4ef1778120aed7cb0dbef4ca3321cc19605c942743daef210638e9e0a3941008e0cb60edb0c43ea452 WHIRLPOOL 912c4efb5c777a4ddf12daafb154cbb5b0d86ed60d4aec4da6167cb441a5b6d0f4db496fc4d677467ec9aa942a36698ed5ae3c4aa7082ff89f2e7fba912143ab
-DIST firefox-45.5.1esr-nl.xpi 435202 SHA256 05b4caf7827fe2081666bc23c35626477aabbd21af655ae1ee95d9b868dfb0ab SHA512 010616bf318e5e7a38d67be0156f1867e9d0fce8e8ccc27b907e44a548b878f8db1c41f0feb21c3f57b03a8b09ae7ede1092de7a56b5e0a9947bebe4c3f6e073 WHIRLPOOL 4d4be4d60cf5e66ca9675487586f71fb13ce74fb39f2da7d9f3ef8d0651a8804b710458d43f7fe25f5f7fc7006c74b2751427805a8873cffc82d8f9e2aec5361
-DIST firefox-45.5.1esr-nn-NO.xpi 432934 SHA256 cc92f63d0326c0ab462a6eaff22719645f5df75acaa509ccf219bf056d71c49b SHA512 b1c386f87ac6fb5783e27c655dc093305b1d920acd07e5a75ce8aadf1e07289c98a8c88128f4ab70b38ece17cba993df2981ef45da1aab471fe35e3bb94f2f42 WHIRLPOOL 09938aec6ee5a9a5122130a6bcc376226f50292698179e25913aed998588429fcc9e009cdd1da0ebb70d05f0ebe7592499c25d88d1c125b8561c6c9ec08cc85f
-DIST firefox-45.5.1esr-or.xpi 495922 SHA256 108b3ee326cb80395970661a8fba4e24e6a22b659cc3223f2c7492148e05dc7d SHA512 49ee4f1e38b01ee27c9fa1e94c44bfdf5bf26192748ae05fba7af4b72702999cbf13efe3aa49e47ef51bf030a1d589d5624419b4a8eba9f476f9b8100134102c WHIRLPOOL b964b073de187bf97b4e24c914970f8b5f53aa1cbac768378c1663229f4e51c64deddb629d11db78b4ebc6bbde29957ca14ca7cf7f18c621890ba6778a28ab0f
-DIST firefox-45.5.1esr-pa-IN.xpi 489551 SHA256 0b0babdc524dfd614680b85b22d77a88a6fc87e230e8a821cddfa00af9d56ba9 SHA512 bdffa9a01b2f1e1f585b02f26a40bdc2a604c0bb012cbff2f330022cc0b8f8cba8358df4adf3cc704b375fc3d8f7672461dc1c0855c50f792dc1057860385488 WHIRLPOOL e5813a308b0489dc8ca739d40f37350960288c634650e865c928dffabb7251dab1beea2ae7dd22134c53d67d13400d9a3295aab8e3e102cb20166ea53e6bc7ae
-DIST firefox-45.5.1esr-pl.xpi 383929 SHA256 7a8d586af73712f8187e777266576a158634615481b4a46f3afdc9b346d1e004 SHA512 c6fae1c57c431d0eeae1f6002091cfeb3cb2c43a85b8a9fd44021f30b88d35796e55265441b827e0c573785ba55d0326a5114add0cda94baf732d2b5a4a03ef3 WHIRLPOOL 47177492c4e12d8cf0200afef6dedf7d7b6079e283ec944a4e85652697a167bb8279b8a339d00dda27c041e2ee104f6ce7847c9c0e72a06d5d1c627f18326a69
-DIST firefox-45.5.1esr-pt-BR.xpi 450990 SHA256 9c6900b4bdb2c293471c4c898ad2db89d67de66f388771f7ae0f8bf4e3598e3e SHA512 553f1c2d3cfda8fcf0897ce28a6885cccaa7269b137f6e5f86b51a234a78c42d8fc4238e8e4470af4ebff28f7c3dda2b6b0aa4e0a8e8f69cee3f238b51885eaf WHIRLPOOL 9ae941029571eabb4a3e45641ca79f368952f661e0f8f7336c2e9c14749241f730436e19e0dca26f58f843d2107b707173e8f2571834ae596b26a89448f8058f
-DIST firefox-45.5.1esr-pt-PT.xpi 437023 SHA256 f9e608017d1fa1e3e4076efa20947496eb4c259fc5c90a7269222c4fcce50f53 SHA512 65a68088d2ee6521b654a1a8faff1d0184c78e00c186944881b04bde62f9d0479ab7d8aadd202d3d7a068474e1cbd7df5f0293870abd86833556ff58c07a80f4 WHIRLPOOL ae8774584bf2ea4aa5a71c928e97aa11ba324f54501e9051978e91694cdff51bbf5b4534b881a18802e926d9dac032e7f1d07e00af52356e58c31a6c2eff0b93
-DIST firefox-45.5.1esr-rm.xpi 437717 SHA256 b974a691a8eee4342aaee6bfb8917899125ddc3d8d80fc396eecace952ab1e54 SHA512 435d60cd0adbeac33b6a904c05f7513b6453633c67005ad1560ec5ca5809c94a302b8c19e3d5811bb0a59441fddcbe26bf8cc197e8b93654bb0addc26a90243d WHIRLPOOL 83e8014d2eb1c45f5a9588f861972f1d8b80f47aa03aa17b5a59bb70678b6b9f469d54246e20c8c3ce0e520ceac449ef120b6722d80610c2670c37016f20e1fc
-DIST firefox-45.5.1esr-ro.xpi 444062 SHA256 bcaf90c8a46072825bad4b3f13e88a6ab6882603a28255c2b923f2c97e607bd1 SHA512 5577c1dbe9c924fa6eee44afb679e285424e04e3ada1435c2aa9202027e45b8ad78364375cf217f907ee2b9cfd78542d712f0747852579849d1fa8d32e456a69 WHIRLPOOL ba9d550d59a3adf76e1d8508ad41495280a8455ee576426b972f7b7159b906ee48510e3d00a68d5c869f6d7cd7ed14eebfdd8a0b64af6d66f5d85f438b9ddc8f
-DIST firefox-45.5.1esr-ru.xpi 392738 SHA256 bbe862b7fe6435ec18d2671ea8d3bbd0a3976cf7258f4259f4d500d92d3965f8 SHA512 063787b7ad28364cf282eefc47c6fc2b6f97451a5c52f48994f377e09a7deca782317e5eee24572dad9cdaf8d3c1bf649fdb1b081caa7a099db7f443b106563c WHIRLPOOL 1fdc074f0fe06ca102cd71f01ac0b4b8045822909c7567212838161b5af5b09e35501bd2b628dde50c22ed9f7ffcdd9deef5124e6ffe7cd7188e25578f523c5d
-DIST firefox-45.5.1esr-si.xpi 482247 SHA256 ac140ec1ca39a0f02f1a9899d4be2f487c909e5e9ab43456b5a79796b5c12f70 SHA512 45d1d6a57d3e85889f18ea6d008644c480ffb2655bf066ab3edfc9d87011e2beed39bb1228463c8b09b599776dc88adbdcfd610fab9101cea53aed265851e5e8 WHIRLPOOL cb67ce055fe89f0ba53054ce5768fcb69398f56a3f3adfdd71290ea26366f1256c88a634c613d055570fbb0d467e1f3fa1d7e87960e64ff777c0a7fc110e562f
-DIST firefox-45.5.1esr-sk.xpi 453606 SHA256 8f85dc374f46dac6f622d0e22222d7e7a7536fa26bff799e1373fa3665999220 SHA512 1e69953bef31443f7d696210a846b9a397e1d97387daaac5bbd27ce6bc1bca069f1fc68dc1d2b2afad480e5b5e1e58d393f83b138b4ca176360b1443b0a0a3b5 WHIRLPOOL 867cc151103fee489d3a09cc05c9306ce08a5d6cd5535555fa9b7bd294ad514e7b0c3b3ad062591f9a2fe8a2ca5800997a6e7fce19d57dd28d607e180d1970e4
-DIST firefox-45.5.1esr-sl.xpi 444963 SHA256 8748e52bec3c524216046e9d76d402ef336da4cb068b48a588a9e5471a3ac4eb SHA512 a13eebcceaa094547d7b3c4c5cc7879c919858459d47861384b1639a4a7ca60543bb9ee2d1ad4b3a7c188b87da613f94192a5231cddca90fb36d35d2678bf6ea WHIRLPOOL 794e372761ab567994376ec8b56a89d01741e0587ba1d5d52062ddc56721c77ba42d57aee82a520bb94be910ef2bb0e49eb84a979962c2dd6e30aca442eb536d
-DIST firefox-45.5.1esr-son.xpi 433513 SHA256 63d6827d7c747f98082d43c7ec674bb986738a5eefe39763a06c28eff78ea48e SHA512 237ff8e9b2cad6c2a4e8ceaf2b5aae97cde13c348c65593051036e22951d3ba68fa549276e4a63645868a0aa64bb4e63f20612fd2296b23290225808e388c504 WHIRLPOOL acfcff03afba21ac1f960ec9aae3bbf77fb64c9a72c46f727295d583c46d134b7a580308f3a0843a193dd6f750e4d1bc33a9f5775a096edf28c014e0a48eb92a
-DIST firefox-45.5.1esr-sq.xpi 452186 SHA256 b336e6a490d2fb5d6e7dd1f82d76fadf624f2a2b90ab7439e46f68f04b07f8d6 SHA512 ce34fe57e74d3b94f54abbbedec8103f19ae197e1956efa46b12871ee7afd0b70dc24d8a4e257f2175e3e9aec835724709eb6bf227241be54633957843cd78cc WHIRLPOOL 208853574679af592336498a1632a6587973214617d1b2fe0aca6663910727ab62c7f65beee969326ec9990ddc2bb16990118a3c63ea370f853a63df4f794369
-DIST firefox-45.5.1esr-sr.xpi 464478 SHA256 f08448a95f8fb2b0e959ae8eab09bcad64d170b1f9f4986552fad0795dd47256 SHA512 56146720e652e2105ce306c0141017afc227da2cc99472e4db175df7cc3b69942f61e0123c565fe16704c376690b95e14441f9b195e84338d15a5f0b55c54b65 WHIRLPOOL f50d08c56728abcd1e7ed53ad99dc1dde45635e8609f3aba49241e46a639f8160e1d595da26b28aca680e998f3e0c5b9b2d4bd04795327bade812bb94f928680
-DIST firefox-45.5.1esr-sv-SE.xpi 444214 SHA256 37a6b468044452752eb39d25316d3748c7aca3baf8f641246a578074b67666e3 SHA512 8d33ac8d9246d9ff4ac87e74e48d93571fb7243bfbdc5d750efaf1eca9d67ee168a9631ed499120dbc9f3603046cff80f8fca448f0f5897e9f9b50a44efe4d9a WHIRLPOOL 79faa21774254fbfd6385547da55aa02d0c33257de458cdb8a855708747f2f477d3e56eebda421c693469aa49a72d6f4530f394a4fd0db89acd12c0079a984aa
-DIST firefox-45.5.1esr-ta.xpi 483119 SHA256 dfb7e7947ed7cbbd7becb0d3a33b096481052343842d47f3f507ed8da094ab8e SHA512 1ec5cb935cb3b20524a926eb2c40fd71644fc58e271f6d19ccff530dd081449a4e49a1c84262e03916da62cb084a42b2692351533be44d3357297e93474df97a WHIRLPOOL 331b451363524eaecf4d29fc3a5d8d4d2f44093f409f2cec5963b0e387d5385dcaee78cc294ba133c0bcfb2180878c3f31491427f63ec536a8cdf868f01a61c5
-DIST firefox-45.5.1esr-te.xpi 492469 SHA256 d1fecb274f34acc257d58c23417abe47b6222952a1da3e6670f4b69a418e4e88 SHA512 689709dbfa9fb55542372766bfebde53d9538c34a353644481cd110f71700814be993df654491cc4eee4e96f9c288f76ed3757e361e8d6724e54f1727e4263ce WHIRLPOOL c0d443ad65600e157221270744d953ce893b397c50cc0f0df092a190c05a27574072348bbd88176ecf1a05369c3d923e4b54868b02730b14b8f65e7162aa190d
-DIST firefox-45.5.1esr-th.xpi 477651 SHA256 7692a802fe24043c4e890f31dd907c347159fed2e98c9cf7c9e227d11ffe872f SHA512 ff9315dc45f40d3371c2a460c43b0a23f04cbbaeccac7ff57d59c60ed8fbe795d4a02f86f9ddbf8479a273f70cf2bdfb9751cd848ac0df5dfb8c72d7cafdf749 WHIRLPOOL 621e1f799e6175065d51f94176d3d3e93a8155b4bdc12f21f64357276e65911f2dbe1a8a61afa2eae4b52d9ef5fddce04f5124ec3775046a5c1ae8fb5772141c
-DIST firefox-45.5.1esr-tr.xpi 451166 SHA256 4391d231bf7d54727d8611357b2283634c74545568a07b2711ace36819ab250a SHA512 39202c3633f4e653ceefa6c270880824e2270406b5642bb12531da26e8a5c10be20bc507605a5e80a74654435af2da54f923da63371f4cad21a8850a381e62a1 WHIRLPOOL 7898d3052d26e86941c77bffe1f6b805de31f253d888abe9179f1d3c95ac7e0199dc61f0d334959a0e8e3002aeee788dc197a9af38765882bb824becdd5c776c
-DIST firefox-45.5.1esr-uk.xpi 494781 SHA256 7f59bdf3cdec6c0042341ad6b395ff7cdf3417841bdbe405cf87bf957e7de123 SHA512 3d8bdbf7af9c28e67a0aac99fa3d78f1cf4b2381668c2ed1fe0cc35c7d2dabb04af61cb60f081f28020f06036de4ca6eeba2e93f6e20b0c18c6399a7055bd539 WHIRLPOOL 9b8f6d2c30d2fb5d6963bf98f3d5e4c346a1cb1ec661912d8dba582d77ed675672c2fe0312a56118f20c0881b75f6862fa11faac9d50b513a641e60b3bcabba0
-DIST firefox-45.5.1esr-uz.xpi 443802 SHA256 7d44d131f9f8e134bfc07d368be77d293a6b56aaaa3c818395749a04b15d2812 SHA512 f1736edf43d6cfed5164ec186aaf3836207f6dd9f0bf1835ebf15a86ec4ee31aca95231d416aeee27a1b11ad0624ac6aec4003df44808f3a0b375b3bb1a8743c WHIRLPOOL 8effb5428d3f72a484aa21d2fbd52f177aa6b8d5fcce6b9231acc90096b24b95fbff23a907088e23093d63f712b0f27d0032acca88f939048dfa35d743692c45
-DIST firefox-45.5.1esr-vi.xpi 450778 SHA256 e131146d1a02c86fb5a5e3da02b173ebaf14c665fe7b086c482892fc913d225e SHA512 5671c1a0220bba0c08425be2ce79e680e028742761cb524b9d34ed9f4515d0cf87e466c4ca7a8f8b2245b667f8e2f503b675169dd1a91221d4de4f2d0aeecbb7 WHIRLPOOL a850e53fd48381b9b949d884d906f109cf0a7962daebaeb140bf261e22e0ad44880852d705806d2330439ecf54c71e9fd3eec155c41597374c2a69fce57579c2
-DIST firefox-45.5.1esr-xh.xpi 432918 SHA256 5558cb4f9704bc592babd1d8966e7bbaa684039615b4e7a9b528235ced01fe9f SHA512 883fff37ad42bd8576413d98f5fcab5ad548618528c069a39b4c92eb21f25276d26c962fc9d8f19d49d5f980a63301e62353f97b16dd1482ba1b3af915bc194a WHIRLPOOL 5ded6fe669387cbf76e880b8282c1f82cbe65e6a71bf0713329290d4d3551ab03e2a419d1ffa3a93cb6e5e251ca3fc4179175281252b968fb85ab6166ca2ba6c
-DIST firefox-45.5.1esr-zh-CN.xpi 475797 SHA256 e0cde1825e0e59dc9d7ca9a820c506978fd142d43f563c75cb7121485e436344 SHA512 0291a0bb1ec051e1504b410809903d7bfe7d1cbe6494fbc25fc65f954f65c62ba359e985f572ee18e19a775ee052f71938bd076c5b2549bc264212614c24172b WHIRLPOOL 43dd909ed4e3d15c30360e7e2e7674fb8248c70f81f67aeeb5f3fc744052b9bb0563d7a1d927f75a9e655571f0e5a760e1d3ef5ee6c6035c3f123214e2d0b9d9
-DIST firefox-45.5.1esr-zh-TW.xpi 466529 SHA256 d408a34d2889e9ea2b5add8cdfc3d57279f90073a1bc83c7d6a96033a0b73020 SHA512 ab99dc7c0630e3b63716c072b95ffcfa109116ab395c57a14a1260e326a7d957060e271af1d1e8d49a9382acaddc2c65d1a58214cc1901d755cc89b09b402931 WHIRLPOOL e6594d444cfdc839f1144416ebcc4a5ae203f0d8c213e16effbb32bc5997adf785c31fa1bf387ad7624a12d3b01e981019497022cb774426abc0393dc0a3cbf3
-DIST firefox-45.5.1esr.source.tar.xz 185542224 SHA256 2796c22ab04fdd8529192118ce6cd9dee7ae88de0ed9317b4192da6eefac9db8 SHA512 36c56e1486a6a35f71526bd81d01fb4fc2b9df852eb2feb39b77c902fcf90d713d8fcdcd6113978630345e1ed36fa5cf0df6da7b6bf7e85a84fe014cb11f9a03 WHIRLPOOL 23bbef56def50af776b60d03921050860ff5a093eab3fa481fd5456b54a04b0dbccd286c4a73f13fa00d0aad46c64f5c7ed79f1697e451f7fbeb560ef29ee8c4
 DIST firefox-45.6.0esr-ach.xpi 426530 SHA256 a26ca317025b57f8465fee3052c97d013755f8a1096ae1258adaeb7aa44a3e8f SHA512 b2709f5085eb87726bd70869d34776e35db065dbb20080e1d64d70332298a10c369c0dd88b9847140b7f7534b67b4953703da906ac82bb7a08dbe019b41b4310 WHIRLPOOL f5474cc8c693809db00d0e712e26b137a16321ebdf23a444ab42069c54fd2eb98631423e56419b62ded357189a214af702f970e77fbf53df4f3cf84edfc5f359
 DIST firefox-45.6.0esr-af.xpi 439354 SHA256 38726e81586b9e76dcc0e363ce7ff8a0f8499ac75d7111bb46d32672f792041c SHA512 8142fefef28ab70bcc949e4cde81dad544997aeffd1a9d914272f355d3d4736eb201bda6505371cc4e609c485816ed997fecb48e1ff1c505edc5fe1e4eeb5b6c WHIRLPOOL 037f0f874e30a49c3535503cf8d8486727f05cc48724c561634b99a136a8f4c89ee4b53154f7c4783ced0a8be455325d3c7afb2a2fbfbe19bb28de9de666c25d
 DIST firefox-45.6.0esr-an.xpi 449036 SHA256 59550c5311cbd4ae6947f772062573519dff438588ec418ae93c3f129f1ea287 SHA512 ec91ca579d060fc420dd4ac17b32ad9796743cf4876dd9f356e9ba661dcdd3867e0c730f30246134ed6b7e8cdb3187764f366507c1d1c8ba30becaeb8dcc0e9d WHIRLPOOL 8b79399c247f55bd835cc78216211132f1522da06ca1c3cdbee882f9851202bc65e8b5737043f2a17bf98eb35fb722327be419942692487f5f771b17826b415d
diff --git a/www-client/firefox/files/mozilla_configure_regexp.patch b/www-client/firefox/files/mozilla_configure_regexp.patch
new file mode 100644
index 000000000000..f35e445fd261
--- /dev/null
+++ b/www-client/firefox/files/mozilla_configure_regexp.patch
@@ -0,0 +1,22 @@
+From: Jory A. Pratt <anarchy@gentoo.org>
+
+Note: the first occurrence of :space: is [:space:] (with a single pair
+of []), where it should be [[:space:]] (with two pairs of []).
+
+This causes the sed command to fail (with the error message quoted in
+my original report), driving to failure the whole configure step.
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1329252
+
+diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
+--- a/build/autoconf/icu.m4
++++ b/build/autoconf/icu.m4
+@@ -70,7 +70,7 @@
+         fi
+     fi
+ 
+-    version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
++    version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
+     if test x"$version" = x; then
+        AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
+     fi
\ No newline at end of file
diff --git a/www-client/firefox/files/mozilla_configure_regexp_esr.patch b/www-client/firefox/files/mozilla_configure_regexp_esr.patch
new file mode 100644
index 000000000000..9e165ff9e88e
--- /dev/null
+++ b/www-client/firefox/files/mozilla_configure_regexp_esr.patch
@@ -0,0 +1,32 @@
+From: Jory A. Pratt <anarchy@gentoo.org>
+
+Note: the first occurrence of :space: is [:space:] (with a single pair
+of []), where it should be [[:space:]] (with two pairs of []).
+
+This causes the sed command to fail (with the error message quoted in
+my original report), driving to failure the whole configure step.
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1329252
+
+diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
+--- a/build/autoconf/icu.m4
++++ b/build/autoconf/icu.m4
+@@ -68,17 +68,17 @@ if test -n "$USE_ICU"; then
+     icudir="$_topsrcdir/intl/icu/source"
+     if test ! -d "$icudir"; then
+         icudir="$_topsrcdir/../../intl/icu/source"
+         if test ! -d "$icudir"; then
+             AC_MSG_ERROR([Cannot find the ICU directory])
+         fi
+     fi
+ 
+-    version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
++    version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
+     if test x"$version" = x; then
+        AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
+     fi
+     MOZ_ICU_VERSION="$version"
+ 
+     if test "$OS_TARGET" = WINNT; then
+         MOZ_SHARED_ICU=1
+     fi
diff --git a/www-client/firefox/files/update_h2_curve.patch b/www-client/firefox/files/update_h2_curve.patch
new file mode 100644
index 000000000000..a1f0ffaeaf94
--- /dev/null
+++ b/www-client/firefox/files/update_h2_curve.patch
@@ -0,0 +1,30 @@
+From: Franziskus Kiefer <franziskuskiefer@gmail.com>
+
+Update keybits in H2
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1290037
+
+diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp
+--- a/netwerk/protocol/http/Http2Session.cpp
++++ b/netwerk/protocol/http/Http2Session.cpp
+@@ -3516,18 +3516,18 @@ Http2Session::ConfirmTLSProfile()
+     RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
+   }
+ 
+   uint32_t keybits = ssl->GetKEAKeyBits();
+   if (kea == ssl_kea_dh && keybits < 2048) {
+     LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n",
+           this, keybits));
+     RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
+-  } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128
+-    LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n",
++  } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1.
++    LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n",
+           this, keybits));
+     RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
+   }
+ 
+   int16_t macAlgorithm = ssl->GetMACAlgorithmUsed();
+   LOG3(("Http2Session::ConfirmTLSProfile %p MAC Algortihm (aead==6) %d\n",
+         this, macAlgorithm));
+   if (macAlgorithm != nsISSLSocketControl::SSL_MAC_AEAD) {
diff --git a/www-client/firefox/firefox-45.4.0.ebuild b/www-client/firefox/firefox-45.4.0.ebuild
deleted file mode 100644
index 15abe58f39e9..000000000000
--- a/www-client/firefox/firefox-45.4.0.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=1
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ach af an ar as ast az be bg bn-BD bn-IN br bs ca cs cy da de
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr
-fy-NL ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko
-lt lv mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si
-sk sl son sq sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-45.0-patches-07"
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-# Kill gtk3 support since gtk+-3.20 breaks it hard prior to 48.0
-#MOZCONFIG_OPTIONAL_GTK3=1
-MOZCONFIG_OPTIONAL_WIFI=1
-MOZCONFIG_OPTIONAL_JIT="enabled"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.45 pax-utils fdo-mime autotools virtualx mozlinguas-v2
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist hardened +hwaccel pgo selinux +gmp-autoupdate test"
-RESTRICT="!bindist? ( bindist )"
-
-# More URIs appended below...
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-# Mesa 7.10 needed for WebGL + bugfixes
-RDEPEND="
-	>=dev-libs/nss-3.21.1
-	>=dev-libs/nspr-4.12
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${RDEPEND}
-	pgo? (
-		>=sys-devel/gcc-4.5 )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
-	CHANGESET="8a3042764de7"
-	SRC_URI="${SRC_URI}
-		https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.xz"
-	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
-else
-	S="${WORKDIR}/firefox-${MOZ_PV}"
-	SRC_URI="${SRC_URI}
-		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-fi
-
-QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	if use pgo; then
-		einfo
-		ewarn "You will do a double build for profile guided optimization."
-		ewarn "This will result in your build taking at least twice as long as before."
-	fi
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use pgo || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our patches
-	eapply "${WORKDIR}/firefox"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Ensure that our plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/browser/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	eautoreconf
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf
-
-	# Need to update jemalloc's configure
-	cd "${S}"/memory/jemalloc/src || die
-	WANT_AUTOCONF= eautoconf
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-mailnews
-
-	# Allow for a proper pgo build
-	if use pgo; then
-		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	# workaround for funky/broken upstream configure...
-	emake -f client.mk configure
-}
-
-src_compile() {
-	if use pgo; then
-		addpredict /root
-		addpredict /etc/gconf
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		# Firefox tries to use dri stuff when it's run, see bug 380283
-		shopt -s nullglob
-		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-		if test -z "${cards}"; then
-			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
-			if test -n "${cards}"; then
-				# Binary drivers seem to cause access violations anyway, so
-				# let's use indirect rendering so that the device files aren't
-				# touched at all. See bug 394715.
-				export LIBGL_ALWAYS_INDIRECT=1
-			fi
-		fi
-		shopt -u nullglob
-		addpredict "${cards}"
-
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-		virtx emake -f client.mk profiledbuild || die "virtx emake failed"
-	else
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-		emake -f client.mk realbuild
-	fi
-
-}
-
-src_install() {
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	mozconfig_install_prefs \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || for plugin in \
-	gmp-gmpopenh264 ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	done
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# The 128x128 icon has a different name
-	insinto "/usr/share/icons/hicolor/128x128/apps"
-	newins "${icon_path}/mozicon128.png" "${icon}.png"
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/content/icon48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Required in order to use plugins and even run firefox on hardened, with jit useflag.
-	if use jit; then
-		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-	else
-		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-	fi
-
-	# very ugly hack to make firefox not sigbus on sparc
-	# FIXME: is this still needed??
-	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
-					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
-					|| die "sparc sed failed"; }
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/firefox/firefox-45.5.0.ebuild b/www-client/firefox/firefox-45.5.0.ebuild
deleted file mode 100644
index aec960e0115e..000000000000
--- a/www-client/firefox/firefox-45.5.0.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=1
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ach af an ar as ast az be bg bn-BD bn-IN br bs ca cs cy da de
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr
-fy-NL ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko
-lt lv mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si
-sk sl son sq sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-45.0-patches-08"
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-# Kill gtk3 support since gtk+-3.20 breaks it hard prior to 48.0
-#MOZCONFIG_OPTIONAL_GTK3=1
-MOZCONFIG_OPTIONAL_WIFI=1
-MOZCONFIG_OPTIONAL_JIT="enabled"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.45 pax-utils fdo-mime autotools virtualx mozlinguas-v2
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist hardened +hwaccel pgo selinux +gmp-autoupdate test"
-RESTRICT="!bindist? ( bindist )"
-
-# More URIs appended below...
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-# Mesa 7.10 needed for WebGL + bugfixes
-RDEPEND="
-	>=dev-libs/nss-3.21.1
-	>=dev-libs/nspr-4.12
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${RDEPEND}
-	pgo? (
-		>=sys-devel/gcc-4.5 )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
-	CHANGESET="8a3042764de7"
-	SRC_URI="${SRC_URI}
-		https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.xz"
-	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
-else
-	S="${WORKDIR}/firefox-${MOZ_PV}"
-	SRC_URI="${SRC_URI}
-		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-fi
-
-QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	if use pgo; then
-		einfo
-		ewarn "You will do a double build for profile guided optimization."
-		ewarn "This will result in your build taking at least twice as long as before."
-	fi
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use pgo || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our patches
-	eapply "${WORKDIR}/firefox"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Ensure that our plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/browser/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	eautoreconf
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf
-
-	# Need to update jemalloc's configure
-	cd "${S}"/memory/jemalloc/src || die
-	WANT_AUTOCONF= eautoconf
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-mailnews
-
-	# Allow for a proper pgo build
-	if use pgo; then
-		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	# workaround for funky/broken upstream configure...
-	emake -f client.mk configure
-}
-
-src_compile() {
-	if use pgo; then
-		addpredict /root
-		addpredict /etc/gconf
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		# Firefox tries to use dri stuff when it's run, see bug 380283
-		shopt -s nullglob
-		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-		if test -z "${cards}"; then
-			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
-			if test -n "${cards}"; then
-				# Binary drivers seem to cause access violations anyway, so
-				# let's use indirect rendering so that the device files aren't
-				# touched at all. See bug 394715.
-				export LIBGL_ALWAYS_INDIRECT=1
-			fi
-		fi
-		shopt -u nullglob
-		addpredict "${cards}"
-
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-		virtx emake -f client.mk profiledbuild || die "virtx emake failed"
-	else
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-		emake -f client.mk realbuild
-	fi
-
-}
-
-src_install() {
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	mozconfig_install_prefs \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || for plugin in \
-	gmp-gmpopenh264 ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	done
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# The 128x128 icon has a different name
-	insinto "/usr/share/icons/hicolor/128x128/apps"
-	newins "${icon_path}/mozicon128.png" "${icon}.png"
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/content/icon48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Required in order to use plugins and even run firefox on hardened, with jit useflag.
-	if use jit; then
-		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-	else
-		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-	fi
-
-	# very ugly hack to make firefox not sigbus on sparc
-	# FIXME: is this still needed??
-	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
-					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
-					|| die "sparc sed failed"; }
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/firefox/firefox-45.5.1.ebuild b/www-client/firefox/firefox-45.5.1.ebuild
deleted file mode 100644
index aec960e0115e..000000000000
--- a/www-client/firefox/firefox-45.5.1.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=1
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ach af an ar as ast az be bg bn-BD bn-IN br bs ca cs cy da de
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr
-fy-NL ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko
-lt lv mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si
-sk sl son sq sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-45.0-patches-08"
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-# Kill gtk3 support since gtk+-3.20 breaks it hard prior to 48.0
-#MOZCONFIG_OPTIONAL_GTK3=1
-MOZCONFIG_OPTIONAL_WIFI=1
-MOZCONFIG_OPTIONAL_JIT="enabled"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.45 pax-utils fdo-mime autotools virtualx mozlinguas-v2
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist hardened +hwaccel pgo selinux +gmp-autoupdate test"
-RESTRICT="!bindist? ( bindist )"
-
-# More URIs appended below...
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-# Mesa 7.10 needed for WebGL + bugfixes
-RDEPEND="
-	>=dev-libs/nss-3.21.1
-	>=dev-libs/nspr-4.12
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${RDEPEND}
-	pgo? (
-		>=sys-devel/gcc-4.5 )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
-	CHANGESET="8a3042764de7"
-	SRC_URI="${SRC_URI}
-		https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.xz"
-	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
-else
-	S="${WORKDIR}/firefox-${MOZ_PV}"
-	SRC_URI="${SRC_URI}
-		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-fi
-
-QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	if use pgo; then
-		einfo
-		ewarn "You will do a double build for profile guided optimization."
-		ewarn "This will result in your build taking at least twice as long as before."
-	fi
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use pgo || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our patches
-	eapply "${WORKDIR}/firefox"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Ensure that our plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/browser/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	eautoreconf
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf
-
-	# Need to update jemalloc's configure
-	cd "${S}"/memory/jemalloc/src || die
-	WANT_AUTOCONF= eautoconf
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-mailnews
-
-	# Allow for a proper pgo build
-	if use pgo; then
-		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	# workaround for funky/broken upstream configure...
-	emake -f client.mk configure
-}
-
-src_compile() {
-	if use pgo; then
-		addpredict /root
-		addpredict /etc/gconf
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		# Firefox tries to use dri stuff when it's run, see bug 380283
-		shopt -s nullglob
-		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-		if test -z "${cards}"; then
-			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
-			if test -n "${cards}"; then
-				# Binary drivers seem to cause access violations anyway, so
-				# let's use indirect rendering so that the device files aren't
-				# touched at all. See bug 394715.
-				export LIBGL_ALWAYS_INDIRECT=1
-			fi
-		fi
-		shopt -u nullglob
-		addpredict "${cards}"
-
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-		virtx emake -f client.mk profiledbuild || die "virtx emake failed"
-	else
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-		emake -f client.mk realbuild
-	fi
-
-}
-
-src_install() {
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	mozconfig_install_prefs \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || for plugin in \
-	gmp-gmpopenh264 ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	done
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# The 128x128 icon has a different name
-	insinto "/usr/share/icons/hicolor/128x128/apps"
-	newins "${icon_path}/mozicon128.png" "${icon}.png"
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/content/icon48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Required in order to use plugins and even run firefox on hardened, with jit useflag.
-	if use jit; then
-		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-	else
-		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-	fi
-
-	# very ugly hack to make firefox not sigbus on sparc
-	# FIXME: is this still needed??
-	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
-					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
-					|| die "sparc sed failed"; }
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/firefox/firefox-45.6.0.ebuild b/www-client/firefox/firefox-45.6.0-r1.ebuild
similarity index 98%
rename from www-client/firefox/firefox-45.6.0.ebuild
rename to www-client/firefox/firefox-45.6.0-r1.ebuild
index 444d97709bf7..9300e5a8f6e7 100644
--- a/www-client/firefox/firefox-45.6.0.ebuild
+++ b/www-client/firefox/firefox-45.6.0-r1.ebuild
@@ -129,7 +129,9 @@ src_unpack() {
 
 src_prepare() {
 	# Apply our patches
-	eapply "${WORKDIR}/firefox"
+	eapply "${WORKDIR}/firefox" \
+		"${FILESDIR}"/mozilla_configure_regexp_esr.patch \
+		"${FILESDIR}"/update_h2_curve.patch
 
 	# Allow user to apply any additional patches without modifing ebuild
 	eapply_user
diff --git a/www-client/firefox/firefox-50.1.0.ebuild b/www-client/firefox/firefox-50.1.0-r1.ebuild
similarity index 99%
rename from www-client/firefox/firefox-50.1.0.ebuild
rename to www-client/firefox/firefox-50.1.0-r1.ebuild
index 5306657dd64e..6c11378cb5c6 100644
--- a/www-client/firefox/firefox-50.1.0.ebuild
+++ b/www-client/firefox/firefox-50.1.0-r1.ebuild
@@ -120,6 +120,8 @@ src_unpack() {
 src_prepare() {
 	# Apply our patches
 	eapply "${WORKDIR}/firefox" \
+		"${FILESDIR}"/mozilla_configure_regexp.patch \
+		"${FILESDIR}"/update_h2_curve.patch \
 		"${FILESDIR}"/${PN}-48.0-pgo.patch
 
 	# Enable gnomebreakpad
diff --git a/www-client/seamonkey/seamonkey-2.46.ebuild b/www-client/seamonkey/seamonkey-2.46-r1.ebuild
similarity index 100%
rename from www-client/seamonkey/seamonkey-2.46.ebuild
rename to www-client/seamonkey/seamonkey-2.46-r1.ebuild
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-375.20-pax.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-375.20-pax.patch
new file mode 100644
index 000000000000..9dd245a1f16a
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-375.20-pax.patch
@@ -0,0 +1,406 @@
+diff -urp work.orig/kernel/common/inc/nv-linux.h work/kernel/common/inc/nv-linux.h
+--- work.orig/kernel/common/inc/nv-linux.h	2016-11-27 21:56:50.391617167 +0100
++++ work/kernel/common/inc/nv-linux.h	2016-11-27 22:04:14.045516163 +0100
+@@ -1310,7 +1310,8 @@ extern void *nvidia_stack_t_cache;
+ #if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
+ #define NV_KMEM_CACHE_CREATE_FULL(name, size, align, flags, ctor) \
+     kmem_cache_create(name, size, align, flags, ctor)
+-
++#define NV_KMEM_CACHE_CREATE_FULL_USERCOPY(name, size, align, flags, useroffset, usersize, ctor) \
++    kmem_cache_create_usercopy(name, size, align, flags, useroffset, usersize, ctor)
+ #else
+ #define NV_KMEM_CACHE_CREATE_FULL(name, size, align, flags, ctor) \
+     kmem_cache_create(name, size, align, flags, ctor, NULL)
+@@ -1319,6 +1320,14 @@ extern void *nvidia_stack_t_cache;
+ #define NV_KMEM_CACHE_CREATE(name, type)    \
+     NV_KMEM_CACHE_CREATE_FULL(name, sizeof(type), 0, 0, NULL)
+ 
++#ifdef SLAB_USERCOPY
++#define NV_KMEM_CACHE_CREATE_USERCOPY(name, type)    \
++    NV_KMEM_CACHE_CREATE_FULL(name, sizeof(type), 0, SLAB_USERCOPY, NULL)
++#else
++#define NV_KMEM_CACHE_CREATE_USERCOPY(name, type)    \
++    NV_KMEM_CACHE_CREATE_FULL_USERCOPY(name, sizeof(type), 0, 0, 0, sizeof(type), NULL)
++#endif
++
+ #define NV_KMEM_CACHE_DESTROY(kmem_cache)   \
+     kmem_cache_destroy(kmem_cache)
+ 
+diff -urp work.orig/kernel/common/inc/nv-modeset-interface.h work/kernel/common/inc/nv-modeset-interface.h
+--- work.orig/kernel/common/inc/nv-modeset-interface.h	2016-11-27 21:56:50.391617167 +0100
++++ work/kernel/common/inc/nv-modeset-interface.h	2016-11-27 21:54:23.971706350 +0100
+@@ -72,7 +72,7 @@ typedef struct {
+      * mix nvidia and nvidia-modeset kernel modules from different
+      * releases.
+      */
+-    const char *version_string;
++//    const char *version_string;
+ 
+     /*
+      * Return system information.
+@@ -117,6 +117,6 @@ typedef struct {
+ 
+ } nvidia_modeset_rm_ops_t;
+ 
+-NV_STATUS nvidia_get_rm_ops(nvidia_modeset_rm_ops_t *rm_ops);
++NV_STATUS nvidia_get_rm_ops(const nvidia_modeset_rm_ops_t **rm_ops, const char **version_string);
+ 
+ #endif /* _NV_MODESET_INTERFACE_H_ */
+diff -urp work.orig/kernel/common/inc/nv-register-module.h work/kernel/common/inc/nv-register-module.h
+--- work.orig/kernel/common/inc/nv-register-module.h	2016-11-27 21:56:50.391617167 +0100
++++ work/kernel/common/inc/nv-register-module.h	2016-11-27 21:54:23.971706350 +0100
+@@ -34,7 +34,7 @@ typedef struct nvidia_module_s {
+     int (*ioctl)(struct inode *, struct file * file, unsigned int cmd, unsigned long arg);
+     unsigned int (*poll)(struct file * file, poll_table *wait);
+ 
+-} nvidia_module_t;
++} __do_const nvidia_module_t;
+ 
+ int nvidia_register_module(nvidia_module_t *);
+ int nvidia_unregister_module(nvidia_module_t *);
+diff -urp work.orig/kernel/nvidia/nv.c work/kernel/nvidia/nv.c
+--- work.orig/kernel/nvidia/nv.c	2016-11-27 21:56:50.395629748 +0100
++++ work/kernel/nvidia/nv.c	2016-11-27 21:54:23.971706350 +0100
+@@ -666,7 +666,7 @@ int __init nvidia_init_module(void)
+     NV_SPIN_LOCK_INIT(&km_lock);
+ #endif
+ 
+-    nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE(nvidia_stack_cache_name,
++    nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE_USERCOPY(nvidia_stack_cache_name,
+                                                 nvidia_stack_t);
+     if (nvidia_stack_t_cache == NULL)
+     {
+diff -urp work.orig/kernel/nvidia/nv-chrdev.c work/kernel/nvidia/nv-chrdev.c
+--- work.orig/kernel/nvidia/nv-chrdev.c	2016-11-27 21:56:50.395629748 +0100
++++ work/kernel/nvidia/nv-chrdev.c	2016-11-27 21:54:23.971706350 +0100
+@@ -20,8 +20,6 @@ int nv_register_chrdev(void *param)
+ {
+     nvidia_module_t *module = (nvidia_module_t *)param;
+ 
+-    module->instance = nv_module_instance;
+-
+     return (nvidia_register_module(module));
+ }
+ 
+diff -urp work.orig/kernel/nvidia/nv-instance.c work/kernel/nvidia/nv-instance.c
+--- work.orig/kernel/nvidia/nv-instance.c	2016-11-27 21:56:50.395629748 +0100
++++ work/kernel/nvidia/nv-instance.c	2016-11-27 21:54:23.971706350 +0100
+@@ -51,6 +51,7 @@ struct pci_driver nv_pci_driver = {
+ nvidia_module_t nv_fops = {
+     .owner       = THIS_MODULE,
+     .module_name = MODULE_NAME,
++    .instance    = MODULE_INSTANCE_NUMBER,
+     .open        = nvidia_open,
+     .close       = nvidia_close,
+     .ioctl       = nvidia_ioctl,
+diff -urp work.orig/kernel/nvidia/nv-mmap.c work/kernel/nvidia/nv-mmap.c
+--- work.orig/kernel/nvidia/nv-mmap.c	2016-11-27 21:56:50.395629748 +0100
++++ work/kernel/nvidia/nv-mmap.c	2016-11-27 21:54:23.971706350 +0100
+@@ -102,12 +102,12 @@ nvidia_vma_release(struct vm_area_struct
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_ACCESS)
+-static int
++static ssize_t
+ nvidia_vma_access(
+     struct vm_area_struct *vma,
+     unsigned long addr,
+     void *buffer,
+-    int length,
++    size_t length,
+     int write
+ )
+ {
+diff -urp work.orig/kernel/nvidia/nv-modeset-interface.c work/kernel/nvidia/nv-modeset-interface.c
+--- work.orig/kernel/nvidia/nv-modeset-interface.c	2016-11-27 21:56:50.395629748 +0100
++++ work/kernel/nvidia/nv-modeset-interface.c	2016-11-27 21:54:23.971706350 +0100
+@@ -100,10 +100,9 @@ static NvU32 nvidia_modeset_enumerate_gp
+     return count;
+ }
+ 
+-NV_STATUS nvidia_get_rm_ops(nvidia_modeset_rm_ops_t *rm_ops)
++NV_STATUS nvidia_get_rm_ops(const nvidia_modeset_rm_ops_t **rm_ops, const char **version_string)
+ {
+-    const nvidia_modeset_rm_ops_t local_rm_ops = {
+-        .version_string = NV_VERSION_STRING,
++    static const nvidia_modeset_rm_ops_t local_rm_ops = {
+         .system_info    = {
+             .allow_write_combining = NV_FALSE,
+         },
+@@ -116,17 +115,26 @@ NV_STATUS nvidia_get_rm_ops(nvidia_modes
+         .set_callbacks  = nvidia_modeset_set_callbacks,
+     };
+ 
+-    if (strcmp(rm_ops->version_string, NV_VERSION_STRING) != 0)
++    static const nvidia_modeset_rm_ops_t local_rm_ops_wc = {
++        .system_info    = {
++            .allow_write_combining = NV_TRUE,
++        },
++        .alloc_stack    = nvidia_modeset_rm_ops_alloc_stack,
++        .free_stack     = nvidia_modeset_rm_ops_free_stack,
++        .enumerate_gpus = nvidia_modeset_enumerate_gpus,
++        .open_gpu       = nvidia_dev_get,
++        .close_gpu      = nvidia_dev_put,
++        .op             = rm_kernel_rmapi_op, /* provided by nv-kernel.o */
++        .set_callbacks  = nvidia_modeset_set_callbacks,
++    };
++
++    if (strcmp(*version_string, NV_VERSION_STRING) != 0)
+     {
+-        rm_ops->version_string = NV_VERSION_STRING;
++        *version_string = NV_VERSION_STRING;
+         return NV_ERR_GENERIC;
+     }
+ 
+-    *rm_ops = local_rm_ops;
+-
+-    if (NV_ALLOW_WRITE_COMBINING(NV_MEMORY_TYPE_FRAMEBUFFER)) {
+-        rm_ops->system_info.allow_write_combining = NV_TRUE;
+-    }
++    *rm_ops = NV_ALLOW_WRITE_COMBINING(NV_MEMORY_TYPE_FRAMEBUFFER) ? &local_rm_ops_wc : &local_rm_ops;
+ 
+     return NV_OK;
+ }
+diff -urp work.orig/kernel/nvidia-drm/nvidia-drm-drv.c work/kernel/nvidia-drm/nvidia-drm-drv.c
+--- work.orig/kernel/nvidia-drm/nvidia-drm-drv.c	2016-11-27 21:56:50.395629748 +0100
++++ work/kernel/nvidia-drm/nvidia-drm-drv.c	2016-11-27 21:54:23.971706350 +0100
+@@ -594,7 +594,7 @@ static const struct drm_ioctl_desc nv_dr
+                       DRM_CONTROL_ALLOW|DRM_RENDER_ALLOW|DRM_UNLOCKED),
+ };
+ 
+-static struct drm_driver nv_drm_driver = {
++static drm_driver_no_const nv_drm_driver __read_only = {
+ 
+     .driver_features        = DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER,
+ 
+@@ -654,6 +654,7 @@ static void nvidia_update_drm_driver_fea
+         return;
+     }
+ 
++    pax_open_kernel();
+     nv_drm_driver.driver_features |= DRIVER_MODESET | DRIVER_ATOMIC;
+ 
+     nv_drm_driver.master_set       = nvidia_drm_master_set;
+@@ -664,6 +665,7 @@ static void nvidia_update_drm_driver_fea
+     nv_drm_driver.dumb_destroy     = drm_gem_dumb_destroy;
+ 
+     nv_drm_driver.gem_vm_ops       = &nv_drm_gem_vma_ops;
++    pax_close_kernel();
+ #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
+ }
+ 
+diff -urp work.orig/kernel/nvidia-modeset/nvidia-modeset-linux.c work/kernel/nvidia-modeset/nvidia-modeset-linux.c
+--- work.orig/kernel/nvidia-modeset/nvidia-modeset-linux.c	2016-11-27 21:56:50.395629748 +0100
++++ work/kernel/nvidia-modeset/nvidia-modeset-linux.c	2016-11-27 21:54:23.971706350 +0100
+@@ -335,29 +335,28 @@ static void nvkms_resume(NvU32 gpuId)
+  * Interface with resman.
+  *************************************************************************/
+ 
+-static nvidia_modeset_rm_ops_t __rm_ops = { 0 };
++static const nvidia_modeset_rm_ops_t *__rm_ops;
+ static nvidia_modeset_callbacks_t nvkms_rm_callbacks = {
+-    nvkms_suspend,
+-    nvkms_resume
++    .suspend = nvkms_suspend,
++    .resume = nvkms_resume
+ };
+ 
+ static int nvkms_alloc_rm(void)
+ {
+     NV_STATUS nvstatus;
+     int ret;
++    const char *version_string = NV_VERSION_STRING;
+ 
+-    __rm_ops.version_string = NV_VERSION_STRING;
+-
+-    nvstatus = nvidia_get_rm_ops(&__rm_ops);
++    nvstatus = nvidia_get_rm_ops(&__rm_ops, &version_string);
+ 
+     if (nvstatus != NV_OK) {
+         printk(KERN_ERR NVKMS_LOG_PREFIX "Version mismatch: "
+                "nvidia.ko(%s) nvidia-modeset.ko(%s)\n",
+-               __rm_ops.version_string, NV_VERSION_STRING);
++               version_string, NV_VERSION_STRING);
+         return -EINVAL;
+     }
+ 
+-    ret = __rm_ops.set_callbacks(&nvkms_rm_callbacks);
++    ret = __rm_ops->set_callbacks(&nvkms_rm_callbacks);
+     if (ret < 0) {
+         printk(KERN_ERR NVKMS_LOG_PREFIX "Failed to register callbacks\n");
+         return ret;
+@@ -368,20 +367,20 @@ static int nvkms_alloc_rm(void)
+ 
+ static void nvkms_free_rm(void)
+ {
+-    __rm_ops.set_callbacks(NULL);
++    __rm_ops->set_callbacks(NULL);
+ }
+ 
+ void NVKMS_API_CALL nvkms_call_rm(void *ops)
+ {
+     nvidia_modeset_stack_ptr stack = NULL;
+ 
+-    if (__rm_ops.alloc_stack(&stack) != 0) {
++    if (__rm_ops->alloc_stack(&stack) != 0) {
+         return;
+     }
+ 
+-    __rm_ops.op(stack, ops);
++    __rm_ops->op(stack, ops);
+ 
+-    __rm_ops.free_stack(stack);
++    __rm_ops->free_stack(stack);
+ }
+ 
+ /*************************************************************************
+@@ -705,13 +704,13 @@ NvBool NVKMS_API_CALL nvkms_open_gpu(NvU
+     nvidia_modeset_stack_ptr stack = NULL;
+     NvBool ret;
+ 
+-    if (__rm_ops.alloc_stack(&stack) != 0) {
++    if (__rm_ops->alloc_stack(&stack) != 0) {
+         return NV_FALSE;
+     }
+ 
+-    ret = __rm_ops.open_gpu(gpuId, stack) == 0;
++    ret = __rm_ops->open_gpu(gpuId, stack) == 0;
+ 
+-    __rm_ops.free_stack(stack);
++    __rm_ops->free_stack(stack);
+ 
+     return ret;
+ }
+@@ -720,23 +719,23 @@ void NVKMS_API_CALL nvkms_close_gpu(NvU3
+ {
+     nvidia_modeset_stack_ptr stack = NULL;
+ 
+-    if (__rm_ops.alloc_stack(&stack) != 0) {
++    if (__rm_ops->alloc_stack(&stack) != 0) {
+         return;
+     }
+ 
+-    __rm_ops.close_gpu(gpuId, stack);
++    __rm_ops->close_gpu(gpuId, stack);
+ 
+-    __rm_ops.free_stack(stack);
++    __rm_ops->free_stack(stack);
+ }
+ 
+ NvU32 NVKMS_API_CALL nvkms_enumerate_gpus(nv_gpu_info_t *gpu_info)
+ {
+-    return __rm_ops.enumerate_gpus(gpu_info);
++    return __rm_ops->enumerate_gpus(gpu_info);
+ }
+ 
+ NvBool NVKMS_API_CALL nvkms_allow_write_combining(void)
+ {
+-    return __rm_ops.system_info.allow_write_combining;
++    return __rm_ops->system_info.allow_write_combining;
+ }
+ 
+ /*************************************************************************
+diff -urp work.orig/kernel/nvidia-uvm/uvm8_global.c work/kernel/nvidia-uvm/uvm8_global.c
+--- work.orig/kernel/nvidia-uvm/uvm8_global.c	2016-11-27 21:56:50.399642330 +0100
++++ work/kernel/nvidia-uvm/uvm8_global.c	2016-11-27 21:54:23.975709978 +0100
+@@ -35,17 +35,17 @@
+ #include "nv_uvm_interface.h"
+ 
+ uvm_global_t g_uvm_global;
+-static struct UvmOpsUvmEvents g_exported_uvm8_ops;
++static struct UvmOpsUvmEvents g_exported_uvm8_ops = {
++    .startDevice = NULL,
++    .stopDevice  = NULL,
++    .isrTopHalf  = uvm8_isr_top_half,
++};
+ static bool g_ops_registered = false;
+ 
+ static NV_STATUS uvm8_register_callbacks(void)
+ {
+     NV_STATUS status = NV_OK;
+ 
+-    g_exported_uvm8_ops.startDevice = NULL;
+-    g_exported_uvm8_ops.stopDevice  = NULL;
+-    g_exported_uvm8_ops.isrTopHalf  = uvm8_isr_top_half;
+-
+     // Register the UVM callbacks with the main GPU driver:
+     status = uvm_rm_locked_call(nvUvmInterfaceRegisterUvmCallbacks(&g_exported_uvm8_ops));
+     if (status != NV_OK)
+diff -urp work.orig/kernel/nvidia-uvm/uvm8_gpu_semaphore.c work/kernel/nvidia-uvm/uvm8_gpu_semaphore.c
+--- work.orig/kernel/nvidia-uvm/uvm8_gpu_semaphore.c	2016-11-27 21:56:50.399642330 +0100
++++ work/kernel/nvidia-uvm/uvm8_gpu_semaphore.c	2016-11-27 21:54:23.975709978 +0100
+@@ -368,7 +368,7 @@ void uvm_gpu_semaphore_set_payload(uvm_g
+     // being optimized out on non-SMP configs (we need them for interacting with
+     // the GPU correctly even on non-SMP).
+     mb();
+-    ACCESS_ONCE(*semaphore->payload) = payload;
++    ACCESS_ONCE_RW(*semaphore->payload) = payload;
+ }
+ 
+ // This function is intended to catch channels which have been left dangling in
+diff -urp work.orig/kernel/nvidia-uvm/uvm8_hal.h work/kernel/nvidia-uvm/uvm8_hal.h
+--- work.orig/kernel/nvidia-uvm/uvm8_hal.h	2016-11-27 21:56:50.399642330 +0100
++++ work/kernel/nvidia-uvm/uvm8_hal.h	2016-11-27 21:54:23.975709978 +0100
+@@ -316,7 +316,7 @@ typedef struct
+         // fault_buffer_ops: id is a hardware class
+         uvm_fault_buffer_hal_t fault_buffer_ops;
+     } u;
+-} uvm_hal_class_ops_t;
++} __do_const uvm_hal_class_ops_t;
+ 
+ // When UVM next support is enabled support for future chips in the hal is
+ // enabled by providing additional hal table entries below.
+diff -urp work.orig/kernel/nvidia-uvm/uvm8_mmu.h work/kernel/nvidia-uvm/uvm8_mmu.h
+--- work.orig/kernel/nvidia-uvm/uvm8_mmu.h	2016-11-27 21:56:50.399642330 +0100
++++ work/kernel/nvidia-uvm/uvm8_mmu.h	2016-11-27 21:54:23.975709978 +0100
+@@ -24,7 +24,6 @@
+ #ifndef __UVM8_MMU_H__
+ #define __UVM8_MMU_H__
+ 
+-#include "uvm8_forward_decl.h"
+ #include "uvm8_hal_types.h"
+ #include "uvm8_pmm_gpu.h"
+ #include "uvmtypes.h"
+diff -urp work.orig/kernel/nvidia-uvm/uvm_common.c work/kernel/nvidia-uvm/uvm_common.c
+--- work.orig/kernel/nvidia-uvm/uvm_common.c	2016-11-27 21:56:50.399642330 +0100
++++ work/kernel/nvidia-uvm/uvm_common.c	2016-11-27 21:54:23.975709978 +0100
+@@ -42,7 +42,6 @@
+ #define UVM_SPIN_LOOP_PRINT_TIMEOUT_SEC     30ULL
+ 
+ static dev_t g_uvmBaseDev;
+-struct UvmOpsUvmEvents g_exportedUvmOps;
+ 
+ static char* uvm_driver_mode = "8";
+ 
+diff -urp work.orig/kernel/nvidia-uvm/uvm_full_fault_buffer.h work/kernel/nvidia-uvm/uvm_full_fault_buffer.h
+--- work.orig/kernel/nvidia-uvm/uvm_full_fault_buffer.h	2016-11-27 21:56:50.399642330 +0100
++++ work/kernel/nvidia-uvm/uvm_full_fault_buffer.h	2016-11-27 21:54:23.975709978 +0100
+@@ -31,6 +31,7 @@
+ #define _UVM_FULL_FAULT_BUFFER_H_
+ 
+ #include "uvmtypes.h"
++#include "linux/compiler.h"
+ 
+ #define MAXWELL_FAULT_BUFFER_A (0xb069)
+ #define MEM_RD32(a) (*(const volatile NvU32 *)(a)) 
+@@ -303,7 +304,7 @@ typedef struct
+     NvUvmControlPrefetch_t              controlPrefetch;
+     NvUvmTestFaultBufferOverflow_t      testFaultBufferOverflow;
+     NvUvmClearFaultBufferOverflow_t     clearFaultBufferOverflow;
+-} UvmFaultBufferOps;
++} __no_const UvmFaultBufferOps;
+ 
+ /******************************************************************************
+     uvmfull_fault_buffer_init
+diff -urp work.orig/kernel/nvidia-uvm/uvm_linux.h work/kernel/nvidia-uvm/uvm_linux.h
+--- work.orig/kernel/nvidia-uvm/uvm_linux.h	2016-11-27 21:56:50.399642330 +0100
++++ work/kernel/nvidia-uvm/uvm_linux.h	2016-11-27 21:54:23.975709978 +0100
+@@ -420,7 +420,7 @@ static inline NvU64 NV_GETTIME(void)
+ 
+ // WRITE_ONCE/READ_ONCE have incompatible definitions across versions, which produces warnings.
+ // Therefore, we define our own macros
+-#define UVM_WRITE_ONCE(x, val) (ACCESS_ONCE(x) = (val))
++#define UVM_WRITE_ONCE(x, val) (ACCESS_ONCE_RW(x) = (val))
+ #define UVM_READ_ONCE(x) ACCESS_ONCE(x)
+ 
+ // Added in 3.11
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-375.26.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-375.26.ebuild
index abfa74f4c3ea..fc45d6f0390e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-375.26.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-375.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -177,7 +177,7 @@ src_prepare() {
 		ewarn "Using PAX patches is not supported. You will be asked to"
 		ewarn "use a standard kernel should you have issues. Should you"
 		ewarn "need support with these patches, contact the PaX team."
-		eapply "${FILESDIR}"/${PN}-364.12-pax.patch
+		eapply "${FILESDIR}"/${PN}-375.20-pax.patch
 	fi
 
 	# Allow user patches so they can support RC kernels and whatever else