diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index ff33842c8278..bd11ba009e20 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,2 +1 @@
-DIST ansible-1.9.3.tar.gz 936633 SHA256 2594f642fd800056a427c1026410dc6ed8dfa7c0033f5c3d187abdb2b0d4eeed SHA512 280d7506417affc11fe8c8715f82ffb011991e48e96db73aca915e1393d51073564c78a98b018c380b7fb8e697ce0fac6208822da44f2bac545f142707325d43 WHIRLPOOL 5738bcd263ca32279bbca30e3f1b5c53e5bd72a18025fdb82393a8d85e5a826b3be4ce78cbbc648133768d212fa49d1c3320af4b34f948c1b1cee40d73147f8a
 DIST ansible-1.9.4.tar.gz 937120 SHA256 972c2face49f1577bd0ff7989440bfe2820e66fb10d7579915cc536bccfa6fe3 SHA512 53ef5b3390be620cedc92687c7c9853c42f38547494f9b77056d5ea48ccd8f43d193648a7f4569fcba5afad343a9202b123296ab47c8cd02eecfe455d83b9586 WHIRLPOOL 0b88a27f690ff940eae1969ff163d8f8c26df038d2e9aa76694bdba1448ac9cbe8123795d0787e528c6d22cf66cc01d6b89add8e3e97bbb107a3f1a96860fd8e
diff --git a/app-admin/ansible/ansible-1.9.3.ebuild b/app-admin/ansible/ansible-1.9.3.ebuild
deleted file mode 100644
index a08091ba13b4..000000000000
--- a/app-admin/ansible/ansible-1.9.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils readme.gentoo
-
-DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/keyczar[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	EXAMPLES=( examples )
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-
-	newenvd "${FILESDIR}"/${PN}.env 95ansible
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	optfeature "Alternative ssh transport" dev-python/paramiko
-}
diff --git a/app-admin/ansible/ansible-1.9.4.ebuild b/app-admin/ansible/ansible-1.9.4.ebuild
index 273d25a097d6..a08091ba13b4 100644
--- a/app-admin/ansible/ansible-1.9.4.ebuild
+++ b/app-admin/ansible/ansible-1.9.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 175ebc5dcfbf..4284a69a020e 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 git-r3 readme.gentoo
+inherit distutils-r1 eutils git-r3 readme.gentoo
 
 DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
 HOMEPAGE="http://ansible.com/"
@@ -43,6 +43,13 @@ python_test() {
 	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
 }
 
+python_compile_all() {
+	local _man
+	for _man in ansible{,-{galaxy,playbook,pull,vault}}; do
+		a2x -f manpage docs/man/man1/${_man}.1.asciidoc.in || die "Failed generating man page (${_man})"
+	done
+}
+
 python_install_all() {
 	EXAMPLES=( examples )
 	distutils-r1_python_install_all
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 9b443daa1c66..ab8d6e18f99e 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,2 +1,3 @@
 DIST emacs-25.0.50_pre20150523.tar.xz 25311384 SHA256 2dd6e7adb8e3359e00a8cbc15a28ef31b631c8363602e3be7566908f2ee2b047 SHA512 a897c4a4d7bd19c9c9a181b23240aed102295e30f1ba9a167b5c1a3231c05a4613023e6810ca0226cedea6325999a35efb0ea2a2b7e535a0338b7b688592438f WHIRLPOOL ce81ceca640c15437af427cef79090f71c8f19a78c8b2d5966f1887e88fff3bd35c00bcb266fb0d8133ee95b22cac8576f12462fa04c41feebcc7aad2f1ddb7e
 DIST emacs-25.0.50_pre20150731.tar.xz 26825232 SHA256 80127a9d905918066c97df81f3e489dbd30f323e9dec2353d33f124522f91c81 SHA512 9834d191e98e780e8ba8f2fa07b50dda6d380a3e220ad0590bdc160d9e2c9cd3c0b0acd5e8d52f3f0f44070280e3686bd7facd78f9bd4b3f6ce0723f1b3311bf WHIRLPOOL 0c0ec4f99630771da61d5bc80b9001a61fa3b7f49f09b6e9a5dd402a383c4d13717c50d86da9d63ad01dd2fce5ac5d7812bcdcd3e31eefb5f0ad4b00d0cc342f
+DIST emacs-25.0.50_pre20151113.tar.xz 26904832 SHA256 dcfd575afa3123bd63eba12b2ae2c7d1390c8fbccc911e9a4a70028feb207240 SHA512 cc8e871e9bb236ffd99ea93750aabc55401cdfad171f56df81c3127fba41b223196d31a64baf597268805b39015df773587e239192870f70671d131d9c6fc9b8 WHIRLPOOL 9571b10e49c028e4f8a10a54fce10bea16ff9b726e8a266650af180a57a370d225ac3bdffc12828c6d170680e514c9fb1179b3676dd4d4de3e6794147dc935ab
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
new file mode 100644
index 000000000000..4ff688c1f01c
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git"
+	EGIT_BRANCH="master"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+else
+	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
+		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	#S="${WORKDIR}/emacs-${FULL_VERSION}"
+	S="${WORKDIR}/emacs"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="25"
+IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
+REQUIRED_USE="?? ( aqua X )"
+
+RDEPEND="sys-libs/ncurses:0
+	>=app-eselect/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+	net-libs/liblockfile
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	gnutls? ( net-libs/gnutls )
+	gpm? ( sys-libs/gpm )
+	hesiod? ( net-dns/hesiod )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	selinux? ( sys-libs/libselinux )
+	zlib? ( sys-libs/zlib )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			gtk3? ( x11-libs/gtk+:3 )
+			!gtk3? ( x11-libs/gtk+:2 )
+		)
+		!gtk? (
+			motif? ( >=x11-libs/motif-2.3:0 )
+			!motif? (
+				Xaw3d? ( x11-libs/libXaw3d )
+				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )
+	pax_kernel? (
+		sys-apps/attr
+		sys-apps/paxctl
+	)"
+
+if [[ ${PV##*.} = 9999 ]]; then
+	DEPEND="${DEPEND}
+	sys-apps/texinfo"
+fi
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	epatch_user
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use sh; then
+		replace-flags "-O[1-9]" -O0		#262359
+	elif use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if use X; then
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --without-x --without-ns"
+	fi
+
+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
+	if [[ ${PV##*.} = 9999 ]]; then
+		myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-gameuser=":gamestat" \
+		--without-compress-install \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with gnutls) \
+		$(use_with gpm) \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with libxml2 xml2) \
+		$(use_with selinux) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
+}
+
+src_install () {
+	emake DESTDIR="${D}" NO_BIN_LINK=t install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+		|| die "moving emacs man page failed"
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+	fi
+
+	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+		through the Emacs eselect module, which also redirects man and info
+		pages. Therefore, several Emacs versions can be installed at the
+		same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
+		strongly recommended that you use app-admin/emacs-updater to rebuild
+		all byte-compiled elisp files of the installed Emacs packages."
+	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+		machine would satisfy basic Emacs requirements under X11.
+		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+		for how to enable anti-aliased fonts."
+	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	local infodir=/usr/share/info/${EMACS_SUFFIX} f
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
+		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
+	elif [[ -d "${ED}"${infodir} ]]; then
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+
+	local pvr
+	for pvr in ${REPLACING_VERSIONS}; do
+		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
+	done
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-emulation/spice/spice-0.12.6.ebuild b/app-emulation/spice/spice-0.12.6-r1.ebuild
similarity index 92%
rename from app-emulation/spice/spice-0.12.6.ebuild
rename to app-emulation/spice/spice-0.12.6-r1.ebuild
index e108c83fd601..02b6211dd9fa 100644
--- a/app-emulation/spice/spice-0.12.6.ebuild
+++ b/app-emulation/spice/spice-0.12.6-r1.ebuild
@@ -43,13 +43,16 @@ RDEPEND="
 DEPEND="
 	>=app-emulation/spice-protocol-0.12.10
 	virtual/pkgconfig
-	$(python_gen_any_dep \
-		'>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep '
+		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')
 	smartcard? ( app-emulation/qemu[smartcard] )
 	${RDEPEND}"
 
 python_check_deps() {
 	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	has_version "dev-python/six[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/app-emulation/wine/wine-1.7.55.ebuild b/app-emulation/wine/wine-1.7.55.ebuild
index e6a53ea16ee6..74bf02a2c61c 100644
--- a/app-emulation/wine/wine-1.7.55.ebuild
+++ b/app-emulation/wine/wine-1.7.55.ebuild
@@ -210,7 +210,7 @@ src_unpack() {
 		fi
 	else
 		unpack ${P}.tar.bz2
-		use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
+		use staging && unpack "${STAGING_P}.tar.gz"
 	fi
 
 	unpack "${WINE_GENTOO}.tar.bz2"
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index e6a53ea16ee6..74bf02a2c61c 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -210,7 +210,7 @@ src_unpack() {
 		fi
 	else
 		unpack ${P}.tar.bz2
-		use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
+		use staging && unpack "${STAGING_P}.tar.gz"
 	fi
 
 	unpack "${WINE_GENTOO}.tar.bz2"
diff --git a/app-eselect/eselect-python/Manifest b/app-eselect/eselect-python/Manifest
index 98a02a21b9f6..4465049cab8c 100644
--- a/app-eselect/eselect-python/Manifest
+++ b/app-eselect/eselect-python/Manifest
@@ -2,3 +2,4 @@ DIST eselect-python-20111108.tar.bz2 64959 SHA256 34d7618808a3c1d22e6763bc6c67d5
 DIST eselect-python-20131210.tar.bz2 71802 SHA256 61ff5a5a3ae7982c6ffd503886cbcd35142df05f07008722b90ab5036e4bf8f2 SHA512 8c523019e2a8fe7f1679b96a3da22326dbe65888739bb8cce3c4e2aa7c2c08cada01196a65c8fe35e08b3b7682a3f695e453e9ef1fb53f6b8886c51c09107d60 WHIRLPOOL e8c75eb1ad6fcaaba50cae9d10d2414b29b3cfc8d06c79257948b0d0b4e7c2156d1672be4f5edd28055b5ae3f6aa54b1b8ef6eaaae9dfa1ce9b7b0b68dbc712a
 DIST eselect-python-20140115.tar.bz2 71910 SHA256 5898ee19015ae905168e8b7aa76552b96f691285ab77c426b6a9238ecf742e45 SHA512 65d6a6b9dfa0a0f4bea5352f965bed8942a16382135edea093342fa79a824d114b900cbcf607490f260b4ce4e5a2eb57872169e5494f8e6e65f41dd63cd5d335 WHIRLPOOL 633bca3e8a87e04c54a3790bb207da92d41af604cce7f8600c5317f6a759c55efbd3e5ba658e893d2d079248d2dadb1a0bb60248960e3d20cd766768a228d8c5
 DIST eselect-python-20140125.tar.bz2 72102 SHA256 ee7b470f7facc42285bab7f4b947280741515a85c9067339511c219248f8fdfb SHA512 94d4eb5a1af365c6f56a6fc2b75298018267cd4f6004f30b2e4d0c4744d3e82b33f6c82e6f0ea0f15132d5157c3ace99fa167bbf3ebada46edd2e005ca96eb51 WHIRLPOOL 70d5f9af2929507d26e56080ce934066d2de5f16030dfd63b016215465ad5fc89eb952d64cc545c7058d146108e26925741d2c8fbaba08abba1a5cae7b0c23b6
+DIST eselect-python-20151117.tar.bz2 62793 SHA256 6f2912ae4d4fc12949ae0c9bb8b93b3a3a8c372336c2138c758f042f91484561 SHA512 3e680f8c851251176d6bb916d003e421e4b414aa9cc59e20cb15d454a3251cdf1e587828e9b2a5db461641f277e3b764ca172f4466fe3f6ef9679a9a05a71732 WHIRLPOOL a2e4ca676ead692b08a6194fb4bf5dabdd383ad158f45a17cb21c59022af139b0646fe39b0f4c9b540c80c4c2a04362c75f90e3c7f1506056b7b0f01e5e51474
diff --git a/app-eselect/eselect-python/eselect-python-20151117.ebuild b/app-eselect/eselect-python/eselect-python-20151117.ebuild
new file mode 100644
index 000000000000..f78b25f806a3
--- /dev/null
+++ b/app-eselect/eselect-python/eselect-python-20151117.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+else
+	SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Eselect module for management of multiple Python versions"
+HOMEPAGE="https://www.gentoo.org/proj/en/Python/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.3
+	>=dev-lang/python-exec-2.1:2
+	!<dev-lang/python-2.7.10-r4:2.7
+	!<dev-lang/python-3.3.5-r4:3.3
+	!<dev-lang/python-3.4.3-r4:3.4
+	!<dev-lang/python-3.5.0-r3:3.5"
+
+src_prepare() {
+	[[ ${PV} == "99999999" ]] && eautoreconf
+}
+
+src_install() {
+	keepdir /etc/env.d/python
+	emake DESTDIR="${D}" install || die
+
+	local f
+	for f in python{,2,3}{,-config} 2to3 pydoc pyvenv; do
+		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
+	done
+}
+
+pkg_preinst() {
+	local py
+
+	# Copy python[23] selection from the old format (symlink)
+	for py in 2 3; do
+		# default to none
+		declare -g "PREV_PYTHON${py}"=
+
+		if [[ -L ${EROOT}/usr/bin/python${py} ]]; then
+			local target=$(readlink "${EROOT}/usr/bin/python${py}")
+
+			# check if it's actually old eselect symlink
+			if [[ ${target} == python?.? ]]; then
+				declare -g "PREV_PYTHON${py}=${target}"
+			fi
+		fi
+	done
+}
+
+pkg_postinst() {
+	local py
+
+	if has_version 'dev-lang/python'; then
+		eselect python update --if-unset
+	fi
+
+	for py in 2 3; do
+		local pyvar=PREV_PYTHON${py}
+		if [[ -n ${!pyvar} ]]; then
+			einfo "Setting Python${py} to ${!pyvar}"
+			eselect python set "--python${py}" "${!pyvar}"
+		elif has_version "=dev-lang/python-${py}*"; then
+			eselect python update "--python${py}" --if-unset
+		fi
+	done
+}
diff --git a/app-eselect/eselect-python/eselect-python-99999999.ebuild b/app-eselect/eselect-python/eselect-python-99999999.ebuild
index 6b16b3d05248..f78b25f806a3 100644
--- a/app-eselect/eselect-python/eselect-python-99999999.ebuild
+++ b/app-eselect/eselect-python/eselect-python-99999999.ebuild
@@ -2,15 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# Keep the EAPI low here because everything else depends on it.
-# We want to make upgrading simpler.
+EAPI=5
 
 if [[ ${PV} == "99999999" ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
 else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
+	SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -21,31 +19,60 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-RDEPEND=">=app-admin/eselect-1.2.3"
+RDEPEND=">=app-admin/eselect-1.2.3
+	>=dev-lang/python-exec-2.1:2
+	!<dev-lang/python-2.7.10-r4:2.7
+	!<dev-lang/python-3.3.5-r4:3.3
+	!<dev-lang/python-3.4.3-r4:3.4
+	!<dev-lang/python-3.5.0-r3:3.5"
 
-src_unpack() {
-	if [[ ${PV} == "99999999" ]] ; then
-		git-r3_src_unpack
-		cd "${S}"
-		eautoreconf
-	else
-		unpack ${A}
-	fi
+src_prepare() {
+	[[ ${PV} == "99999999" ]] && eautoreconf
 }
 
 src_install() {
 	keepdir /etc/env.d/python
 	emake DESTDIR="${D}" install || die
+
+	local f
+	for f in python{,2,3}{,-config} 2to3 pydoc pyvenv; do
+		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
+	done
+}
+
+pkg_preinst() {
+	local py
+
+	# Copy python[23] selection from the old format (symlink)
+	for py in 2 3; do
+		# default to none
+		declare -g "PREV_PYTHON${py}"=
+
+		if [[ -L ${EROOT}/usr/bin/python${py} ]]; then
+			local target=$(readlink "${EROOT}/usr/bin/python${py}")
+
+			# check if it's actually old eselect symlink
+			if [[ ${target} == python?.? ]]; then
+				declare -g "PREV_PYTHON${py}=${target}"
+			fi
+		fi
+	done
 }
 
 pkg_postinst() {
+	local py
+
 	if has_version 'dev-lang/python'; then
 		eselect python update --if-unset
 	fi
-	if has_version '=dev-lang/python-2*'; then
-		eselect python update --python2 --if-unset
-	fi
-	if has_version '=dev-lang/python-3*'; then
-		eselect python update --python3 --if-unset
-	fi
+
+	for py in 2 3; do
+		local pyvar=PREV_PYTHON${py}
+		if [[ -n ${!pyvar} ]]; then
+			einfo "Setting Python${py} to ${!pyvar}"
+			eselect python set "--python${py}" "${!pyvar}"
+		elif has_version "=dev-lang/python-${py}*"; then
+			eselect python update "--python${py}" --if-unset
+		fi
+	done
 }
diff --git a/app-office/pinpoint/Manifest b/app-office/pinpoint/Manifest
index bcd986fd67b5..50d635b9084e 100644
--- a/app-office/pinpoint/Manifest
+++ b/app-office/pinpoint/Manifest
@@ -1,2 +1,2 @@
 DIST pinpoint-0.1.6.tar.xz 773492 SHA256 812a6e49ccd8bcd6cd0927fda98ceb0f2bafb1f18246bd2d75ea96c3c971f34b SHA512 5db48b64eb69fe677b5a4c226e989ce6eaea483396de82fdd644e4c4ed238ad5fd11f956ed6ffd1badbdfa8c9d24e9ec23375572360094721135c3b6a8347c27 WHIRLPOOL de1749d53b1512e0af761ef7457f01975b90a3301bed1b9e53a267349358b849be1f04d9a74aef98b02a6ddbf200c1ecd7dbe466ed9a207f5a1659a311cb0e57
-DIST pinpoint-215ccad331a39c6e95d173938fcfffe6eb4d75d6.tar.xz 708020 SHA256 1303581f09ff6414269fe0642f7ce51094ebc5cee5101ef5b3113054da0bc8e9 SHA512 efbc711e034a968b104cca669fedaae8c1f088f598996843a65849f632ebdbff3df8d36225852b24327c26e2b972b1c5097775531b23ebc3eedf62415346f27e WHIRLPOOL 1c80ee81257c42b10ab860eabd4a95c61a9980b80cfb901ce167e70cf0046586b74e3670bffdb4342adfd378fb02c97ecfb1f4ae59d3e0ce09b205f9ef1e7ebd
+DIST pinpoint-0.1.8.tar.xz 772980 SHA256 5a207dd1a35681b7268e6aa5ff9b2c5381f4cc63e5f2e5695997ca9d3264e8ca SHA512 dc41405f79bf03b6a7c77ec31304e505d4ae2d13407304fbcc2f338dfe175f91db3c554ea06ba8041edbf99a12551f16efed98b5a07f29b7f24255cad2b1b94d WHIRLPOOL 4ddda5e82faa2ce2d426adccfbb0d834161d354cf6947526a829b2126e1f9067b5632925c2b3d29a42030cd815a8295922443ddf314c76e5156539a7f051c484
diff --git a/app-office/pinpoint/pinpoint-0.1.5_pre20141026.ebuild b/app-office/pinpoint/pinpoint-0.1.8.ebuild
similarity index 73%
rename from app-office/pinpoint/pinpoint-0.1.5_pre20141026.ebuild
rename to app-office/pinpoint/pinpoint-0.1.8.ebuild
index 8ef69a3bd28d..bb1445508d12 100644
--- a/app-office/pinpoint/pinpoint-0.1.5_pre20141026.ebuild
+++ b/app-office/pinpoint/pinpoint-0.1.8.ebuild
@@ -5,40 +5,31 @@
 EAPI=5
 GCONF_DEBUG="no"
 
-inherit autotools gnome2
+inherit gnome2
 
 DESCRIPTION="A tool for making hackers do excellent presentations"
 HOMEPAGE="https://wiki.gnome.org/Apps/Pinpoint"
 
-MY_PV="215ccad331a39c6e95d173938fcfffe6eb4d75d6" #snapshot
-SRC_URI="https://git.gnome.org/browse/${PN}/snapshot/${PN}-${MY_PV}.tar.xz"
-
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+gstreamer +pdf"
 
 # rsvg is used for svg-in-pdf -- clubbing it under pdf for now
 RDEPEND="
-	>=media-libs/clutter-1.12:1.0
+	>=media-libs/clutter-1.23.7:1.0
+	>=media-libs/clutter-gtk-1.6:1.0
 	>=dev-libs/glib-2.28:2
 	>=x11-libs/cairo-1.9.4
 	x11-libs/pango
 	x11-libs/gdk-pixbuf:2
-	gstreamer? ( media-libs/clutter-gst:2.0 )
+	gstreamer? ( media-libs/clutter-gst:3.0 )
 	pdf? ( gnome-base/librsvg:2 )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
 src_configure() {
 	# dax support is disabled because we don't have it in tree yet and it's
 	# experimental
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
index c4347b381002..e329c8e742d5 100644
--- a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
@@ -6,12 +6,12 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 pypy )
 
-inherit python-single-r1
+inherit readme.gentoo python-single-r1
 
 DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,8 +23,6 @@ RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
 		dev-libs/libxslt
 		graphviz? ( media-gfx/graphviz )
 		app-text/docbook-xml-dtd:4.5
-		app-text/dblatex
-		|| ( www-client/w3m www-client/lynx )
 		highlight? ( || ( dev-util/source-highlight \
 			dev-python/pygments[${PYTHON_USEDEP}] \
 			app-text/highlight )
@@ -40,6 +38,11 @@ DEPEND="test? ( dev-util/source-highlight
 			${PYTHON_DEPS} )
 "
 
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
 src_prepare() {
 	if ! use vim-syntax; then
 		sed -i -e '/^install/s/install-vim//' Makefile.in || die
@@ -66,6 +69,7 @@ src_install() {
 
 	python_fix_shebang "${ED}"/usr/bin/*.py
 
+	readme.gentoo_create_doc
 	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
 			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
 
diff --git a/app-text/asciidoc/asciidoc-9999.ebuild b/app-text/asciidoc/asciidoc-9999.ebuild
index 3e19725242a1..0a4f1a949fe4 100644
--- a/app-text/asciidoc/asciidoc-9999.ebuild
+++ b/app-text/asciidoc/asciidoc-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 pypy )
 
 [ "$PV" == "9999" ] && inherit mercurial autotools
-inherit python-single-r1
+inherit readme.gentoo python-single-r1
 
 DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
 HOMEPAGE="http://www.methods.co.nz/asciidoc/"
@@ -17,7 +17,7 @@ if [ "$PV" == "9999" ]; then
 	KEYWORDS=""
 else
 	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -30,8 +30,6 @@ RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
 		dev-libs/libxslt
 		graphviz? ( media-gfx/graphviz )
 		app-text/docbook-xml-dtd:4.5
-		app-text/dblatex
-		|| ( www-client/w3m www-client/lynx )
 		highlight? ( || ( dev-util/source-highlight \
 			dev-python/pygments[${PYTHON_USEDEP}] \
 			app-text/highlight )
@@ -47,6 +45,11 @@ DEPEND="test? ( dev-util/source-highlight
 			${PYTHON_DEPS} )
 "
 
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
 if [ "$PV" == "9999" ]; then
 	DEPEND="${DEPEND}
 		dev-util/aap
@@ -100,6 +103,7 @@ src_install() {
 		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples
 	fi
 
+	readme.gentoo.create_doc
 	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
 			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
 }
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest
index e9da27228abf..5dab9bacc7a6 100644
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@@ -1,2 +1,3 @@
 DIST python-exec-2.0.1.tar.bz2 80965 SHA256 3eddcb0d6c682a5c182c62578bb8d6ce1140a009873747e9ba1bf9de72ed7efd SHA512 0396e2617c759a66b16e57b0ca60b57e03f3c8096ae4a7f2e402eafcbee4ffd839bf0c6e4d259c6ba90940f9ba7e3f191125e395080cce3ef82e5f52053d0462 WHIRLPOOL 50c0cac1c7e2b5d2a21125647874c83caeabee293b87ef01926474d492b79b7837754c2d26173282977e9d00024559bb070f8d76bb5227df1776e937cd280c32
 DIST python-exec-2.0.2.tar.bz2 82217 SHA256 c411638fe94953c1e8ff57e7b66f601a817633fbc9cb7d410982778042051bb0 SHA512 96198dda88a73b902d617a32f10ddf2ac981b1871fb5eaf5003d77453df8a0aacf299c39c6e49ebaa620994a30e57ee7a1128fb4ba41aa4f503031fa2addef7f WHIRLPOOL 603b494c7b87f0f3f0cfba35378e1a2e231879a01b730657e09ecf798957fa4dfd54a6d852074c2aa9ae3c15e5d1d3203584b8a120e5dd0dee2117319706a5ce
+DIST python-exec-2.1.tar.bz2 82167 SHA256 adac4e9ae677ca0fbb9efc55573ecbb0e8361ed7a60a5241e7abc1056fba06ad SHA512 cadfb7723aa412caec4a449909769b14a800c19650c64768b0ffb30b2c0645e70c9a039f960f3263c6c18490bb73c0129b83a72c7407f558bcaf3652cc4c8bcf WHIRLPOOL 72b73b216faf7caa8afbc3ce316771bd832e468cf84835267dc3833d5c52fce24578e09f2d3aa8a322f324426eda5e53bd9611711ea976679574b2be764c2525
diff --git a/dev-lang/python-exec/python-exec-2.1.ebuild b/dev-lang/python-exec/python-exec-2.1.ebuild
new file mode 100644
index 000000000000..dbcb2ed726a8
--- /dev/null
+++ b/dev-lang/python-exec/python-exec-2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Kids, don't do this at home!
+inherit python-utils-r1
+PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
+
+# Inherited purely to have PYTHON_TARGET flags which will satisfy USE
+# dependencies and trigger necessary rebuilds.
+inherit python-r1
+
+DESCRIPTION="Python script wrapper"
+HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<dev-python/python-exec-10000
+	!<app-eselect/eselect-python-20151117"
+
+src_configure() {
+	local pyimpls=() i EPYTHON
+	for i in "${PYTHON_COMPAT[@]}"; do
+		python_export "${i}" EPYTHON
+		pyimpls+=( "${EPYTHON}" )
+	done
+
+	local myconf=(
+		--with-eprefix="${EPREFIX}"
+		--with-python-impls="${pyimpls[*]}"
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/dev-lang/python-exec/python-exec-2.9999.ebuild b/dev-lang/python-exec/python-exec-2.9999.ebuild
index a4628994aa58..cf4c3ebd2fcd 100644
--- a/dev-lang/python-exec/python-exec-2.9999.ebuild
+++ b/dev-lang/python-exec/python-exec-2.9999.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 #if LIVE
-AUTOTOOLS_AUTORECONF=yes
 EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-EGIT_BRANCH="python-exec2"
 
-inherit git-r3
+inherit autotools git-r3
 #endif
 
 # Kids, don't do this at home!
 inherit python-utils-r1
 PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
 
-inherit autotools-utils python-r1
+# Inherited purely to have PYTHON_TARGET flags which will satisfy USE
+# dependencies and trigger necessary rebuilds.
+inherit python-r1
 
 DESCRIPTION="Python script wrapper"
 HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
@@ -27,24 +27,29 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND="!<dev-python/python-exec-10000"
+RDEPEND="!<dev-python/python-exec-10000
+	!<app-eselect/eselect-python-20151117"
 
 #if LIVE
 KEYWORDS=
 SRC_URI=
+
+src_prepare() {
+	eautoreconf
+}
 #endif
 
 src_configure() {
-	local pyimpls i EPYTHON
+	local pyimpls=() i EPYTHON
 	for i in "${PYTHON_COMPAT[@]}"; do
 		python_export "${i}" EPYTHON
-		pyimpls+=" ${EPYTHON}"
+		pyimpls+=( "${EPYTHON}" )
 	done
 
-	local myeconfargs=(
+	local myconf=(
 		--with-eprefix="${EPREFIX}"
-		--with-python-impls="${pyimpls}"
+		--with-python-impls="${pyimpls[*]}"
 	)
 
-	autotools-utils_src_configure
+	econf "${myconf[@]}"
 }
diff --git a/dev-lang/python/python-2.7.10.ebuild b/dev-lang/python/python-2.7.10-r1.ebuild
similarity index 100%
rename from dev-lang/python/python-2.7.10.ebuild
rename to dev-lang/python/python-2.7.10-r1.ebuild
diff --git a/dev-lang/python/python-2.7.10-r3.ebuild b/dev-lang/python/python-2.7.10-r3.ebuild
index 4fae1b589991..0a4bd58c953d 100644
--- a/dev-lang/python/python-2.7.10-r3.ebuild
+++ b/dev-lang/python/python-2.7.10-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="4"
 WANT_LIBTOOL="none"
 
 inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
@@ -25,10 +25,11 @@ IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurs
 # run the bootstrap code on your dev box and include the results in the
 # patchset. See bug 447752.
 
-RDEPEND="app-arch/bzip2:0=
-	>=sys-libs/zlib-1.1.3:0=
+RDEPEND="app-arch/bzip2
+	>=sys-libs/zlib-1.1.3
 	virtual/libffi
 	virtual/libintl
+	xml? ( >=dev-libs/expat-2.1 )
 	berkdb? ( || (
 		sys-libs/db:5.3
 		sys-libs/db:5.2
@@ -42,23 +43,21 @@ RDEPEND="app-arch/bzip2:0=
 		sys-libs/db:4.3
 		sys-libs/db:4.2
 	) )
-	gdbm? ( sys-libs/gdbm:0=[berkdb] )
+	gdbm? ( sys-libs/gdbm[berkdb] )
 	ncurses? (
-		>=sys-libs/ncurses-5.2:0=
-		readline? ( >=sys-libs/readline-4.1:0= )
+		>=sys-libs/ncurses-5.2
+		readline? ( >=sys-libs/readline-4.1 )
 	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
+		!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-lang/tk-8.0
+		dev-tcltk/blt
 		dev-tcltk/tix
 	)
-	xml? ( >=dev-libs/expat-2.1 )
 	!!<sys-apps/portage-2.1.9"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -271,6 +270,9 @@ src_install() {
 
 	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
 
+	# Backwards compat with Gentoo divergence.
+	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
+
 	# Fix collisions between different slots of Python.
 	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
 	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
diff --git a/dev-lang/python/python-2.7.10-r2.ebuild b/dev-lang/python/python-2.7.10-r4.ebuild
similarity index 90%
rename from dev-lang/python/python-2.7.10-r2.ebuild
rename to dev-lang/python/python-2.7.10-r4.ebuild
index 0a4bd58c953d..2158a5471c81 100644
--- a/dev-lang/python/python-2.7.10-r2.ebuild
+++ b/dev-lang/python/python-2.7.10-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
 WANT_LIBTOOL="none"
 
 inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
@@ -25,11 +25,10 @@ IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurs
 # run the bootstrap code on your dev box and include the results in the
 # patchset. See bug 447752.
 
-RDEPEND="app-arch/bzip2
-	>=sys-libs/zlib-1.1.3
+RDEPEND="app-arch/bzip2:0=
+	>=sys-libs/zlib-1.1.3:0=
 	virtual/libffi
 	virtual/libintl
-	xml? ( >=dev-libs/expat-2.1 )
 	berkdb? ( || (
 		sys-libs/db:5.3
 		sys-libs/db:5.2
@@ -43,21 +42,23 @@ RDEPEND="app-arch/bzip2
 		sys-libs/db:4.3
 		sys-libs/db:4.2
 	) )
-	gdbm? ( sys-libs/gdbm[berkdb] )
+	gdbm? ( sys-libs/gdbm:0=[berkdb] )
 	ncurses? (
-		>=sys-libs/ncurses-5.2
-		readline? ( >=sys-libs/readline-4.1 )
+		>=sys-libs/ncurses-5.2:0=
+		readline? ( >=sys-libs/readline-4.1:0= )
 	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3 )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
 	)
 	tk? (
-		>=dev-lang/tk-8.0
-		dev-tcltk/blt
+		>=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 )
 	!!<sys-apps/portage-2.1.9"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -270,9 +271,6 @@ src_install() {
 
 	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
 
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
 	# Fix collisions between different slots of Python.
 	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
 	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
@@ -306,7 +304,7 @@ src_install() {
 		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
 	# for python-exec
-	local vars=( EPYTHON PYTHON_SITEDIR )
+	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then
@@ -319,6 +317,25 @@ src_install() {
 	python_export "python${SLOT}" "${vars[@]}"
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${SLOT%.*}
+	mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+	# python and pythonX
+	ln -s "../../../bin/python${SLOT}" \
+		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+	ln -s "python${pymajor}" \
+		"${D}${PYTHON_SCRIPTDIR}/python" || die
+	# python-config and pythonX-config
+	ln -s "../../../bin/python${SLOT}-config" \
+		"${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-${SLOT}" \
+		"${D}${PYTHON_SCRIPTDIR}/2to3" || die
+	ln -s "../../../bin/pydoc${SLOT}" \
+		"${D}${PYTHON_SCRIPTDIR}/pydoc" || die
 }
 
 pkg_preinst() {
diff --git a/dev-lang/python/python-3.3.5-r3.ebuild b/dev-lang/python/python-3.3.5-r4.ebuild
similarity index 92%
rename from dev-lang/python/python-3.3.5-r3.ebuild
rename to dev-lang/python/python-3.3.5-r4.ebuild
index 3049ce1f71bc..9b0e26111a7f 100644
--- a/dev-lang/python/python-3.3.5-r3.ebuild
+++ b/dev-lang/python/python-3.3.5-r4.ebuild
@@ -291,7 +291,7 @@ src_install() {
 		-i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
 
 	# for python-exec
-	local vars=( EPYTHON PYTHON_SITEDIR )
+	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then
@@ -304,6 +304,27 @@ src_install() {
 	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
+	ln -s "../../../bin/${abiver}-config" \
+		"${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
 }
 
 pkg_preinst() {
diff --git a/dev-lang/python/python-3.4.3-r3.ebuild b/dev-lang/python/python-3.4.3-r4.ebuild
similarity index 91%
rename from dev-lang/python/python-3.4.3-r3.ebuild
rename to dev-lang/python/python-3.4.3-r4.ebuild
index aaaa72aca152..526233a9621a 100644
--- a/dev-lang/python/python-3.4.3-r3.ebuild
+++ b/dev-lang/python/python-3.4.3-r4.ebuild
@@ -274,7 +274,7 @@ src_install() {
 		-i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
 
 	# for python-exec
-	local vars=( EPYTHON PYTHON_SITEDIR )
+	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then
@@ -287,6 +287,27 @@ src_install() {
 	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
+	ln -s "../../../bin/${abiver}-config" \
+		"${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
 }
 
 pkg_preinst() {
diff --git a/dev-lang/python/python-3.5.0-r2.ebuild b/dev-lang/python/python-3.5.0-r3.ebuild
similarity index 91%
rename from dev-lang/python/python-3.5.0-r2.ebuild
rename to dev-lang/python/python-3.5.0-r3.ebuild
index caa9e3531aeb..b2b50a17f0c2 100644
--- a/dev-lang/python/python-3.5.0-r2.ebuild
+++ b/dev-lang/python/python-3.5.0-r3.ebuild
@@ -277,7 +277,7 @@ src_install() {
 		-i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
 
 	# for python-exec
-	local vars=( EPYTHON PYTHON_SITEDIR )
+	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then
@@ -290,6 +290,27 @@ src_install() {
 	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
+	ln -s "../../../bin/${abiver}-config" \
+		"${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
 }
 
 pkg_preinst() {
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index d28de0187cf3..2695f87fdb92 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/dbus-test-runner )"
 
 src_prepare() {
+	# https://bugs.launchpad.net/libindicator/+bug/1502925
 	epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
 	eautoreconf
 }
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 2b5d34bc79fb..d6d9e3a74c45 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,5 +1,4 @@
-DIST libinput-0.7.0.tar.xz 440228 SHA256 129f485afe5e4a9394641293991c97cb99f5f3338340d0d65b704ff463d1579e SHA512 0e03ab7ca98c4574997742b7d8912000fb176d7a3e2c381b7e63139f78455374f8f38284e226fe443d5a524f34be8995317b91fc0190795a97b10af060423b77 WHIRLPOOL 664510fc33cb718b56600553332bb3eb587b3f4a40f81d4a80dd218882aba204522bcbbfab98f3ae0c6447d3a39cc98b9d88aea5f8e3c21da0803b93d64ad321
 DIST libinput-0.9.0.tar.xz 510512 SHA256 309043976f41f5451c2a4b1c25bc2993b18aecb22524d797f21eb6b6c968ff0d SHA512 a6f718215428eda45ac00c25d0b62ada84bf924822cb66e0a9b28f4cfc36e7d1678f2dfb47afae16ce4c277d589adcf97aefe8e2e5a154873b649fe4a84527a1 WHIRLPOOL 23da6dbcd7b17000cea641e0931db8a9b2ad34b0655e4e31b0419ff4799adc59d2646b10316e073ad49695ebd652c150abf05c39d15c735ecb1d97f6f8c1d8de
-DIST libinput-1.0.0.tar.xz 785056 SHA256 afbd2751c000a4e5833624b6177a6919ad259f0bca44093947421c885fd42c0f SHA512 b6fc7973982cb2826fc5beb514e954d7673023628739a86d18b2522b1ad0ecf55f9d6c83e6307c10c633c57d6b61227898aded6a22a2de536c0f14f27d23b903 WHIRLPOOL 13304875b753127ada76bf18ba56ea9828d6532db5eefce56439ede83eeeb43b6da6aa59f763d2c912de838221ee53fd7d02bf865e80316a24c412ea001d3043
 DIST libinput-1.0.1.tar.xz 800244 SHA256 482fb35119b457ba65a8bebaa47e4f6b4dbd77e59c320014a22296847b7ff99e SHA512 17efc6ddd58aadcd30aecb4d1b8b6ad32f6f61c592f29b0a99aac7d49e5cb814038874d9e8996cd6726f15c58bf4239169564c650a3250a87a9ec6fd3110c5bb WHIRLPOOL 0bba6b4a58ca0020ebcbffe5675d75832b4ed67a350ca141d990f9db522a2eee942543f475d76c1f2b816b849074f4a50e30bcb3adc99bd4abdea1a43800a2d5
 DIST libinput-1.1.0.tar.xz 802348 SHA256 673186ea2a0d2b695afaa9758834f9217b175774d9ae222e1b43ff63c663f582 SHA512 7f014eabed120c00fcd2d8748aed44a8ca31fd30bdda8b289ca63f7d1bebb9c49f1d508707fb0c4a5c7c4a37b58548efdff0e9b7761475f18e1cf787a80520e6 WHIRLPOOL 028518c20cfc6daa442dd92d04183a6575b95b1f4792a646ce42c09a7bc75e5bb469ca88b8cad89919c0814e00aa65178cc49c9dca6e9aad4ce997a94f9ba645
+DIST libinput-1.1.1.tar.xz 791276 SHA256 2de2b433ddc73ba1bfd4d309fd873d0ced6937cf1a7a94e4afbf18ddd8f8dd17 SHA512 3806e67a4530be71463b693076a64f210475d3487abc2848f5ee13b92b281c6e4950bdb754c6b9c090c51c5b8dd4e698b882ae325bdea78bb05e6b7399eb75f0 WHIRLPOOL 031af4cb17d51d2f888cdb3192ccb25e4b3eb22422aeda3e999fd215b3d5bba89782b1f4a5e0b95706bf6da2ffaf3cbc0b5078a1fa95433afd414b79826542de
diff --git a/dev-libs/libinput/libinput-0.7.0.ebuild b/dev-libs/libinput/libinput-0.7.0.ebuild
deleted file mode 100644
index 4ea4655c85e3..000000000000
--- a/dev-libs/libinput/libinput-0.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-# License appears to be a variant of libtiff
-LICENSE="libtiff"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/libevdev-0.4
-	>=sys-libs/mtdev-1.1
-	virtual/libudev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Doc handling in kinda strange but everything
-	# is available in the tarball already.
-	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	econf \
-		--disable-event-gui \
-		--disable-tests
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc -r doc/html
-	prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-1.0.0.ebuild b/dev-libs/libinput/libinput-1.1.1.ebuild
similarity index 98%
rename from dev-libs/libinput/libinput-1.0.0.ebuild
rename to dev-libs/libinput/libinput-1.1.1.ebuild
index b4ddf6c09270..26877357fe85 100644
--- a/dev-libs/libinput/libinput-1.0.0.ebuild
+++ b/dev-libs/libinput/libinput-1.1.1.ebuild
@@ -3,7 +3,6 @@
 # $Id$
 
 EAPI=5
-
 inherit eutils udev
 
 DESCRIPTION="Library to handle input devices in Wayland"
@@ -21,8 +20,8 @@ RESTRICT="test"
 RDEPEND="
 	>=dev-libs/libevdev-0.4
 	>=sys-libs/mtdev-1.1
-	virtual/libudev"
-
+	virtual/libudev
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 #	test? (
diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index fba6d8031638..78b4c40a1bbf 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -1,6 +1,2 @@
-DIST coloredlogs-1.0.1.tar.gz 13926 SHA256 11067ca91532ba4a316fa53b005152a08b3e015dcb1234d393cfc25af88ebc3e SHA512 098aa22b371ffdb6400fac7d2f000aa73f8956eae71f48ceed2110eb35a4b4d11f814f8cacca643c4deccd82da058a750c700264e7c71c2351514a6f887101a5 WHIRLPOOL 71b447498d5e91a0cda131046f7545230bc0c13aa814f0d79cf8888bd60934dee7c5cc54a729dd36b0a937451f80302384fb0733fd94e43e09c2ce9258c950fd
-DIST coloredlogs-2.0.tar.gz 15486 SHA256 532198042eac7560f5292961bfb6f844343132fda805575684f67deeb780b2c2 SHA512 b42e18b563caef4506377fba754e976fed31b7402d418ca79d1875504986572b36fe90b602afcb952dc8b06b9f7bc7ed6861abc2239ae5b5340e006377f9a14d WHIRLPOOL 6cbec16a204f91a218428c8056e2c39d94aeaedbf3356b2548fa288a386b8583bf639a40f0c40dc596096bf44ccb28acb7c2d66403d19cf72143599ba88a82b5
-DIST coloredlogs-3.1.2.tar.gz 22914 SHA256 ad559e2f2e08eadfb63a210344acf0d00855ba0896fc5662e8d57e1a488e3209 SHA512 872d041f732bb30a0cc3decd5dc677cf58aad300d6cd37fc0a38dcdb24bad2e6640f332ab58e469b07e2a37d6b7fdbfdf6e804431df175c48add00d86a3b5624 WHIRLPOOL 6d9593d8db8eac3ec558581a0772e7264e74e3c4e084c76af58402b2627b3b97689f947ee6eb871bd1fc65c3a2855d66f9f64434b8f612d55b7cefbf3670edf2
-DIST coloredlogs-3.1.3.tar.gz 22911 SHA256 d2195daa0e310bfaaf3dae47e22feaa3ee3631885e2ffc19aa765ad02196bf03 SHA512 81ff3476ee44dae3b08b1849189cfd03f7eb0e3c97414b463aeba1f7c6b3a3539f234dd058a0b05a503c5e5f4490236e8145fcb8bc019abb1888d8f10f542ca9 WHIRLPOOL 78f668fbac2ac9c61aa82a831c1ca2fd36bbb52557677f565b495dc9ce3206f048fd6e3d6493166559f9a7111f97f9466782d7a643675cea9615303d6a9dbc53
 DIST coloredlogs-3.1.4.tar.gz 23038 SHA256 c906ef520d55b94ace4f0aad8625a89fc1d324f24ed2892cc1ac5d479183a14c SHA512 0ee97d0b0e12351c006686418b09a951c3f4c04b6533437e41ffd54f9c427c2b9e5a35c486a37c54565d7cb0c4150b1656a87fed5a86f3ed08b3cd2595d59bd5 WHIRLPOOL caeb81a34e2c832a0d75e8123bb0d9d7e9071269b44e103031ab31657225f43a578f4eb10c6f5aaccce24feba08460fceb8bce9e0bba8eb873df2daa65338fa0
-DIST coloredlogs-3.1.tar.gz 22876 SHA256 d3efaaaa1ae85c3a1af335f116f634832691873dd87e5872b94bee1dd0a1e43a SHA512 01ed7841a79278b21fc0588b527803f8092b371c866785949d57f8c04649457fbe34c98ec77d3921f05f224b6d21e1a8fc8f835e4ea542886b948124d9d02bb1 WHIRLPOOL c59cbbd0e773763dcc95c45986385ca518ed9f0c59030d2421af0a4f62c9e3a08586f894e5910000058dc5e3cfb3a2c39c7886ec0673d59c40d1d811755bd109
+DIST coloredlogs-5.0.tar.gz 24933 SHA256 612354a11acd2e1d603c24fe7be21d736c53a23ad27f244cd9e3fdb4a99661d4 SHA512 f20a18779964b0bd4d48b51b6df81a57e3918f0097108510c50d27d88386ae89bc4e6abcb6263e757148c5094aa02edb6fe8829caecae13ed4fe7596db488763 WHIRLPOOL e23012b14689125ac09d3c16dfe32823e7f792030e3be77899f6aa8bbc1c757c23f9fd739907e67ae3a24304bda036e7e690f95ccf6e7793ca75379bff11f726
diff --git a/dev-python/coloredlogs/coloredlogs-1.0.1-r1.ebuild b/dev-python/coloredlogs/coloredlogs-1.0.1-r1.ebuild
deleted file mode 100644
index 6d2702e1707a..000000000000
--- a/dev-python/coloredlogs/coloredlogs-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Colored stream handler for the logging module"
-HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/humanfriendly-1.25.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/verboselogs[${PYTHON_USEDEP}] )"
-
-DOCS=( README.rst )
-
-PATCHES=( "${FILESDIR}"/${P}-ansi2html.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/coloredlogs/coloredlogs-2.0.ebuild b/dev-python/coloredlogs/coloredlogs-2.0.ebuild
deleted file mode 100644
index 74cc4955d2bc..000000000000
--- a/dev-python/coloredlogs/coloredlogs-2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Colored stream handler for the logging module"
-HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/humanfriendly-1.25.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/verboselogs[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( README.rst )
-
-PATCHES=( "${FILESDIR}"/${P}-skip-cli-test.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/coloredlogs/coloredlogs-3.1.2.ebuild b/dev-python/coloredlogs/coloredlogs-3.1.2.ebuild
deleted file mode 100644
index 5145699bf294..000000000000
--- a/dev-python/coloredlogs/coloredlogs-3.1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Colored stream handler for the logging module"
-HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/humanfriendly-1.42[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/verboselogs[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( README.rst )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0-skip-cli-test.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/coloredlogs/coloredlogs-3.1.ebuild b/dev-python/coloredlogs/coloredlogs-3.1.ebuild
deleted file mode 100644
index 5145699bf294..000000000000
--- a/dev-python/coloredlogs/coloredlogs-3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Colored stream handler for the logging module"
-HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/humanfriendly-1.42[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/verboselogs[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( README.rst )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0-skip-cli-test.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/coloredlogs/coloredlogs-3.1.3.ebuild b/dev-python/coloredlogs/coloredlogs-5.0.ebuild
similarity index 89%
rename from dev-python/coloredlogs/coloredlogs-3.1.3.ebuild
rename to dev-python/coloredlogs/coloredlogs-5.0.ebuild
index 5145699bf294..ec7bcb061bc0 100644
--- a/dev-python/coloredlogs/coloredlogs-3.1.3.ebuild
+++ b/dev-python/coloredlogs/coloredlogs-5.0.ebuild
@@ -30,5 +30,9 @@ DOCS=( README.rst )
 PATCHES=( "${FILESDIR}"/${PN}-2.0-skip-cli-test.patch )
 
 python_test() {
+	# Sandbox violations
+	sed \
+		-e 's:test_system_logging:_&:g' \
+		-i ${PN}/tests.py || die
 	esetup.py test
 }
diff --git a/dev-python/coloredlogs/files/coloredlogs-1.0.1-ansi2html.patch b/dev-python/coloredlogs/files/coloredlogs-1.0.1-ansi2html.patch
deleted file mode 100644
index 32f124481f28..000000000000
--- a/dev-python/coloredlogs/files/coloredlogs-1.0.1-ansi2html.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- setup.py | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index bbfd220..0ffe721 100755
---- a/setup.py
-+++ b/setup.py
-@@ -41,9 +41,6 @@ setup(name='coloredlogs',
-       author='Peter Odding',
-       author_email='peter@peterodding.com',
-       packages=find_packages(),
--      entry_points=dict(console_scripts=[
--          'ansi2html = coloredlogs.converter:main',
--      ]),
-       install_requires=[
-           'humanfriendly >= 1.25.1',
-       ],
diff --git a/dev-python/git-review/git-review-1.25.0.ebuild b/dev-python/git-review/git-review-1.25.0.ebuild
index f0f1f202d8e3..d6227a0c5e42 100644
--- a/dev-python/git-review/git-review-1.25.0.ebuild
+++ b/dev-python/git-review/git-review-1.25.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport b/dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport
new file mode 100644
index 000000000000..06bdb83abab1
--- /dev/null
+++ b/dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport
@@ -0,0 +1,55 @@
+commit 364a77403199087168786234554f459e7d985063
+Author: Lawrence Mitchell <lawrence.mitchell@imperial.ac.uk>
+Date:   Tue Nov 3 14:18:48 2015 +0000
+
+    setup: Support building with current mpi4py version
+    
+    mpi4py migrated the mpi4py.mpi_c module to mpi4py.libmpi in April 2014.
+    After the release of v1.3.1 but before v2.  Sniff this in setup
+    configure and import MPI types from the appropriate module in h5p.pyx,
+    to allow building with MPI on and modern mpi4py versions.
+
+diff --git a/h5py/h5p.pyx b/h5py/h5p.pyx
+index da175dd..8a1cbb0 100644
+--- a/h5py/h5p.pyx
++++ b/h5py/h5p.pyx
+@@ -25,7 +25,11 @@ from h5py import _objects
+ from ._objects import phil, with_phil
+ 
+ if MPI:
+-    from mpi4py.mpi_c cimport MPI_Comm, MPI_Info, MPI_Comm_dup, MPI_Info_dup, \
++    if MPI4PY_V2:
++        from mpi4py.libmpi cimport MPI_Comm, MPI_Info, MPI_Comm_dup, MPI_Info_dup, \
++                               MPI_Comm_free, MPI_Info_free
++    else:
++        from mpi4py.mpi_c cimport MPI_Comm, MPI_Info, MPI_Comm_dup, MPI_Info_dup, \
+                                MPI_Comm_free, MPI_Info_free
+ 
+ # Initialization
+diff --git a/setup_build.py b/setup_build.py
+index ccc0f27..e49a4e8 100644
+--- a/setup_build.py
++++ b/setup_build.py
+@@ -162,14 +162,22 @@ class h5py_build_ext(build_ext):
+         # Rewrite config.pxi file if needed
+         if not op.isfile(config_file) or config.rebuild_required:
+             with open(config_file, 'wb') as f:
++                if config.mpi:
++                    import mpi4py
++                    from distutils.version import StrictVersion
++                    v2 = StrictVersion(mpi4py.__version__) > StrictVersion("1.3.1")
++                else:
++                    v2 = False
+                 s = """\
+ # This file is automatically generated by the h5py setup script.  Don't modify.
+ 
+ DEF MPI = %(mpi)s
++DEF MPI4PY_V2 = %(mpi4py_v2)s
+ DEF HDF5_VERSION = %(version)s
+ DEF SWMR_MIN_HDF5_VERSION = (1,9,178)
+ """
+                 s %= {'mpi': bool(config.mpi),
++                      'mpi4py_v2': bool(v2),
+                       'version': tuple(int(x) for x in config.hdf5_version.split('.'))}
+                 s = s.encode('utf-8')
+                 f.write(s)
diff --git a/dev-python/h5py/h5py-2.5.0.ebuild b/dev-python/h5py/h5py-2.5.0.ebuild
index 5947f064842e..f7c87dc9e2b3 100644
--- a/dev-python/h5py/h5py-2.5.0.ebuild
+++ b/dev-python/h5py/h5py-2.5.0.ebuild
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
 		)
 	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-mpi4py2.backport
+)
+
 pkg_setup() {
 	use mpi && export CC=mpicc
 }
diff --git a/dev-python/ipython/ipython-3.2.1-r1.ebuild b/dev-python/ipython/ipython-3.2.1-r1.ebuild
index a4db074de7ec..f482b55a62bd 100644
--- a/dev-python/ipython/ipython-3.2.1-r1.ebuild
+++ b/dev-python/ipython/ipython-3.2.1-r1.ebuild
@@ -145,6 +145,8 @@ python_install_all() {
 pkg_postinst() {
 	optfeature "sympyprinting" dev-python/sympy
 	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
 	if use nbconvert; then
 		if ! has_version app-text/pandoc ; then
 			einfo "Node.js will be used to convert notebooks to other formats"
diff --git a/dev-python/kazoo/kazoo-2.2.1.ebuild b/dev-python/kazoo/kazoo-2.2.1.ebuild
index 6aeff57b15f9..c4a8a79425a2 100644
--- a/dev-python/kazoo/kazoo-2.2.1.ebuild
+++ b/dev-python/kazoo/kazoo-2.2.1.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc gevent test"
 
 RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
 	gevent? ( dev-python/gevent[$(python_gen_usedep 'python2*')] )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
new file mode 100644
index 000000000000..abe554928bcf
--- /dev/null
+++ b/dev-python/line_profiler/Manifest
@@ -0,0 +1 @@
+DIST line_profiler-1.0.tar.gz 65862 SHA256 a9e0c9ffa814f1215107c86c890afa8e63bec5a37d951f6f9d3668c1df2b1900 SHA512 15dd7ee10951287a5030eaff28e729e82094ec41d8e8dec803d5e44c6b9036ecbf1198365ef43c1fdd28451dec260c6491d118f1762d99fe037bb85eb7908dda WHIRLPOOL 1fd56ea4777a3c569807a124c708018fc77e68521d1f1ecdb13c343ddad3fcd881353cd71a0af36d06a12f1dd17be0f2731040fca5e827a4936298057dabf917
diff --git a/dev-python/line_profiler/line_profiler-1.0.ebuild b/dev-python/line_profiler/line_profiler-1.0.ebuild
new file mode 100644
index 000000000000..a2df317bf77e
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="https://github.com/rkern/line_profiler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	"${PYTHON}" -m unittest discover -v "${S}"/tests/ \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/line_profiler/line_profiler-9999.ebuild b/dev-python/line_profiler/line_profiler-9999.ebuild
new file mode 100644
index 000000000000..2b7914dee907
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="https://github.com/rkern/line_profiler"
+EGIT_REPO_URI="https://github.com/rkern/${PN}.git"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS=""
+IUSE="test"
+
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	"${PYTHON}" -m unittest discover -v "${S}"/tests/ \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/line_profiler/metadata.xml b/dev-python/line_profiler/metadata.xml
new file mode 100644
index 000000000000..270efb218b4c
--- /dev/null
+++ b/dev-python/line_profiler/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <maintainer>
+    <email>marbre@linux.sungazer.de</email>
+    <name>Marius Brehler</name>
+  </maintainer>
+  <longdescription>
+    line_profiler is a module for doing line-by-line profiling of
+    functions. kernprof is a convenient script for running either
+    line_profiler or the Python standard library's cProfile or profile
+    modules, depending on what is available.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">line_profiler</remote-id>
+    <remote-id type="github">rkern/line_profiler</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
new file mode 100644
index 000000000000..51010f03772f
--- /dev/null
+++ b/dev-python/memory_profiler/Manifest
@@ -0,0 +1 @@
+DIST memory_profiler-0.39.tar.gz 27859 SHA256 61021f2dade7edd6cc09d7924bfdccc453bd1949608412a3e021d44a410d3a23 SHA512 aaf8bcb105bf7301af16a9f090b62177e608d93f1ec5ca51ca78005515943f216657dd316fcd60a56784dc65c879a605f9712723a810400ecc5685e01b3dcf72 WHIRLPOOL a329950674ff9f34a8152be257e282821c9282fb16b6df9484307717ac104dbbb107381bd0ccef53a35ab1391f2dbde04fb0de13c20e66c726cc7006dcc834e3
diff --git a/dev-python/memory_profiler/memory_profiler-0.39.ebuild b/dev-python/memory_profiler/memory_profiler-0.39.ebuild
new file mode 100644
index 000000000000..9595e036119b
--- /dev/null
+++ b/dev-python/memory_profiler/memory_profiler-0.39.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A module for monitoring memory usage of a python program"
+HOMEPAGE="http://pypi.python.org/pypi/memory_profiler https://github.com/fabianp/memory_profiler"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+DEPEND="${REDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} -m memory_profiler test/test_func.py || die
+	${EPYTHON} -m memory_profiler test/test_loop.py || die
+	${EPYTHON} -m memory_profiler test/test_as.py || die
+	${EPYTHON} -m memory_profiler test/test_global.py || die
+	${EPYTHON} -m memory_profiler test/test_precision_command_line.py || die
+	${EPYTHON} test/test_import.py || die
+	${EPYTHON} test/test_memory_usage.py || die
+	${EPYTHON} test/test_precision_import.py || die
+}
diff --git a/dev-python/memory_profiler/metadata.xml b/dev-python/memory_profiler/metadata.xml
new file mode 100644
index 000000000000..86ec95cf0444
--- /dev/null
+++ b/dev-python/memory_profiler/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">memory_profiler</remote-id>
+    <maintainer status="unknown">
+      <email>f@bianp.net</email>
+      <name>Fabian Pedregosa</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/psutil/psutil-3.2.2.ebuild b/dev-python/psutil/psutil-3.2.2.ebuild
index 43be6f7afb61..ee1d2359bd13 100644
--- a/dev-python/psutil/psutil-3.2.2.ebuild
+++ b/dev-python/psutil/psutil-3.2.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index bcb24dac94b7..54740a41d9bd 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -2,3 +2,4 @@ DIST pyparsing-1.5.6.tar.gz 1418892 SHA256 5c84aa4500e82d5aa2c0842d5628c5da985e6
 DIST pyparsing-2.0.3.tar.gz 1462653 SHA256 06e729e1cbf5274703b1f47b6135ed8335999d547f9d8cf048b210fb8ebf844f SHA512 9771851f4b0191c7d3f8d2a2a6d2a9198b173120d3f133d08284b71e792fc59a906d571edea8f44ba04ab00c1d906e1974d1e8a2d6155d492de1358ba99c575a WHIRLPOOL 42b9c7aa0b8d4d91436a01a60cbca64a9c8f7798b7aeb60bd2c4af085f9e13167a5ac5132d55bd890b4890c00428e908dfae32ed78ec153c868ee02ed3cdaa3f
 DIST pyparsing-2.0.4.tar.gz 1140009 SHA256 c43c9f1395975bf2b032c20e6b149d6b698cdabf9291079bcaf0131709e95f59 SHA512 021d3610ead6b864b1e0227b6cad2393aae0c1f38a44c09dd7ac33d05be30cb4c75176a33ebd8c44e87ed9d54b58aaf27fab7ac8f3cdcb3ce4418b5b0d586b01 WHIRLPOOL 0fa3fe631c5c6fc79fb13f029fe8a32bd9651fd663e915c5be394225bcb1ea1f199d3edc2294e7a4b0732590e7a0cc3053effca9aa20155ca69d4c3908019e6d
 DIST pyparsing-2.0.5.tar.gz 1140072 SHA256 58756bf33e989d84ac72142e4ca558cf10c778a3233edb0a86632f271409ba9e SHA512 203c4520378302434078b49467369ee0ae70ef4807ca16b8e0ca361dbc3f555806e5e07f9e5005eec34452144b528ed0480f8892b1c61bae83512baa4e74b56e WHIRLPOOL 0da95e0d61a877669ff0f586e3688b0f8444baa5b857fdea8bb758b52af1ea8d6709effe2d1df031bf7d5940fb3b65582f44ca750adedaae12a36d5af105b6a6
+DIST pyparsing-2.0.6.tar.gz 1140849 SHA256 aea69042752ad7e9c436eea6ae5d40e73642e27f50edb6da4a2532030ef532da SHA512 3722198efc98f6ffc124fa012f6ef23ec840ccc2280922dcb35b05c1e78cdc40f1057be0f364732d20fb0dd25897776a15625ceadee14f6800d67b6d180b42f1 WHIRLPOOL c6228050452d4297bcb77326972b5ea5c671ee264ce8ebba1ceb115f8ca84e099d94a6db43a1dafef761e26bbf8cab96d46602e116c1d03607ab1860d907c233
diff --git a/dev-python/pyparsing/metadata.xml b/dev-python/pyparsing/metadata.xml
index 2e238a8e072e..e9e87318b49c 100644
--- a/dev-python/pyparsing/metadata.xml
+++ b/dev-python/pyparsing/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
diff --git a/dev-python/pyparsing/pyparsing-2.0.6.ebuild b/dev-python/pyparsing/pyparsing-2.0.6.ebuild
new file mode 100644
index 000000000000..ef7c5b117177
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-2.0.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy-to-use Python module for text parsing"
+HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples"
+
+RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# no contained in the tarball
+RESTRICT=test
+
+python_install_all() {
+	local HTML_DOCS=( HowToUsePyparsing.html )
+	if use doc; then
+		HTML_DOCS+=( htmldoc/. )
+		dodoc docs/*.pdf
+	fi
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	${PYTHON} unitTests.py || die
+}
diff --git a/dev-python/python-debian/python-debian-0.1.27.ebuild b/dev-python/python-debian/python-debian-0.1.27.ebuild
index b841b0aba42d..7bf9eccc9744 100644
--- a/dev-python/python-debian/python-debian-0.1.27.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.27.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.1.26-fix-tests.patch
-	)
+)
 
 python_compile_all() {
 	"${PYTHON}" lib/debian/doc-debtags > README.debtags || die
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index f760397b453b..f496b5f8255b 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -2,3 +2,4 @@ DIST setuptools_scm-1.5.4.tar.gz 15647 SHA256 756fb77b82c5e22818683b838c978537f4
 DIST setuptools_scm-1.5.5.tar.gz 17442 SHA256 63f56843b9cc18743c843e43d54fd78ab091cb82d01f5acb64655743e8002134 SHA512 39516db6164dc0d6179922fd79b012950c0684c8f6d4dbf71c2fcae661d1a54ef745c48c8d521ed3906c4f74d91b79fe4a94b5e27ab6a84701964494057c2494 WHIRLPOOL 929e5c38aaef9c247a451382842bf16faf44528858981af7c29133d5b3f4693414b85d076ade33c033dfbadb5803bf1b95fa5d8fa942725af2c3b01534d72a72
 DIST setuptools_scm-1.7.0.tar.gz 18754 SHA256 f2f69c782b4f549003edf5b75b356b37f40a4e880b615996c5d9c117913d6f9c SHA512 58fb39dff1fe7731d8f8fb9a383d4df41ad9271590c13e64d75bf9e5d390f553414a47b3223747e2c6d9407af44eff84365bce162251f0c0324bfb216f44c1a8 WHIRLPOOL 3555650b8d40df3b43e61240c0c7c09b46d7fb735c9cc64cf50da7fc3b9c6c66f237b69f1eb7bc66bfc4592daed824f1b25e2db507245a946ea6dafd028ec0fe
 DIST setuptools_scm-1.8.0.tar.bz2 14491 SHA256 ddbf365e60e5f8e3f86fe117edeee4a7e1dd8ce7a9337951c9c163e7c506e602 SHA512 a109fa3ffc89d3f6e515fa58026cebbd8ba98c1a401c49d5008e0dfc693f0e9e9468823621bd7b055911d3c898394e0ed1e498136cecaaa0be25e6312ec059df WHIRLPOOL ed87332ea7c27f1618c5c0c69b95360d48ec3b7d762d928d4cb097310fc0435c1aac15e53155417c0bdc0b9ba6ae6835e28f35735c10d70c6164d91340b09762
+DIST setuptools_scm-1.9.0.tar.gz 17669 SHA256 b17362734ea2494a5fee611a2b3f09c251356fa5b9ed4567b666fe91105d4478 SHA512 e44cd8fa4e6badd707e8987e0d91f79d6dee4cda3dbab42bba70f661a66b841cc16dc9b59b35fecc0948b80e6ef198fb19f267aa839e32d09a543f3b724645cd WHIRLPOOL f688f00d2c700946ba17bc2acbc357412569068063893fd72414ab41d5e4e3360d410ae3e48b837ddebec5979e7e024ab544e75556b428d5e2603edf2b82acff
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.9.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.9.0.ebuild
new file mode 100644
index 000000000000..79c9688c0148
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-1.9.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="package to manage versions by scm tags via setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
+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"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v -v -x || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index 9ba454caefb0..0c5a4815b861 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -4,3 +4,4 @@ DIST testtools-1.3.0.tar.gz 204755 SHA256 3bf0be7c76587e8318936462438124ffb74372
 DIST testtools-1.5.0.tar.gz 205197 SHA256 8d22a559f15b4540e069df0d69698d5bc70d9c42c8694c5e253595d70283511a SHA512 187a3f65eb3b00382853b8490d598f71990398f5867e985be00d13b87bb3ed155e9ecd3c16a268adf16ddf730b58a7d8849a8ba313668fc10af317e3eb3c825e WHIRLPOOL de91a36d9abc18680dba0f1c2b94133fe07d387093ee70a8f7bed2685faf55bbcbb46b5f9fcab0cdab73de382fabf800e78fa48889a733b9bceee06a61d3cbf9
 DIST testtools-1.7.1.tar.gz 202573 SHA256 e9999eecf002a9fdc499ab82c13cc7b40226ed4b5fc4ed2a2c1cfb08fe23cfea SHA512 ca38d61abf2fa9589177f986f57f15abd3105ed26b834c136cb12592a0aaa1bbe62d5bc3914ec958daad323091e8d88fd3ccad68c5d970a67d84188baa53ba41 WHIRLPOOL b38f00016d82852a58350d1a456b861af9c6a3e1f97d40463b225c7b6349b765680b45af6e18f21e05c88d40ce3c02445b04072c48d0f433176a4d718f907f88
 DIST testtools-1.8.0.tar.gz 207976 SHA256 8afd6400fb4e75adb0b29bd09695ecb2024cd7befab4677a58c147701afadd97 SHA512 b5f0201222d1e8c60fb7c2793bcd38e1c96c6f9fae99e9f3e784d17230c9abbf7325053d501c07e752bad2da36b49e2c79a25d0c20cb9a2f426057f839a77b3a WHIRLPOOL 71d4082197a9c179862fc3c63eadc37d6ff776f0a62e5fb08c296a5bf7109dc5110a2104a1ed15ca97c523aa0afb9e7124805ec6a6ae18f7605d7641abd9c54a
+DIST testtools-1.8.1.tar.gz 209327 SHA256 155ed29086e48156519e15f7801b702c15ba34d8700d80ba606101f448a3839f SHA512 0bd765bd3cc82a38c980d251427f9f32d44c377aa753d2d83c36fb8cfaeb8a10cfc86a38899b89ff454fe11742ab5e309439980e12a8bbae19b3d9df799803d9 WHIRLPOOL 06f654e447b6ae42cffbff454886dc1016746bf218c90e89c4b9361af2dc709acdfdcd0100c1624dffc1f72dec5c8037dd4357aa373a6413abf945c0d27868e1
diff --git a/dev-python/testtools/testtools-1.8.1.ebuild b/dev-python/testtools/testtools-1.8.1.ebuild
new file mode 100644
index 000000000000..c9824956468a
--- /dev/null
+++ b/dev-python/testtools/testtools-1.8.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the Python standard library unit testing framework"
+HOMEPAGE="https://github.com/testing-cabal/testtools"
+SRC_URI="mirror://pypi/${P: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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND="
+	dev-python/extras[${PYTHON_USEDEP}]
+	dev-python/mimeparse[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	>=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
+	dev-python/traceback2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	"${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/virtualenv/virtualenv-13.1.2.ebuild b/dev-python/virtualenv/virtualenv-13.1.2.ebuild
index fcbcb8894aea..b760d8215fe4 100644
--- a/dev-python/virtualenv/virtualenv-13.1.2.ebuild
+++ b/dev-python/virtualenv/virtualenv-13.1.2.ebuild
@@ -21,11 +21,9 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sp
 SLOT="0"
 IUSE="doc test"
 
-RDEPEND="
-	>=dev-python/pip-7.1.2[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
+RDEPEND=""
 DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
@@ -44,7 +42,7 @@ python_compile_all() {
 }
 
 python_test() {
-	py.test -vvx || die "Tests fail with ${EPYTHON}"
+	py.test -v -v || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 76b6c537ba45..8b07fb97f05a 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -2,4 +2,5 @@ DIST Werkzeug-0.10.1.tar.gz 1134481 SHA256 9cf783990b1a99173e707a5768610800aa877
 DIST Werkzeug-0.10.4.tar.gz 1137282 SHA256 9d2771e4c89be127bc4bac056ab7ceaf0e0064c723d6b6e195739c3af4fd5c1d SHA512 d1285521f144a569f86e8f4089fe8001f60dd4ffd87856f761338be81bc328adc5eca5bb7cd06b4f9c96e6e46dc1a283198f37a70033ca78183915c3da2c4f47 WHIRLPOOL c3f3a21550e26407db28470cf539c8060c01359724613993b387f0a54435dcefc14cfbf7e4b12839e8f9b3a1421e34183f20d2d1e36a4106544ac76cd2ac22b1
 DIST Werkzeug-0.10.tar.gz 1133931 SHA256 9a97a6fcf87390172748da9e5250710b352dff18e979db925d276112cdcfa7ac SHA512 fc9872892ce02b3501a0edc0ea25a1edd793af61e0c268de80e465fb6ecee6f95c323a624fb2f71903c28a4b743012e3a48d23652172e7c4bc7305c797d4fee5 WHIRLPOOL 77a6a71a9c8d8ea55970f8a30569bf2964ebdb762c97fd8d92516a08aac1a53efcb115ad0ee10ee952be93b4732067680844a463d33ff69207454f2046594b3f
 DIST Werkzeug-0.11.1.tar.gz 1151713 SHA256 280b37866a1fa8604549cbc278f06d310143e20f1a6520ae5cf66e0df615e0a7 SHA512 d6cc65b8c3afe66f45acf3c9897679684c3525fcb27bbad54e7920fef15d88081d264f41f35f7a4d498e7f0664259f664a06ddfe794f8837585642a68d650c45 WHIRLPOOL 075923ea3f44356dc72b6272bc94d8a023c372123f19b59c9e3f2bf9852cdcf57d6ab54fc00b4d1eb87700852225e9f24877d550ab4c3813204cd07a9eef4590
+DIST Werkzeug-0.11.2.tar.gz 1152067 SHA256 eb4f98994b40a8e2edce289e811c9a38880ae53eb9ff6f031d0e243a69b0fcbf SHA512 aa83da47763a4c5b9b68c10e84ad195d8ae50b419faf25928d135cd0eebf7a57c4a7e178002a2f7a849005e0df8491398e12cd00098ccfb227ae2b75129e4966 WHIRLPOOL 612df2c211627712ed1853b89f17e943daf6156658fd7fd224133c8bc3d23808f77497a1bb5b711f9d7d446de8d2f6b8f0be1df0f9eb2e8f777d23a3bbed83dd
 DIST Werkzeug-0.9.6.tar.gz 1128428 SHA256 7f11e7e2e73eb22677cac1b11113eb6106f66cedef13d140e83cf6563c90b79c SHA512 0b36df25d5f69a0353f7a9321b9197ace2926b6d8e983a91ef372c270ff51462f7d86184447a5f74b4ad05ffdc6411098f77b45a4f1c906dd525d7edf220399c WHIRLPOOL db153036e9dc36c70239001a6b451adeaafa3819f4903bb8c297bb4313c9a064926a2aad6e4457810b53796b3e492228a9ee1ec165fe5dce0522ab0d2c7407f9
diff --git a/dev-python/werkzeug/werkzeug-0.11.2.ebuild b/dev-python/werkzeug/werkzeug-0.11.2.ebuild
new file mode 100644
index 000000000000..c6dd78d7cbc9
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-0.11.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Werkzeug"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/wheel/wheel-0.26.0.ebuild b/dev-python/wheel/wheel-0.26.0.ebuild
index 8d9c086a769d..7172a4cbb02d 100644
--- a/dev-python/wheel/wheel-0.26.0.ebuild
+++ b/dev-python/wheel/wheel-0.26.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
index 6d001c3d185e..106d59b55235 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
@@ -17,5 +17,5 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
 
 LICENSE="|| ( MIT Ruby GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 1e33a63934af..3933ce1f33ae 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -2,5 +2,4 @@ DIST facter-2.4.1.gem 236544 SHA256 4c8836066378d387c0561e4c3574865fa10d85d7474d
 DIST facter-2.4.3.gem 245760 SHA256 3c1e49c32e6b07c1f802ec120e860f882938a5057c6f3733594b7ff8a80ee58f SHA512 a834c50d0ac14a751ccd0d5da3f8d64a83173e82991e2a3cd70bf47c023ee0b0517baed3726398a1075043b1237a91cc8389d58acbb2bbf79c76b5e2ecd3aedb WHIRLPOOL daa82ef6b2f6eb2f640a106528e67f5631748ee4232fbe9c595146b25ac6ca01048d3fc7a5cf519469bec597b6cc6dc6a4d6b2b779b7c77972fbb8efc952c32b
 DIST facter-2.4.4.gem 245760 SHA256 4f7b592f9b6bc6ad8a9789e3ca0953fae07e6d06b10a9cb7599eb1e71a03646b SHA512 9d485d147cf726cd4a2943d1ee3475d2593067953102c11487e2916d59464407016a074b6eb31af4da37a3914588937d827d2cf4c64196650baefa2fb097bb89 WHIRLPOOL 574afae52fc7ad3cf8619abcd89eee4ca38e5ecc903e316bfc18aef708fa32e8b3487f315605a21ac9faf0ba66989c8d108d77a9104f74f79fc5e953dd8ccdd7
 DIST facter-3.0.2.tar.gz 508583 SHA256 2fee1ee938196790f24b7b876ff04a5d69c0ac1492ff6935b003ae23500eced7 SHA512 57a5c40d2ad07911a2b9c242b22bcffbbf8eedc88e12d7d6e8f6cf044ef30034cae7230468a7b414c93d6008d8805be1621a8c6b1af2543539d979bd3df7d1e8 WHIRLPOOL 6b89ca76ba7d993e1b87fe840b76dda9b1d8534df06f9f45e3c24752b95b441e471899446018f66bb6db0d490bb4a76cd4ab146a5060755333072ab5a5767bd3
-DIST facter-3.1.0.tar.gz 620224 SHA256 637a4e9cc3283374e11949b0450d0433fabcb2e2699c5d01921e8dad9cb457dd SHA512 ce5e5c62d55fa253ebc25467682f56bd32d6ca7b1a9feac31a3fe037d5c06205d753dd31c29c51da61355c6d8c1f301b9451d4a1078776e4f2216f81920270a6 WHIRLPOOL 4644cb7ce9a1bd0698932b630dd52bfa9a0b5ea5602de6518dc0a8d0cceee0c891fdae3fae6a8a0bd191e6b0dfdf6d06a4b4146b0cde681e5eb51847c2ee2860
-DIST facter-3.1.1.tar.gz 601017 SHA256 e60e02bf13020c5ddc59111204e282365eacbff325b62e5660772e17bf2476e5 SHA512 20d9dc6c4a650e7140b26143a4b6c4dda5e6bd8c445cfbdc40e270915a2027606ce1a6ea91c1b3ff470c4b7d27c2cf784a5a4b85cbefeda7a430804bc8001935 WHIRLPOOL 9c22bc0d6a0b35c9e455f352ccee77b44f8fea69d4f7f6aefae9339917cc42f88eb62f19f1d1e37dfa978c767babb2428deb90a022b1cdcfd75b72b9ac9e00ee
+DIST facter-3.1.2.tar.gz 603375 SHA256 9da41388127b7c02f9ac17945dad48332e62d663191bf51b2339c48222641c26 SHA512 f2435bb04d4ca51f65ce54134ff81e7fccb61df3f26ee890580f59b5eb65c6f7ca6db9fcd779baedca297a1456143741777cc9ba46b00e26c8b3965ab3db79e0 WHIRLPOOL e07c743a1025320c364800d3fece9e5d0b72e0f82ac648f459aaaeed44a46b187454ec4fdfcb532c87f6f62025632ebad5985356dbe056329e16eabd8eaec68c
diff --git a/dev-ruby/facter/facter-3.1.1.ebuild b/dev-ruby/facter/facter-3.1.1.ebuild
deleted file mode 100644
index 31604763e41d..000000000000
--- a/dev-ruby/facter/facter-3.1.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-inherit cmake-utils ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://downloads.puppetlabs.com/facter/${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-CDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/boost-1.54
-	>=dev-cpp/yaml-cpp-0.5.1
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl"
-
-RDEPEND+=" ${CDEPEND}"
-DEPEND+=" test? ( ${CDEPEND} )"
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "vendor/leatherman/cmake/cflags.cmake" || die
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i 's/if(RUBY_VENDORDIR)/if(False)/g' lib/CMakeLists.txt || die
-	sed -i '/RUBY_VENDORDIR/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i 's/\ lib)/\ lib${LIB_SUFFIX})/g' lib/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-}
diff --git a/dev-ruby/facter/facter-3.1.0.ebuild b/dev-ruby/facter/facter-3.1.2.ebuild
similarity index 98%
rename from dev-ruby/facter/facter-3.1.0.ebuild
rename to dev-ruby/facter/facter-3.1.2.ebuild
index 31604763e41d..7e9cf4fde45c 100644
--- a/dev-ruby/facter/facter-3.1.0.ebuild
+++ b/dev-ruby/facter/facter-3.1.2.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 
 CDEPEND="
 	>=sys-devel/gcc-4.8:*
-	>=dev-libs/boost-1.54
+	>=dev-libs/boost-1.54[nls]
 	>=dev-cpp/yaml-cpp-0.5.1
 	dev-libs/openssl:*
 	sys-apps/util-linux
diff --git a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild
index 6eb23739f856..e6eadc143488 100644
--- a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild
+++ b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://seattlerb.rubyforge.org/hoe-seattlerb"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/nokogiri/nokogiri-1.6.6.2.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.6.2.ebuild
index c3f90e165ae5..6fad21ae449e 100644
--- a/dev-ruby/nokogiri/nokogiri-1.6.6.2.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.6.6.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rake-compiler/rake-compiler-0.9.2-r1.ebuild b/dev-ruby/rake-compiler/rake-compiler-0.9.2-r1.ebuild
index eb7ce12d0c6b..d59aec6451a0 100644
--- a/dev-ruby/rake-compiler/rake-compiler-0.9.2-r1.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-0.9.2-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="MIT"
 SRC_URI="https://github.com/luislavena/${PN}/tarball/v${PV} -> ${P}.tar.gz"
 RUBY_S="luislavena-${PN}-*"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
index c93194bf076c..ce661ea1cf68 100644
--- a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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 "test? (
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild
index a25030832f99..8b0ba3d6b157 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.3"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
index 3c25b75b7eda..7ef4f61a1116 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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 "
diff --git a/dev-ruby/rspec/rspec-2.14.1-r1.ebuild b/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
index 268ac1cc5ad4..a59995b39c92 100644
--- a/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
+++ b/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://rspec.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/zentest/zentest-4.11.0.ebuild b/dev-ruby/zentest/zentest-4.11.0.ebuild
index ad6d98793609..b2d570d4d02f 100644
--- a/dev-ruby/zentest/zentest-4.11.0.ebuild
+++ b/dev-ruby/zentest/zentest-4.11.0.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="ZenTest provides tools to support testing: zentest, unit_diff, auto
 HOMEPAGE="https://github.com/seattlerb/zentest"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index 5eef70ef7ccd..ea0be3e366c7 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -1 +1,2 @@
 DIST gitg-3.16.1.tar.xz 1322412 SHA256 914e964402dadda152c7e034906d84e266c474603f58bc1a300f2a1659615569 SHA512 30ea13cfbd14d82db4d0db5ff5ffd456a8ceaa2364e8f3b9eff224c268de46b5dab070a068b3dc9497c7acd90023f60618a4bd5041dab35516ca336421454419 WHIRLPOOL 2774a264e00e28a27728ce4c7791a0340702893c52f32dd141f1ffc682516c4643a94d62b21ddc959b6fbb35c7cff73942cd62a77bcf3ac22991853bfe4f6ec9
+DIST gitg-3.18.0.tar.xz 1413188 SHA256 fa4b7b9c492f13f5f1d864af1281ea377ac8c7619c856e05f533b18989edf421 SHA512 df6944df057d6863ec6a551749edf4d003bf9954c474b0d83ef1476747df210f1e7ead4d007dce06de6f84e25afcafb8aa4f61d8af703861c014c4189cf008d0 WHIRLPOOL 4a27708999e33a533988d62e94a2ad2ee6424184d9862e79bd5dd4a1033e38505672f407f492d9831465249cae68b20a112de6d5737286d28d6d952793c33265
diff --git a/dev-vcs/gitg/gitg-3.18.0.ebuild b/dev-vcs/gitg/gitg-3.18.0.ebuild
new file mode 100644
index 000000000000..b23a33b1a281
--- /dev/null
+++ b/dev-vcs/gitg/gitg-3.18.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit gnome2 python-r1 vala
+
+DESCRIPTION="git repository viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="debug glade +python"
+REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
+
+# test if unbundling of libgd is possible
+# Currently it seems not to be (unstable API/ABI)
+RDEPEND="
+	app-crypt/libsecret
+	dev-libs/libgee:0.8[introspection]
+	>=dev-libs/json-glib-0.16
+	>=app-text/gtkspell-3.0.3:3
+	>=dev-libs/glib-2.38:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	dev-libs/libgit2:=[threads]
+
+	>=dev-libs/libgit2-glib-0.23.5[ssh]
+	<dev-libs/libgit2-glib-0.24.0
+
+	>=dev-libs/libpeas-1.5.0[gtk]
+	>=gnome-base/gsettings-desktop-schemas-0.1.1
+	>=net-libs/webkit-gtk-2.2:4[introspection]
+	>=x11-libs/gtk+-3.12.0:3
+	>=x11-libs/gtksourceview-3.10:3.0
+	>=x11-themes/gnome-icon-theme-symbolic-3.10
+	glade? ( >=dev-util/glade-3.2:3.10 )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/libpeas[python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/libgit2-glib-0.22.0[vala]
+	gnome-base/gnome-common
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40
+	$(vala_depend)
+"
+
+pkg_setup() {
+	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+}
+
+src_prepare() {
+	sed \
+		-e '/CFLAGS/s:-g::g' \
+		-e '/CFLAGS/s:-O0::g' \
+		-i configure.ac || die
+
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-deprecations \
+		$(use_enable debug) \
+		$(use_enable glade glade-catalog) \
+		$(use_enable python)
+}
+
+src_install() {
+	gnome2_src_install -j1
+}
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 5a9ea9f60781..1a508f119aaf 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1079,7 +1079,8 @@ unipatch() {
 			# https://bugs.gentoo.org/show_bug.cgi?id=507656                   #
 			####################################################################
 			if [[ ${PN} == "git-sources" ]] ; then
-				if [[ ${KV_MAJOR}.${KV_PATCH} > 3.15 && ${RELEASETYPE} == -rc ]] ; then
+				if [[ ${KV_MAJOR} -gt 3 || ( ${KV_MAJOR} -eq 3 && ${KV_PATCH} -gt 15 ) &&
+					${RELEASETYPE} == -rc ]] ; then
 					ebegin "Applying ${i/*\//} (-p1)"
 					if [ $(patch -p1 --no-backup-if-mismatch -f < ${i} >> ${STDERR_T}) "$?" -le 2 ]; then
 						eend 0
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 7d2f6ddc0ee9..a298eb0fd5be 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,3 +1,3 @@
 DIST cinnamon-control-center-2.6.0-pyongyang.tar.xz 32912 SHA256 d26e31c1377abc1c3e47e1c8e78572e0169d21bdfddb920ab839bec4e1bbe8a7 SHA512 3c6d6a970382a8e0429cc78873e4d230d5848f2a6ae4feee4d28db28cb21124f59cd7b4632f3a427f91dd7e497ee32dd3f7ba5139a3c1566264904939007d28e WHIRLPOOL a1a4102ddb13e00414b58352c3eabbd02dc425f2b3a59027a579d9ac78bdd0fd7dcacc8c204ceaeb858944202af72bbfcecabb48aa1e7ddf4ff6ec4e682fb97d
 DIST cinnamon-control-center-2.6.0.tar.gz 4169903 SHA256 bbc39ac8ddcbc06b6aada1ef271f95f5f0d0fe439bec38b9cd847af420305c49 SHA512 ed383484b751a9d98de7f136c21c5eb6ce7cfe1418945bd0725aa9e9f08397eb78854b38db258434ed8895dbadd2ce29b5a423a9025dea17fb4876f8847ff125 WHIRLPOOL 7e6d3373e97116d5b531f4fcff85984050fd5d7ad343137b76e30089b3c6f4ff5409f68867289f3967a257a67cd04059f2aa02c48a4e0e4c29b43755d6f4cd84
-DIST cinnamon-control-center-2.8.0.tar.gz 4090227 SHA256 ce4bca5044a65605c24d77118036394728c9bf4cfc424a4acf0e1f0c190f55bb SHA512 c3e5789dea3527310508bc51d2a7c4f9df8bb295419a6576075cc41471a53f7ca349de4946dc6df198706be1528caff7ad81b5c02619da98cdb7e383398905b1 WHIRLPOOL 32f1f52534e0697605f8dbce528558661e5ef6c8b517d371eceaa1c032a36b5c4232340fc8d66d85044adff09da52cdbd9e950ddcb42829de9012470bb32778b
+DIST cinnamon-control-center-2.8.1.tar.gz 4090162 SHA256 595076ef89949c31357cd45f41818df1f6b7350a2b810f107e0b88cd9870e273 SHA512 e0f21bc29128b56d2024ea5bd9dff70a917259437804f4aad0942ee1313090b70e6811d1b54513b4639c0bff0230efcb2847a42fcf9ad183b24a3cbfeda976de WHIRLPOOL 47d3255eeddd782fb5c87ff82ed5d8ab8588b8066b9da9344abcfa259d0b481e06f676cefa43563f28ddc75d2c8112b30712b4ae52f750e03f779b1a73108c7b
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
similarity index 100%
rename from gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.0.ebuild
rename to gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 764375a68539..4d55e9f33c57 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,2 +1,2 @@
 DIST cinnamon-translations-2.6.3.tar.gz 7371754 SHA256 3b86b3f16e3afb9dff31506b431c95251d87b9390c5d2290c5896331b2ec91fe SHA512 097960f2e4aaba2e6cbf09488799c987ca4939cad3fe2c0af7b659b05826e03ecc490ad885de1f296f3ff2cd6d95a5908e8223c29fc7b7b7ffee8e34003824dd WHIRLPOOL 6264607dc2c937086494c784c5df74de5534d77ba5ce005998c267c6146bbeea21b283e601d77c6ebc1642f4e38f5ac0099e0739d9a3cd61f1fa71dc00490696
-DIST cinnamon-translations-2.8.1.tar.gz 7639040 SHA256 48431b300fd46552d71d009e3fad84c76d4f0d0cc6db9ec7241aed95f8bb5f98 SHA512 d02d035e325e6549c7c8e303427adedbdbcca2c73a6d27e14a872bf13725820acbc20978256e0a138e157288e2ddb371641ddf49633c38dec92d2863370bef29 WHIRLPOOL bdcf682ab8d85b460b82c379a8681efd5ee2db6e3e3dd6abaab7b2908f7ccffa14845a92fb7b373f5eed493eeec3ac13350f7f9007d46fdeebdfc3eac09c5462
+DIST cinnamon-translations-2.8.2.tar.gz 7667573 SHA256 062f8d76d448500aea175889b68fdc00b582b957a972e7dd1e05f34bc9ed4c7f SHA512 67aa5fe96a914bd46b7231c16ebd17d4278f4f4bd823263d1d9bf70672ec309ce5928a9c83e82348b5183d7c992f89af22dccde85a90f4c8e4d6899e76e1afd6 WHIRLPOOL 369db619207a4f2f18e1d6d20d75aba79ad8b73e14ac8c8c23e28660ea7705f91df6589c35aaa384c807d4b8d6363ac4c840aa27b6afcec501538be617b2356d
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.1.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.2.ebuild
similarity index 100%
rename from gnome-extra/cinnamon-translations/cinnamon-translations-2.8.1.ebuild
rename to gnome-extra/cinnamon-translations/cinnamon-translations-2.8.2.ebuild
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index d522a0b8851b..10a13b85bcbb 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1,2 @@
 DIST cinnamon-2.6.13.tar.gz 2967812 SHA256 f349403901bf3e84cda2ebd425dc6f58850059092775e285862067f120debe86 SHA512 41192b25ac34c542596f9625a671d019531aa466f057777da12ca0fda0f23daa10929c9f7a4e3c1a7137887fc9b0b556836a82f42645128b620949386387efec WHIRLPOOL 0c7c7ed6375964a93217adf43cc6236f7e7b92b75facfc94ded86f914890452b92753486d1c46b8a6531eef49993a0bc9fc0d387e8ea2a5bc4f05dd80571462a
-DIST cinnamon-2.8.3.tar.gz 3024863 SHA256 e83e3f9fcf00214ec8444dfe4be88e9d00bec14f03b3cbf01dd6dfa7237dec9b SHA512 28a3c43f268066665999d7a9c0e512e45b3f8be9ef2213ca092b5bb3ce1a8f4a595dc2b8d4d5c6486647ce37577b7c607d7f06af17fc4bccbf6ff0a807a85b32 WHIRLPOOL d37c1c319e547e8a5d1a06a6478b5a76d4c21b05a7b4e4eb280dfb29515f6a73ee01725477a1d9a03308a86033d98cdf0572674a2399d4334e4b204c00ee5c06
+DIST cinnamon-2.8.4.tar.gz 3025109 SHA256 4ae7ed062e2bfacabdac66002c14666c4709182d45a6f0140a577800e28b0326 SHA512 d2be926c17262c20aff7253b8fb25f7955328fbd7ee4271ec1f29d847c1768f1dffc90c1d9dd843c4bcd4a8a0503200b078e01d6dd6cc8fa66894f1b5fcd9a37 WHIRLPOOL a9726b360958799c6b8614b088acb0b38c544e5e78739d0e5f35e14d801d1aae32d0bc12064efd405eea01bddf6f5350f1e1298c2c11c10a07f27c54a2bc1566
diff --git a/gnome-extra/cinnamon/cinnamon-2.8.3.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.4.ebuild
similarity index 100%
rename from gnome-extra/cinnamon/cinnamon-2.8.3.ebuild
rename to gnome-extra/cinnamon/cinnamon-2.8.4.ebuild
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
index 677a4eeddb83..d002e2b74548 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -1 +1,2 @@
 DIST gnome-user-share-3.14.2.tar.xz 391916 SHA256 6b05b3ef31af3bb39c903f94a0d163c0a9c4aa5266ae98e2281e0613f2972ee9 SHA512 d42587c0c64fda9d051f3d6c792358d02c32b95193df512016a04a0ee4861483f3060f1579de6fa229676795e420cf88732da334757471b79410d3be6ebe8bd1 WHIRLPOOL 14a191b8cbfa218e4dcde379212a00f0753d02726b55b16b9f67fbc2c5484038d9d18ababb5c2019624856041257a88cea6b00a3d4cf21a83c9369b9486452be
+DIST gnome-user-share-3.18.0.tar.xz 376944 SHA256 feb3bed59193eafea31f563ed7eab5f066aa5f86d4a89f067b162653d168d3fc SHA512 bc053b879c602f2d6d04431f817f528c7f6ffb20e2078fcef1b4cc8acbe95a658fb6cfe03b55fe87c46bd87ea175cfdfda8314928e9c3525ccf2fa8ab0fdf055 WHIRLPOOL 72c43048afae3888306c8033d63458df7fd806bf21c99405b72b5694e03e73fc5a43473671da978aea5ae223f9bf4111a809c0a9f17f47f7d38a55dd25f08817
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild
new file mode 100644
index 000000000000..530f69e65e35
--- /dev/null
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib
+
+DESCRIPTION="Personal file sharing for the GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# FIXME: could libnotify be made optional ?
+# FIXME: selinux automagic support
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3:3
+	>=gnome-base/nautilus-2.91.7
+	media-libs/libcanberra[gtk3]
+	>=www-apache/mod_dnssd-0.6
+	>=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile,apache2_mpms_prefork]
+	>=x11-libs/libnotify-0.7:=
+"
+DEPEND="${RDEPEND}
+	!<gnome-base/gnome-control-center-3.9
+	app-text/yelp-tools
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--with-httpd=apache2 \
+		--with-modules-path=/usr/$(get_libdir)/apache2/modules/
+}
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index ad92639189f7..ccade218f989 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,3 +1,2 @@
-DIST nemo-2.4.5.tar.gz 1356445 SHA256 a4eae743f25d1a66cbb5b28675d78aee1d57224c825d6baebdf88068dc1d8d04 SHA512 1f6120569198f54e3fbc7f57ca9d4f644e617e029d28dc08669ae33774e474b838a5d430b0bf5ef3e0e253596a02666bbc1cbab32d1ef134971871567bf49bdb WHIRLPOOL 804c169fd6b22558718223bab44cafe183214bdd0325e1c1dcf67a41a28fddca35cf5890b42248c6b0ef485d6010cc9151c75a3994e792092b366fc98e11bd75
-DIST nemo-2.6.6.tar.gz 1404568 SHA256 03e0345dad1e98b95e30b804acc5ec3613d4a258efce592db6e1296569a55a3f SHA512 2f234fa123202357f978603efa2ef20a7cf38a61d49205201c00f5e6d69add8e9ff1cbf1584a149b6ad333d974b406183d57511143d6cf20b186a68fd80e23a0 WHIRLPOOL a805a6a0698015d175fc79f8443192aed28f9dcc1b8064e98b450004b749cd88c52d4322314295e89fb77659dc8b8bed76eb79101b53a387427c6fa456dfe8ca
 DIST nemo-2.6.7.tar.gz 1404410 SHA256 fcb7c596d4aa2325df0c9a0af6d26bcc8c1c85f299ae511f8a1ea3a23619f8ed SHA512 2a7f52b830eab7967f3ca779de076739371f51071f705d134de469b7642e3b592428f14e4c4e45c623445c36c990e90ad5c6698864cb920d0140aa3ad76a9f0b WHIRLPOOL 62fe0313d51b9b312960fb9f2ab059d9a6ca74ec32c88eb0eb860444bbc5c3b975cd7e9a09739c27b511f9d965621e8a4cff686d33f34fe3de0a09e8f34f0870
+DIST nemo-2.8.4.tar.gz 1409144 SHA256 ad5bef847cb9eddfc8be65a6be8408d554fefb8d047c78d3697ba6ff62a694b7 SHA512 e17cae5d9f44f2faf69a135104b4eaed518c7c4316815808a91fa88a3ba66bb0f0f72f31df73af7bd9e465d825f9c44cb4032365b5cae434de249aaad3bd6b40 WHIRLPOOL cd8912cfbedf7cd56000a7cd1fe9252b93f15232bc018712411ecb16723ad7bb42abe027e3b1e5acdea73da7ad8021ce1243301cecd09237b0e393dda927b1ec
diff --git a/gnome-extra/nemo/nemo-2.4.5.ebuild b/gnome-extra/nemo/nemo-2.4.5.ebuild
deleted file mode 100644
index 174ee2a0f7d7..000000000000
--- a/gnome-extra/nemo/nemo-2.4.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="exif +introspection +l10n packagekit tracker xmp"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.34:2
-	>=gnome-extra/cinnamon-desktop-1.0:0=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.3.17:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-
-	gnome-base/dconf:0=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.12:= )
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-	l10n? ( >=gnome-extra/cinnamon-translations-2.2 )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto
-
-	dev-util/gtk-doc
-	gnome-base/gnome-common
-"
-# For eautoreconf
-#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-
-src_prepare() {
-	epatch_user
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-more-warnings \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
-
-	gnome2_environment_reset
-	unset DBUS_SESSION_BUS_ADDRESS
-	cd src # we don't care about translation tests
-	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" GSETTINGS_BACKEND="memory" Xemake check
-}
diff --git a/gnome-extra/nemo/nemo-2.6.6.ebuild b/gnome-extra/nemo/nemo-2.8.4.ebuild
similarity index 95%
rename from gnome-extra/nemo/nemo-2.6.6.ebuild
rename to gnome-extra/nemo/nemo-2.8.4.ebuild
index 9080cb64046f..317ac30e71e4 100644
--- a/gnome-extra/nemo/nemo-2.6.6.ebuild
+++ b/gnome-extra/nemo/nemo-2.8.4.ebuild
@@ -19,10 +19,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="exif +introspection +nls packagekit tracker xmp"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.34:2[dbus]
+	>=dev-libs/glib-2.37.3:2[dbus]
 	>=gnome-extra/cinnamon-desktop-2.6.1:0=
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.3.17:3[introspection?]
+	>=x11-libs/gtk+-3.9.10:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 
 	gnome-base/dconf:0=
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	exif? ( >=media-libs/libexif-0.6.20:= )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
 	tracker? ( >=app-misc/tracker-0.12:= )
-	xmp? ( >=media-libs/exempi-2.1.0:= )
+	xmp? ( >=media-libs/exempi-2.2.0:= )
 "
 RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic
diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
new file mode 100644
index 000000000000..a288fdb12e5e
--- /dev/null
+++ b/gnustep-apps/sogo/Manifest
@@ -0,0 +1 @@
+DIST sogo-2.3.2.tar.gz 11440737 SHA256 236812a74afdd388a10edd9b2db27f4bf8e05818d5ddd65fea9b1b43e6c7a223 SHA512 a91a710af1c36e3becf250c60e1430a012b98e9026957c9faf6c7cddc526273296f00d9df2e7c8c830887a96dfa2576ffd2dd0dfb1ed3e6fc6bfa1b9f100b792 WHIRLPOOL 66fcd37f012923f4f500f6b961dface5dab47b99e89788660728274fc752ad229b5728408e5846450e40e8bf17a54c73372ee0a9ab6666e3b100c05cd7f24cad
diff --git a/gnustep-apps/sogo/files/sogod.confd b/gnustep-apps/sogo/files/sogod.confd
new file mode 100644
index 000000000000..906a6978d862
--- /dev/null
+++ b/gnustep-apps/sogo/files/sogod.confd
@@ -0,0 +1,6 @@
+# /etc/conf.d/sogod: config file for /etc/init.d/sogod
+
+SOGOD_WORKERS=3
+
+# Additional options for SOGo
+SOGOD_OPTS=""
diff --git a/gnustep-apps/sogo/files/sogod.initd b/gnustep-apps/sogo/files/sogod.initd
new file mode 100644
index 000000000000..c0dfcdc0c0c7
--- /dev/null
+++ b/gnustep-apps/sogo/files/sogod.initd
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+SOGOD_PID=/run/sogo/sogod.pid
+
+depend() {
+	need net
+	need memcached
+	after postgresql mysql
+	after slapd
+	after mta
+}
+
+start() {
+	checkpath -q -d -m 0755 -o sogo:sogo $(dirname "${SOGOD_PID}")
+	ebegin "Starting SOGo service"
+	start-stop-daemon --start --quiet \
+		--user sogo --exec /usr/sbin/sogod \
+		--	-WOWorkersCount ${SOGOD_WORKERS} \
+			-WOLogFile /var/log/sogo/sogod.log \
+			-WOPidFile "${SOGOD_PID}" \
+			"${SOGOD_OPTS}"
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping SOGo service"
+	start-stop-daemon --stop \
+		--pidfile "${SOGOD_PID}"
+	eend ${?}
+}
diff --git a/gnustep-apps/sogo/metadata.xml b/gnustep-apps/sogo/metadata.xml
new file mode 100644
index 000000000000..f3cc8a88c46c
--- /dev/null
+++ b/gnustep-apps/sogo/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnustep</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type='github'>inverse-inc/sogo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnustep-apps/sogo/sogo-2.3.2.ebuild b/gnustep-apps/sogo/sogo-2.3.2.ebuild
new file mode 100644
index 000000000000..e11cbe4d7b12
--- /dev/null
+++ b/gnustep-apps/sogo/sogo-2.3.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit gnustep-2 user vcs-snapshot
+
+DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
+HOMEPAGE="http://www.sogo.nu"
+SRC_URI="https://github.com/inverse-inc/sogo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls libressl +ssl"
+
+RDEPEND="
+	dev-libs/libmemcached
+	net-misc/curl
+	net-misc/memcached
+	>=gnustep-libs/sope-${PV}[ldap]
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	>=gnustep-base/gnustep-make-2.6.2"
+
+pkg_pretend() {
+	if use ssl && use gnutls && use libressl ; then
+		ewarn "You have enabled both gnutls and libressl, but only"
+		ewarn "one provider can be active. Using gnutls!"
+	fi
+}
+
+pkg_setup() {
+	enewuser sogo -1 /bin/bash /var/lib/sogo
+}
+
+src_prepare() {
+	gnustep-base_src_prepare
+	sed -e "s/validateArgs$//" -i configure \
+		|| die "GNUstep.conf sed failed"
+}
+
+src_configure() {
+	local ssl_provider
+	if use ssl ; then
+		if use gnutls ; then
+			ssl_provider=gnutls
+		else
+			ssl_provider=ssl
+		fi
+	else
+		ssl_provider=none
+	fi
+
+	egnustep_env
+
+	./configure \
+		--disable-strip \
+		--prefix=/usr \
+		--with-ssl="${ssl_provider}" \
+		$(use_enable debug) \
+		|| die "configure failed"
+}
+
+src_install() {
+	gnustep-base_src_install
+
+	newconfd "${FILESDIR}"/sogod.confd sogod
+	newinitd "${FILESDIR}"/sogod.initd sogod
+
+	insinto /etc/logrotate.d
+	newins Scripts/logrotate sogo
+	newdoc Apache/SOGo.conf SOGo-Apache.conf
+
+	insinto /etc/sogo
+	doins Scripts/sogo.conf
+
+	insinto /etc/cron.d
+	newins Scripts/sogo.cron sogo
+	keepdir /var/log/sogo
+
+	fowners sogo:sogo /var/log/sogo
+	fowners -R root:sogo /etc/sogo
+}
+
+pkg_postinst() {
+	gnustep-base_pkg_postinst
+	elog "SOGo documentation is available online at:"
+	elog "http://www.sogo.nu/downloads/documentation.html"
+	elog
+	elog "Apache sample configuration file is available in:"
+	elog "/usr/share/doc/${PF}"
+}
diff --git a/gnustep-libs/sope/Manifest b/gnustep-libs/sope/Manifest
new file mode 100644
index 000000000000..c2ec7f4d9b15
--- /dev/null
+++ b/gnustep-libs/sope/Manifest
@@ -0,0 +1 @@
+DIST sope-2.3.2.tar.gz 2184555 SHA256 f37877eb5915d5a6a3bc831a4d38ef2bd60e7fdaa40354056b10c4cfbc0ecdc1 SHA512 17d0ee6474410692c6b81bf32b730f4352e7d9c367f18c4a53d7aebbbe65aa2ca2f6eeaea8c722c8367835973b96395b932c9fdb81f08fdf79f299a926e14c9d WHIRLPOOL 17ca7912056d6d6a33c70af56c44819eaff8f640a87de76aa8858f2cd85114026ce108d6d424d50b6fa4085649c1873aee1854482379708785a9162fdc94daf1
diff --git a/gnustep-libs/sope/files/sope-2.3.2-optional-deps.patch b/gnustep-libs/sope/files/sope-2.3.2-optional-deps.patch
new file mode 100644
index 000000000000..ffe369e4a367
--- /dev/null
+++ b/gnustep-libs/sope/files/sope-2.3.2-optional-deps.patch
@@ -0,0 +1,138 @@
+From 36e3816a89fd03261d7a50163a4b36a1fa4baded Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@hasufell.de>
+Date: Tue, 3 Nov 2015 17:09:02 +0100
+Subject: [PATCH] configure: allow more explicit control over dependencies
+
+Previously the 'checkLinking <lib> optional' strings caused
+trouble for distributions, because these checks are automagic, as in:
+even if the user doesn't want ldap support, but ldap exists on the
+system, it will still be used, possibly causing problems if
+ldap is removed afterwards.
+
+Making these things explicit fixes those problems. Default is
+still automagic, unless --enable-<feature> or --disable-<feature>
+is passed.
+---
+ configure | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 66 insertions(+), 6 deletions(-)
+
+diff --git a/configure b/configure
+index 0c4b5cf..90ee783 100755
+--- a/configure
++++ b/configure
+@@ -22,6 +22,10 @@ ARG_FHSMAKE="$PWD/fhs-postinstall.make"
+ ARG_WITH_GNUSTEP=0
+ ARG_WITH_DEBUG=1
+ ARG_WITH_STRIP=1
++ARG_WITH_MYSQL=auto
++ARG_WITH_POSTGRESQL=auto
++ARG_WITH_OPENLDAP=auto
++ARG_WITH_XML=auto
+ 
+ DARG_GNUSTEP_SH="$ARG_GSMAKE/GNUstep.sh"
+ DARG_IS_FHS=1
+@@ -65,10 +69,16 @@ Installation directories:
+   --frameworks=DIR        build frameworks and install in DIR
+   --gsmake=PATH           path to gnustep-make tree
+   --configmake=PATH       path to the config file being created
++
++Build flags:
+   --with-gnustep          install in GNUstep tree
+   --enable-debug          turn on debugging and compile time warnings
+   --enable-strip          turn on stripping of debug symbols
+   --with-ssl=SSL          specify ssl library (none, libssl, gnutls, auto) [auto]
++  --enable-xml            Enable xml support (auto if unspecified)
++  --enable-mysql          Enable mysql support (auto if unspecified)
++  --enable-postgresql     Enable postgresql support (auto if unspecified)
++  --enable-openldap       Enable ldap support (auto if unspecified)
+ 
+ _ACEOF
+ 
+@@ -475,9 +485,22 @@ checkDependencies() {
+   cfgwrite ""
+   cfgwrite "# library dependencies"
+   cfgwrite "BASE_LIBS := `gnustep-config --base-libs`"
+-  
+-  checkLinking "xml2"        optional;
+-  checkLinking "ldap"        optional;
++
++  if test "x$ARG_WITH_XML" = "xauto" ; then
++    checkLinking "xml2"        optional;
++  elif test $ARG_WITH_XML = 1 ; then
++    checkLinking "xml2"        required;
++  else
++    cfgwrite "HAS_LIBRARY_xml2=no"
++  fi
++
++  if test "x$ARG_WITH_OPENLDAP" = "xauto" ; then
++    checkLinking "ldap"        optional;
++  elif test $ARG_WITH_OPENLDAP = 1 ; then
++    checkLinking "ldap"        required;
++  else
++    cfgwrite "HAS_LIBRARY_ldap=no"
++  fi
+ 
+   if test "x$ARG_CFGSSL" = "xauto"; then
+       checkLinking "ssl"     optional;
+@@ -490,10 +513,24 @@ checkDependencies() {
+       checkLinking "gnutls"  required;
+   fi
+ 
+-  checkLinking "pq"          optional;
++  if test "x$ARG_WITH_POSTGRESQL" = "xauto" ; then
++    checkLinking "pq"          optional;
++  elif test $ARG_WITH_POSTGRESQL = 1 ; then
++    checkLinking "pq"          required;
++  else
++    cfgwrite "HAS_LIBRARY_pq=no"
++  fi
++
+ #  checkLinking "sqlite3"     optional;
+   cfgwrite "HAS_LIBRARY_sqlite3=no"
+-  checkLinking "mysqlclient" optional;
++
++  if test "x$ARG_WITH_MYSQL" = "xauto" ; then
++    checkLinking "mysqlclient"          optional;
++  elif test $ARG_WITH_MYSQL = 1 ; then
++    checkLinking "mysqlclient" required;
++  else
++    cfgwrite "HAS_LIBRARY_mysqlclient=no"
++  fi
+ }
+ 
+ runIt() {
+@@ -575,7 +612,30 @@ processOption() {
+         extractFuncValue $1;
+         ARG_CFGSSL="$VALUE"
+ 	;;
+-
++    "x--enable-mysql")
++        ARG_WITH_MYSQL=1
++	;;
++    "x--enable-postgresql")
++        ARG_WITH_POSTGRESQL=1
++	;;
++    "x--enable-openldap")
++        ARG_WITH_OPENLDAP=1
++	;;
++    "x--enable-xml")
++        ARG_WITH_XML=1
++	;;
++    "x--disable-mysql")
++        ARG_WITH_MYSQL=0
++	;;
++    "x--disable-postgresql")
++        ARG_WITH_POSTGRESQL=0
++	;;
++    "x--disable-openldap")
++        ARG_WITH_OPENLDAP=0
++	;;
++    "x--disable-xml")
++        ARG_WITH_XML=0
++	;;
+     *) echo "error: cannot process argument: $1"; exit 1; ;;
+   esac
+ }
+-- 
+2.6.1
+
diff --git a/gnustep-libs/sope/metadata.xml b/gnustep-libs/sope/metadata.xml
new file mode 100644
index 000000000000..b82e2bc9012f
--- /dev/null
+++ b/gnustep-libs/sope/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnustep</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type='github'>inverse-inc/sope</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnustep-libs/sope/sope-2.3.2.ebuild b/gnustep-libs/sope/sope-2.3.2.ebuild
new file mode 100644
index 000000000000..b06ce6194efc
--- /dev/null
+++ b/gnustep-libs/sope/sope-2.3.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils gnustep-2 vcs-snapshot
+
+DESCRIPTION="An extensive set of frameworks which form a complete Web application server environment"
+HOMEPAGE="http://www.sogo.nu/"
+SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
+
+RDEPEND="
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	mysql? ( virtual/libmysqlclient:= )
+	postgres? ( dev-db/postgresql:= )
+	xml? ( dev-libs/libxml2:2 )
+"
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+	if use ssl && use gnutls && use libressl ; then
+		ewarn "You have enabled both gnutls and libressl, but only"
+		ewarn "one provider can be active. Using gnutls!"
+	fi
+}
+
+src_prepare() {
+	# https://github.com/inverse-inc/sope/pull/33
+	epatch "${FILESDIR}"/${P}-optional-deps.patch
+	gnustep-base_src_prepare
+}
+
+src_configure() {
+	local ssl_provider
+	if use ssl ; then
+		if use gnutls ; then
+			ssl_provider=gnutls
+		else
+			ssl_provider=ssl
+		fi
+	else
+		ssl_provider=none
+	fi
+
+	egnustep_env
+
+	# Non-standard configure script
+	./configure \
+		--disable-strip \
+		$(use_enable debug) \
+		$(use_enable ldap openldap) \
+		$(use_enable mysql) \
+		$(use_enable postgres postgresql) \
+		$(use_enable xml) \
+		--with-ssl="${ssl_provider}" \
+		--with-gnustep || die "configure failed"
+}
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index cb4e264de842..763758eb42f3 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -1,4 +1,3 @@
-DIST Argyll_V1.6.3_src.zip 10338488 SHA256 188beaa03dd2459403415023f8f8f9aab362bf3062a9822b3622dde6902e4b84 SHA512 7c350c73492d7e2e27354814cfcb172bf1e4bb6ee8f3f71f2003a7d44ed4be9890a6c80d6a69228495645be11a327c0f7c2ab68d6f6621dd938744a1cd7ebe95 WHIRLPOOL a854ebcca1950f3e654ae85fff3189bae17c511c26e2f3dd8104d9b55ddb83022659276fae201899f51a2a27b00c1cf98f157261e50d0fd48f1a8044923e11c6
 DIST Argyll_V1.7.0_src.zip 13935712 SHA256 dac51cf5d8f6d04bb02f2f5b119fa0e8b773a010e6377116768b082ef018f663 SHA512 644683c8a73d36583d607b5d51c543dca8f1e3fb3db8138a164f9ed7f994df7739ee7d810b7136a7cf0eba7b54fe53b35ffbdd4e6915ec20b271325119ce369c WHIRLPOOL e08c6e311856716ee6b49e37c583d8d4275629fb746f018e0d7c768d4c907644dc60545ff2c709217988c668b198dfc95396af3fdf0ccd40d320514854b1c087
-DIST Argyll_V1.8.0_src.zip 13931190 SHA256 02440060b224bf8e42bd7eabe0c857e1311546839391d94bb250dda60e4db13b SHA512 959a581aaf3514a130cae3aa133c385591b53d11e5ee6bb11349ee8614f392baa5f5799ede4d10dda8a3c182fc69a186a5a1738070649acdfb9987aa52f83976 WHIRLPOOL 6b43e3ecff4cde12fa1d6fe51f0a9612019ac1f452eed66e32ce8a834f127ee84119fdbb436cf1266e4e586f534acbf74df1102215d311d69a7f4f723d77a286
 DIST Argyll_V1.8.2_src.zip 13946428 SHA256 59bdfaeace35d2007c90fc53234ba33bf8a64cffc08f7b27a297fc5f85455377 SHA512 fb5a9fcfe558ce0593cc63d43751693dcaca8ed9dc202372bea5d8d54e19c004de0cb80382ffd2b570d9eeeb58584c7466b725d35377c72cbbde414625613d9c WHIRLPOOL 1a7f32f5ac203ae69773c8f40540aed4c2d36b1878ac7e7cc703df8809faa6ca086a249c1f20f5c2b8bb3db652add330b8a555dd34570c79b1da74cd5bb372ed
+DIST Argyll_V1.8.3_src.zip 13933565 SHA256 60494176785f6c2e4e4daefb9452d83859880449040b2a843ed81de3bd0c558e SHA512 19bdba20313ec62b5b3c461d29a4f1eefbeb799ded06a1e0b568013b606547bf97b23c1b69f27d415e0052a7a2b747273131624e725ee21781b261568822b3a7 WHIRLPOOL d0f65bfdee48dcb29c887f371fe787aebac8c9577a1db0f386bb4a17e379ab99d2c0f94bc7474e753b3fd49548028928aeb48d9c0021b8ee5a76ab55575d5ce8
diff --git a/media-gfx/argyllcms/argyllcms-1.6.3.ebuild b/media-gfx/argyllcms/argyllcms-1.6.3.ebuild
deleted file mode 100644
index 0ea5ca709602..000000000000
--- a/media-gfx/argyllcms/argyllcms-1.6.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base flag-o-matic multiprocessing toolchain-funcs udev
-
-MY_P="Argyll_V${PV}"
-
-DESCRIPTION="Open source, ICC compatible color management system"
-HOMEPAGE="http://www.argyllcms.com/"
-SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 hppa ~x86"
-IUSE="doc"
-
-RDEPEND="
-	media-libs/tiff
-	sys-libs/zlib
-	virtual/jpeg
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm
-	x11-libs/libXScrnSaver"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/ftjam"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	)
-
-src_compile() {
-	# Make it respect LDFLAGS
-	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
-
-	# Evil hack to get --as-needed working. The build system unfortunately lists all
-	# the shared libraries by default on the command line _before_ the object to be built...
-	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
-
-	append-cflags -DUNIX -D_THREAD_SAFE
-
-	sed \
-		-e 's:CCFLAGS:CFLAGS:g' \
-		-e "s:ar rusc:$(tc-getAR) rusc:g" \
-		-i Jambase || die
-
-	tc-export CC RANLIB
-
-	jam -dx -fJambase "-j$(makeopts_jobs)" || die
-}
-
-src_install() {
-	jam -dx -fJambase install || die
-
-	rm bin/License.txt || die
-
-	pushd bin > /dev/null
-	local binname
-	for binname in * ; do
-		newbin ${binname} argyll-${binname}
-	done
-	popd > /dev/null
-
-	use doc && dohtml doc/*
-
-	dodoc log.txt Readme.txt ttbd.txt notes.txt
-
-	insinto /usr/share/${PN}
-	doins -r ref
-
-	udev_dorules usb/55-Argyll.rules
-}
-
-pkg_postinst() {
-	elog "If you have a Spyder2 you need to extract the firmware"
-	elog "from the CVSpyder.dll of the windows driver package"
-	elog "and store it as /usr/share/color/spyd2PLD.bin"
-	echo
-	elog "For further info on setting up instrument access read"
-	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
-	echo
-}
diff --git a/media-gfx/argyllcms/argyllcms-1.8.0.ebuild b/media-gfx/argyllcms/argyllcms-1.8.3.ebuild
similarity index 95%
rename from media-gfx/argyllcms/argyllcms-1.8.0.ebuild
rename to media-gfx/argyllcms/argyllcms-1.8.3.ebuild
index eac1ccdc5706..13b3448b2c54 100644
--- a/media-gfx/argyllcms/argyllcms-1.8.0.ebuild
+++ b/media-gfx/argyllcms/argyllcms-1.8.3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit base flag-o-matic multiprocessing toolchain-funcs udev
+inherit flag-o-matic multiprocessing toolchain-funcs udev
 
 MY_P="Argyll_V${PV}"
 
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${PN}-1.8.0-gcc5.patch
 	)
 
 src_compile() {
diff --git a/media-gfx/meshlab/files/1.3.3/meshrender.patch b/media-gfx/meshlab/files/1.3.3/meshrender.patch
new file mode 100644
index 000000000000..382e21ca2f0d
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/meshrender.patch
@@ -0,0 +1,15 @@
+--- meshlab/src/meshlabplugins/render_gdp/meshrender.cpp	2014-02-07 10:38:28.000000000 +0100
++++ meshlab/src/meshlabplugins/render_gdb/meshrender.cpp	2015-11-15 22:17:39.848179962 +0100
+@@ -36,8 +36,11 @@
+ 	/*QAction * qaNone = new QAction("None", this); 
+ 	qaNone->setCheckable(false);
+ 	actionList << qaNone;*/
+-
++#if defined(Q_OS_LINUX)
++	QDir shadersDir = QDir("/usr/share/meshlab");
++#else
+ 	QDir shadersDir = QDir(qApp->applicationDirPath());
++#endif
+ #if defined(Q_OS_WIN)
+ 	if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins"  )
+ 		shadersDir.cdUp();
diff --git a/media-gfx/meshlab/files/1.3.3/pluginmanager.patch b/media-gfx/meshlab/files/1.3.3/pluginmanager.patch
new file mode 100644
index 000000000000..00f3ba8c1822
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/pluginmanager.patch
@@ -0,0 +1,14 @@
+--- meshlab/src/common/pluginmanager.cpp~	2014-04-01 17:07:40.000000000 +0200
++++ meshlab/src/common/pluginmanager.cpp	2015-11-15 20:58:53.708227793 +0100
+@@ -178,7 +178,11 @@
+ 
+ QString PluginManager::getBaseDirPath()
+ {
++#if defined(Q_OS_LINUX)
++  QDir baseDir("/usr/lib/meshlab");
++#else
+   QDir baseDir(qApp->applicationDirPath());
++#endif
+ 
+ #if defined(Q_OS_WIN)
+   // Windows:
diff --git a/media-gfx/meshlab/files/1.3.3/rfx.patch b/media-gfx/meshlab/files/1.3.3/rfx.patch
new file mode 100644
index 000000000000..9cac55959910
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/rfx.patch
@@ -0,0 +1,14 @@
+--- meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp~	2014-02-07 10:38:29.000000000 +0100
++++ meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp	2015-11-16 00:07:34.868113218 +0100
+@@ -55,7 +55,11 @@
+ 
+ void RenderRFX::initActionList()
+ {
++#if defined(Q_OS_LINUX)
++	QDir shadersDir("/usr/share/meshlab");
++#else
+ 	QDir shadersDir = PluginManager::getBaseDirPath();
++#endif
+ 
+ #if defined(Q_OS_WIN)
+ 	if (shadersDir.dirName() == "debug"   ||
diff --git a/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch b/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch
new file mode 100644
index 000000000000..59f3333a7311
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch
@@ -0,0 +1,15 @@
+--- meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp~	2013-05-22 17:08:53.000000000 +0200
++++ meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp	2015-11-15 23:18:04.678143277 +0100
+@@ -63,7 +63,12 @@
+ 
+ void RmMeshShaderRenderPlugin::initActionList() {
+ 
++#if defined(Q_OS_LINUX)
++	QDir shadersDir = QDir("/usr/share/meshlab/shaders");
++#else
+ 	QDir shadersDir = QDir(qApp->applicationDirPath());
++#endif
++
+ #if defined(Q_OS_WIN)
+ 	if (shadersDir.dirName() == "debug" ||
+ 	    shadersDir.dirName() == "release" ||
diff --git a/media-gfx/meshlab/meshlab-1.3.3.ebuild b/media-gfx/meshlab/meshlab-1.3.3.ebuild
index 10241aa0e5ba..e8d6cb2c9969 100644
--- a/media-gfx/meshlab/meshlab-1.3.3.ebuild
+++ b/media-gfx/meshlab/meshlab-1.3.3.ebuild
@@ -36,7 +36,11 @@ src_prepare() {
 		"${FILESDIR}/${PV}"/lapack.patch \
 		"${FILESDIR}/${PV}"/mpir.patch \
 		"${FILESDIR}/${PV}"/qt-4.8.patch \
-		"${FILESDIR}/${PV}"/rpath.patch
+		"${FILESDIR}/${PV}"/rpath.patch \
+		"${FILESDIR}/${PV}"/pluginmanager.patch \
+		"${FILESDIR}/${PV}"/meshrender.patch \
+		"${FILESDIR}/${PV}"/rmmeshrender.patch \
+		"${FILESDIR}/${PV}"/rfx.patch
 }
 
 src_configure() {
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index b3b9baeaa582..c53b787bc1c4 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,3 +1 @@
-DIST simple-scan-3.14.3.tar.xz 483900 SHA256 bb26128b6cce329932209fceed1bf8c21f0847f543aa417946682d413640c01b SHA512 0985c759daef2f08df280b89faf7c3a1b304a4e5b380c68fda2dd36ab480406ecc4e5a9d68e09042f78450ca614726e1b6068ed45342edfe59636d378ccf6e37 WHIRLPOOL 0f4a023effcc0151cf5c2c43efca92b3d517ef6a44fb001f2a214eb66da2694443b0d8e7e8c403b15fc6257190a3d6f2bbd73e3cfc101816452b583005eec17e
-DIST simple-scan-3.16.1.tar.xz 487764 SHA256 f0fdb236336ddaa82390bc4647aa8df0037e8efe87a45ae37e9cb9144c82ee9d SHA512 15be4a3263cc28e027bc1f868f7894a39faf8f622d2f98a24d84704fae34be8526754a9776a8ab87f63ce34ba53871d76bbb452ee4ac16db9cb9a9b9d8d011d5 WHIRLPOOL f61ee901c77f9f0a380dfa4264c53072cb750fdf3e558e12024bb9872001884cdcc319f5f64ae711e62827d8e34e2a9a38adbe08891dfd9b197df1f49def5367
 DIST simple-scan-3.16.2.tar.xz 487808 SHA256 1c6727591813e7fd44da932adbae226001ce3a7b8f1a162c9b19d1dc630d7402 SHA512 5f665698f7c7bad57a41bfbb388c6861839cc56d6d25dbd74ea563d64fab63b6fd798f2b957b46ae69177b7e15963ef8f17d26f2a071bf89b6f1e2b6e7f1a835 WHIRLPOOL 098d8f3b16d3bac85e12d3034902df84fa1e3b76a346277114d3f19b5f8fd5a80b84fc1e88b595035cdfa483bdac952128ab20fd16f0f68040455f8afffa74db
diff --git a/media-gfx/simple-scan/simple-scan-3.14.3.ebuild b/media-gfx/simple-scan/simple-scan-3.14.3.ebuild
deleted file mode 100644
index 1a66ee63d5e0..000000000000
--- a/media-gfx/simple-scan/simple-scan-3.14.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://launchpad.net/simple-scan"
-
-MY_PV=$(get_version_component_range 1-2)
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=media-gfx/sane-backends-1.0.20:=
-	>=sys-libs/zlib-1.2.3.1:=
-	virtual/jpeg:0=
-	virtual/libgudev:=
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3:3
-	|| (
-		>=x11-misc/colord-0.1.24:=[udev]
-		x11-misc/colord:=[scanner] )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	x11-themes/gnome-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="NEWS README.md"
-	gnome2_src_configure \
-		VALAC=$(type -P true)
-}
diff --git a/media-gfx/simple-scan/simple-scan-3.16.1.ebuild b/media-gfx/simple-scan/simple-scan-3.16.1.ebuild
deleted file mode 100644
index 7bbe6296daa4..000000000000
--- a/media-gfx/simple-scan/simple-scan-3.16.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://launchpad.net/simple-scan"
-
-MY_PV=$(get_version_component_range 1-2)
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=media-gfx/sane-backends-1.0.20:=
-	>=sys-libs/zlib-1.2.3.1:=
-	virtual/jpeg:0=
-	virtual/libgudev:=
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3:3
-	>=x11-misc/colord-0.1.24:=[udev]
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	|| (
-		x11-themes/adwaita-icon-theme
-		x11-themes/gnome-icon-theme )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="NEWS README.md"
-	gnome2_src_configure \
-		VALAC=$(type -P true)
-}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 5abce9b43558..95c4c1b744c8 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,3 +1,2 @@
-DIST harfbuzz-0.9.38.tar.bz2 1177106 SHA256 6736f383b4edfcaaeb6f3292302ca382d617d8c79948bb2dd2e8f86cdccfd514 SHA512 7638853a33bafa139d3a87b2733e89d19239c2ef13afcd1bb0dac3a0f95f786caaaf327560c1714d502ee0adcc2bb068ee6095e81b501a66f8c7559394f1458e WHIRLPOOL 79278d7db00a401af036f35bb90d7dd058b99bc13095f5ba4dac97e68372b51b8192dc0538667ff67b13e39c97318df8351c9c5f5482cc1af7c3bc6764cd534e
-DIST harfbuzz-0.9.40.tar.bz2 1182989 SHA256 1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f SHA512 9dcc8f5790b78efa14d328e48c68d97f44fce8658fdad9f6d46a79feb715a57903064087d2aef6cea84904936c27c623583b4c67d0e21511a4b82a9213d86eff WHIRLPOOL 4b450d4a1a02bb846de582f84a63483182d3b2f071e54abd2a58b2b9d88c25eb7b880a961584ad087bee8c1eae2789446a9da29634f22467f00d72e7b90eb0d2
 DIST harfbuzz-0.9.41.tar.bz2 1188176 SHA256 d81aa53d0c02b437beeaac159d7fc16394d676bbce0860fb6f6a10b587dc057c SHA512 821b2fbd0d668c90e9e0040f60b7cfd8d35954d218045cebfb5e9c6ba29aba4230d0cd8e951697c26afcc4da447177fe967fa323449499fa710b52dd7e1a7011 WHIRLPOOL 84ba899d8fbc27b19d255d3c40e2d1f92c8c0dcc0a764b5c83c8c470af4902891f954d11aa64b6eb69aac0e8cf55c36ee9babff0a9260fc9f6286ce48330accb
+DIST harfbuzz-1.0.6.tar.bz2 1240522 SHA256 f616a7fbdc78a627043f9029000bf08c0c71df59cde4143fc92a014f6a993b26 SHA512 20ee169389a784e4ad4e2ff006a59a36879dba0a37a999ff51c2b4d76da9496a1a747d5176e9611998187452e6d18f880295bdfb9f45338acddf772fc3f16021 WHIRLPOOL 63eab91311674417b66fa92e0b92a5482321dfa8dc48edcc3ae1ed459483222ab08229438356245cc183234a65388fbb6bdb73222359dea0ec2a35a1bf141c78
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.38.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.38.ebuild
deleted file mode 100644
index 2cae8120bcca..000000000000
--- a/media-libs/harfbuzz/harfbuzz-0.9.38.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils libtool multilib-minimal python-any-r1
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
-[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="+cairo +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34 )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-	dev-util/ragel
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
-	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	econf \
-		--without-coretext \
-		--without-uniscribe \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with cairo) \
-		$(use_with glib) \
-		$(use_with introspection gobject) \
-		$(use_with graphite graphite2) \
-		$(use_with icu) \
-		$(multilib_native_use_enable introspection) \
-		$(use_with truetype freetype)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/html docs/reference/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.40.ebuild b/media-libs/harfbuzz/harfbuzz-1.0.6.ebuild
similarity index 90%
rename from media-libs/harfbuzz/harfbuzz-0.9.40.ebuild
rename to media-libs/harfbuzz/harfbuzz-1.0.6.ebuild
index 7b0789786d53..cdfd7a5ea536 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.40.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.0.6.ebuild
@@ -19,15 +19,17 @@ LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="+cairo +glib +graphite icu +introspection static-libs test +truetype"
+
+IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
 
 RDEPEND="
 	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
 	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
 	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
 	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34 )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
@@ -77,6 +79,7 @@ multilib_src_configure() {
 		--without-uniscribe \
 		$(use_enable static-libs static) \
 		$(multilib_native_use_with cairo) \
+		$(use_with fontconfig) \
 		$(use_with glib) \
 		$(use_with introspection gobject) \
 		$(use_with graphite graphite2) \
@@ -85,7 +88,7 @@ multilib_src_configure() {
 		$(use_with truetype freetype)
 
 	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/html docs/reference/html || die
+		ln -s "${S}"/docs/html docs/html || die
 	fi
 }
 
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 872f59d90a4c..4cede3bc9010 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,2 +1,2 @@
 DIST gnome-music-3.16.2.tar.xz 1479984 SHA256 362cf90f6cd41c38845b7afa01ce2f5fbb70ce7694139a69f5dac16620723588 SHA512 c634a72f5c539e7e0792f780dcced1b48c56a0467182ab60506d3d22d1b7b7ff030b79f440ea874b8fca5b084bc121668cd5f03f2eb3ffbd82b7fa810a2885d2 WHIRLPOOL e576f033d1194ea7b9232d420a3e5e4a895ce6836f0e4d592579ea0baeab2b3113f9cf3eafa2f17922ad14c2f45e9b79f07291664ab7404000d74d421bf0c9b4
-DIST gnome-music-3.18.0.tar.xz 1534760 SHA256 e2e4b99a57c7b5c83ce3deccd38880cbafb875b423ab276204af523bc648d69c SHA512 4a87cce71b7ca3dc0aa7e4e64a7d427297fbb08d300e18444bc4acbf637c4c23e34f130c5d72c80e8b052d452b3b962066ee7d3df6f20686f3202a025a5173da WHIRLPOOL 379f6402752f1e73b4ed30db6c854dfd657b63b29b0f02dacf776a058428a9a5e2a0ad454d86abc644f2bcac1e0164d84a6cf3b2bc7e2d7df2e6a966e1a950b3
+DIST gnome-music-3.18.2.tar.xz 14110 SHA256 5e91d2a8f5935ec87192878dae0ab46886dc010e9a368e3d420e8c6961e1625e SHA512 74e50aef97ba18494322273aea9253cbcbee8a77dfc804cb1e58be78ece0f6d655609a9b02f5a1d1322deadea4fa4fb259801d76dbbe17815c8fbbfb41fa700a WHIRLPOOL 6b5c9f32d0fdc104e3f966d43485b9d939baca3fc9a9a1167ffb98791cbb0e29d50e231ca4fc4e90f6c9728f7cf6f73bcbd2a3eae036755a000e9a8215bcc105
diff --git a/media-sound/gnome-music/gnome-music-3.18.0.ebuild b/media-sound/gnome-music/gnome-music-3.18.2.ebuild
similarity index 96%
rename from media-sound/gnome-music/gnome-music-3.18.0.ebuild
rename to media-sound/gnome-music/gnome-music-3.18.2.ebuild
index 324407d40ac9..601462fb00a3 100644
--- a/media-sound/gnome-music/gnome-music-3.18.0.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.18.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_3,3_4} )
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
 
 inherit gnome2 python-r1
 
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index d349256799e2..0fc45b082094 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,2 +1,2 @@
 DIST sound-juicer-3.16.1.tar.xz 811148 SHA256 dfb744504a60f8069257584b74d90cba1ce99c744a7106b68627ad1d40b2a657 SHA512 9d9065942f0bdb2609f03cc561186cfdf67042e986a0f4a0e23835e56c210335f87c351a4d7e44a7dbb3960af19a3e6ba2dc3d1d6c6a5ce62bb27cfc2ea52352 WHIRLPOOL 86859d332610f8228660be213495212e89eb09a743214e10229e144858c147c64638c94ff89fef4dffb97477ba8d196e0385e64e3a942fea2e959d14f74c6678
-DIST sound-juicer-3.18.0.tar.xz 817904 SHA256 0525cfcdf76379d7aa5255fae2cde9e44ad0a24b12ac953d4fbc3dc55dfab048 SHA512 3a450cf2fd4de7386b9883947085711e7537f50dc493c386257d471fde27beaaabcd4d3756ccc7fdd74a0924c4c4f2c21845a571e15c056256c92ab398bd454d WHIRLPOOL dd91ac8f5496a3ba7360d10efc2b44b9128b5f4862559de54943a6359d783c3e89035708a41b7f6667e153e60b41572963efe33ace2f7470547f181882ad261e
+DIST sound-juicer-3.18.1.tar.xz 819428 SHA256 526d5a84d9b6b8f002f82f9d5678e3850c48e3b5692a499451fc5f36eef0de76 SHA512 00091ab962409c97afee7dec0c8a4135c33203a439584c33f958e883338df9d4bbc8022e9541fcf061ab09bb14844f3d2480deb703709a4d077f0f07788462f2 WHIRLPOOL 74cd69c719da6cfec62b04c80e4919d4366c324a518fddcdad45ea2d7bd82c6470c80cbba76b4f79069c9433f97271e9c9ce945c878cfb92556a22ea529228cd
diff --git a/media-sound/sound-juicer/sound-juicer-3.18.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild
similarity index 95%
rename from media-sound/sound-juicer/sound-juicer-3.18.0.ebuild
rename to media-sound/sound-juicer/sound-juicer-3.18.1.ebuild
index dcddfd69296f..4ef2e3b3d353 100644
--- a/media-sound/sound-juicer/sound-juicer-3.18.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="flac test vorbis"
 
 COMMON_DEPEND="
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index dee6b3f268a4..b61d2e2bc6a4 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,3 +1,2 @@
-DIST cheese-3.12.2.tar.xz 1777924 SHA256 a7b45369e75e222e3bd5e9a4408a0e6c230be0c49d359a387d36a42e17e3bc64 SHA512 4548ac903cc435f8ab5e55fbf684239d9a8da2413448506a1bfd6a387348e9b8b08dc3f292e8eff5bab3491ff079cadcb901f82fd42dadd75b801e154a15cdf3 WHIRLPOOL a8312e428771059cbdc982e458bb119af507e2a667f2af9743cdfe2ed6a25829432e7ea7a5dca27932999b7f3ab1cf16f99a0b31cec8f9094fd9941b85b57dfb
-DIST cheese-3.14.2.tar.xz 1804900 SHA256 3074a567e0080d7b8fc0512bf3b08c3397e38083cce1767104624288f033a517 SHA512 cf89baab6858bd2fa100e4dec24067d0bcc49f27632331b99a4f442f235ffca14630af2bf11317cbdc3850202c71bab1920101b9190091c2f0ff9bd4274c0753 WHIRLPOOL 7c909d3d991d97b674a0edd48e639e11d1c81eb9b938861c6f5555f722785f1f9c5b6a74ca79820d6c7bb24ba159154fc402a19248dcadcc1e3aea444b11bc4e
 DIST cheese-3.16.1.tar.xz 1823864 SHA256 44622f6ad6d8703b22c6d40219ae317959495ccc9994b563b324592933ff90a0 SHA512 c5af1fb76b53e8f1331f5e30052c05f5555eb6baf1c6e0a3b63c962e99507c83240175b5e1d84817425a34f0f1ebd3c51ea126799873390685f61ae4a7add043 WHIRLPOOL 901cd41f7923d456f7f7f78ac248014e9223eba41e3560e3198c160250b9c148bb1c35dd2c22df6560b97c30a2ba278c54dbc626b752100de473561bd1e77785
+DIST cheese-3.18.1.tar.xz 1829408 SHA256 fc9d8798b1f0c6b35731f063869a32c6910bab6d0386b9ea36386ebda0d57177 SHA512 37e48f393521b242750d0cbda31537564cd63d2ceb4b3ea6a066c758c8bc9ac632dcbe4ee0ec0b36405c54058ea98ff5744ed087bf928445ffa58fdd2b04d2f7 WHIRLPOOL b996dcfb5f4d3ab72811d7f072dc16d7c0c17109664ce84581659d70786585738b169949f4c9fe2f72df8b48401a30fde96c2557f2a1d888d7bafd38f5de2fef
diff --git a/media-video/cheese/cheese-3.12.2-r1.ebuild b/media-video/cheese/cheese-3.12.2-r1.ebuild
deleted file mode 100644
index 379a9859f9f7..000000000000
--- a/media-video/cheese/cheese-3.12.2-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
-HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
-
-LICENSE="GPL-2+"
-SLOT="0/7" # subslot = libcheese soname version
-IUSE="+introspection test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# using clutter-gst-2.0.0 results in GLSL errors; bug #478702
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39.90:2
-	>=x11-libs/gtk+-3.10:3[introspection?]
-	>=x11-libs/cairo-1.10:=
-	>=x11-libs/pango-1.28.0
-	>=gnome-base/gnome-desktop-2.91.6:3=
-	>=gnome-base/librsvg-2.32.0:2
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=media-libs/clutter-1.13.2:1.0[introspection?]
-	>=media-libs/clutter-gtk-0.91.8:1.0
-	>=media-libs/clutter-gst-2.0.6:2.0
-	media-libs/cogl:1.0=[introspection?]
-
-	media-video/gnome-video-effects
-	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
-	x11-libs/libX11
-	x11-libs/libXtst
-
-	media-libs/gstreamer:1.0[introspection?]
-	media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X]
-
-	virtual/libgudev:=
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-bad:1.0
-	media-libs/gst-plugins-good:1.0
-
-	media-plugins/gst-plugins-jpeg:1.0
-	media-plugins/gst-plugins-v4l2:1.0
-	media-plugins/gst-plugins-vpx:1.0
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-text/docbook-xml-dtd:4.3
-	app-text/yelp-tools
-	dev-libs/libxml2:2
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50
-	virtual/pkgconfig
-	x11-proto/xf86vidmodeproto
-	test? ( dev-libs/glib:2[utils] )
-"
-
-src_prepare() {
-	# FIXME: looks like a regression from an underlying library
-	sed -e 's|\(g_test_add_func.*photo_path.*;\)|/*\1*/|' \
-	    -e 's|\(g_test_add_func.*video_path.*;\)|/*\1*/|' \
-		-i "${S}"/tests/test-libcheese.c || die
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		GST_INSPECT=$(type -P true) \
-		$(use_enable introspection) \
-		--disable-lcov \
-		--disable-static \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Clutter-related sandbox violations when USE="doc introspection" and
-	# FEATURES="-userpriv" (see bug #385917).
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/media-video/cheese/cheese-3.16.1.ebuild b/media-video/cheese/cheese-3.16.1.ebuild
index 027a716dc2d8..4127212a050f 100644
--- a/media-video/cheese/cheese-3.16.1.ebuild
+++ b/media-video/cheese/cheese-3.16.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 LICENSE="GPL-2+"
 SLOT="0/7" # subslot = libcheese soname version
 IUSE="+introspection test"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # using clutter-gst-2.0.0 results in GLSL errors; bug #478702
 COMMON_DEPEND="
diff --git a/media-video/cheese/cheese-3.14.2.ebuild b/media-video/cheese/cheese-3.18.1.ebuild
similarity index 89%
rename from media-video/cheese/cheese-3.14.2.ebuild
rename to media-video/cheese/cheese-3.18.1.ebuild
index 027a716dc2d8..5a9424fc3c34 100644
--- a/media-video/cheese/cheese-3.14.2.ebuild
+++ b/media-video/cheese/cheese-3.18.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 LICENSE="GPL-2+"
 SLOT="0/7" # subslot = libcheese soname version
 IUSE="+introspection test"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # using clutter-gst-2.0.0 results in GLSL errors; bug #478702
 COMMON_DEPEND="
@@ -24,7 +24,7 @@ COMMON_DEPEND="
 	>=media-libs/libcanberra-0.26[gtk3]
 	>=media-libs/clutter-1.13.2:1.0[introspection?]
 	>=media-libs/clutter-gtk-0.91.8:1.0
-	>=media-libs/clutter-gst-2.0.6:2.0
+	media-libs/clutter-gst:3.0
 	media-libs/cogl:1.0=[introspection?]
 
 	media-video/gnome-video-effects
@@ -36,10 +36,10 @@ COMMON_DEPEND="
 	media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X]
 
 	virtual/libgudev:=
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 "
 RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-bad:1.0
+	>=media-libs/gst-plugins-bad-1.4:1.0
 	media-libs/gst-plugins-good:1.0
 
 	media-plugins/gst-plugins-jpeg:1.0
@@ -55,6 +55,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gdbus-codegen
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.50
+	dev-util/itstool
 	virtual/pkgconfig
 	x11-proto/xf86vidmodeproto
 	test? ( dev-libs/glib:2[utils] )
@@ -70,8 +71,7 @@ src_configure() {
 		GST_INSPECT=$(type -P true) \
 		$(use_enable introspection) \
 		--disable-lcov \
-		--disable-static \
-		ITSTOOL=$(type -P true)
+		--disable-static
 }
 
 src_compile() {
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 2c4d85af6ac3..2e099343fb00 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 17 Nov 2015 09:50:28 +0000
+Wed, 18 Nov 2015 05:50:59 +0000
diff --git a/metadata/glsa/glsa-201511-02.xml b/metadata/glsa/glsa-201511-02.xml
new file mode 100644
index 000000000000..5118dc08b830
--- /dev/null
+++ b/metadata/glsa/glsa-201511-02.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201511-02">
+  <title>Adobe Flash Player: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Adobe Flash Player, the
+    worst of which allows remote attackers to execute arbitrary code. 
+  </synopsis>
+  <product type="ebuild">adobe-flash</product>
+  <announced>November 17, 2015</announced>
+  <revised>November 17, 2015: 1</revised>
+  <bug>563014</bug>
+  <bug>563172</bug>
+  <bug>565318</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-plugins/adobe-flash" auto="yes" arch="*">
+      <unaffected range="ge">11.2.202.548</unaffected>
+      <vulnerable range="lt">11.2.202.548</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>The Adobe Flash Player is a renderer for the SWF file format, which is
+      commonly used to provide interactive websites. 
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Adobe Flash Player.
+      Please review the CVE identifiers referenced below for details. 
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process, cause a Denial of Service condition, obtain
+      sensitive information, or bypass security restrictions. 
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Adobe Flash Player users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-plugins/adobe-flash-11.2.202.548"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-5569">CVE-2015-5569</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7625">CVE-2015-7625</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7626">CVE-2015-7626</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7627">CVE-2015-7627</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7628">CVE-2015-7628</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7629">CVE-2015-7629</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7630">CVE-2015-7630</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7631">CVE-2015-7631</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7632">CVE-2015-7632</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7633">CVE-2015-7633</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7634">CVE-2015-7634</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7643">CVE-2015-7643</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7644">CVE-2015-7644</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7645">CVE-2015-7645</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7646">CVE-2015-7646</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7647">CVE-2015-7647</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7648">CVE-2015-7648</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7651">CVE-2015-7651</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7652">CVE-2015-7652</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7653">CVE-2015-7653</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7654">CVE-2015-7654</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7655">CVE-2015-7655</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7656">CVE-2015-7656</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7657">CVE-2015-7657</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7658">CVE-2015-7658</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7659">CVE-2015-7659</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7660">CVE-2015-7660</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7661">CVE-2015-7661</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7662">CVE-2015-7662</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7663">CVE-2015-7663</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-8042">CVE-2015-8042</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-8043">CVE-2015-8043</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-8044">CVE-2015-8044</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-8046">CVE-2015-8046</uri>
+  </references>
+  <metadata tag="requester" timestamp="Sat, 31 Oct 2015 14:56:04 +0000">K_F</metadata>
+  <metadata tag="submitter" timestamp="Tue, 17 Nov 2015 11:42:29 +0000">K_F</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9cf6a76637df..2e099343fb00 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 17 Nov 2015 09:50:29 +0000
+Wed, 18 Nov 2015 05:50:59 +0000
diff --git a/metadata/md5-cache/app-admin/ansible-1.9.3 b/metadata/md5-cache/app-admin/ansible-1.9.3
deleted file mode 100644
index 432988dfef4e..000000000000
--- a/metadata/md5-cache/app-admin/ansible-1.9.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/keyczar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/passlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git ) 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(-)]
-DESCRIPTION=Radically simple deployment, model-driven configuration management, and command execution framework
-EAPI=5
-HOMEPAGE=http://ansible.com/
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/keyczar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh 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=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible/ansible-1.9.3.tar.gz
-_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=c3afbdf6a6626f4bd5eb9cdcdcab566d
diff --git a/metadata/md5-cache/app-admin/ansible-1.9.4 b/metadata/md5-cache/app-admin/ansible-1.9.4
index 3492edf098ab..4167adfc4366 100644
--- a/metadata/md5-cache/app-admin/ansible-1.9.4
+++ b/metadata/md5-cache/app-admin/ansible-1.9.4
@@ -4,7 +4,7 @@ DESCRIPTION=Radically simple deployment, model-driven configuration management,
 EAPI=5
 HOMEPAGE=http://ansible.com/
 IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/keyczar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh 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=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-1.9.4.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=e718b7004d73dc6de3cdbe21618bbef1
+_md5_=c3afbdf6a6626f4bd5eb9cdcdcab566d
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index 68ba7e096b4d..a3c04e5d8b8d 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	git-r3	1502b9838d043db47700b8120083e637	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=dae8024a32611e4310f473ac6c78a79f
+_md5_=590f0f5809b45283b1718a12c080a8ab
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-25.0.50_pre20151113 b/metadata/md5-cache/app-editors/emacs-vcs-25.0.50_pre20151113
new file mode 100644
index 000000000000..e7f6af890b84
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-vcs-25.0.50_pre20151113
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=sys-libs/ncurses:0 >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr sys-apps/paxctl ) !<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=The extensible, customizable, self-documenting real-time display editor
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=sys-libs/ncurses:0 >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) )
+REQUIRED_USE=?? ( aqua X )
+SLOT=25
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-25.0.50_pre20151113.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-25.0.50_pre20151113.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	73c48c11ad6a6494eda0d0cca848c8fa	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=bb584dbf3a7c4d8c166c7fb888ba6ba2
diff --git a/metadata/md5-cache/app-emulation/spice-0.12.6 b/metadata/md5-cache/app-emulation/spice-0.12.6-r1
similarity index 57%
rename from metadata/md5-cache/app-emulation/spice-0.12.6
rename to metadata/md5-cache/app-emulation/spice-0.12.6-r1
index 36f1288358ef..0704f58a4628 100644
--- a/metadata/md5-cache/app-emulation/spice-0.12.6
+++ b/metadata/md5-cache/app-emulation/spice-0.12.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=app-emulation/spice-protocol-0.12.10 virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pyparsing-1.5.6-r2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( dev-lang/python:3.4 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) smartcard? ( app-emulation/qemu[smartcard] ) >=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) libressl? ( dev-libs/libressl[static-libs(+)?] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) client? ( media-libs/alsa-lib >=x11-libs/libXrandr-1.2 x11-libs/libX11 x11-libs/libXext >=x11-libs/libXinerama-1.0 x11-libs/libXfixes x11-libs/libXrender smartcard? ( app-emulation/qemu[smartcard] ) )
+DEPEND=>=app-emulation/spice-protocol-0.12.10 virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pyparsing-1.5.6-r2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( dev-lang/python:3.4 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/six[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) smartcard? ( app-emulation/qemu[smartcard] ) >=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) libressl? ( dev-libs/libressl[static-libs(+)?] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) client? ( media-libs/alsa-lib >=x11-libs/libXrandr-1.2 x11-libs/libX11 x11-libs/libXext >=x11-libs/libXinerama-1.0 x11-libs/libXfixes x11-libs/libXrender smartcard? ( app-emulation/qemu[smartcard] ) )
 DESCRIPTION=SPICE server and client
 EAPI=5
 HOMEPAGE=http://spice-space.org/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[
 SLOT=0
 SRC_URI=http://spice-space.org/download/releases/spice-0.12.6.tar.bz2
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=36e172b7176c20e5cdef877b5c9cc4aa
+_md5_=bbc3b54cc777986ac389f0ab1fea6104
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.55 b/metadata/md5-cache/app-emulation/wine-1.7.55
index 3f875ddc64be..bb6f060a1208 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.55
+++ b/metadata/md5-cache/app-emulation/wine-1.7.55
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://dl.winehq.org/wine/source/1.7/wine-1.7.55.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.40/wine_gecko-2.40-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.40/wine_gecko-2.40-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( https://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) https://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.55.tar.gz -> wine-staging-1.7.55.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	588052cacdf74572e68bdfeaece20534	l10n	714aaf78929eade946da5eaff7d2001a	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	pax-utils	9dd3f9de6dccb2463faf55e568439d1c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
-_md5_=609bb99da7b2c59577d71c663a85fd65
+_md5_=98d14750436e765578993078d5b9411c
diff --git a/metadata/md5-cache/app-emulation/wine-9999 b/metadata/md5-cache/app-emulation/wine-9999
index dbb507f55e84..68ec56ec4f17 100644
--- a/metadata/md5-cache/app-emulation/wine-9999
+++ b/metadata/md5-cache/app-emulation/wine-9999
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.40/wine_gecko-2.40-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.40/wine_gecko-2.40-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( https://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) https://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	git-r3	1502b9838d043db47700b8120083e637	gnome2-utils	588052cacdf74572e68bdfeaece20534	l10n	714aaf78929eade946da5eaff7d2001a	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	pax-utils	9dd3f9de6dccb2463faf55e568439d1c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
-_md5_=609bb99da7b2c59577d71c663a85fd65
+_md5_=98d14750436e765578993078d5b9411c
diff --git a/metadata/md5-cache/app-eselect/eselect-python-20151117 b/metadata/md5-cache/app-eselect/eselect-python-20151117
new file mode 100644
index 000000000000..ebe458230ef7
--- /dev/null
+++ b/metadata/md5-cache/app-eselect/eselect-python-20151117
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst prepare
+DESCRIPTION=Eselect module for management of multiple Python versions
+EAPI=5
+HOMEPAGE=https://www.gentoo.org/proj/en/Python/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=app-admin/eselect-1.2.3 >=dev-lang/python-exec-2.1:2 !<dev-lang/python-2.7.10-r4:2.7 !<dev-lang/python-3.3.5-r4:3.3 !<dev-lang/python-3.4.3-r4:3.4 !<dev-lang/python-3.5.0-r3:3.5
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/eselect-python-20151117.tar.bz2
+_md5_=b957a44ceae6aa66c48f76092c2f20f0
diff --git a/metadata/md5-cache/app-eselect/eselect-python-99999999 b/metadata/md5-cache/app-eselect/eselect-python-99999999
index d9dacdfbaaf1..84837da8b408 100644
--- a/metadata/md5-cache/app-eselect/eselect-python-99999999
+++ b/metadata/md5-cache/app-eselect/eselect-python-99999999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=install postinst unpack
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=install postinst preinst prepare unpack
+DEPEND=!<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-vcs/git-1.8.2.1
 DESCRIPTION=Eselect module for management of multiple Python versions
-EAPI=0
+EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/Python/
 LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3
+RDEPEND=>=app-admin/eselect-1.2.3 >=dev-lang/python-exec-2.1:2 !<dev-lang/python-2.7.10-r4:2.7 !<dev-lang/python-3.3.5-r4:3.3 !<dev-lang/python-3.4.3-r4:3.4 !<dev-lang/python-3.5.0-r3:3.5
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	git-r3	1502b9838d043db47700b8120083e637	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=10763dfbc35b4aabba90cf8b8f786e72
+_md5_=b957a44ceae6aa66c48f76092c2f20f0
diff --git a/metadata/md5-cache/app-office/pinpoint-0.1.5_pre20141026 b/metadata/md5-cache/app-office/pinpoint-0.1.5_pre20141026
deleted file mode 100644
index 7c04ba3318e0..000000000000
--- a/metadata/md5-cache/app-office/pinpoint-0.1.5_pre20141026
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=media-libs/clutter-1.12:1.0 >=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.9.4 x11-libs/pango x11-libs/gdk-pixbuf:2 gstreamer? ( media-libs/clutter-gst:2.0 ) pdf? ( gnome-base/librsvg:2 ) 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
-DESCRIPTION=A tool for making hackers do excellent presentations
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Apps/Pinpoint
-IUSE=+gstreamer +pdf
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=media-libs/clutter-1.12:1.0 >=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.9.4 x11-libs/pango x11-libs/gdk-pixbuf:2 gstreamer? ( media-libs/clutter-gst:2.0 ) pdf? ( gnome-base/librsvg:2 )
-SLOT=0
-SRC_URI=https://git.gnome.org/browse/pinpoint/snapshot/pinpoint-215ccad331a39c6e95d173938fcfffe6eb4d75d6.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a022dbbc5b4775315dca7ca88a3d829f
diff --git a/metadata/md5-cache/app-office/pinpoint-0.1.8 b/metadata/md5-cache/app-office/pinpoint-0.1.8
new file mode 100644
index 000000000000..73adf51c6154
--- /dev/null
+++ b/metadata/md5-cache/app-office/pinpoint-0.1.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=media-libs/clutter-1.23.7:1.0 >=media-libs/clutter-gtk-1.6:1.0 >=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.9.4 x11-libs/pango x11-libs/gdk-pixbuf:2 gstreamer? ( media-libs/clutter-gst:3.0 ) pdf? ( gnome-base/librsvg:2 ) virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=A tool for making hackers do excellent presentations
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Apps/Pinpoint
+IUSE=+gstreamer +pdf
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=media-libs/clutter-1.23.7:1.0 >=media-libs/clutter-gtk-1.6:1.0 >=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.9.4 x11-libs/pango x11-libs/gdk-pixbuf:2 gstreamer? ( media-libs/clutter-gst:3.0 ) pdf? ( gnome-base/librsvg:2 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/pinpoint/0.1/pinpoint-0.1.8.tar.xz
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b306d59113ca0f88079a96a9e0db9a40
diff --git a/metadata/md5-cache/app-text/asciidoc-8.6.9-r2 b/metadata/md5-cache/app-text/asciidoc-8.6.9-r2
index 7aaab06ced43..13056d073ae5 100644
--- a/metadata/md5-cache/app-text/asciidoc-8.6.9-r2
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.9-r2
@@ -1,14 +1,14 @@
-DEFINED_PHASES=configure install prepare setup test
+DEFINED_PHASES=configure install postinst prepare setup test
 DEPEND=test? ( dev-util/source-highlight media-sound/lilypond media-gfx/imagemagick dev-texlive/texlive-latex app-text/dvipng media-gfx/graphviz python_single_target_pypy? ( virtual/pypy:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] )
 DESCRIPTION=AsciiDoc is a plain text human readable/writable document format
 EAPI=5
 HOMEPAGE=http://asciidoc.org/
 IUSE=examples graphviz highlight test vim-syntax python_targets_pypy python_targets_python2_7 python_single_target_pypy python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt graphviz? ( media-gfx/graphviz ) app-text/docbook-xml-dtd:4.5 app-text/dblatex || ( www-client/w3m www-client/lynx ) highlight? ( || ( dev-util/source-highlight dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] app-text/highlight ) ) python_single_target_pypy? ( virtual/pypy:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?]
+RDEPEND=>=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt graphviz? ( media-gfx/graphviz ) app-text/docbook-xml-dtd:4.5 highlight? ( || ( dev-util/source-highlight dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] app-text/highlight ) ) python_single_target_pypy? ( virtual/pypy:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?]
 REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/asciidoc/asciidoc/8.6.9/asciidoc-8.6.9.tar.gz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	f0877a50e1277a64cd4fe5855250102b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=fd369dd83854101ad8f8f6568c1d25f0
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	f0877a50e1277a64cd4fe5855250102b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=2f62c7dca0aee3a213502472f20a64e5
diff --git a/metadata/md5-cache/app-text/asciidoc-9999 b/metadata/md5-cache/app-text/asciidoc-9999
index b5d78e960cc1..b771487028b1 100644
--- a/metadata/md5-cache/app-text/asciidoc-9999
+++ b/metadata/md5-cache/app-text/asciidoc-9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=test? ( dev-util/source-highlight media-sound/lilypond media-gfx/imagemagick dev-texlive/texlive-latex app-text/dvipng media-gfx/graphviz python_single_target_pypy? ( virtual/pypy:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] ) dev-util/aap www-client/lynx dev-util/source-highlight dev-vcs/mercurial !<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=AsciiDoc is a plain text human readable/writable document format
 EAPI=5
 HOMEPAGE=http://www.methods.co.nz/asciidoc/
 IUSE=examples graphviz highlight test vim-syntax python_targets_pypy python_targets_python2_7 python_single_target_pypy python_single_target_python2_7
 LICENSE=GPL-2
-RDEPEND=>=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt graphviz? ( media-gfx/graphviz ) app-text/docbook-xml-dtd:4.5 app-text/dblatex || ( www-client/w3m www-client/lynx ) highlight? ( || ( dev-util/source-highlight dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] app-text/highlight ) ) python_single_target_pypy? ( virtual/pypy:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?]
+RDEPEND=>=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt graphviz? ( media-gfx/graphviz ) app-text/docbook-xml-dtd:4.5 highlight? ( || ( dev-util/source-highlight dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] app-text/highlight ) ) python_single_target_pypy? ( virtual/pypy:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?]
 REQUIRED_USE=highlight? ( ^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 ) )
 SLOT=0
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	libtool	7f78cd7d403808a350c9ae23f5821fb4	mercurial	6ac07cde03301514a5f9e4f13df3f55e	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	f0877a50e1277a64cd4fe5855250102b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=dfc573d8cce76f20d43b85c2e2a3e437
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	libtool	7f78cd7d403808a350c9ae23f5821fb4	mercurial	6ac07cde03301514a5f9e4f13df3f55e	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	f0877a50e1277a64cd4fe5855250102b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=cdb9b318ac24e815eed5f0e69b699831
diff --git a/metadata/md5-cache/dev-lang/python-2.7.10 b/metadata/md5-cache/dev-lang/python-2.7.10-r1
similarity index 100%
rename from metadata/md5-cache/dev-lang/python-2.7.10
rename to metadata/md5-cache/dev-lang/python-2.7.10-r1
diff --git a/metadata/md5-cache/dev-lang/python-2.7.10-r2 b/metadata/md5-cache/dev-lang/python-2.7.10-r2
deleted file mode 100644
index d7247a398fa7..000000000000
--- a/metadata/md5-cache/dev-lang/python-2.7.10-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !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=4
-HOMEPAGE=http://www.python.org/
-IUSE=-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode 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 app-admin/python-updater
-RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
-SLOT=2.7
-SRC_URI=http://www.python.org/ftp/python/2.7.10/Python-2.7.10.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.10-0.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	pax-utils	9dd3f9de6dccb2463faf55e568439d1c	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=8f8237d45ec21228cef6a3cd9b45a7f3
diff --git a/metadata/md5-cache/dev-lang/python-2.7.10-r3 b/metadata/md5-cache/dev-lang/python-2.7.10-r3
index 9c382ee8639e..d7247a398fa7 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.10-r3
+++ b/metadata/md5-cache/dev-lang/python-2.7.10-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) 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 ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !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
+EAPI=4
 HOMEPAGE=http://www.python.org/
 IUSE=-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode 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 app-admin/python-updater
-RDEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) 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 ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
+RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
 SLOT=2.7
 SRC_URI=http://www.python.org/ftp/python/2.7.10/Python-2.7.10.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.10-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	pax-utils	9dd3f9de6dccb2463faf55e568439d1c	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=3354ebb19cd647b29d88b667256c45c5
+_md5_=8f8237d45ec21228cef6a3cd9b45a7f3
diff --git a/metadata/md5-cache/dev-lang/python-2.7.10-r4 b/metadata/md5-cache/dev-lang/python-2.7.10-r4
new file mode 100644
index 000000000000..ba0ce1715c9e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-2.7.10-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) 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 ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !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=http://www.python.org/
+IUSE=-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode 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 app-admin/python-updater
+RDEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) 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 ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
+SLOT=2.7
+SRC_URI=http://www.python.org/ftp/python/2.7.10/Python-2.7.10.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.10-0.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	pax-utils	9dd3f9de6dccb2463faf55e568439d1c	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=926b983a2c7558eba5f77241ee950866
diff --git a/metadata/md5-cache/dev-lang/python-3.3.5-r3 b/metadata/md5-cache/dev-lang/python-3.3.5-r4
similarity index 98%
rename from metadata/md5-cache/dev-lang/python-3.3.5-r3
rename to metadata/md5-cache/dev-lang/python-3.3.5-r4
index 928a5651a3e5..7e4b514fad74 100644
--- a/metadata/md5-cache/dev-lang/python-3.3.5-r3
+++ b/metadata/md5-cache/dev-lang/python-3.3.5-r4
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 SLOT=3.3/3.3m
 SRC_URI=http://www.python.org/ftp/python/3.3.5/Python-3.3.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.3.5-0.tar.xz mirror://gentoo/python-gentoo-patches-3.3.5-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	pax-utils	9dd3f9de6dccb2463faf55e568439d1c	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=a7e2938fdc60fae632051aa900cd272a
+_md5_=0f66df4712c242cb7147e42092cb81be
diff --git a/metadata/md5-cache/dev-lang/python-3.4.3-r3 b/metadata/md5-cache/dev-lang/python-3.4.3-r4
similarity index 98%
rename from metadata/md5-cache/dev-lang/python-3.4.3-r3
rename to metadata/md5-cache/dev-lang/python-3.4.3-r4
index 29049d019a64..a5772cb4d2d1 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.3-r3
+++ b/metadata/md5-cache/dev-lang/python-3.4.3-r4
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 SLOT=3.4/3.4m
 SRC_URI=http://www.python.org/ftp/python/3.4.3/Python-3.4.3.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.3-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	pax-utils	9dd3f9de6dccb2463faf55e568439d1c	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=3f32f2cd0066215e2fbaee8349edea4e
+_md5_=b1dec294e281e4e4ff4827ea550a20e6
diff --git a/metadata/md5-cache/dev-lang/python-3.5.0-r2 b/metadata/md5-cache/dev-lang/python-3.5.0-r3
similarity index 98%
rename from metadata/md5-cache/dev-lang/python-3.5.0-r2
rename to metadata/md5-cache/dev-lang/python-3.5.0-r3
index c0d14a20befc..b4be9005aadd 100644
--- a/metadata/md5-cache/dev-lang/python-3.5.0-r2
+++ b/metadata/md5-cache/dev-lang/python-3.5.0-r3
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 SLOT=3.5/3.5m
 SRC_URI=http://www.python.org/ftp/python/3.5.0/Python-3.5.0.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.5.0-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	9dd3f9de6dccb2463faf55e568439d1c	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=2f25a005a47b166f85a1c404f1e51571
+_md5_=2ba9f459fcab45ceae01fedc66b8ce8d
diff --git a/metadata/md5-cache/dev-lang/python-exec-2.1 b/metadata/md5-cache/dev-lang/python-exec-2.1
new file mode 100644
index 000000000000..aa5e9e914823
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-exec-2.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DESCRIPTION=Python script wrapper
+EAPI=5
+HOMEPAGE=https://bitbucket.org/mgorny/python-exec/
+IUSE=python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy python_targets_pypy3 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=!<dev-python/python-exec-10000 !<app-eselect/eselect-python-20151117
+SLOT=2
+SRC_URI=https://www.bitbucket.org/mgorny/python-exec/downloads/python-exec-2.1.tar.bz2
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=68f678563cecb3eb0224d691836f71f1
diff --git a/metadata/md5-cache/dev-lang/python-exec-2.9999 b/metadata/md5-cache/dev-lang/python-exec-2.9999
index e9c5670a9b4f..91af21b04257 100644
--- a/metadata/md5-cache/dev-lang/python-exec-2.9999
+++ b/metadata/md5-cache/dev-lang/python-exec-2.9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 !<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
+DEFINED_PHASES=configure prepare unpack
+DEPEND=!<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-vcs/git-1.8.2.1
 DESCRIPTION=Python script wrapper
 EAPI=5
 HOMEPAGE=https://bitbucket.org/mgorny/python-exec/
 IUSE=python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy python_targets_pypy3 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_python2_7
 LICENSE=BSD-2
-RDEPEND=!<dev-python/python-exec-10000
+RDEPEND=!<dev-python/python-exec-10000 !<app-eselect/eselect-python-20151117
 SLOT=2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	f813d23e417656bf3917483643165d5a	git-r3	1502b9838d043db47700b8120083e637	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=07e6633ad5f3bc60fa8dea4273fc3a71
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	git-r3	1502b9838d043db47700b8120083e637	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=ff1140735ffae1a6d552993a7161490e
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
index bb14c9a31653..83c691fdfb5b 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_m
 SLOT=3
 SRC_URI=https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	7d550983f9b6adb3e7091f4090ddae2f
-_md5_=7646bde18f564d0b85671e047d70da05
+_md5_=dc9772d5f833900a1673df9735e97c82
diff --git a/metadata/md5-cache/dev-libs/libinput-0.7.0 b/metadata/md5-cache/dev-libs/libinput-0.7.0
deleted file mode 100644
index 62c64873ec6f..000000000000
--- a/metadata/md5-cache/dev-libs/libinput-0.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libevdev-0.4 >=sys-libs/mtdev-1.1 virtual/libudev virtual/pkgconfig
-DESCRIPTION=Library to handle input devices in Wayland
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/libinput/
-KEYWORDS=~alpha amd64 arm ~mips ppc ppc64 x86
-LICENSE=libtiff
-RDEPEND=>=dev-libs/libevdev-0.4 >=sys-libs/mtdev-1.1 virtual/libudev
-RESTRICT=test
-SLOT=0/5
-SRC_URI=http://www.freedesktop.org/software/libinput/libinput-0.7.0.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=6913d74b91bf4197f1387c8967f3a3ca
diff --git a/metadata/md5-cache/dev-libs/libinput-1.0.0 b/metadata/md5-cache/dev-libs/libinput-1.1.1
similarity index 93%
rename from metadata/md5-cache/dev-libs/libinput-1.0.0
rename to metadata/md5-cache/dev-libs/libinput-1.1.1
index 615877492ad2..d97110b10456 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.0.0
+++ b/metadata/md5-cache/dev-libs/libinput-1.1.1
@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libevdev-0.4 >=sys-libs/mtdev-1.1 virtual/libudev
 RESTRICT=test
 SLOT=0/10
-SRC_URI=http://www.freedesktop.org/software/libinput/libinput-1.0.0.tar.xz
+SRC_URI=http://www.freedesktop.org/software/libinput/libinput-1.1.1.tar.xz
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	37ef89be271b9ae8aa64be024ddb39b5
-_md5_=e8404bd72832fbd146b4e904a3609703
+_md5_=d629a9467b096ce03b59d69b19420c1d
diff --git a/metadata/md5-cache/dev-python/coloredlogs-1.0.1-r1 b/metadata/md5-cache/dev-python/coloredlogs-1.0.1-r1
deleted file mode 100644
index aec9ba747956..000000000000
--- a/metadata/md5-cache/dev-python/coloredlogs-1.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/humanfriendly-1.25.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/verboselogs[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Colored stream handler for the logging module
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/humanfriendly-1.25.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/c/coloredlogs/coloredlogs-1.0.1.tar.gz
-_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=849b543beaf7ab82763510b96d2bce59
diff --git a/metadata/md5-cache/dev-python/coloredlogs-2.0 b/metadata/md5-cache/dev-python/coloredlogs-2.0
deleted file mode 100644
index f282e902f755..000000000000
--- a/metadata/md5-cache/dev-python/coloredlogs-2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/humanfriendly-1.25.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/capturer[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/verboselogs[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Colored stream handler for the logging module
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/humanfriendly-1.25.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/c/coloredlogs/coloredlogs-2.0.tar.gz
-_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=ca4e62cda97f8fb1e8bb85b03085510e
diff --git a/metadata/md5-cache/dev-python/coloredlogs-3.1.2 b/metadata/md5-cache/dev-python/coloredlogs-3.1.2
deleted file mode 100644
index 6e78aacc622f..000000000000
--- a/metadata/md5-cache/dev-python/coloredlogs-3.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/humanfriendly-1.42[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/capturer[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/verboselogs[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-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_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Colored stream handler for the logging module
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/humanfriendly-1.42[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-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_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/c/coloredlogs/coloredlogs-3.1.2.tar.gz
-_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=c9d6eb5ab3224c6f68f9298a8c9f4f19
diff --git a/metadata/md5-cache/dev-python/coloredlogs-3.1.3 b/metadata/md5-cache/dev-python/coloredlogs-3.1.3
deleted file mode 100644
index c1d86681921e..000000000000
--- a/metadata/md5-cache/dev-python/coloredlogs-3.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/humanfriendly-1.42[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/capturer[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/verboselogs[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-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_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Colored stream handler for the logging module
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/humanfriendly-1.42[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-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_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/c/coloredlogs/coloredlogs-3.1.3.tar.gz
-_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=c9d6eb5ab3224c6f68f9298a8c9f4f19
diff --git a/metadata/md5-cache/dev-python/coloredlogs-3.1 b/metadata/md5-cache/dev-python/coloredlogs-5.0
similarity index 97%
rename from metadata/md5-cache/dev-python/coloredlogs-3.1
rename to metadata/md5-cache/dev-python/coloredlogs-5.0
index 7ab36f272cb9..804cc1e1c264 100644
--- a/metadata/md5-cache/dev-python/coloredlogs-3.1
+++ b/metadata/md5-cache/dev-python/coloredlogs-5.0
@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=>=dev-python/humanfriendly-1.42[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-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_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
-SRC_URI=mirror://pypi/c/coloredlogs/coloredlogs-3.1.tar.gz
+SRC_URI=mirror://pypi/c/coloredlogs/coloredlogs-5.0.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=c9d6eb5ab3224c6f68f9298a8c9f4f19
+_md5_=3464b0a0d19b3c2b680af2b78397a921
diff --git a/metadata/md5-cache/dev-python/git-review-1.25.0 b/metadata/md5-cache/dev-python/git-review-1.25.0
index b5a23806a8d4..639aef457ad9 100644
--- a/metadata/md5-cache/dev-python/git-review-1.25.0
+++ b/metadata/md5-cache/dev-python/git-review-1.25.0
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to submit code to Gerrit
 EAPI=5
 HOMEPAGE=https://git.openstack.org/cgit/openstack-infra/git-review
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/requests-1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/g/git-review/git-review-1.25.0.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=3b85afa7dfad45cafbc9efef89ed859f
+_md5_=79faf77fc7481befedf4d14500b285d1
diff --git a/metadata/md5-cache/dev-python/h5py-2.5.0 b/metadata/md5-cache/dev-python/h5py-2.5.0
index f98ce6fdf3d8..f6e7b27c202e 100644
--- a/metadata/md5-cache/dev-python/h5py-2.5.0
+++ b/metadata/md5-cache/dev-python/h5py-2.5.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/h5py/h5py-2.5.0.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=558a498f4ed098eb2227c318490fb90b
+_md5_=203c9f4014375c3de5423c924c50488e
diff --git a/metadata/md5-cache/dev-python/ipython-3.2.1-r1 b/metadata/md5-cache/dev-python/ipython-3.2.1-r1
index 2a77810981bc..d2e13f4e6d83 100644
--- a/metadata/md5-cache/dev-python/ipython-3.2.1-r1
+++ b/metadata/md5-cache/dev-python/ipython-3.2.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( doc matplotlib mongodb notebook nbconvert octave qt4 wxwidg
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-3.2.1.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	7d550983f9b6adb3e7091f4090ddae2f
-_md5_=4ec1bcd0558b2171e14ffbc37cbd5acc
+_md5_=311d790cccdaee7955b2f045d8e0c97e
diff --git a/metadata/md5-cache/dev-python/kazoo-2.2.1 b/metadata/md5-cache/dev-python/kazoo-2.2.1
index 220291867fd4..bcb916289dea 100644
--- a/metadata/md5-cache/dev-python/kazoo-2.2.1
+++ b/metadata/md5-cache/dev-python/kazoo-2.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=gevent? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] gevent? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 DESCRIPTION=A high-level Python library that makes it easier to use Apache Zookeeper
 EAPI=5
 HOMEPAGE=https://kazoo.readthedocs.org/ https://github.com/python-zk/kazoo/ https://pypi.python.org/pypi/kazoo/
 IUSE=doc gevent test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=gevent? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] gevent? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/k/kazoo/kazoo-2.2.1.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=4f9c7ce8897486de847d38dd2b323a96
+_md5_=f3dfd0547c981aa96cace7c5920907ae
diff --git a/metadata/md5-cache/dev-python/line_profiler-1.0 b/metadata/md5-cache/dev-python/line_profiler-1.0
new file mode 100644
index 000000000000..d4faa1c5479f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/line_profiler-1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-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_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Line-by-line profiler
+EAPI=5
+HOMEPAGE=https://github.com/rkern/line_profiler
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/l/line_profiler/line_profiler-1.0.tar.gz
+_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=7cc78f05b96f5a7fd0e9fbcf98bbf4ed
diff --git a/metadata/md5-cache/dev-python/line_profiler-9999 b/metadata/md5-cache/dev-python/line_profiler-9999
new file mode 100644
index 000000000000..6da2bc35f92f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/line_profiler-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-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_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Line-by-line profiler
+EAPI=5
+HOMEPAGE=https://github.com/rkern/line_profiler
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	git-r3	1502b9838d043db47700b8120083e637	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=07b5fb40ea80595e6552ae4ab3f5ecb8
diff --git a/metadata/md5-cache/dev-python/memory_profiler-0.39 b/metadata/md5-cache/dev-python/memory_profiler-0.39
new file mode 100644
index 000000000000..2c7085e36d74
--- /dev/null
+++ b/metadata/md5-cache/dev-python/memory_profiler-0.39
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DESCRIPTION=A module for monitoring memory usage of a python program
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/memory_profiler https://github.com/fabianp/memory_profiler
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3 )
+SLOT=0
+SRC_URI=mirror://pypi/m/memory_profiler/memory_profiler-0.39.tar.gz
+_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=baf2c0a8b91252f71826dbda16ac7b8f
diff --git a/metadata/md5-cache/dev-python/psutil-3.2.2 b/metadata/md5-cache/dev-python/psutil-3.2.2
index 011e38c341e5..1983b8f56de4 100644
--- a/metadata/md5-cache/dev-python/psutil-3.2.2
+++ b/metadata/md5-cache/dev-python/psutil-3.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 DESCRIPTION=Retrieve information on running processes and system utilization
 EAPI=5
 HOMEPAGE=https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-3.2.2.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=5463027a49ead6dc44e187e54b656bd1
+_md5_=9fcd3a21ea698c72dbe30d5fe85620c6
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.0.6 b/metadata/md5-cache/dev-python/pyparsing-2.0.6
new file mode 100644
index 000000000000..144a5592662e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyparsing-2.0.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DESCRIPTION=Easy-to-use Python module for text parsing
+EAPI=5
+HOMEPAGE=http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing
+IUSE=doc examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!dev-python/pyparsing:py2 !dev-python/pyparsing:py3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pyparsing/pyparsing-2.0.6.tar.gz
+_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=8b0912e1d9ca50c4fb3a9f31f083ba67
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.27 b/metadata/md5-cache/dev-python/python-debian-0.1.27
index 0767126170ef..4e26b7e8d61e 100644
--- a/metadata/md5-cache/dev-python/python-debian-0.1.27
+++ b/metadata/md5-cache/dev-python/python-debian-0.1.27
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( app-arch/dpkg ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DEPEND=dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] test? ( app-arch/dpkg ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)]
 DESCRIPTION=Python modules to work with Debian-related data formats
 EAPI=5
 HOMEPAGE=http://packages.debian.org/sid/python-debian
-IUSE=examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+IUSE=examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 GPL-3
-RDEPEND=dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+RDEPEND=dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.27.tar.xz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=6e539a9130379f23540f33764b898521
+_md5_=df501f818bfc2a7a04f52cf1c95155ac
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-1.9.0 b/metadata/md5-cache/dev-python/setuptools_scm-1.9.0
new file mode 100644
index 000000000000..008cf56caf99
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools_scm-1.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DESCRIPTION=package to manage versions by scm tags via setuptools
+EAPI=5
+HOMEPAGE=https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3 )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.9.0.tar.gz
+_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=5a4c65036990f0d6e2fa184c5a0d20e9
diff --git a/metadata/md5-cache/dev-python/testtools-1.8.1 b/metadata/md5-cache/dev-python/testtools-1.8.1
new file mode 100644
index 000000000000..147bccc5e7c8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/testtools-1.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/extras[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/mimeparse[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/pbr-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/unittest2-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/traceback2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) python_targets_pypy3? ( virtual/pypy3:0=[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DESCRIPTION=Extensions to the Python standard library unit testing framework
+EAPI=5
+HOMEPAGE=https://github.com/testing-cabal/testtools
+IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/extras[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/mimeparse[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/pbr-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/unittest2-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/traceback2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) python_targets_pypy3? ( virtual/pypy3:0=[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3 )
+SLOT=0
+SRC_URI=mirror://pypi/t/testtools/testtools-1.8.1.tar.gz
+_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=209f5f133951a5f6d44e16cc01678ba3
diff --git a/metadata/md5-cache/dev-python/virtualenv-13.1.2 b/metadata/md5-cache/dev-python/virtualenv-13.1.2
index 069b33823f5b..b28ab2788b11 100644
--- a/metadata/md5-cache/dev-python/virtualenv-13.1.2
+++ b/metadata/md5-cache/dev-python/virtualenv-13.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pip-7.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 DESCRIPTION=Virtual Python Environment builder
 EAPI=5
 HOMEPAGE=http://www.virtualenv.org/ https://pypi.python.org/pypi/virtualenv https://github.com/pypa/virtualenv/
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3
 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 ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=>=dev-python/pip-7.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=https://github.com/pypa/virtualenv/archive/13.1.2.tar.gz -> virtualenv-13.1.2.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=ad47090f249d8abc3da0d00cfb678b80
+_md5_=d4d4177afa12129f2e18281798632bbb
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.11.2 b/metadata/md5-cache/dev-python/werkzeug-0.11.2
new file mode 100644
index 000000000000..e4a913e0d964
--- /dev/null
+++ b/metadata/md5-cache/dev-python/werkzeug-0.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/simplejson[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] test? ( dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] dev-python/pytest-xprocess[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)]
+DESCRIPTION=Collection of various utilities for WSGI applications
+EAPI=5
+HOMEPAGE=http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=dev-python/simplejson[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.11.2.tar.gz
+_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=1b3a709c3a4099f1336eae44f9f541cd
diff --git a/metadata/md5-cache/dev-python/wheel-0.26.0 b/metadata/md5-cache/dev-python/wheel-0.26.0
index b0119d8bc643..f98dc5923300 100644
--- a/metadata/md5-cache/dev-python/wheel-0.26.0
+++ b/metadata/md5-cache/dev-python/wheel-0.26.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 DESCRIPTION=A built-package format for Python
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/wheel
-IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~x86
+IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wheel/wheel-0.26.0.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=7a445639fdb92bff9821b24c5fdc1e88
+_md5_=9a7448897f0c51638fdfe3e1ed347911
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1 b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
index 58bdf16e1e46..f0934d929221 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Use the McIlroy-Hunt LCS algorithm to compute differences
 EAPI=5
 HOMEPAGE=https://github.com/halostatue/diff-lcs
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MIT Ruby GPL-2 )
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/diff-lcs-1.2.5.gem
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5b4c17b41ec78e55b615c055567b14df
+_md5_=c2d70cafe270a3e2f1523d412dc7f405
diff --git a/metadata/md5-cache/dev-ruby/facter-3.1.0 b/metadata/md5-cache/dev-ruby/facter-3.1.0
deleted file mode 100644
index c9f38e055966..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54 >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=5
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54 >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/facter/facter-3.1.0.tar.gz
-_eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=22f2ff1315b1d09a4c40de11af6cf78b
diff --git a/metadata/md5-cache/dev-ruby/facter-3.1.1 b/metadata/md5-cache/dev-ruby/facter-3.1.2
similarity index 51%
rename from metadata/md5-cache/dev-ruby/facter-3.1.1
rename to metadata/md5-cache/dev-ruby/facter-3.1.2
index 96c71e7780c8..480aa7bd100a 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.1.1
+++ b/metadata/md5-cache/dev-ruby/facter-3.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54 >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=test? ( >=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
 IUSE=debug test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54 >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/facter/facter-3.1.1.tar.gz
+SRC_URI=https://downloads.puppetlabs.com/facter/facter-3.1.2.tar.gz
 _eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=22f2ff1315b1d09a4c40de11af6cf78b
+_md5_=3aed1a8c01bddc6c7b08ad78ac093181
diff --git a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4 b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
index 701a81f98f69..45978c1fb188 100644
--- a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
+++ b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=Hoe plugins providing tasks used by seattle.rb
 EAPI=5
 HOMEPAGE=http://seattlerb.rubyforge.org/hoe-seattlerb
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-seattlerb-1.3.4.gem
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4540fc623c6cb366f53e543bd6823c1e
+_md5_=63d6221f1a441c454d367bda8b0cacb6
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.2 b/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.2
index 34a59315f32b..678ec1f26b83 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.2
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
 EAPI=5
 HOMEPAGE=http://nokogiri.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.6.6.2.tar.gz -> nokogiri-1.6.6.2-git.tgz
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4124cbd60765cbc46fb7a18e55076bbd
+_md5_=7d1707e3851b801ac8d9a980420822c4
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2-r1 b/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2-r1
index b4d22ca06266..a7977ffe837b 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2-r1
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Provide a standard and simplified way to build and package Ruby exte
 EAPI=5
 HOMEPAGE=https://github.com/luislavena/rake-compiler
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/tarball/v0.9.2 -> rake-compiler-0.9.2.tar.gz
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a424347e336da3aefe2ca6847fbb9e8f
+_md5_=fd8c2bad55c5e21d3175463182d316fa
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1 b/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
index 7ad4122a747b..4c7a28ad51fe 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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_ruby19? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby19] =dev-ruby/rspec-expectations-2.14*[ruby_targets_ruby19] =dev-ruby/rspec-mocks-2.14*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby20] =dev-ruby/rspec-expectations-2.14*[ruby_targets_ruby20] =dev-ruby/rspec-mocks-2.14*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-2.14*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-2.14*[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=mirror://rubygems/rspec-2.14.1.gem
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b1f9fffd1e44291880667da903d17df9
+_md5_=304c5b60e7fa22526efe8e5d1499ec94
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4 b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
index 14e5436bffe2..7b686acfd306 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.14.8.tar.gz -> rspec-core-2.14.8-git.tgz
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7e65ff88fad779d31181286f01091a05
+_md5_=ca18536b212d37caf6c29b8591e43b22
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
index 353619c801dd..af74fc7607d5 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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_ruby19? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.14.5.tar.gz -> rspec-expectations-2.14.5-git.tgz
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=708b34f4cc007d31584784cdcdfe68bc
+_md5_=74b2e9c85825f1b722ce2461f8094158
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
index 4ef0abaedebb..7b90064a6aa2 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.14.6.tar.gz -> rspec-mocks-2.14.6-git.tgz
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3704884c2dd1686943b722b791531e6a
+_md5_=439a484deec040dd091a07a7471ea825
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.11.0 b/metadata/md5-cache/dev-ruby/zentest-4.11.0
index e86e80b73663..aed0a8ef139f 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.11.0
+++ b/metadata/md5-cache/dev-ruby/zentest-4.11.0
@@ -4,11 +4,11 @@ DESCRIPTION=ZenTest provides tools to support testing: zentest, unit_diff, autot
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/zentest
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ZenTest-4.11.0.gem
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5af188dfbac86b3255c55da17f3e4dda
+_md5_=933e59449d9a41332c840e184fe89709
diff --git a/metadata/md5-cache/dev-vcs/gitg-3.18.0 b/metadata/md5-cache/dev-vcs/gitg-3.18.0
new file mode 100644
index 000000000000..a0aa2e2ed136
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/gitg-3.18.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=app-crypt/libsecret dev-libs/libgee:0.8[introspection] >=dev-libs/json-glib-0.16 >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= dev-libs/libgit2:=[threads] >=dev-libs/libgit2-glib-0.23.5[ssh] <dev-libs/libgit2-glib-0.24.0 >=dev-libs/libpeas-1.5.0[gtk] >=gnome-base/gsettings-desktop-schemas-0.1.1 >=net-libs/webkit-gtk-2.2:4[introspection] >=x11-libs/gtk+-3.12.0:3 >=x11-libs/gtksourceview-3.10:3.0 >=x11-themes/gnome-icon-theme-symbolic-3.10 glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-libs/libpeas[python,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) >=dev-libs/libgit2-glib-0.22.0[vala] gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig >=dev-util/intltool-0.40 || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=git repository viewer for GNOME
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Apps/Gitg
+IUSE=debug glade +python python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=app-crypt/libsecret dev-libs/libgee:0.8[introspection] >=dev-libs/json-glib-0.16 >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= dev-libs/libgit2:=[threads] >=dev-libs/libgit2-glib-0.23.5[ssh] <dev-libs/libgit2-glib-0.24.0 >=dev-libs/libpeas-1.5.0[gtk] >=gnome-base/gsettings-desktop-schemas-0.1.1 >=net-libs/webkit-gtk-2.2:4[introspection] >=x11-libs/gtk+-3.12.0:3 >=x11-libs/gtksourceview-3.10:3.0 >=x11-themes/gnome-icon-theme-symbolic-3.10 glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-libs/libpeas[python,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] )
+REQUIRED_USE=python? ( ^^ ( python_targets_python3_3 python_targets_python3_4 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gitg/3.18/gitg-3.18.0.tar.xz
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=9da20800b5beb563152c24bad0a29f41
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-2.8.3 b/metadata/md5-cache/gnome-extra/cinnamon-2.8.4
similarity index 98%
rename from metadata/md5-cache/gnome-extra/cinnamon-2.8.3
rename to metadata/md5-cache/gnome-extra/cinnamon-2.8.4
index da35f98766e8..828980ccdac3 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-2.8.3
+++ b/metadata/md5-cache/gnome-extra/cinnamon-2.8.4
@@ -9,6 +9,6 @@ LICENSE=GPL-2+
 RDEPEND=app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] gnome-extra/cinnamon-menus[introspection] >=gnome-extra/cjs-2.4 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-sound/pulseaudio:0=[glib] net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-2.5[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) >=gnome-extra/cinnamon-session-2.4 >=gnome-extra/cinnamon-settings-daemon-2.4 >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-misc/xdg-utils dev-python/dbus-python[python_targets_python2_7] dev-python/gconf-python:2[python_targets_python2_7] dev-python/lxml[python_targets_python2_7] dev-python/pexpect[python_targets_python2_7] dev-python/pycairo[python_targets_python2_7] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyinotify[python_targets_python2_7] dev-python/pypam[python_targets_python2_7] dev-python/pillow[python_targets_python2_7] x11-themes/gnome-themes-standard[gtk] x11-themes/gnome-icon-theme-symbolic >=gnome-extra/nemo-2.4 >=gnome-extra/cinnamon-control-center-2.4 >=gnome-extra/cinnamon-screensaver-2.4 gnome-extra/polkit-gnome networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=gnome-extra/cinnamon-translations-2.4 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) python_targets_python2_7 || ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
-SRC_URI=https://github.com/linuxmint/Cinnamon/archive/2.8.3.tar.gz -> cinnamon-2.8.3.tar.gz
+SRC_URI=https://github.com/linuxmint/Cinnamon/archive/2.8.4.tar.gz -> cinnamon-2.8.4.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	9dd3f9de6dccb2463faf55e568439d1c	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3676dab69d35255b2039c658d26dcb5e
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-2.8.0 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-2.8.1
similarity index 98%
rename from metadata/md5-cache/gnome-extra/cinnamon-control-center-2.8.0
rename to metadata/md5-cache/gnome-extra/cinnamon-control-center-2.8.1
index 7b7bfe429134..93c49c516e30 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-control-center-2.8.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-control-center-2.8.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-1.1[glib] >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 ) x11-themes/gnome-icon-theme x11-themes/gnome-icon-theme-symbolic colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
 SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/2.8.0.tar.gz -> cinnamon-control-center-2.8.0.tar.gz
+SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/2.8.1.tar.gz -> cinnamon-control-center-2.8.1.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=23ed6f12f0efdf40ffcd0361d0d1258d
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-2.8.1 b/metadata/md5-cache/gnome-extra/cinnamon-translations-2.8.2
similarity index 97%
rename from metadata/md5-cache/gnome-extra/cinnamon-translations-2.8.1
rename to metadata/md5-cache/gnome-extra/cinnamon-translations-2.8.2
index c77a516fc924..b4e36c3c7f5c 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-translations-2.8.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-translations-2.8.2
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/2.8.1.tar.gz -> cinnamon-translations-2.8.1.tar.gz
+SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/2.8.2.tar.gz -> cinnamon-translations-2.8.2.tar.gz
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=b90381306c92095bec24c929dc3eb770
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.0 b/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.0
new file mode 100644
index 000000000000..97c09864f322
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile,apache2_mpms_prefork] >=x11-libs/libnotify-0.7:= !<gnome-base/gnome-control-center-3.9 app-text/yelp-tools app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Personal file sharing for the GNOME desktop
+EAPI=5
+HOMEPAGE=https://git.gnome.org/browse/gnome-user-share
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile,apache2_mpms_prefork] >=x11-libs/libnotify-0.7:=
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-user-share/3.18/gnome-user-share-3.18.0.tar.xz
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=6e3389b0e79b0e718ca20717727f6a5b
diff --git a/metadata/md5-cache/gnome-extra/nemo-2.4.5 b/metadata/md5-cache/gnome-extra/nemo-2.4.5
deleted file mode 100644
index 98cfdef23acd..000000000000
--- a/metadata/md5-cache/gnome-extra/nemo-2.4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.34:2 >=gnome-extra/cinnamon-desktop-1.0:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.3.17:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.1.0:= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/polib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-proto/xproto dev-util/gtk-doc gnome-base/gnome-common !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
-EAPI=5
-HOMEPAGE=http://cinnamon.linuxmint.com/
-IUSE=exif +introspection +l10n packagekit tracker xmp test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2+ FDL-1.1
-PDEPEND=>=gnome-base/gvfs-0.1.2
-RDEPEND=>=dev-libs/glib-2.34:2 >=gnome-extra/cinnamon-desktop-1.0:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.3.17:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.1.0:= ) x11-themes/gnome-icon-theme-symbolic l10n? ( >=gnome-extra/cinnamon-translations-2.2 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/nemo/archive/2.4.5.tar.gz -> nemo-2.4.5.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
-_md5_=58b58fd64c6c0a63b6651d68e2970782
diff --git a/metadata/md5-cache/gnome-extra/nemo-2.6.6 b/metadata/md5-cache/gnome-extra/nemo-2.6.6
deleted file mode 100644
index 5b1fdf4010d9..000000000000
--- a/metadata/md5-cache/gnome-extra/nemo-2.6.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.34:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.3.17:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.1.0:= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/polib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-proto/xproto dev-util/gtk-doc gnome-base/gnome-common !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
-EAPI=5
-HOMEPAGE=http://cinnamon.linuxmint.com/
-IUSE=exif +introspection +nls packagekit tracker xmp test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+ FDL-1.1
-PDEPEND=>=gnome-base/gvfs-0.1.2
-RDEPEND=>=dev-libs/glib-2.34:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.3.17:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.1.0:= ) x11-themes/gnome-icon-theme-symbolic nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/nemo/archive/2.6.6.tar.gz -> nemo-2.6.6.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
-_md5_=f30d748bf7340fc66ca04a2ccd6518ae
diff --git a/metadata/md5-cache/gnome-extra/nemo-2.8.4 b/metadata/md5-cache/gnome-extra/nemo-2.8.4
new file mode 100644
index 000000000000..1907f8f29a5d
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/nemo-2.8.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/polib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-proto/xproto dev-util/gtk-doc gnome-base/gnome-common !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
+EAPI=5
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=exif +introspection +nls packagekit tracker xmp test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+ FDL-1.1
+PDEPEND=>=gnome-base/gvfs-0.1.2
+RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) x11-themes/gnome-icon-theme-symbolic nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/nemo/archive/2.8.4.tar.gz -> nemo-2.8.4.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
+_md5_=f45ffe4440a85e2fd7e9719d47ef670d
diff --git a/metadata/md5-cache/gnustep-apps/sogo-2.3.2 b/metadata/md5-cache/gnustep-apps/sogo-2.3.2
new file mode 100644
index 000000000000..2f42d58cf211
--- /dev/null
+++ b/metadata/md5-cache/gnustep-apps/sogo-2.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
+DEPEND=dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-2.3.2[ldap] gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=gnustep-base/gnustep-make-2.6.2 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Groupware server built around OpenGroupware.org and the SOPE application server
+EAPI=5
+HOMEPAGE=http://www.sogo.nu
+IUSE=gnutls libressl +ssl debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-2.3.2[ldap] gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://github.com/inverse-inc/sogo/archive/2.3.2.tar.gz -> sogo-2.3.2.tar.gz
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnustep-2	eae71f6ebee53a3bf1016938874bca15	gnustep-base	707840264bcc460d4e700dcc8c6aa746	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
+_md5_=8a9d5f106c3b1623c005627951240b51
diff --git a/metadata/md5-cache/gnustep-libs/sope-2.3.2 b/metadata/md5-cache/gnustep-libs/sope-2.3.2
new file mode 100644
index 000000000000..72fd35a20d83
--- /dev/null
+++ b/metadata/md5-cache/gnustep-libs/sope-2.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
+DEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=An extensive set of frameworks which form a complete Web application server environment
+EAPI=5
+HOMEPAGE=http://www.sogo.nu/
+IUSE=gnutls ldap libressl mysql postgres +ssl +xml debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://github.com/inverse-inc/sope/archive/SOPE-2.3.2.tar.gz -> sope-2.3.2.tar.gz
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnustep-2	eae71f6ebee53a3bf1016938874bca15	gnustep-base	707840264bcc460d4e700dcc8c6aa746	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
+_md5_=6c84d46582dc3d2dfaddb389a645f46e
diff --git a/metadata/md5-cache/media-gfx/argyllcms-1.6.3 b/metadata/md5-cache/media-gfx/argyllcms-1.6.3
deleted file mode 100644
index ad9670431d5b..000000000000
--- a/metadata/md5-cache/media-gfx/argyllcms-1.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=media-libs/tiff sys-libs/zlib virtual/jpeg x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver app-arch/unzip dev-util/ftjam virtual/pkgconfig
-DESCRIPTION=Open source, ICC compatible color management system
-EAPI=5
-HOMEPAGE=http://www.argyllcms.com/
-IUSE=doc
-KEYWORDS=~amd64 hppa ~x86
-LICENSE=AGPL-3
-RDEPEND=media-libs/tiff sys-libs/zlib virtual/jpeg x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver
-SLOT=0
-SRC_URI=http://www.argyllcms.com/Argyll_V1.6.3_src.zip
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	37ef89be271b9ae8aa64be024ddb39b5
-_md5_=f2161cd778f91f7b27cfdcead33e2f1c
diff --git a/metadata/md5-cache/media-gfx/argyllcms-1.8.0 b/metadata/md5-cache/media-gfx/argyllcms-1.8.3
similarity index 56%
rename from metadata/md5-cache/media-gfx/argyllcms-1.8.0
rename to metadata/md5-cache/media-gfx/argyllcms-1.8.3
index f3dc54d815fd..adf00f11da61 100644
--- a/metadata/md5-cache/media-gfx/argyllcms-1.8.0
+++ b/metadata/md5-cache/media-gfx/argyllcms-1.8.3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
+DEFINED_PHASES=compile install postinst
 DEPEND=media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver app-arch/unzip dev-util/ftjam virtual/pkgconfig
 DESCRIPTION=Open source, ICC compatible color management system
 EAPI=5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=AGPL-3
 RDEPEND=media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver
 SLOT=0
-SRC_URI=http://www.argyllcms.com/Argyll_V1.8.0_src.zip
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	37ef89be271b9ae8aa64be024ddb39b5
-_md5_=b2d4f564a11bfdaa14c4125d5ecf5465
+SRC_URI=http://www.argyllcms.com/Argyll_V1.8.3_src.zip
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	37ef89be271b9ae8aa64be024ddb39b5
+_md5_=70b169b70ccd512d8b2e01661a78b2f2
diff --git a/metadata/md5-cache/media-gfx/meshlab-1.3.3 b/metadata/md5-cache/media-gfx/meshlab-1.3.3
index 4e436f09e4c3..a1e5ea40ebac 100644
--- a/metadata/md5-cache/media-gfx/meshlab-1.3.3
+++ b/metadata/md5-cache/media-gfx/meshlab-1.3.3
@@ -9,4 +9,4 @@ RDEPEND=dev-cpp/eigen:3 dev-cpp/muParser dev-qt/qtcore:4 dev-qt/qtopengl:4 media
 SLOT=0
 SRC_URI=mirror://sourceforge/project/meshlab/meshlab/MeshLab%20v1.3.3/MeshLabSrc_AllInc_v133.tgz
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=71cae43b14ad1e1b11528c54eb42bca6
+_md5_=11163754dff91e8e15aa1c422491fedf
diff --git a/metadata/md5-cache/media-gfx/simple-scan-3.14.3 b/metadata/md5-cache/media-gfx/simple-scan-3.14.3
deleted file mode 100644
index dae01535d4ba..000000000000
--- a/metadata/md5-cache/media-gfx/simple-scan-3.14.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=media-gfx/sane-backends-1.0.20:= >=sys-libs/zlib-1.2.3.1:= virtual/jpeg:0= virtual/libgudev:= x11-libs/cairo:= >=x11-libs/gtk+-3:3 || ( >=x11-misc/colord-0.1.24:=[udev] x11-misc/colord:=[scanner] ) app-text/yelp-tools >=dev-util/intltool-0.35.0 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Simple document scanning utility
-EAPI=5
-HOMEPAGE=https://launchpad.net/simple-scan
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.32:2 >=media-gfx/sane-backends-1.0.20:= >=sys-libs/zlib-1.2.3.1:= virtual/jpeg:0= virtual/libgudev:= x11-libs/cairo:= >=x11-libs/gtk+-3:3 || ( >=x11-misc/colord-0.1.24:=[udev] x11-misc/colord:=[scanner] ) x11-misc/xdg-utils x11-themes/gnome-icon-theme
-SLOT=0
-SRC_URI=https://launchpad.net/simple-scan/3.14/3.14.3/+download/simple-scan-3.14.3.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2274fd06b92e0fad3805e413a1a4a5f5
diff --git a/metadata/md5-cache/media-gfx/simple-scan-3.16.1 b/metadata/md5-cache/media-gfx/simple-scan-3.16.1
deleted file mode 100644
index d72f7ab1bec3..000000000000
--- a/metadata/md5-cache/media-gfx/simple-scan-3.16.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=media-gfx/sane-backends-1.0.20:= >=sys-libs/zlib-1.2.3.1:= virtual/jpeg:0= virtual/libgudev:= x11-libs/cairo:= >=x11-libs/gtk+-3:3 >=x11-misc/colord-0.1.24:=[udev] app-text/yelp-tools >=dev-util/intltool-0.35.0 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Simple document scanning utility
-EAPI=5
-HOMEPAGE=https://launchpad.net/simple-scan
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.32:2 >=media-gfx/sane-backends-1.0.20:= >=sys-libs/zlib-1.2.3.1:= virtual/jpeg:0= virtual/libgudev:= x11-libs/cairo:= >=x11-libs/gtk+-3:3 >=x11-misc/colord-0.1.24:=[udev] x11-misc/xdg-utils || ( x11-themes/adwaita-icon-theme x11-themes/gnome-icon-theme )
-SLOT=0
-SRC_URI=https://launchpad.net/simple-scan/3.16/3.16.1/+download/simple-scan-3.16.1.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c3847f1ed1216db81df9ca3e8fe355a1
diff --git a/metadata/md5-cache/media-libs/harfbuzz-0.9.38 b/metadata/md5-cache/media-libs/harfbuzz-0.9.38
deleted file mode 100644
index ddd6f0ae77ac..000000000000
--- a/metadata/md5-cache/media-libs/harfbuzz-0.9.38
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.34.3: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.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(-)?] ) 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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34 ) truetype? ( >=media-libs/freetype-2.5.0.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-util/gtk-doc-am virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=An OpenType text shaping engine
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/HarfBuzz
-IUSE=+cairo +glib +graphite icu +introspection static-libs test +truetype 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Old-MIT ISC icu
-RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.34.3: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.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(-)?] ) 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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34 ) truetype? ( >=media-libs/freetype-2.5.0.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(-)?] )
-REQUIRED_USE=introspection? ( glib )
-SLOT=0/0.9.18
-SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.38.tar.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=cf226c2873c23768d18f01eea31821a9
diff --git a/metadata/md5-cache/media-libs/harfbuzz-0.9.40 b/metadata/md5-cache/media-libs/harfbuzz-0.9.40
deleted file mode 100644
index 334cc24240fe..000000000000
--- a/metadata/md5-cache/media-libs/harfbuzz-0.9.40
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.34.3: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.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(-)?] ) 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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34 ) truetype? ( >=media-libs/freetype-2.5.0.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-util/gtk-doc-am virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=An OpenType text shaping engine
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/HarfBuzz
-IUSE=+cairo +glib +graphite icu +introspection static-libs test +truetype 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Old-MIT ISC icu
-RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.34.3: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.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(-)?] ) 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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34 ) truetype? ( >=media-libs/freetype-2.5.0.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(-)?] )
-REQUIRED_USE=introspection? ( glib )
-SLOT=0/0.9.18
-SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.40.tar.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=b6a04ef5570a1366de05a976ba2a6f73
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.0.6 b/metadata/md5-cache/media-libs/harfbuzz-1.0.6
new file mode 100644
index 000000000000..486ac7001554
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.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(-)?] ) glib? ( >=dev-libs/glib-2.34.3: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.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(-)?] ) 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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.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-util/gtk-doc-am virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=An OpenType text shaping engine
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.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(-)?] ) glib? ( >=dev-libs/glib-2.34.3: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.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(-)?] ) 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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.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(-)?] )
+REQUIRED_USE=introspection? ( glib )
+SLOT=0/0.9.18
+SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.0.6.tar.bz2
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=dd236dcf223ec25123306b1fba99e3fe
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.18.0 b/metadata/md5-cache/media-sound/gnome-music-3.18.0
deleted file mode 100644
index f6a05fbfc731..000000000000
--- a/metadata/md5-cache/media-sound/gnome-music-3.18.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9:= >=media-libs/grilo-0.2.6:0.2[introspection] media-libs/libmediaart:2.0 >=x11-libs/gtk+-3.13.2:3[introspection] >=dev-util/intltool-0.26 dev-util/itstool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Music management for Gnome
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Apps/Music
-IUSE=python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9:= >=media-libs/grilo-0.2.6:0.2[introspection] media-libs/libmediaart:2.0 >=x11-libs/gtk+-3.13.2:3[introspection] app-misc/tracker[introspection(+)] || ( app-misc/tracker[gstreamer] app-misc/tracker[ffmpeg] ) dev-python/pygobject:3[cairo,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/dbus-python[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.2[tracker] x11-misc/xdg-user-dirs
-REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-music/3.18/gnome-music-3.18.0.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cd9f110540a17601f6ee69345706cabd
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.18.2 b/metadata/md5-cache/media-sound/gnome-music-3.18.2
new file mode 100644
index 000000000000..c5785f524448
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gnome-music-3.18.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9:= >=media-libs/grilo-0.2.6:0.2[introspection] media-libs/libmediaart:2.0 >=x11-libs/gtk+-3.13.2:3[introspection] >=dev-util/intltool-0.26 dev-util/itstool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Music management for Gnome
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Apps/Music
+IUSE=python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9:= >=media-libs/grilo-0.2.6:0.2[introspection] media-libs/libmediaart:2.0 >=x11-libs/gtk+-3.13.2:3[introspection] app-misc/tracker[introspection(+)] || ( app-misc/tracker[gstreamer] app-misc/tracker[ffmpeg] ) dev-python/pygobject:3[cairo,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/dbus-python[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.2[tracker] x11-misc/xdg-user-dirs
+REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-music/3.18/gnome-music-3.18.2.tar.xz
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3c4557ca6e7724ac0f61dd863b0a4a9e
diff --git a/metadata/md5-cache/media-sound/sound-juicer-3.18.0 b/metadata/md5-cache/media-sound/sound-juicer-3.18.1
similarity index 93%
rename from metadata/md5-cache/media-sound/sound-juicer-3.18.0
rename to metadata/md5-cache/media-sound/sound-juicer-3.18.1
index c2a31519dbd4..8be8c840c738 100644
--- a/metadata/md5-cache/media-sound/sound-juicer-3.18.0
+++ b/metadata/md5-cache/media-sound/sound-juicer-3.18.1
@@ -4,10 +4,10 @@ DESCRIPTION=CD ripper for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/SoundJuicer
 IUSE=flac test vorbis debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.38:2[dbus] >=x11-libs/gtk+-3.4:3 media-libs/libcanberra[gtk3] >=app-cdr/brasero-2.90 sys-apps/dbus gnome-base/gsettings-desktop-schemas media-libs/libdiscid >=media-libs/musicbrainz-5.0.1:5 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[vorbis?] flac? ( media-plugins/gst-plugins-flac:1.0 ) gnome-base/gvfs[cdda,udev] || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0
 SLOT=0
-SRC_URI=mirror://gnome/sources/sound-juicer/3.18/sound-juicer-3.18.0.tar.xz
+SRC_URI=mirror://gnome/sources/sound-juicer/3.18/sound-juicer-3.18.1.tar.xz
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=019cb3b61e4ecc877cbe7c28e4fc694e
+_md5_=66c1e3f24a7c73a973f769bdc83e5840
diff --git a/metadata/md5-cache/media-video/cheese-3.12.2-r1 b/metadata/md5-cache/media-video/cheese-3.12.2-r1
deleted file mode 100644
index 14e3e8957c91..000000000000
--- a/metadata/md5-cache/media-video/cheese-3.12.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/cairo-1.10:= >=x11-libs/pango-1.28.0 >=gnome-base/gnome-desktop-2.91.6:3= >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 ) app-text/docbook-xml-dtd:4.3 app-text/yelp-tools dev-libs/libxml2:2 >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50 virtual/pkgconfig x11-proto/xf86vidmodeproto test? ( dev-libs/glib:2[utils] ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A cheesy program to take pictures and videos from your webcam
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Apps/Cheese
-IUSE=+introspection test test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/cairo-1.10:= >=x11-libs/pango-1.28.0 >=gnome-base/gnome-desktop-2.91.6:3= >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-v4l2:1.0 media-plugins/gst-plugins-vpx:1.0
-SLOT=0/7
-SRC_URI=mirror://gnome/sources/cheese/3.12/cheese-3.12.2.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
-_md5_=fa453a1f1f8d35f81821b9f16c0c4af5
diff --git a/metadata/md5-cache/media-video/cheese-3.14.2 b/metadata/md5-cache/media-video/cheese-3.14.2
deleted file mode 100644
index f5e0357196ec..000000000000
--- a/metadata/md5-cache/media-video/cheese-3.14.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.13.4:3[introspection?] >=gnome-base/gnome-desktop-2.91.6:3= >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 ) app-text/docbook-xml-dtd:4.3 app-text/yelp-tools dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50 virtual/pkgconfig x11-proto/xf86vidmodeproto test? ( dev-libs/glib:2[utils] ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A cheesy program to take pictures and videos from your webcam
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Apps/Cheese
-IUSE=+introspection test test
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.13.4:3[introspection?] >=gnome-base/gnome-desktop-2.91.6:3= >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-v4l2:1.0 media-plugins/gst-plugins-vpx:1.0
-SLOT=0/7
-SRC_URI=mirror://gnome/sources/cheese/3.14/cheese-3.14.2.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
-_md5_=428e01e40c74e8ff0642aba92bd5f37c
diff --git a/metadata/md5-cache/media-video/cheese-3.16.1 b/metadata/md5-cache/media-video/cheese-3.16.1
index 707088ddeae4..7dc061d79d1c 100644
--- a/metadata/md5-cache/media-video/cheese-3.16.1
+++ b/metadata/md5-cache/media-video/cheese-3.16.1
@@ -4,10 +4,10 @@ DESCRIPTION=A cheesy program to take pictures and videos from your webcam
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Cheese
 IUSE=+introspection test test
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.13.4:3[introspection?] >=gnome-base/gnome-desktop-2.91.6:3= >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-v4l2:1.0 media-plugins/gst-plugins-vpx:1.0
 SLOT=0/7
 SRC_URI=mirror://gnome/sources/cheese/3.16/cheese-3.16.1.tar.xz
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
-_md5_=428e01e40c74e8ff0642aba92bd5f37c
+_md5_=e910c916f33151163e01ea75b7397fb5
diff --git a/metadata/md5-cache/media-video/cheese-3.18.1 b/metadata/md5-cache/media-video/cheese-3.18.1
new file mode 100644
index 000000000000..4ce1fd55fff0
--- /dev/null
+++ b/metadata/md5-cache/media-video/cheese-3.18.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.13.4:3[introspection?] >=gnome-base/gnome-desktop-2.91.6:3= >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 media-libs/clutter-gst:3.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 ) app-text/docbook-xml-dtd:4.3 app-text/yelp-tools dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50 dev-util/itstool virtual/pkgconfig x11-proto/xf86vidmodeproto test? ( dev-libs/glib:2[utils] ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A cheesy program to take pictures and videos from your webcam
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Apps/Cheese
+IUSE=+introspection test test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.13.4:3[introspection?] >=gnome-base/gnome-desktop-2.91.6:3= >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 media-libs/clutter-gst:3.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) >=media-libs/gst-plugins-bad-1.4:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-v4l2:1.0 media-plugins/gst-plugins-vpx:1.0
+SLOT=0/7
+SRC_URI=mirror://gnome/sources/cheese/3.18/cheese-3.18.1.tar.xz
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
+_md5_=53a1c58abc1757c72ab40ba2039e0aad
diff --git a/metadata/md5-cache/net-analyzer/2ping-3.1.0 b/metadata/md5-cache/net-analyzer/2ping-3.1.0
new file mode 100644
index 000000000000..c20842d887e4
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/2ping-3.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)]
+DESCRIPTION=A bi-directional ping utility
+EAPI=5
+HOMEPAGE=http://www.finnie.org/software/2ping/
+IUSE=server python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=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=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://www.finnie.org/software/2ping/2ping-3.1.0.tar.gz
+_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=3f78e8e92e9ca0f5536788f0917be6d9
diff --git a/metadata/md5-cache/net-analyzer/ndoutils-2.0.0 b/metadata/md5-cache/net-analyzer/ndoutils-2.0.0
index e9d600080dde..f7767c8abd88 100644
--- a/metadata/md5-cache/net-analyzer/ndoutils-2.0.0
+++ b/metadata/md5-cache/net-analyzer/ndoutils-2.0.0
@@ -9,4 +9,4 @@ RDEPEND=dev-perl/DBD-mysql dev-perl/DBI virtual/mysql >=net-analyzer/nagios-core
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/ndoutils-2.0.0.tar.gz
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=0f825fa2b376d3e47212152b6a61515d
+_md5_=2f948c23d02ef71c2347c6b814188fbf
diff --git a/metadata/md5-cache/net-libs/gupnp-ui-0.1.1 b/metadata/md5-cache/net-libs/gupnp-ui-0.1.1
index b60b5e4b2da6..23d87c47248b 100644
--- a/metadata/md5-cache/net-libs/gupnp-ui-0.1.1
+++ b/metadata/md5-cache/net-libs/gupnp-ui-0.1.1
@@ -1,11 +1,12 @@
-DEFINED_PHASES=configure install
-DEPEND=x11-libs/gtk+:2 net-libs/gupnp virtual/pkgconfig sys-devel/gettext
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/gtk+:2 net-libs/gupnp virtual/pkgconfig sys-devel/gettext !<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=Collection of simple GTK+ widgets on top of GUPnP
-EAPI=2
+EAPI=5
 HOMEPAGE=http://gupnp.org
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
 RDEPEND=x11-libs/gtk+:2 net-libs/gupnp
 SLOT=0
 SRC_URI=http://gupnp.org/sources/gupnp-ui/gupnp-ui-0.1.1.tar.gz
-_md5_=400762fdf6342e68e839ce549dc1ceff
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	f813d23e417656bf3917483643165d5a	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=6b0d5f53f2b6df9bfc232b2f84b556b8
diff --git a/metadata/md5-cache/net-misc/chrony-2.2 b/metadata/md5-cache/net-misc/chrony-2.2
index 4d059ad5fb64..f65fe6cb436a 100644
--- a/metadata/md5-cache/net-misc/chrony-2.2
+++ b/metadata/md5-cache/net-misc/chrony-2.2
@@ -4,7 +4,7 @@ DESCRIPTION=NTP client and server programs
 EAPI=5
 HOMEPAGE=http://chrony.tuxfamily.org/
 IUSE=caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) selinux? ( sec-policy/selinux-chronyd )
 REQUIRED_USE=?? ( libedit readline )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/chrony/chrony-2.2.tar.gz
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=369fdeb22b2d9708048bbb976f138042
+_md5_=76ef265f9755765a821cbc57da285a32
diff --git a/metadata/md5-cache/net-misc/usbip-3.19 b/metadata/md5-cache/net-misc/usbip-3.19
index 91523f4987b8..77232818da2b 100644
--- a/metadata/md5-cache/net-misc/usbip-3.19
+++ b/metadata/md5-cache/net-misc/usbip-3.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e6455f6a5c71a0442d3fa19555c3c06
diff --git a/metadata/md5-cache/net-misc/wget-1.16 b/metadata/md5-cache/net-misc/wget-1.16
deleted file mode 100644
index 9e42f9a6664d..000000000000
--- a/metadata/md5-cache/net-misc/wget-1.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext ) !<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=Network utility to retrieve files from the WWW
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/wget/
-IUSE=debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib
-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
-LICENSE=GPL-3
-RDEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
-REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
-SLOT=0
-SRC_URI=mirror://gnu/wget/wget-1.16.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=47fd573bb55fb7fe420bf8be94a6b27a
diff --git a/metadata/md5-cache/net-misc/wget-1.16.1 b/metadata/md5-cache/net-misc/wget-1.16.1
deleted file mode 100644
index 5ec824f2af41..000000000000
--- a/metadata/md5-cache/net-misc/wget-1.16.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext ) !<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=Network utility to retrieve files from the WWW
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/wget/
-IUSE=debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib
-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
-LICENSE=GPL-3
-RDEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
-REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
-SLOT=0
-SRC_URI=mirror://gnu/wget/wget-1.16.1.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=840063232f503051848b2f9c87920b2a
diff --git a/metadata/md5-cache/net-misc/wget-1.16.2 b/metadata/md5-cache/net-misc/wget-1.16.2
deleted file mode 100644
index b309a0b7c6d3..000000000000
--- a/metadata/md5-cache/net-misc/wget-1.16.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup test
-DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext )
-DESCRIPTION=Network utility to retrieve files from the WWW
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/wget/
-IUSE=debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib
-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
-LICENSE=GPL-3
-RDEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
-REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
-SLOT=0
-SRC_URI=mirror://gnu/wget/wget-1.16.2.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=beb37737e6430e51aa9097cb0601b3db
diff --git a/metadata/md5-cache/net-misc/wget-1.16.3 b/metadata/md5-cache/net-misc/wget-1.16.3
deleted file mode 100644
index f2399baa55f4..000000000000
--- a/metadata/md5-cache/net-misc/wget-1.16.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup test
-DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext )
-DESCRIPTION=Network utility to retrieve files from the WWW
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/wget/
-IUSE=debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib
-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
-LICENSE=GPL-3
-RDEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
-REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
-SLOT=0
-SRC_URI=mirror://gnu/wget/wget-1.16.3.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=8121c25962be05a87cfc984392773988
diff --git a/metadata/md5-cache/net-misc/wget-1.17 b/metadata/md5-cache/net-misc/wget-1.17
new file mode 100644
index 000000000000..14ee59eb9194
--- /dev/null
+++ b/metadata/md5-cache/net-misc/wget-1.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup test
+DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext )
+DESCRIPTION=Network utility to retrieve files from the WWW
+EAPI=4
+HOMEPAGE=https://www.gnu.org/software/wget/
+IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib
+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
+LICENSE=GPL-3
+RDEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
+REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
+SLOT=0
+SRC_URI=mirror://gnu/wget/wget-1.17.tar.xz http://git.savannah.gnu.org/cgit/wget.git/patch/?id=2cfcadf5e6d5c444765aa460915ae27109a8dbce -> wget-1.17-fix_disabled_ipv6.patch
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=d544330f29b554aa6028493df0fd042d
diff --git a/metadata/md5-cache/sys-apps/portage-2.2.25 b/metadata/md5-cache/sys-apps/portage-2.2.25
new file mode 100644
index 000000000000..94ef940c2dcb
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.2.25
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=!build? ( python_targets_pypy? ( virtual/pypy:0=[ssl(+),bzip2(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ssl(+),bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+),bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+),bzip2(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+),bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python2_7(-)] ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( virtual/pypy:0=[bzip2(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=build doc epydoc +ipc linguas_ru selinux xattr python_targets_pypy python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python2_7(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( virtual/pypy:0=[bzip2(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.2.25.tar.bz2 https://dev.gentoo.org/~dolsen/releases/portage/portage-2.2.25.tar.bz2
+_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	f813d23e417656bf3917483643165d5a	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=39116e8104ecfcafad5f74b596050e33
diff --git a/metadata/md5-cache/sys-apps/shadow-4.2.1-r2 b/metadata/md5-cache/sys-apps/shadow-4.2.1-r2
new file mode 100644
index 000000000000..550c57c45fe9
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/shadow-4.2.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=acl? ( sys-apps/acl ) audit? ( sys-process/audit ) cracklib? ( >=sys-libs/cracklib-2.7-r3 ) pam? ( virtual/pam ) skey? ( sys-auth/skey ) selinux? ( >=sys-libs/libselinux-1.28 sys-libs/libsemanage ) nls? ( virtual/libintl ) xattr? ( sys-apps/attr ) app-arch/xz-utils nls? ( sys-devel/gettext ) !<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=Utilities to deal with user accounts
+EAPI=4
+HOMEPAGE=http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/
+IUSE=acl audit cracklib nls pam selinux skey xattr linguas_cs linguas_da linguas_de linguas_es linguas_fi linguas_fr linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=acl? ( sys-apps/acl ) audit? ( sys-process/audit ) cracklib? ( >=sys-libs/cracklib-2.7-r3 ) pam? ( virtual/pam ) skey? ( sys-auth/skey ) selinux? ( >=sys-libs/libselinux-1.28 sys-libs/libsemanage ) nls? ( virtual/libintl ) xattr? ( sys-apps/attr ) pam? ( >=sys-auth/pambase-20150213 )
+SLOT=0
+SRC_URI=http://pkg-shadow.alioth.debian.org/releases/shadow-4.2.1.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=2fb97b53ae3554572156a86f183beea2
diff --git a/metadata/md5-cache/sys-fs/xfsdump-3.1.4 b/metadata/md5-cache/sys-fs/xfsdump-3.1.6
similarity index 83%
rename from metadata/md5-cache/sys-fs/xfsdump-3.1.4
rename to metadata/md5-cache/sys-fs/xfsdump-3.1.6
index 05c77e516413..f32ecd60a36a 100644
--- a/metadata/md5-cache/sys-fs/xfsdump-3.1.4
+++ b/metadata/md5-cache/sys-fs/xfsdump-3.1.6
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure prepare
 DEPEND=sys-fs/e2fsprogs >=sys-fs/xfsprogs-3.2.0 sys-apps/dmapi >=sys-apps/attr-2.4.19 sys-devel/gettext
 DESCRIPTION=xfs dump/restore utilities
-EAPI=4
+EAPI=5
 HOMEPAGE=http://oss.sgi.com/projects/xfs
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-fs/e2fsprogs >=sys-fs/xfsprogs-3.2.0 sys-apps/dmapi >=sys-apps/attr-2.4.19
 SLOT=0
-SRC_URI=ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsdump-3.1.4.tar.gz ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/xfsdump-3.1.4.tar.gz
+SRC_URI=ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsdump-3.1.6.tar.gz ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/xfsdump-3.1.6.tar.gz
 _eclasses_=eutils	f813d23e417656bf3917483643165d5a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=80d2f9bedac4c83d8c868f5d326686c8
+_md5_=015e597ce4c043abf46626de9d1ff353
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.22 b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.22
index 16d9a654ba37..39dc5e2d4a72 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.22
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.22
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.22
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) https://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.18.1+_p20151012.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.18-22.base.tar.xz mirror://gentoo/genpatches-3.18-22.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-22.experimental.tar.xz ) )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=57553d164efea16e2337aef1dd8e6eec
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.0.4 b/metadata/md5-cache/sys-kernel/aufs-sources-4.0.4
index 9cb593e95610..fb557dc12093 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.0.4
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.0.4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.0_p20150518.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.0-6.base.tar.xz mirror://gentoo/genpatches-4.0-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-6.experimental.tar.xz ) )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b60af268290a02d521c7afcb5ead8f1d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.0.9 b/metadata/md5-cache/sys-kernel/aufs-sources-4.0.9
index 3bdec29445ab..f0be8db33089 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.0.9
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.0.9
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.9
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.0_p20150629.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.0-11.base.tar.xz mirror://gentoo/genpatches-4.0-11.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-11.experimental.tar.xz ) )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d27eefc9d5b55c842573c4c556a08ef1
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.1.12 b/metadata/md5-cache/sys-kernel/aufs-sources-4.1.12
index 7f8ac16309d3..dd9ee5dccbc1 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.1.12
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.1.12
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1.12
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.1_p20151012.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.1-16.base.tar.xz mirror://gentoo/genpatches-4.1-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-16.experimental.tar.xz ) )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f545cfd57ee5fd8178b1359a25ab1167
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.2.4 b/metadata/md5-cache/sys-kernel/aufs-sources-4.2.4
index 5816168c797c..6454bbcace0f 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.2.4
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.2.4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.2.4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.2_p20151012.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.2-7.base.tar.xz mirror://gentoo/genpatches-4.2-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.2-7.experimental.tar.xz ) )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e0989d1a8acae02f506a9b256592a09f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.2.5 b/metadata/md5-cache/sys-kernel/aufs-sources-4.2.5
index 13c36792bd4d..2fc406f37bfd 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.2.5
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.2.5
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.2.5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.2_p20151012.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.2-8.base.tar.xz mirror://gentoo/genpatches-4.2-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.2-8.experimental.tar.xz ) )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4267ea3f72b005f061e104bedeaa1ea2
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.2.6 b/metadata/md5-cache/sys-kernel/aufs-sources-4.2.6
index 355ed9ca804e..dcc1a8f8b339 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.2.6
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.2.6
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.2.6
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.2_p20151116.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.2-9.base.tar.xz mirror://gentoo/genpatches-4.2-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.2-9.experimental.tar.xz ) )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e015d4019fc6e39e4edeb7141791b699
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.3.0 b/metadata/md5-cache/sys-kernel/aufs-sources-4.3.0
index 2b1160b2167e..b62782d2a7c3 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.3.0
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.3.0
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.3.0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.3_p20151109.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.3-1.base.tar.xz mirror://gentoo/genpatches-4.3-1.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.3-1.experimental.tar.xz ) )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d335630d88b7db9b05ef5b9bfd3d1258
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.10.82 b/metadata/md5-cache/sys-kernel/ck-sources-3.10.82
index d06edde7c81c..65df0a224108 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.10.82
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.10.82
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.82
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-3.10 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-88.base.tar.xz mirror://gentoo/genpatches-3.10-88.extras.tar.xz mirror://gentoo/genpatches-3.10-88.experimental.tar.xz !bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/patch-3.10-ck1-r1.bz2 http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patch-3.10-ck1-r1.bz2 ) bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/3.10-sched-bfs-440-r1.patch http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patches/3.10-sched-bfs-440-r1.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc501d95138e664f1487baa586c9acf6
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.10.83 b/metadata/md5-cache/sys-kernel/ck-sources-3.10.83
index e73ae1ef1de8..6733a5ed189d 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.10.83
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.10.83
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.83
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-3.10 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-89.base.tar.xz mirror://gentoo/genpatches-3.10-89.extras.tar.xz mirror://gentoo/genpatches-3.10-89.experimental.tar.xz !bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/patch-3.10-ck1-r1.bz2 http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patch-3.10-ck1-r1.bz2 ) bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/3.10-sched-bfs-440-r1.patch http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patches/3.10-sched-bfs-440-r1.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b8a11cd9e2b360755ba2c8f305c64cb6
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.10.86 b/metadata/md5-cache/sys-kernel/ck-sources-3.10.86
index 901ac0fed2de..c5d3023a3eaa 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.10.86
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.10.86
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.86
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-3.10 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-91.base.tar.xz mirror://gentoo/genpatches-3.10-91.extras.tar.xz mirror://gentoo/genpatches-3.10-91.experimental.tar.xz !bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/patch-3.10-ck1-r1.bz2 http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patch-3.10-ck1-r1.bz2 ) bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/3.10-sched-bfs-440-r1.patch http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patches/3.10-sched-bfs-440-r1.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=692be0854140d81e4726d59b4e694e78
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.10.87 b/metadata/md5-cache/sys-kernel/ck-sources-3.10.87
index e0e2a88c817a..2c49e2a8e7f7 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.10.87
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.10.87
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.87
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-3.10 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-92.base.tar.xz mirror://gentoo/genpatches-3.10-92.extras.tar.xz mirror://gentoo/genpatches-3.10-92.experimental.tar.xz !bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/patch-3.10-ck1-r1.bz2 http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patch-3.10-ck1-r1.bz2 ) bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/3.10-sched-bfs-440-r1.patch http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patches/3.10-sched-bfs-440-r1.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3233960ea3d0679c42af4f9733db6de2
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.14.46 b/metadata/md5-cache/sys-kernel/ck-sources-3.14.46
index a28f0559f245..d2bf5096a567 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.14.46
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.14.46
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.46
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-52.base.tar.xz mirror://gentoo/genpatches-3.14-52.extras.tar.xz mirror://gentoo/genpatches-3.14-52.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patch-3.14-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patches/3.14-sched-bfs-447.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=005b4ae66ded32d0fcccd0368ed5086b
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.14.48 b/metadata/md5-cache/sys-kernel/ck-sources-3.14.48
index f2b2149c8a11..b318d948ea44 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.14.48
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.14.48
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.48
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-54.base.tar.xz mirror://gentoo/genpatches-3.14-54.extras.tar.xz mirror://gentoo/genpatches-3.14-54.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patch-3.14-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patches/3.14-sched-bfs-447.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6795b0b1610557e86007b48f96ff6d25
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.14.50 b/metadata/md5-cache/sys-kernel/ck-sources-3.14.50
index 924ee59e0774..9b8f437a915e 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.14.50
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.14.50
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.50
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-56.base.tar.xz mirror://gentoo/genpatches-3.14-56.extras.tar.xz mirror://gentoo/genpatches-3.14-56.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patch-3.14-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patches/3.14-sched-bfs-447.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=26953e2e3fd68a2bc0b32c70ff95fcbc
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.14.51 b/metadata/md5-cache/sys-kernel/ck-sources-3.14.51
index 7ba8638809c0..bccb0e604307 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.14.51
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.14.51
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.51
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-57.base.tar.xz mirror://gentoo/genpatches-3.14-57.extras.tar.xz mirror://gentoo/genpatches-3.14-57.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patch-3.14-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patches/3.14-sched-bfs-447.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2c3e2eee8a2cf5cc7df9e5876e226589
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.18.16 b/metadata/md5-cache/sys-kernel/ck-sources-3.18.16
index 2517aadb1b29..6c2e73de63ae 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.18.16
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.18.16
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.16
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/v3.x/incr/patch-3.18.14-15.xz mirror://kernel/linux/kernel/v3.x/incr/patch-3.18.15-16.xz mirror://gentoo/genpatches-3.18-16.base.tar.xz mirror://gentoo/genpatches-3.18-16.extras.tar.xz mirror://gentoo/genpatches-3.18-16.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patch-3.18-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patches/3.18-sched-bfs-460.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2c3c9106f227c549472a7154e25e8237
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.18.19 b/metadata/md5-cache/sys-kernel/ck-sources-3.18.19
index ce63185fc698..4186ae819c8a 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.18.19
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.18.19
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.19
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://gentoo/genpatches-3.18-19.base.tar.xz mirror://gentoo/genpatches-3.18-19.extras.tar.xz mirror://gentoo/genpatches-3.18-19.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patch-3.18-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patches/3.18-sched-bfs-460.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=199b2ea28aa3bb9a6d1cc3d73ae77856
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.19.8 b/metadata/md5-cache/sys-kernel/ck-sources-3.19.8
index e91cdcefe362..978109aaf66e 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.19.8
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.19.8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.19.8
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.19-gnu/deblob-3.19 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.19-gnu/deblob-check -> deblob-check-3.19 ) mirror://gentoo/genpatches-3.19-9.base.tar.xz mirror://gentoo/genpatches-3.19-9.extras.tar.xz mirror://gentoo/genpatches-3.19-9.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.19/3.19-ck1/patch-3.19-ck1.xz ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.19/3.19-ck1/patches/3.19-sched-bfs-461.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f566464d18e10e239865b5aff578fd8d
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.4.107 b/metadata/md5-cache/sys-kernel/ck-sources-3.4.107
index d70033a9ea96..4874c9f0fc0c 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.4.107
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.4.107
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.107
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.4-gnu/deblob-3.4 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.4-gnu/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-90.base.tar.xz mirror://gentoo/genpatches-3.4-90.extras.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patch-3.4-ck3.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/3.4-sched-bfs-424.patch ) experimental? ( urwlocks? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/bfs424-grq_urwlocks.patch http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/urw-locks.patch ) )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ade4edb99d2aca217b91af1b220dbdb
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.0.7 b/metadata/md5-cache/sys-kernel/ck-sources-4.0.7
index 72d122eb9a53..42ba597194c6 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.0.7
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.0.7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.7
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) mirror://gentoo/genpatches-4.0-9.base.tar.xz mirror://gentoo/genpatches-4.0-9.extras.tar.xz mirror://gentoo/genpatches-4.0-9.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patch-4.0-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patches/4.0-sched-bfs-462.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=218d6150d858a6cb224303047c25867a
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.0.9 b/metadata/md5-cache/sys-kernel/ck-sources-4.0.9
index 6312eb519da1..c7a7f6988f1d 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.0.9
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.0.9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.9
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) mirror://gentoo/genpatches-4.0-11.base.tar.xz mirror://gentoo/genpatches-4.0-11.extras.tar.xz mirror://gentoo/genpatches-4.0-11.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patch-4.0-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patches/4.0-sched-bfs-462.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=962e2e2dc9fe41d16ae5a59968618f3e
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.1.3 b/metadata/md5-cache/sys-kernel/ck-sources-4.1.3
index 9940ed9f9c2f..b6554164af32 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.1.3
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.1.3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1.3
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) mirror://gentoo/genpatches-4.1-7.base.tar.xz mirror://gentoo/genpatches-4.1-7.extras.tar.xz mirror://gentoo/genpatches-4.1-7.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/4.0/4.1/4.1-ck1/patch-4.1-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/4.0/4.1/4.1-ck1/patches/4.1-sched-bfs-463.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=086507673a028d30351edb5a73116ab7
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.1.5 b/metadata/md5-cache/sys-kernel/ck-sources-4.1.5
index ed7d403eed22..3084ca27d679 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.1.5
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.1.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1.5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) mirror://gentoo/genpatches-4.1-9.base.tar.xz mirror://gentoo/genpatches-4.1-9.extras.tar.xz mirror://gentoo/genpatches-4.1-9.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.1/4.1-ck2/patch-4.1-ck2.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a31a8deb086e78027f93277da146e687
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.1.6 b/metadata/md5-cache/sys-kernel/ck-sources-4.1.6
index bf70ccff5777..3e0a4c9dcbd7 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.1.6
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.1.6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1.6
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) mirror://gentoo/genpatches-4.1-10.base.tar.xz mirror://gentoo/genpatches-4.1-10.extras.tar.xz mirror://gentoo/genpatches-4.1-10.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.1/4.1-ck2/patch-4.1-ck2.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=535b6b60567cbb72e6018b391b02a97a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.92 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.92
index dcf53150ff4f..c4ff84d1c970 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.92
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.92
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.92
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-97.base.tar.xz mirror://gentoo/genpatches-3.10-97.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-97.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb8250d33d3c283dfbef549663c78045
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.93 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.93
index 82d0a23c274b..08f9449c18f4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.93
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.93
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.93
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-98.base.tar.xz mirror://gentoo/genpatches-3.10-98.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-98.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6feb0344dcdb0c1ae3af7abac1e70211
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.49 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.49
index 97a328278c61..47fc54f47057 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.49
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.49
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.12.49
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-46.base.tar.xz mirror://gentoo/genpatches-3.12-46.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-46.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=30639a4cefccedf94efedfe183bc400a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.50 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.50
index 012d541c9d3c..b2cbd8a1bfc0 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.50
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.50
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.12.50
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-47.base.tar.xz mirror://gentoo/genpatches-3.12-47.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-47.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=762e3a44fcb9b9597eb8dc724b4d41ff
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.9999 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.9999
index 9ebd7f5b98d3..3c24ec3b9c0e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.9999
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.9999
@@ -9,5 +9,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.12.9999
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.12.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-r3	1502b9838d043db47700b8120083e637	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	subversion	4fee0a764150bb4dda27ed4d2c4ed7ce	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-r3	1502b9838d043db47700b8120083e637	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	subversion	4fee0a764150bb4dda27ed4d2c4ed7ce	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c14cb6aa9f4f8082a9ecf8b1dbba25d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.56 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.56
index b43c868e62d8..324bb5045c02 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.56
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.56
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.56
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-62.base.tar.xz mirror://gentoo/genpatches-3.14-62.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-62.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed190b0dc30e05db3ddd8791b47c7875
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.57 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.57
index cba95e46a6bf..c0f3b01ab4ec 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.57
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.57
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.57
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-63.base.tar.xz mirror://gentoo/genpatches-3.14-63.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-63.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=32586d959c68641f5276fa9d39a8f31a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.21 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.21
index f566ac5b0fd3..4b18a43e29a7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.21
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.21
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.21
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://gentoo/genpatches-3.18-21.base.tar.xz mirror://gentoo/genpatches-3.18-21.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-21.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f28894c1545cfe4fe3038c61abe26d38
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.22 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.22
index 0a9d654c6b5e..411aef78309c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.22
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.22
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.22
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://gentoo/genpatches-3.18-22.base.tar.xz mirror://gentoo/genpatches-3.18-22.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-22.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0d4459f9383d64edc52b76140bf7fc9b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.23 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.23
index 47e9ffe10ca6..af5b6c5bb51a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.23
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.23
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.23
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://gentoo/genpatches-3.18-23.base.tar.xz mirror://gentoo/genpatches-3.18-23.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-23.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4475cd52ebf57ebc483dacf34816cb89
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.24 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.24
index 11bf780d8c3b..124862e73b3d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.24
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.24
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.24
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-24.base.tar.xz mirror://gentoo/genpatches-3.18-24.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-24.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=69762c81e0e962101893f90bcf8756f7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.110 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.110
index 957442bd0f34..9b441fc8291d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.110
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.110
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.110
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz mirror://gentoo/genpatches-3.4-93.base.tar.xz mirror://gentoo/genpatches-3.4-93.extras.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a4e83526a60657a2731894cccecf14f7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.9999 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.9999
index 88c9d4e58422..fbfe5b0cbe29 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.9999
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.9999
@@ -9,5 +9,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.9999
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-r3	1502b9838d043db47700b8120083e637	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	subversion	4fee0a764150bb4dda27ed4d2c4ed7ce	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-r3	1502b9838d043db47700b8120083e637	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	subversion	4fee0a764150bb4dda27ed4d2c4ed7ce	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c14cb6aa9f4f8082a9ecf8b1dbba25d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.4
index 5826302614b2..8a704ba10bd9 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.4
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) mirror://gentoo/genpatches-4.0-6.base.tar.xz mirror://gentoo/genpatches-4.0-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-6.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc681eac85ac844a72589562f6834c49
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.9 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.9
index 5171e1af90b1..4b12e6c11f1a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.9
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.9
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) mirror://gentoo/genpatches-4.0-11.base.tar.xz mirror://gentoo/genpatches-4.0-11.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-11.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3dc7c9f955a3236cb2eecfdb878de5df
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.12
index 083f2eb1dd33..6c2a95915fcf 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.12
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.12
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1.12
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz mirror://gentoo/genpatches-4.1-16.base.tar.xz mirror://gentoo/genpatches-4.1-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-16.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a8429a62d87df2d2bf1e32db04f85f05
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.13 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.13
index 922e59e25e68..61047e9e57a6 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.13
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.13
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1.13
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz mirror://gentoo/genpatches-4.1-17.base.tar.xz mirror://gentoo/genpatches-4.1-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-17.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=456d01768c7659386d0d0da4549dcad6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.2.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.2.4
index c4eb61789026..4477a62950da 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.2.4
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.2.4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.2.4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz mirror://gentoo/genpatches-4.2-7.base.tar.xz mirror://gentoo/genpatches-4.2-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.2-7.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=577bdc2752b687a08d41aba5b730ecb3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.2.5 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.2.5
index 257020d91f74..0ae5621a638a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.2.5
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.2.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.2.5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz mirror://gentoo/genpatches-4.2-8.base.tar.xz mirror://gentoo/genpatches-4.2-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.2-8.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5e2049ee184f28d9d7fe4adc7159f093
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.2.6 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.2.6
index 32b2f27bf677..0e7892f1e0d9 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.2.6
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.2.6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.2.6
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz mirror://gentoo/genpatches-4.2-9.base.tar.xz mirror://gentoo/genpatches-4.2-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.2-9.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4f06e24da84479774f443891be8ead3d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.3.0 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.3.0
index e7975f8d2711..f596cf3e6f79 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.3.0
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.3.0
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.3.0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.3.tar.xz mirror://gentoo/genpatches-4.3-1.base.tar.xz mirror://gentoo/genpatches-4.3-1.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.3-1.experimental.tar.xz )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3fa68c0491a380b2f05896b9a976d909
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.4_rc1 b/metadata/md5-cache/sys-kernel/git-sources-4.4_rc1
index c05d3de2c1a4..495744afb04b 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-4.4_rc1
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.4_rc1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.4_rc1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.4-rc1.xz mirror://kernel/linux/kernel/v4.x/linux-4.3.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0ea488757d8676d39e925bf8584dc22f
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.1.7-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-4.1.7-r1
index 52b01e3198a7..afed3baac52e 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.1.7-r1
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.1.7-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=4.1.7-r1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.1.7-2.extras.tar.bz2 mirror://gentoo/genpatches-4.1-11.base.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1326abd100b2fa69e15912b9114c9adc
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.2.6-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-4.2.6-r1
index 3db0bdd809f2..e71dae206c46 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.2.6-r1
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.2.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=4.2.6-r1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.2-gnu/deblob-4.2 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.2-gnu/deblob-check -> deblob-check-4.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.2.6-2.extras.tar.bz2 mirror://gentoo/genpatches-4.2-8.base.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3d90d84def30d34b58170e1cab39b54e
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.2.6-r3 b/metadata/md5-cache/sys-kernel/hardened-sources-4.2.6-r3
index a8cb93b304a0..510b3395bd25 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.2.6-r3
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.2.6-r3
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=4.2.6-r3
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.2-gnu/deblob-4.2 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.2-gnu/deblob-check -> deblob-check-4.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.2.6-3.extras.tar.bz2 mirror://gentoo/genpatches-4.2-8.base.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=57013f24f58da5f46accb70581990c7c
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3 b/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3
index d5cc0a9b10e2..8a32065d84cc 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3
+++ b/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v2.4/patch-2.4.33.3.xz mirror://kernel/linux/kernel/v2.4/linux-2.4.33.tar.xz mirror://gentoo/gentoo-headers-2.4.33-1.tar.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5260313ce6c477331d09cd8545e940ce
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-2.4.36 b/metadata/md5-cache/sys-kernel/linux-headers-2.4.36
index a8a437d0ab40..d16bbfb06b63 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-2.4.36
+++ b/metadata/md5-cache/sys-kernel/linux-headers-2.4.36
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v2.4/linux-2.4.36.tar.xz mirror://gentoo/gentoo-headers-2.4.36-1.tar.lzma
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fd51ad60a9806be4b6f4a9d240424f55
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.18 b/metadata/md5-cache/sys-kernel/linux-headers-3.18
index 3c03fd91a7a0..dcbff4cce074 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.18
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.18
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.18.tar.xz mirror://gentoo/gentoo-headers-3.18-1.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e5a11b3a3744adb30dbdf181fdde490b
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.19 b/metadata/md5-cache/sys-kernel/linux-headers-3.19
index 6cd273543406..45d8a3a359ba 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.19
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.19
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.19.tar.xz mirror://gentoo/gentoo-headers-3.19-1.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5074bc9ace57f955674b563c806cbcb5
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.0 b/metadata/md5-cache/sys-kernel/linux-headers-4.0
index 7f0547dc4173..f51685b0439a 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.0
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.0
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.0.tar.xz mirror://gentoo/gentoo-headers-4.0-2.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c840f4c528c53b0ed68d8c72c52ed42f
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.1 b/metadata/md5-cache/sys-kernel/linux-headers-4.1
index 58827a2c45ff..bf6379df2f04 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.1
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.1.tar.xz mirror://gentoo/gentoo-headers-4.1-1.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=772646df44dca1471f8ef7aae4c0f588
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.2 b/metadata/md5-cache/sys-kernel/linux-headers-4.2
index f4cd12b41553..bf43be82c68f 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.2
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.2
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.2.tar.xz mirror://gentoo/gentoo-headers-4.2-1.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b8294f00d00f6440affb9fd6d801905f
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.3 b/metadata/md5-cache/sys-kernel/linux-headers-4.3
index d41720156fb8..a034f0077f53 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.3
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.3
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.3.tar.xz mirror://gentoo/gentoo-headers-4.3-1.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b8294f00d00f6440affb9fd6d801905f
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.1.7 b/metadata/md5-cache/sys-kernel/mips-sources-4.1.7
index 736c2c3a607c..03c5e815a8f0 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.1.7
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.1.7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1.7
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.1.7.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz mirror://gentoo/mipsgit-4.1.0-20150830.diff.xz mirror://gentoo/mips-sources-4.1.0-patches-v2.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4dc4f0a1d53a1a3b7de0c0aa3419c08d
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.2.0-r2 b/metadata/md5-cache/sys-kernel/mips-sources-4.2.0-r2
index d72f7caecdb6..838a8fc5b5ea 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.2.0-r2
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.2.0-r2
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz mirror://gentoo/mipsgit-4.2.0-20150830.diff.xz mirror://gentoo/mips-sources-4.2.0-patches-v3.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96aad5b9130b2d0adac6a65f8e1c42e7
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.5 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.5
index 7c74a3c8adb0..d8a2ad424443 100644
--- a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.5
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.32.108.5
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab108.5/patches/patch-042stab108.5-combined.gz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0b4f628d6459d959affe7de0eee1ef67
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.8 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.8
index 4e2c961dad88..85a2178ef79f 100644
--- a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.8
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.32.108.8
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab108.8/patches/patch-042stab108.8-combined.gz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0b4f628d6459d959affe7de0eee1ef67
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.111.12 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.111.12
index b647a8adae82..3a85bbc6defd 100644
--- a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.111.12
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.111.12
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.32.111.12
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab111.12/patches/patch-042stab111.12-combined.gz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7950d880af469269985e2ede575c1fac
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9
index 83de449bd918..b05a925fcdc7 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.31_p9
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.31.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.31-gnu/deblob-2.6.31 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.31-gnu/deblob-check -> deblob-check-2.6.31 ) http://pf.natalenko.name/sources/2.6.31/patch-2.6.31-pf9.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=23c79866b5052af9798fb759c6764e20
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16
index 3b64d0882f14..b00ec9ca3f5d 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.32_p16
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.32-gnu/deblob-2.6.32 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.32-gnu/deblob-check -> deblob-check-2.6.32 ) http://pf.natalenko.name/sources/2.6.32/patch-2.6.32-pf16.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=23c79866b5052af9798fb759c6764e20
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4
index 552c0309d7be..1cd726b3ed02 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.33_p4
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.33.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.33-gnu/deblob-2.6.33 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.33-gnu/deblob-check -> deblob-check-2.6.33 ) http://pf.natalenko.name/sources/2.6.33/patch-2.6.33-pf4.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=23c79866b5052af9798fb759c6764e20
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7
index c4cf79d0944a..799ead8816f4 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.34_p7
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.34.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.34-gnu/deblob-2.6.34 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.34-gnu/deblob-check -> deblob-check-2.6.34 ) http://pf.natalenko.name/sources/2.6.34/patch-2.6.34-pf7.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=23c79866b5052af9798fb759c6764e20
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11
index 834657130fa1..38f927afc0ca 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.35_p11
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.35.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.35-gnu/deblob-2.6.35 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.35-gnu/deblob-check -> deblob-check-2.6.35 ) http://pf.natalenko.name/sources/2.6.35/patch-2.6.35-pf11.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=23c79866b5052af9798fb759c6764e20
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6
index e6d3a29cda3a..0f0f31cf4a95 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.36_p6
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.36.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.36-gnu/deblob-2.6.36 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.36-gnu/deblob-check -> deblob-check-2.6.36 ) http://pf.natalenko.name/sources/2.6.36/patch-2.6.36-pf6.bz2 experimental? ( http://ck.kolivas.org/patches/bfs/bfs357-penalise_fork_depth_account_threads.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f3b1f7bbfd4f9b9cee9fc961d0199d07
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6
index ba8671ec7098..215f54dd7c28 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.37_p6
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.37.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.37-gnu/deblob-2.6.37 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.37-gnu/deblob-check -> deblob-check-2.6.37 ) http://pf.natalenko.name/sources/2.6.37/patch-2.6.37-pf6.bz2 experimental? ( http://ck.kolivas.org/patches/bfs/bfs357-penalise_fork_depth_account_threads.patch )
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a5041a4ee0182bdf142371b6212cd46
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8
index 840831f0e328..2c58c316bb86 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.38_p8
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.38.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.38-gnu/deblob-2.6.38 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.38-gnu/deblob-check -> deblob-check-2.6.38 ) http://pf.natalenko.name/sources/2.6.38/patch-2.6.38-pf8.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b432e7d872dd5ceebb4cacbbb4d1ec37
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4
index 6398a2750a14..d8956a34cf8f 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.39_p4
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.39.tar.xz http://pf.natalenko.name/sources/2.6.39/patch-2.6.39-pf4.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b432e7d872dd5ceebb4cacbbb4d1ec37
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2 b/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2
index e87bc257afdd..4304e3c71644 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.0.7-r2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.xz http://pf.natalenko.name/sources/3.0/patch-3.0.7-pf.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4c8e12529a47625f7ca36cb708e0876
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2 b/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2
index caa4a89e0ba4..602b60054fb1 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.1.6-r2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.xz http://pf.natalenko.name/sources/3.1/patch-3.1.6-pf.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cbde34eda84c090ba4abe59b50c38e87
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.10.1 b/metadata/md5-cache/sys-kernel/pf-sources-3.10.1
index a54d5334f917..5a89258edaae 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.10.1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.10.1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz http://pf.natalenko.name/sources/3.10/patch-3.10.1-pf.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4f008e8779ba4aace7b0c0ff255b04e
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.11.4 b/metadata/md5-cache/sys-kernel/pf-sources-3.11.4
index 2f1f2d3f1ba7..c6c5263d10db 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.11.4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.11.4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.11.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.11.tar.xz http://pf.natalenko.name/sources/3.11/patch-3.11.4-pf.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4f008e8779ba4aace7b0c0ff255b04e
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.12.4 b/metadata/md5-cache/sys-kernel/pf-sources-3.12.4
index e61e69c9ec2f..4945ca6e90f8 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.12.4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.12.4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.12.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz http://pf.natalenko.name/sources/3.12/patch-3.12.4-pf.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2997d3d340dd557a2b954db8775edb18
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.13.3 b/metadata/md5-cache/sys-kernel/pf-sources-3.13.3
index aed59adba7e9..17a7862d3866 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.13.3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.13.3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.13.3
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz http://pf.natalenko.name/sources/3.13/patch-3.13.3-pf.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d62027a11f09e076452e7cc1ed728095
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.14_p4 b/metadata/md5-cache/sys-kernel/pf-sources-3.14_p4
index 8fcbb383d72b..1b5c446d496b 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.14_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.14_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14_p4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz http://pf.natalenko.name/sources/3.14/patch-3.14-pf4.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02645bedc5962d7233d8e98027941ef9
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.15_p5 b/metadata/md5-cache/sys-kernel/pf-sources-3.15_p5
index d0a84cf28efc..b2e5b5731882 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.15_p5
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.15_p5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.15_p5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.15.tar.xz http://pf.natalenko.name/sources/3.15/patch-3.15-pf5.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02645bedc5962d7233d8e98027941ef9
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.16_p4 b/metadata/md5-cache/sys-kernel/pf-sources-3.16_p4
index 6eccd36f92be..da9fd82f854c 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.16_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.16_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.16_p4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.16.tar.xz http://pf.natalenko.name/sources/3.16/patch-3.16-pf4.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02645bedc5962d7233d8e98027941ef9
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.17_p4 b/metadata/md5-cache/sys-kernel/pf-sources-3.17_p4
index 3089e28b5616..2f89a051bf8a 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.17_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.17_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.17_p4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.17.tar.xz http://pf.natalenko.name/sources/3.17/patch-3.17-pf4.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7dcc1b84cb66f005d8366bce629d4716
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.19_p1 b/metadata/md5-cache/sys-kernel/pf-sources-3.19_p1
index c47314243898..b5cc0ce99f61 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.19_p1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.19_p1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.19_p1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz http://pf.natalenko.name/sources/3.19/patch-3.19-pf1.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7dcc1b84cb66f005d8366bce629d4716
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.2.7 b/metadata/md5-cache/sys-kernel/pf-sources-3.2.7
index 259d8d860605..c1ed78b85114 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.2.7
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.2.7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.2.7
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz http://pf.natalenko.name/sources/3.2/patch-3.2.7-pf.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ac6f446df3e04aff0cdd7f5b4470511
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.3.6 b/metadata/md5-cache/sys-kernel/pf-sources-3.3.6
index 597d8975e566..a15b2ada2b98 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.3.6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.3.6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.3.6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.xz http://pf.natalenko.name/sources/3.3/patch-3.3.6-pf.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ac6f446df3e04aff0cdd7f5b4470511
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.4.6 b/metadata/md5-cache/sys-kernel/pf-sources-3.4.6
index 17a642f21e0f..03b549a3e99a 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.4.6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.4.6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz http://pf.natalenko.name/sources/3.4/patch-3.4.6-pf.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ac6f446df3e04aff0cdd7f5b4470511
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.5.4 b/metadata/md5-cache/sys-kernel/pf-sources-3.5.4
index 5e984ef4eec8..1faa80138b1d 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.5.4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.5.4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.5.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.xz http://pf.natalenko.name/sources/3.5/patch-3.5.4-pf.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ac6f446df3e04aff0cdd7f5b4470511
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.6.12 b/metadata/md5-cache/sys-kernel/pf-sources-3.6.12
index 2306f4565abf..fcd0558dcd19 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.6.12
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.6.12
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.6.12
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.xz http://pf.natalenko.name/sources/3.6/patch-3.6.12-pf.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ac6f446df3e04aff0cdd7f5b4470511
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.7.5 b/metadata/md5-cache/sys-kernel/pf-sources-3.7.5
index 45a0fcb9d926..e791d78bb974 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.7.5
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.7.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.7.5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.7.tar.xz http://pf.natalenko.name/sources/3.7/patch-3.7.5-pf.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4f008e8779ba4aace7b0c0ff255b04e
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.8.2 b/metadata/md5-cache/sys-kernel/pf-sources-3.8.2
index 24ab14630960..5b237e8273f8 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.8.2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.8.2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.8.2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.8.tar.xz http://pf.natalenko.name/sources/3.8/patch-3.8.2-pf.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4f008e8779ba4aace7b0c0ff255b04e
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.9.5 b/metadata/md5-cache/sys-kernel/pf-sources-3.9.5
index 47ba42bee556..2be821021dda 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.9.5
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.9.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.9.5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz http://pf.natalenko.name/sources/3.9/patch-3.9.5-pf.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4f008e8779ba4aace7b0c0ff255b04e
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.0_p6 b/metadata/md5-cache/sys-kernel/pf-sources-4.0_p6
index 07d3825885dc..7bad7d9231e2 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.0_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.0_p6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0_p6
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz http://pf.natalenko.name/sources/4.0/patch-4.0-pf6.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7e6aee948ca0f198465278eb49f12a0b
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.1_p1 b/metadata/md5-cache/sys-kernel/pf-sources-4.1_p1
index ea5073e75e79..5f64e951957c 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.1_p1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.1_p1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1_p1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz http://pf.natalenko.name/sources/4.1/patch-4.1-pf1.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7e6aee948ca0f198465278eb49f12a0b
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.2_p3 b/metadata/md5-cache/sys-kernel/pf-sources-4.2_p3
index f8bdf4fcd3ce..eac094713ee2 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.2_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.2_p3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.2_p3
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz http://pf.natalenko.name/sources/4.2/patch-4.2-pf3.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7e6aee948ca0f198465278eb49f12a0b
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.1_pre-r20130719 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.1_pre-r20130719
index 2bea26aade5e..a065dffe97ca 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.1_pre-r20130719
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.1_pre-r20130719
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.1_pre-r20130719
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.1.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz https://dev.gentoo.org/~xmw/raspberrypi-sources/raspberrypi-sources-3.10.1_pre-r20130719.patch.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07f867462eab8e985e81019256f56bf9
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.9999
index 1e6a7c09230f..012e0f834573 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.10.9999
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=912ac5900ef5fb6c90b8d452d12bf5e2
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.12.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.12.9999
index 7133ebed24ce..532a3cf9c469 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.12.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.12.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.12.9999
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=912ac5900ef5fb6c90b8d452d12bf5e2
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.14.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.14.9999
index cfc580adca9f..a70b7b1bf27c 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.14.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.14.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.14.9999
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=437183d58bd2aa7ef61a96b3c035268d
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.18.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.18.9999
index 9056cc345a12..18400782e6a3 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.18.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.18.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.18.9999
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f025fdebb7d3ac0cc0a1bd1a865f6c9b
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.19.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.19.9999
index df30fe6b5511..075e3f855862 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.19.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.19.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.19.9999
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f025fdebb7d3ac0cc0a1bd1a865f6c9b
diff --git a/metadata/md5-cache/sys-kernel/rsbac-sources-3.14.28 b/metadata/md5-cache/sys-kernel/rsbac-sources-3.14.28
index 6bda8ee2541f..f79e376aa80c 100644
--- a/metadata/md5-cache/sys-kernel/rsbac-sources-3.14.28
+++ b/metadata/md5-cache/sys-kernel/rsbac-sources-3.14.28
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.28
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz http://download.rsbac.org/patches/1.4.9/patch-linux-3.14.28-rsbac-1.4.9.diff.xz mirror://gentoo/genpatches-3.14-33.base.tar.xz mirror://gentoo/genpatches-3.14-33.extras.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5594d7bcba1d00d8eb7ca7d8ba187944
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.14.46_p46 b/metadata/md5-cache/sys-kernel/rt-sources-3.14.46_p46
index 83561e856dff..fa4bd3a3c1b2 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.14.46_p46
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.14.46_p46
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.46_p46
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.14.46.xz mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://kernel/linux/kernel/projects/rt/3.14/patch-3.14.46-rt46.patch.xz mirror://kernel/linux/kernel/projects/rt/3.14/older/patch-3.14.46-rt46.patch.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff81d6be690b9cc4ca0e38901d79e62d
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.17_p14 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.17_p14
index b5ea1ea5332d..4f39843c34fd 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.18.17_p14
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.18.17_p14
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.17_p14
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.17.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.17-rt14.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.17-rt14.patch.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff81d6be690b9cc4ca0e38901d79e62d
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.0.5_p4 b/metadata/md5-cache/sys-kernel/rt-sources-4.0.5_p4
index 0013dc6133d7..a8c0ea4deefb 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.0.5_p4
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.0.5_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.5_p4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.0.5.xz mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) mirror://kernel/linux/kernel/projects/rt/4.0/patch-4.0.5-rt4.patch.xz mirror://kernel/linux/kernel/projects/rt/4.0/older/patch-4.0.5-rt4.patch.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff81d6be690b9cc4ca0e38901d79e62d
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.1.5_p5 b/metadata/md5-cache/sys-kernel/rt-sources-4.1.5_p5
index 3ffc97efea5b..fa0fced3d958 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.1.5_p5
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.1.5_p5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1.5_p5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.1.5.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) mirror://kernel/linux/kernel/projects/rt/4.1/patch-4.1.5-rt5.patch.xz mirror://kernel/linux/kernel/projects/rt/4.1/older/patch-4.1.5-rt5.patch.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff81d6be690b9cc4ca0e38901d79e62d
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.88 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.88
index 45c30470ed2a..b08ecd646872 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.88
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.88
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.10.88
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-93.base.tar.xz mirror://gentoo/genpatches-3.10-93.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-93.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.10.87-2015-08-22.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=49593312c27d321e573f0b11f35e9a12
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.90 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.90
index f8fd034bb2bd..14500b30852b 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.90
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.90
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.10.90
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-95.base.tar.xz mirror://gentoo/genpatches-3.10-95.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-95.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.10.90-2015-10-02.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=83da61905fd33be122a47a644338850c
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.92 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.92
index e6e78f94686a..80c3ba3965a7 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.92
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.92
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.10.92
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-97.base.tar.xz mirror://gentoo/genpatches-3.10-97.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-97.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.10.92-2015-10-30.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c41e29682ad4de7a79983889cbe60b3
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.93 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.93
index 627f947a9496..63d475a4ae63 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.93
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.93
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.10.93
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-98.base.tar.xz mirror://gentoo/genpatches-3.10-98.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-98.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.10.92-2015-10-30.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=52f70ee3550f526d7904d6b94f5e0a21
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.47 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.47
index 7a6cc2e6e2a1..81d16e6f6fdb 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.47
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.47
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.12.47
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-44.base.tar.xz mirror://gentoo/genpatches-3.12-44.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-44.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.12.47-2015-09-08.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b12fbd1803f156ae7c6a4ae59a3a01ad
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.48 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.48
index 49e0bc0d92ec..ffd0efbbc4e9 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.48
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.48
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.12.48
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-45.base.tar.xz mirror://gentoo/genpatches-3.12-45.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-45.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.12.48-2015-09-23.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d34fe37880882609c9f58d38169edb65
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.49 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.49
index 85ab57fb8eee..6f26980db2ee 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.49
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.49
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.12.49
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-46.base.tar.xz mirror://gentoo/genpatches-3.12-46.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-46.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.12.49-2015-10-10.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=85e322111c2797fff01e7ea0c9d1a2cd
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.50 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.50
index c96e6507cd1a..d10c5aaac512 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.50
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.50
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.12.50
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-47.base.tar.xz mirror://gentoo/genpatches-3.12-47.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-47.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.12.49-2015-10-10.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=558f1e9352338a75858e41f6cc8fe379
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.52 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.52
index ec06109fb599..cfaa28b33026 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.52
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.52
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.14.52
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-58.base.tar.xz mirror://gentoo/genpatches-3.14-58.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-58.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.14.51-2015-08-22.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f2adf5d250b04aaba2b603b87ef2741a
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.54 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.54
index 651ad2f71db4..b5e8ee5a6a0f 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.54
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.54
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.14.54
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-60.base.tar.xz mirror://gentoo/genpatches-3.14-60.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-60.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.14.54-2015-10-02.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d440e3560e1f69716fdd17f6d67b7373
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.56 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.56
index a793bcb9a87f..b9818cf076ca 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.56
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.56
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.14.56
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-62.base.tar.xz mirror://gentoo/genpatches-3.14-62.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-62.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.14.56-2015-10-30.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ae1ef7c10ec8d579897eb87b03274a67
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.57 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.57
index 9bcb9b2fd315..9aa5e09901f8 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.57
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.57
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.14.57
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-63.base.tar.xz mirror://gentoo/genpatches-3.14-63.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-63.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.14.56-2015-10-30.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=94bea83a4db4af8a4df7dfac524a080d
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.21 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.21
index 4deea4a541c2..8b804c68efd6 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.21
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.21
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.18.21
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-21.base.tar.xz mirror://gentoo/genpatches-3.18-21.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-21.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.18.21-2015-09-08.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c00472c9faeba0deb5da474390a0d20
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.22 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.22
index 868dcd862581..073157993cca 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.22
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.22
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.18.22
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-22.base.tar.xz mirror://gentoo/genpatches-3.18-22.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-22.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.18.22-2015-10-10.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5147b28342688e913ce8bf5c0030be8d
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.23 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.23
index 641121809771..2a54ad44f1a4 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.23
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.23
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.18.23
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-23.base.tar.xz mirror://gentoo/genpatches-3.18-23.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-23.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.18.23-2015-10-30.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=317907c6d89c1bf9db90585f994fe022
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.24 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.24
index f3ef07f941c0..b9426f6f1e5e 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.24
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.24
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.18.24
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-24.base.tar.xz mirror://gentoo/genpatches-3.18-24.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-24.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.18.23-2015-10-30.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=53c1dd38d781c5232a970ade02974c89
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.108 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.108
index 9b9a1cfa07f0..80217f0d91f0 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.108
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.108
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.4.108
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz mirror://gentoo/genpatches-3.4-91.base.tar.xz mirror://gentoo/genpatches-3.4-91.extras.tar.xz http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.4.107-2015-04-18.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a667c276bf77b6122f50e70e58f420a
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.109 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.109
index 228e3cb48f3a..889f9fedcd2a 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.109
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.109
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.4.109
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz mirror://gentoo/genpatches-3.4-92.base.tar.xz mirror://gentoo/genpatches-3.4-92.extras.tar.xz http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.4.109-2015-09-23.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3d7e4161e0f3d094dce5d77eb3ea2c41
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.110 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.110
index c7d2ae669073..4b4e7a2f801a 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.110
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.110
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.4.110
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz mirror://gentoo/genpatches-3.4-93.base.tar.xz mirror://gentoo/genpatches-3.4-93.extras.tar.xz http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.4.110-2015-10-30.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1896843371ece80c3cdc5c163616c58
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.0.9 b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.0.9
index c6dc1e0e62b8..2221dbb52094 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.0.9
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.0.9
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=4.0.9
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz mirror://gentoo/genpatches-4.0-11.base.tar.xz mirror://gentoo/genpatches-4.0-11.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-11.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-4.0.9-2015-07-23.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=968ecbb8260a1eeaffc9d71df5fdd3ff
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.12 b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.12
index a048d933cca9..df1d0fc93668 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.12
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.12
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=4.1.12
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz mirror://gentoo/genpatches-4.1-16.base.tar.xz mirror://gentoo/genpatches-4.1-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-16.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-4.1.12-2015-10-30.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f62d3e78c3348df497614c7191a303f6
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.13 b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.13
index e7442ceb6c10..f1c93a85c872 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.13
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.13
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=4.1.13
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz mirror://gentoo/genpatches-4.1-17.base.tar.xz mirror://gentoo/genpatches-4.1-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-17.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-4.1.12-2015-10-30.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=451bb646fa81f390ccf0aa7ad6c9369c
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.7 b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.7
index 5de340136cde..be4b8b227452 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.7
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.7
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=4.1.7
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz mirror://gentoo/genpatches-4.1-11.base.tar.xz mirror://gentoo/genpatches-4.1-11.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-11.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-4.1.6-2015-08-22.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=25ee6fa1b4a538c8348421ed7388c480
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.9 b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.9
index 165d44aad97c..2e12dc40f8d4 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.9
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.1.9
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=4.1.9
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz mirror://gentoo/genpatches-4.1-14.base.tar.xz mirror://gentoo/genpatches-4.1-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-14.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-4.1.9-2015-10-02.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2f210751812f296332fac28c1d0ddb57
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.0 b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.0
index 809398ceea6a..a60c60d273ac 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.0
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=4.2.0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz mirror://gentoo/genpatches-4.2-2.base.tar.xz mirror://gentoo/genpatches-4.2-2.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.2-2.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-4.2.0-2015-09-08.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7c5508de796d9793d5d49d9c005d9faa
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.3 b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.3
index d0aaea77ba94..10d1bf60943a 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.3
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=4.2.3
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz mirror://gentoo/genpatches-4.2-6.base.tar.xz mirror://gentoo/genpatches-4.2-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.2-6.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-4.2.3-2015-10-10.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=09856e075fdb21b7415a633308165d39
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.5 b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.5
index 2df95829feb0..c1d9465fbe68 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.5
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=4.2.5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz mirror://gentoo/genpatches-4.2-8.base.tar.xz mirror://gentoo/genpatches-4.2-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.2-8.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-4.2.5-2015-10-30.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b2a36413278d7c68c8cd872efa22cb4b
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.6 b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.6
index c40e39a72eb1..26ced273eb89 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.6
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.2.6
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=4.2.6
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz mirror://gentoo/genpatches-4.2-9.base.tar.xz mirror://gentoo/genpatches-4.2-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.2-9.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-4.2.5-2015-10-30.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a1fb6eadd71615db430c7ee03988134d
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.3.0 b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.3.0
index 6e191ce2a483..b98fdeae98d8 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.3.0
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=4.3.0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.3.tar.xz mirror://gentoo/genpatches-4.3-1.base.tar.xz mirror://gentoo/genpatches-4.3-1.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.3-1.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-head-4.3.0-rc7-2015-11-01.patch.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1f81a3d2fbd6d246bc9cf0052d41ae6a
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.93 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.93
index 3c4d8eaf67f6..541a6b72cf38 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.93
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.93
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.93
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.93.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=935bbb694ae5475a82e7aadf08914b06
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.50 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.50
index 3196ac603b89..9e8ea98dadf5 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.50
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.50
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.12.50
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.12.50.xz mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=935bbb694ae5475a82e7aadf08914b06
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.57 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.57
index 79e632f6797a..667022367118 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.57
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.57
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.57
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.14.57.xz mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=935bbb694ae5475a82e7aadf08914b06
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.23 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.23
index 9cfc11644a42..17f564627f6a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.23
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.23
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.23
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.23.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=935bbb694ae5475a82e7aadf08914b06
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.72 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.73
similarity index 78%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.2.72
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.2.73
index 2fc5b1bb1e45..e9bc3e5c88b0 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.72
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.73
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~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=3.2.72
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.72.xz mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+SLOT=3.2.73
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.73.xz mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=935bbb694ae5475a82e7aadf08914b06
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.110 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.110
index ff4c88828f61..65a68272de6f 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.110
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.110
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.110
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.110.xz mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=935bbb694ae5475a82e7aadf08914b06
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.13 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.13
index d72ae49b0468..1302846a0b4b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.13
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.13
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1.13
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.1.13.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=935bbb694ae5475a82e7aadf08914b06
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.2.6 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.2.6
index e7bd860f0109..c7b93f7de488 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.2.6
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.2.6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.2.6
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.2.6.xz mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=935bbb694ae5475a82e7aadf08914b06
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.3.0 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.3.0
index eec52c330ea8..d3c1dab82b1f 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.3.0
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.3.0
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.3.0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.3.tar.xz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=935bbb694ae5475a82e7aadf08914b06
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32
index d236eed70d35..77185db68c5c 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.0.36.32
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.35.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.35-gnu/deblob-2.6.35 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.35-gnu/deblob-check -> deblob-check-2.6.35 ) mirror://gentoo/genpatches-2.6.35-9.base.tar.xz mirror://gentoo/genpatches-2.6.35-9.extras.tar.xz https://dev.gentoo.org/~hollow/distfiles/vserver-patches-2.6.35_2.3.0.36.32.tar.bz2
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=555caf389d1405689abda362109c2000
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.11 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.11
index d258ac5b6f8e..32b65ab66870 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.11
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.11
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.6.11
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.13.11.xz mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.13.11-vs2.3.6.11.diff
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0163794799bf1535f98577b06d95f307
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.14 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.14
index aaac05039656..4f17d9cfee29 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.14
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.14
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.6.14
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.14.27.xz mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.14.27-vs2.3.6.14.diff
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c01eeb76c8d9799cf71c20e8b1efce53
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.5 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.5
index 98bd93902144..c64724b48e13 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.5
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.6.5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.9.10.xz mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.9.10-vs2.3.6.5.diff
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a70374979494dee7e329a30b04451618
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.8 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.8
index 30889ed200b7..8109cd74d5e8 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.8
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.6.8
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.40.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.10.40-vs2.3.6.8.diff
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed5318c53590e1f2eabcd821e0e36c3c
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.3 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.3
index 86798a2c5628..4d56b9cc016e 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.3
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.7.3
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.5.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.18.5-vs2.3.7.3.diff
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=63bae420ec01f1413254289eb91c451b
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.4 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.4
index 4d16149ab228..71dfd4be0977 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.4
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.7.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.7.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.18.7-vs2.3.7.4.diff
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc95d40d93c4129d93661bebfa45d93c
diff --git a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26 b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
index fadde2b6d80a..000b9ba84437 100644
--- a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
+++ b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.16.26
 SRC_URI=mirror://kernel/linux/kernel/v2.6/patch-2.6.16.26.xz mirror://kernel/linux/kernel/v2.6/linux-2.6.16.tar.xz mirror://sourceforge/xbox-linux/linux-2.6.16-xbox.patch.gz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a887ed224412def94de2bc643f99a650
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.10.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.10.9999
index 63994acf3a75..f13a6e13b892 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-3.10.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.10.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.10.9999
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=307fcb46bc5232c06b51e92eb1767ed7
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.11.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.11.9999
index 1c8890036f57..a5caa595c2ae 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-3.11.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.11.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.11.9999
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=307fcb46bc5232c06b51e92eb1767ed7
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.12.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.12.9999
index dde44a17178d..a856e3f44d47 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-3.12.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.12.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.12.9999
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=307fcb46bc5232c06b51e92eb1767ed7
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.13.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.13.9999
index 25cedb35b68e..764473e21221 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-3.13.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.13.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.13.9999
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=605b73bac752225f3701931986fb5080
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.8.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.8.9999
index 982d5e1941ba..a981a16ba6f8 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-3.8.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.8.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.8.9999
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=307fcb46bc5232c06b51e92eb1767ed7
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.9.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.9.9999
index 8aa71d4ae697..115e93f2cc4d 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-3.9.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.9.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.9.9999
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	6c6f2aa136dfdc07a5d1242fbde2f153	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	f813d23e417656bf3917483643165d5a	git-2	df00117322129fb906bb0a53c3d6a020	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=307fcb46bc5232c06b51e92eb1767ed7
diff --git a/metadata/md5-cache/www-apps/drupal-8.0.0_beta11 b/metadata/md5-cache/www-apps/drupal-8.0.0_beta11
deleted file mode 100644
index 8ee7664ca7ea..000000000000
--- a/metadata/md5-cache/www-apps/drupal-8.0.0_beta11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=5
-HOMEPAGE=http://drupal.org/
-IUSE=+accelerator +mysql postgres sqlite +uploadprogress vhosts
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml] virtual/httpd-php accelerator? ( || ( dev-php/xcache ( >=dev-lang/php-5.5[opcache] dev-php/pecl-apcu ) ) ) uploadprogress? ( dev-php/pecl-uploadprogress ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) sqlite? ( dev-lang/php[sqlite] ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=8.0.0_beta11
-SRC_URI=http://drupal.org/files/projects/drupal-8.0.0-beta11.tar.gz
-_eclasses_=webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=c3874b817cefac0732684a29a990d88f
diff --git a/metadata/md5-cache/www-apps/drupal-8.0.0_beta14 b/metadata/md5-cache/www-apps/drupal-8.0.0_beta14
deleted file mode 100644
index 08af18070f5b..000000000000
--- a/metadata/md5-cache/www-apps/drupal-8.0.0_beta14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=5
-HOMEPAGE=http://drupal.org/
-IUSE=+accelerator +mysql postgres sqlite +uploadprogress vhosts
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml] virtual/httpd-php accelerator? ( || ( dev-php/xcache ( >=dev-lang/php-5.5[opcache] dev-php/pecl-apcu ) ) ) uploadprogress? ( dev-php/pecl-uploadprogress ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) sqlite? ( dev-lang/php[sqlite] ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=8.0.0_beta14
-SRC_URI=http://drupal.org/files/projects/drupal-8.0.0-beta14.tar.gz
-_eclasses_=webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=c3874b817cefac0732684a29a990d88f
diff --git a/metadata/md5-cache/www-apps/drupal-8.0.0_rc1 b/metadata/md5-cache/www-apps/drupal-8.0.0_rc4
similarity index 91%
rename from metadata/md5-cache/www-apps/drupal-8.0.0_rc1
rename to metadata/md5-cache/www-apps/drupal-8.0.0_rc4
index 894756cec299..c97dc91acbdb 100644
--- a/metadata/md5-cache/www-apps/drupal-8.0.0_rc1
+++ b/metadata/md5-cache/www-apps/drupal-8.0.0_rc4
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml] virtual/httpd-php accelerator? ( || ( dev-php/xcache ( >=dev-lang/php-5.5[opcache] dev-php/pecl-apcu ) ) ) uploadprogress? ( dev-php/pecl-uploadprogress ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) sqlite? ( dev-lang/php[sqlite] ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=8.0.0_rc1
-SRC_URI=http://drupal.org/files/projects/drupal-8.0.0-rc1.tar.gz
+SLOT=8.0.0_rc4
+SRC_URI=http://drupal.org/files/projects/drupal-8.0.0-rc4.tar.gz
 _eclasses_=webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=c3874b817cefac0732684a29a990d88f
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-48.0.2560.0_p1 b/metadata/md5-cache/www-client/google-chrome-unstable-48.0.2564.8_p1
similarity index 94%
rename from metadata/md5-cache/www-client/google-chrome-unstable-48.0.2560.0_p1
rename to metadata/md5-cache/www-client/google-chrome-unstable-48.0.2564.8_p1
index f4f94946bd15..b1d73ff8df15 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-48.0.2560.0_p1
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-48.0.2564.8_p1
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2560.0-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2560.0-1_i386.deb )
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2564.8-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2564.8-1_i386.deb )
 _eclasses_=chromium	e6257bd55bfdac1269e99d4d7ed21cda	eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	588052cacdf74572e68bdfeaece20534	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	9dd3f9de6dccb2463faf55e568439d1c	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=008c75c87c3b342e7b9996f4c522e051
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2560.0_alpha1 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2564.8_alpha1
similarity index 84%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2560.0_alpha1
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2564.8_alpha1
index b59003655832..0283b22d968a 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2560.0_alpha1
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2564.8_alpha1
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=!www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2560.0-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2560.0-1_i386.deb )
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2564.8-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2564.8-1_i386.deb )
 _eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
 _md5_=a298ad95eeea170c424be0b43ae88a8b
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.18.4 b/metadata/md5-cache/x11-libs/gtk+-3.18.5
similarity index 99%
rename from metadata/md5-cache/x11-libs/gtk+-3.18.4
rename to metadata/md5-cache/x11-libs/gtk+-3.18.5
index c5161a25b939..f49fc8439c5f 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.18.4
+++ b/metadata/md5-cache/x11-libs/gtk+-3.18.5
@@ -10,6 +10,6 @@ PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 RDEPEND=>=dev-libs/atk-2.15[introspection?,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/glib-2.45.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(-)?] media-libs/fontconfig[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(-)?] >=media-libs/libepoxy-1.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(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,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(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,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(-)?] >=x11-libs/pango-1.37.3[introspection?,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(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.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(-)?] >=dev-libs/json-glib-1.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(-)?] ) colord? ( >=x11-misc/colord-0.1.9: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(-)?] ) cups? ( >=net-print/cups-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.5.91[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(-)?] media-libs/mesa[wayland,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(-)?] >=x11-libs/libxkbcommon-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(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[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(-)?] x11-libs/libXrender[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(-)?] x11-libs/libX11[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(-)?] >=x11-libs/libXi-1.3[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(-)?] x11-libs/libXext[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(-)?] >=x11-libs/libXrandr-1.3[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(-)?] x11-libs/libXcursor[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(-)?] x11-libs/libXfixes[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(-)?] x11-libs/libXcomposite[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(-)?] x11-libs/libXdamage[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(-)?] xinerama? ( x11-libs/libXinerama[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-util/gtk-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90 >=x11-themes/adwaita-icon-theme-3.14 X? ( !<x11-base/xorg-server-1.11.4 )
 REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
 SLOT=3
-SRC_URI=mirror://gnome/sources/gtk+/3.18/gtk+-3.18.4.tar.xz
+SRC_URI=mirror://gnome/sources/gtk+/3.18/gtk+-3.18.5.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
 _md5_=9a35a1ec72509373be2f8725243cc74b
diff --git a/metadata/md5-cache/x11-wm/muffin-2.8.2 b/metadata/md5-cache/x11-wm/muffin-2.8.3
similarity index 97%
rename from metadata/md5-cache/x11-wm/muffin-2.8.2
rename to metadata/md5-cache/x11-wm/muffin-2.8.3
index 37b061e646ba..38971acca3e7 100644
--- a/metadata/md5-cache/x11-wm/muffin-2.8.2
+++ b/metadata/md5-cache/x11-wm/muffin-2.8.3
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?] >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] >=media-libs/clutter-1.14.3:1.0=[introspection?] >=media-libs/cogl-1.13.3:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/libXcomposite-0.3 >=x11-libs/startup-notification-0.7:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender virtual/opengl gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) xinerama? ( x11-libs/libXinerama ) !x11-misc/expocity
 SLOT=0
-SRC_URI=https://github.com/linuxmint/muffin/archive/2.8.2.tar.gz -> muffin-2.8.2.tar.gz
+SRC_URI=https://github.com/linuxmint/muffin/archive/2.8.3.tar.gz -> muffin-2.8.3.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ae05955ed4459d65b65eaf0c62ebfc7
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9cf6a76637df..2e099343fb00 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 17 Nov 2015 09:50:29 +0000
+Wed, 18 Nov 2015 05:50:59 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 8ef851e49e01..ab82eb681c3d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Nov 17 09:49:33 UTC 2015
+Wed Nov 18 05:50:04 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c85aa516ff92..76c635611865 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 17 Nov 2015 10:30:02 +0000
+Wed, 18 Nov 2015 06:30:02 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0a3ded8e30e7..70450a12d4ca 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1447753801 Tue 17 Nov 2015 09:50:01 AM UTC
+1447825801 Wed 18 Nov 2015 05:50:01 AM UTC
diff --git a/net-analyzer/2ping/2ping-3.1.0.ebuild b/net-analyzer/2ping/2ping-3.1.0.ebuild
new file mode 100644
index 000000000000..4c311b30f1b3
--- /dev/null
+++ b/net-analyzer/2ping/2ping-3.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A bi-directional ping utility"
+HOMEPAGE="http://www.finnie.org/software/2ping/"
+SRC_URI="http://www.finnie.org/software/2ping/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="server"
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/2ping.1
+	dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md}
+	use server && {
+		doinitd "${FILESDIR}"/2pingd
+		newconfd "${FILESDIR}"/2pingd.conf 2pingd
+	}
+}
diff --git a/net-analyzer/2ping/Manifest b/net-analyzer/2ping/Manifest
index 970106079f5d..1ea41b16acf7 100644
--- a/net-analyzer/2ping/Manifest
+++ b/net-analyzer/2ping/Manifest
@@ -1 +1,2 @@
 DIST 2ping-3.0.1.tar.gz 39752 SHA256 d6997cd1680151e6f7d5e60137d45cd41bf385d26029878afdaaf5dc4f63dcc4 SHA512 c5e8b26591a51bc3410db2ab572b17d6fddbce8f25c8cbfb4eb23cb738b28b12dae1cc395d26987e84191039193853178dffb748b1f951661e319ac2d5c053db WHIRLPOOL 1f90e57a5e5e6788cc832335213fa3c93d029b2bb82837e322dc65b41c1b2dbfe7aa824e38e1595f3378b2ea2978604915404351866cac245276beedef6cbf39
+DIST 2ping-3.1.0.tar.gz 42581 SHA256 0f5b4e10f89dd99ef04e2cc0564d6673ceae897ed0bf59b636553ec6aa1c7a92 SHA512 6b264001f32cd6d7178f66365a0999e5087516681ee266b9170fe4a8bf10be27e451302e40141534a3d115dfa73689954e566cb68b51ce181965f0d347b8f844 WHIRLPOOL 90ddfa773e0cedf292acb3671c3e1f9cd444a082379e2132553de505de81c16d77fbff0c2bd2f976cf92b1e82b11a4c3945b181e6805c01e48f8de11a10c9cb8
diff --git a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
index a7285fe8e9fc..703f3e9cc1a1 100644
--- a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -56,6 +56,15 @@ DOCS=(
 
 src_install() {
 	default
+
+	local itarget
+	if has_version ">=net-analyzer/nagios-core-4.0" ; then
+		itarget="install-4x"
+	else
+		itarget="install-3x"
+	fi
+
+	emake -C src DESTDIR="${D}" "${itarget}"
 	emake DESTDIR="${D}" install-config
 
 	newinitd "${FILESDIR}"/ndo2db.init-nagios3 ndo2db
@@ -64,5 +73,5 @@ src_install() {
 pkg_postinst() {
 	elog "To include NDO in your Nagios setup you'll need to activate the NDO broker module"
 	elog "in /etc/nagios/nagios.cfg:"
-	elog "\tbroker_module=/usr/bin/ndomod-3x.o config_file=/etc/nagios/ndomod.cfg"
+	elog "\tbroker_module=/usr/bin/ndomod.o config_file=/etc/nagios/ndomod.cfg"
 }
diff --git a/net-libs/gupnp-ui/files/gupnp-ui-0.1.1-underlinking.patch b/net-libs/gupnp-ui/files/gupnp-ui-0.1.1-underlinking.patch
new file mode 100644
index 000000000000..207eecc7f12c
--- /dev/null
+++ b/net-libs/gupnp-ui/files/gupnp-ui-0.1.1-underlinking.patch
@@ -0,0 +1,25 @@
+--- configure.ac
++++ configure.ac
+@@ -11,7 +11,7 @@
+ AC_PROG_LIBTOOL
+ 
+ PKG_CHECK_MODULES(LIBGUPNP_UI, gupnp-1.0 >= 0.3 gtk+-2.0)
+-
++PKG_CHECK_MODULES(GSSDP, gssdp-1.0)
+ PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
+ 
+ # Debugging
+--- tests/Makefile.am
++++ tests/Makefile.am
+@@ -1,9 +1,9 @@
+-AM_CFLAGS = $(LIBGUPNP_UI_CFLAGS) $(GTHREAD_CFLAGS) -I$(top_srcdir)
++AM_CFLAGS = $(LIBGUPNP_UI_CFLAGS) $(GTHREAD_CFLAGS) $(GSSDP_CFLAGS) -I$(top_srcdir)
+ 
+ noinst_PROGRAMS = test-view
+ 
+ test_view_SOURCES = test-view.c
+-test_view_LDADD   = $(top_builddir)/libgupnp-ui/libgupnp-ui-1.0.la $(GTHREAD_LIBS)
++test_view_LDADD   = $(top_builddir)/libgupnp-ui/libgupnp-ui-1.0.la $(GTHREAD_LIBS) $(GSSDP_LIBS)
+ 
+ CLEANFILES = $(BUILT_SOURCES)
+ DISTCLEANFILES = $(BUILT_SOURCES)
diff --git a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
index 6ccd7ffb44cc..1d129c2e6dd1 100644
--- a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
+++ b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
@@ -2,7 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils
 
 DESCRIPTION="Collection of simple GTK+ widgets on top of GUPnP"
 HOMEPAGE="http://gupnp.org"
@@ -19,6 +24,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext"
 
+PATCHES=(
+       "${FILESDIR}"/${P}-underlinking.patch
+)
+
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
diff --git a/net-misc/chrony/chrony-2.2.ebuild b/net-misc/chrony/chrony-2.2.ebuild
index 3b219f232e7b..69acd55a9303 100644
--- a/net-misc/chrony/chrony-2.2.ebuild
+++ b/net-misc/chrony/chrony-2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
 REQUIRED_USE="
 	?? ( libedit readline )
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 88ff133fdd84..58c95891ecef 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,4 +1,3 @@
-DIST wget-1.16.1.tar.xz 1760120 SHA256 2b96c707ee15fe847f5bc2f872a7a530dca803b927a750419b44f50803e14d33 SHA512 28f69b2037bb3ea34b109bb20d99da7056e025dd9cce18a74cde2ffcc61933625b643673c76a7ba59b42d7e029898774da2d8af0fdbca3cffd5e4434c30e339a WHIRLPOOL a5ed1b7515acbfb33390c575588f8f476bf537eb90ebaaeb2b880e1962f15a6992eb7aa4a977b554fc6e34d384569f132760df7df9c48007e369e9773ceda696
-DIST wget-1.16.2.tar.xz 1805080 SHA256 a7dfde1bcb0eb135addf587a649fd0e47c1a876edef359b9197cdffd1fdcd7d5 SHA512 ec99606577afb131fa1eb3c286a3dd9dccea689bf5c83df8303b1130ed569934ca27f8c517a06f9e2be456c020480842cbf8eebe97285890e46dca60158f3c12 WHIRLPOOL 2b174aa4223d3f3ff64366b96ed5f725e4c4a1c96f2aa01ab4ee0eac702a600869a71636a1860bd9ebca6fad5e0c16164280ca202f92254b6b5052a10bdf0fb7
 DIST wget-1.16.3.tar.xz 1794148 SHA256 67f7b7b0f5c14db633e3b18f53172786c001e153d545cfc85d82759c5c2ffb37 SHA512 2d1fe632bcd116a68ae333278e368cb810081b51d2259ddade602bebf3dd08dee1f51f67c9c7d79d2410e19fe0d48a0b9a1b1a7c7c6eeb47e2840ce6c1a3471c WHIRLPOOL b8fe9880523fc295b092c3b9ff4f9af58c071f55d516903ded66df67722cd27955ad651f6f2f6032b611e5445dd89b8ff97878443abc04d095c29e76f0564490
-DIST wget-1.16.tar.xz 1697308 SHA256 9261dd090a17687b6dc0682a257e90a926def15624b650e8f799af57e5c8b0e7 SHA512 20f1247a344cac8f9120a506a4ca1fff84e5f3f5abb8492f67c22d213cb41cbfa24d5a68b91512a6ca42765d319bea8785adff8fad58d854f8f563c6593b4298 WHIRLPOOL a1094b27f77547baf7dac6f1a6ded691b3a043caff948e8fd84555a730d6a02ae157f4d72144f3c1672439166da28a4cca26f9c4f7ec4473603899545cc956b4
+DIST wget-1.17-fix_disabled_ipv6.patch 4218 SHA256 3ba621258f60fe4b64735f0beed8b691c58b502a6109a1116c819a76b0e02147 SHA512 83a123fa0f2b269993265dd0e23d35bab2d82e7e9055689987a19b09a9c7833e5ffd33d136ee0e5c0645f1a81f65d4f155b9a96c20a1fa7270dbbc674f1bad3b WHIRLPOOL b74fb6d3ae67be9ab924b1eee87a6b48b0b8b4bb34d0cb42697af408ee1ea5734c265b745692c41da73c7885523b305c4b4c3f043bf2431b37f950e6ca9406ef
+DIST wget-1.17.tar.xz 1884628 SHA256 bd69d63acbf329a8286ccebbe63cd4fecc998718131a0d4b2ab9239542d2bb87 SHA512 4936dad41580f6ba33df73de041e407cd6dd5266af4af947ebf4c54457f0f296e3462cfff1fb203b27ff5760ec4f6f4d24ea4faceeea461f98c22b031225947f WHIRLPOOL a0e87d20e99276c74c7ea17e09893481d02e431a19184cbc2b0245d61b555f521293de89de7c27f5645d8ad22f2628ab0aab42b901ccd548c19bf026b8f1bef4
diff --git a/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch b/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch
deleted file mode 100644
index 97037cee724a..000000000000
--- a/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-detect openssl via pkg-config if it's available
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -234,7 +234,17 @@ dnl
- dnl Checks for libraries.
- dnl
- 
-+PKG_PROG_PKG_CONFIG
-+
- AS_IF([test x"$with_ssl" = xopenssl], [
-+    PKG_CHECK_MODULES([OPENSSL], [openssl], [
-+        AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-+        AC_LIBOBJ([openssl])
-+        LIBS="$OPENSSL_LIBS $LIBS"
-+        CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS"
-+        LIBSSL=" " # ntlm check below wants this #395349
-+    ], [
-+
-     dnl some versions of openssl use zlib compression
-     AC_CHECK_LIB(z, compress)
- 
-@@ -294,6 +303,8 @@ AS_IF([test x$ssl_found != xyes],
- 
- ])
- 
-+])
-+
- ], [
-   # --with-ssl is not gnutls: check if it's no
-   AS_IF([test x"$with_ssl" != xno], [
diff --git a/net-misc/wget/files/wget-1.14-gnutls-ssl.patch b/net-misc/wget/files/wget-1.14-gnutls-ssl.patch
deleted file mode 100644
index 8d5fe81e1b55..000000000000
--- a/net-misc/wget/files/wget-1.14-gnutls-ssl.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-https://bugs.gentoo.org/479948
-
-From ae80fd2ec75fafdbec9895b9d973f2966209d588 Mon Sep 17 00:00:00 2001
-From: mancha <mancha1@hush.com>
-Date: Sun, 5 May 2013 07:16:58 +0200
-Subject: [PATCH] gnutls: do not abort on non-fatal alerts during handshake
-
-Signed-off-by: mancha <mancha1@hush.com>
----
- src/ChangeLog |  6 ++++++
- src/gnutls.c  | 25 ++++++++++++++++++++++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-2013-05-05  mancha  <mancha1@hush.com> (tiny change)
-
-	* gnutls.c (ssl_connect_wget): Don't abort on non-fatal alerts
-        received during handshake. For example, when connecting to servers
-        using TSL-SNI that send warning-level unrecognized_name alerts.
-
-diff --git a/src/gnutls.c b/src/gnutls.c
-index 769b005..54422fc 100644
---- a/src/gnutls.c
-+++ b/src/gnutls.c
-@@ -376,8 +376,9 @@ ssl_connect_wget (int fd, const char *hostname)
- {
-   struct wgnutls_transport_context *ctx;
-   gnutls_session_t session;
--  int err;
-+  int err,alert;
-   gnutls_init (&session, GNUTLS_CLIENT);
-+  const char *str;
- 
-   /* We set the server name but only if it's not an IP address. */
-   if (! is_valid_ip_address (hostname))
-@@ -440,10 +441,28 @@ ssl_connect_wget (int fd, const char *hostname)
-       return false;
-     }
- 
--  err = gnutls_handshake (session);
-+  /* We don't stop the handshake process for non-fatal errors */
-+  do
-+    {
-+      err = gnutls_handshake (session);
-+      if (err < 0)
-+        {
-+          logprintf (LOG_NOTQUIET, "GnuTLS: %s\n", gnutls_strerror (err));
-+          if (err == GNUTLS_E_WARNING_ALERT_RECEIVED ||
-+              err == GNUTLS_E_FATAL_ALERT_RECEIVED)
-+            {
-+              alert = gnutls_alert_get (session);
-+              str = gnutls_alert_get_name (alert);
-+              if (str == NULL)
-+                str = "(unknown)";
-+              logprintf (LOG_NOTQUIET, "GnuTLS: received alert [%d]: %s\n", alert, str);
-+            }
-+        }
-+    }
-+  while (err == GNUTLS_E_WARNING_ALERT_RECEIVED && gnutls_error_is_fatal (err) == 0);
-+
-   if (err < 0)
-     {
--      logprintf (LOG_NOTQUIET, "GnuTLS: %s\n", gnutls_strerror (err));
-       gnutls_deinit (session);
-       return false;
-     }
--- 
-1.8.4.3
-
diff --git a/net-misc/wget/files/wget-1.14-pkg-config.patch b/net-misc/wget/files/wget-1.14-pkg-config.patch
deleted file mode 100644
index ea6364bf3ae1..000000000000
--- a/net-misc/wget/files/wget-1.14-pkg-config.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From b97942cd6b496501b396ea3bc2710010f4591542 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 21 May 2012 18:39:59 -0400
-Subject: [PATCH] detect openssl/pcre/libuuid/zlib via pkg-config if it's
- available
-
-Newer versions of these packages ship with pkg-config files, so if we can
-detect it via those, do so.  If that fails, fall back to the old methods.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac | 110 ++++++++++++++++++++++++++++++++++++++---------------------
- 1 file changed, 71 insertions(+), 39 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 873c3c9..779ff39 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -68,6 +68,9 @@ AC_ARG_WITH(ssl,
- AC_ARG_WITH(zlib,
- [[  --without-zlib          disable zlib ]])
- 
-+AC_ARG_ENABLE(pcre, AC_HELP_STRING([--disable-pcre],
-+                                   [Disable PCRE style regular expressions]))
-+
- AC_ARG_ENABLE(opie,
- [  --disable-opie          disable support for opie or s/key FTP login],
- ENABLE_OPIE=$enableval, ENABLE_OPIE=yes)
-@@ -237,11 +240,25 @@ dnl
- dnl Checks for libraries.
- dnl
- 
-+PKG_PROG_PKG_CONFIG
-+
- AS_IF([test x"$with_zlib" != xno], [
--  AC_CHECK_LIB(z, compress)
-+  PKG_CHECK_MODULES([ZLIB], zlib, [
-+    LIBS="$ZLIB_LIBS $LIBS"
-+    CFLAGS="$ZLIB_CFLAGS $CFLAGS"
-+  ], [
-+    AC_CHECK_LIB(z, compress)
-+  ])
- ])
- 
- AS_IF([test x"$with_ssl" = xopenssl], [
-+  PKG_CHECK_MODULES([OPENSSL], [openssl], [
-+    AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-+    AC_LIBOBJ([openssl])
-+    LIBS="$OPENSSL_LIBS $LIBS"
-+    CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS"
-+    LIBSSL=" " # ntlm check below wants this
-+  ], [
-     dnl some versions of openssl use zlib compression
-     AC_CHECK_LIB(z, compress)
- 
-@@ -278,29 +295,29 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-       ;;
-     esac
- 
--AS_IF([test x$ssl_found != xyes],
--[
--  dnl Now actually check for -lssl if it wasn't already found
--    AC_LIB_HAVE_LINKFLAGS([ssl], [crypto z], [
--  #include <openssl/ssl.h>
--  #include <openssl/x509.h>
--  #include <openssl/err.h>
--  #include <openssl/rand.h>
--  #include <openssl/des.h>
--  #include <openssl/md4.h>
--  #include <openssl/md5.h>
--    ], [SSL_library_init ()])
--    if test x"$LIBSSL" != x
--    then
--      ssl_found=yes
--      AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
--      AC_LIBOBJ([openssl])
--      LIBS="$LIBSSL $LIBS"
--    elif test x"$with_ssl" != x
--    then
--      AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
--    fi
--])
-+    AS_IF([test x$ssl_found != xyes], [
-+      dnl Now actually check for -lssl if it wasn't already found
-+        AC_LIB_HAVE_LINKFLAGS([ssl], [crypto z], [
-+#include <openssl/ssl.h>
-+#include <openssl/x509.h>
-+#include <openssl/err.h>
-+#include <openssl/rand.h>
-+#include <openssl/des.h>
-+#include <openssl/md4.h>
-+#include <openssl/md5.h>
-+        ], [SSL_library_init ()])
-+        if test x"$LIBSSL" != x
-+        then
-+          ssl_found=yes
-+          AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-+          AC_LIBOBJ([openssl])
-+          LIBS="$LIBSSL $LIBS"
-+        elif test x"$with_ssl" != x
-+        then
-+          AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
-+        fi
-+    ])
-+  ])
- 
- ], [
-   # --with-ssl is not gnutls: check if it's no
-@@ -322,13 +322,20 @@ AS_IF([test x"$with_ssl" = xopenssl], [
- ], [
-   # --with-ssl is not gnutls: check if it's no
-   AS_IF([test x"$with_ssl" != xno], [
--    dnl Now actually check for -lssl
-+    dnl Now actually check for gnutls
- 
-+  PKG_CHECK_MODULES([GNUTLS], [gnutls], [
-+    AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
-+    AC_LIBOBJ([gnutls])
-+    LIBS="$GNUTLS_LIBS $LIBS"
-+    CFLAGS="$GNUTLS_CFLAGS -DHAVE_LIBGNUTLS $CFLAGS"
-+  ], [
-+
-+    dnl Now actually check for -lgnutls
-     AC_CHECK_LIB(z, compress)
-     AC_CHECK_LIB(gpg-error, gpg_err_init)
-     AC_CHECK_LIB(gcrypt, gcry_control)
- 
--  dnl Now actually check for -lssl
-   AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
- #include <gnutls/gnutls.h>
-   ], [gnutls_global_init()])
-@@ -342,6 +349,8 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-     AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.])
-   fi
- 
-+  ])
-+
-   AC_CHECK_FUNCS(gnutls_priority_set_direct)
-   ]) # endif: --with-ssl == no?
- ]) # endif: --with-ssl == openssl?
-@@ -524,26 +541,41 @@ dnl
- dnl Check for UUID
- dnl
- 
--AC_CHECK_HEADER(uuid/uuid.h,
--                AC_CHECK_LIB(uuid, uuid_generate,
--                  [LIBS="${LIBS} -luuid"
--                   AC_DEFINE([HAVE_LIBUUID], 1,
--                             [Define if libuuid is available.])
--                  ])
--)
-+AC_ARG_WITH(libuuid, AC_HELP_STRING([--without-libuuid],
-+                                    [Generate UUIDs for WARC files via libuuid]))
-+AS_IF([test "X$with_libuuid" != "Xno"],[
-+  PKG_CHECK_MODULES([UUID], uuid, [
-+    LIBS="$UUID_LIBS $LIBS"
-+    CFLAGS="$UUID_CFLAGS $CFLAGS"
-+  ], [
-+    AC_CHECK_HEADER(uuid/uuid.h,
-+                    AC_CHECK_LIB(uuid, uuid_generate,
-+                                 [LIBS="${LIBS} -luuid"
-+                                  AC_DEFINE([HAVE_LIBUUID], 1,
-+                                            [Define if libuuid is available.])
-+                                 ])
-+    )
-+  ])
-+])
- 
- dnl
- dnl Check for PCRE
- dnl
- 
--AC_CHECK_HEADER(pcre.h,
--                AC_CHECK_LIB(pcre, pcre_compile,
--                  [LIBS="${LIBS} -lpcre"
--                   AC_DEFINE([HAVE_LIBPCRE], 1,
--                             [Define if libpcre is available.])
--                  ])
--)
--
-+AS_IF([test "X$enable_pcre" != "Xno"],[
-+  PKG_CHECK_MODULES([PCRE], libpcre, [
-+    LIBS="$PCRE_LIBS $LIBS"
-+    CFLAGS="$PCRE_CFLAGS $CFLAGS"
-+  ], [
-+    AC_CHECK_HEADER(pcre.h,
-+                    AC_CHECK_LIB(pcre, pcre_compile,
-+                                 [LIBS="${LIBS} -lpcre"
-+                                  AC_DEFINE([HAVE_LIBPCRE], 1,
-+                                            [Define if libpcre is available.])
-+                                 ])
-+    )
-+  ])
-+])
-  
- dnl Needed by src/Makefile.am
- AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"])
--- 
-1.8.4.3
-
diff --git a/net-misc/wget/files/wget-1.14-texi2pod.patch b/net-misc/wget/files/wget-1.14-texi2pod.patch
deleted file mode 100644
index 700242bf4414..000000000000
--- a/net-misc/wget/files/wget-1.14-texi2pod.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2013-06-18
-Initial Package Version: 1.14
-Upstream Status: Submitted
-Origin: Arch
-Description: Build with perl-5.18.
-
-http://lists.gnu.org/archive/html/bug-wget/2013-06/msg00046.html
-
-From 2ed1707b5d8be66feb80cccfe8e11e719b52b99a Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Mon, 17 Jun 2013 23:31:46 +0530
-Subject: [PATCH] Fix error in texi2pod intriduced with Perl 5.18
-
----
-
-diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl
-index 86c4b18..9db6de1 100755
---- a/doc/texi2pod.pl
-+++ b/doc/texi2pod.pl
-@@ -291,7 +291,7 @@ while(<$inf>) {
- 	if (defined $1) {
-             my $thing = $1;
-             if ($ic =~ /\@asis/) {
--                $_ = "\n=item $thing\n";
-+                $_ = "\n=item C<$thing>\n";
-             } else {
-                 # Entity escapes prevent munging by the <> processing below.
-                 $_ = "\n=item $ic\&LT;$thing\&GT;\n";
--- 
-1.8.3.1
-
diff --git a/net-misc/wget/files/wget-1.14-wgetrc.patch b/net-misc/wget/files/wget-1.14-wgetrc.patch
deleted file mode 100644
index 8252aca4273c..000000000000
--- a/net-misc/wget/files/wget-1.14-wgetrc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-link to the man manual pages
-
-document user agent issue vs portage fetching
-https://bugs.gentoo.org/327229
-
---- a/doc/sample.wgetrc
-+++ b/doc/sample.wgetrc
-@@ -5,7 +5,10 @@
- ## You can use this file to change the default behaviour of wget or to
- ## avoid having to type many many command-line options. This file does
- ## not contain a comprehensive list of commands -- look at the manual
--## to find out what you can put into this file.
-+## to find out what you can put into this file. You can find this here:
-+##   $ info wget.info 'Startup File'
-+## Or online here:
-+##   https://www.gnu.org/software/wget/manual/wget.html#Startup-File
- ##
- ## Wget initialization file can reside in /usr/local/etc/wgetrc
- ## (global, for all users) or $HOME/.wgetrc (for a single user).
-@@ -14,6 +15,11 @@
- ## as well as change them, in most cases, as the values on the
- ## commented-out lines are the default values (e.g. "off").
- 
-+## You should not modify user_agent in the global config file.  Instead,
-+## keep that in your ~/.wgetrc file.  If you really want to modify it
-+## globally, make sure you set a custom FETCHCOMMAND in your package
-+## manager because you will randomly break fetching with some servers.
-+
- 
- ##
- ## Global settings (useful for setting up in /usr/local/etc/wgetrc).
diff --git a/net-misc/wget/files/wget-1.15-pkg-config.patch b/net-misc/wget/files/wget-1.15-pkg-config.patch
deleted file mode 100644
index 825ce1dacad8..000000000000
--- a/net-misc/wget/files/wget-1.15-pkg-config.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 5730efa0804468d342cb82d1ac9d5fc794ff572d Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 16 May 2014 11:29:53 +0200
-Subject: [PATCH] detect openssl/pcre/libuuid/zlib via pkg-config if it's
- available
-
-Newer versions of these packages ship with pkg-config files, so if we can
-detect it via those, do so.  If that fails, fall back to the old methods.
-
-Forward-ported to 1.15 release from b97942cd6b496501b396ea3bc2710010f4591542
-(Mon, 21 May 2012 18:39:59 -0400)
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 107 ++++++++++++++++++++++++++++++++++++++++++-----------------
- 1 file changed, 77 insertions(+), 30 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c5437bf..e0e2b25 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -68,6 +68,9 @@ AC_ARG_WITH(ssl,
- AC_ARG_WITH(zlib,
- [[  --without-zlib          disable zlib ]])
- 
-+AC_ARG_ENABLE(pcre, AC_HELP_STRING([--disable-pcre],
-+				   [Disable PCRE style regular expressions]))
-+
- AC_ARG_ENABLE(opie,
- [  --disable-opie          disable support for opie or s/key FTP login],
- ENABLE_OPIE=$enableval, ENABLE_OPIE=yes)
-@@ -237,12 +240,28 @@ dnl
- dnl Checks for libraries.
- dnl
- 
-+PKG_PROG_PKG_CONFIG
-+
- AS_IF([test x"$with_zlib" != xno], [
-   with_zlib=yes
--  AC_CHECK_LIB(z, compress)
-+  PKG_CHECK_MODULES([ZLIB], zlib, [
-+    LIBS="$ZLIB_LIBS $LIBS"
-+    CFLAGS="$ZLIB_CFLAGS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBZ], [1], [Define if using zlib.])
-+  ], [
-+    AC_CHECK_LIB(z, compress)
-+  ])
- ])
- 
- AS_IF([test x"$with_ssl" = xopenssl], [
-+  PKG_CHECK_MODULES([OPENSSL], [openssl], [
-+    AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-+    AC_LIBOBJ([openssl])
-+    LIBS="$OPENSSL_LIBS $LIBS"
-+    CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS"
-+    LIBSSL=" " # ntlm check below wants this
-+    AC_DEFINE([HAVE_LIBSSL], [1], [Define if using openssl.])
-+  ], [
-   dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
-   dnl doesn't record its dependency on libdl, so we need to make sure
-   dnl -ldl ends up in LIBS on systems that have it.  Most OSes use
-@@ -276,9 +295,9 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-     ;;
-   esac
- 
--  AS_IF([test x$ssl_found != xyes], [
--    dnl Now actually check for -lssl if it wasn't already found
--    AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
-+    AS_IF([test x$ssl_found != xyes], [
-+      dnl Now actually check for -lssl if it wasn't already found
-+      AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
- #include <openssl/ssl.h>
- #include <openssl/x509.h>
- #include <openssl/err.h>
-@@ -286,17 +305,18 @@ AS_IF([test x"$with_ssl" = xopenssl], [
- #include <openssl/des.h>
- #include <openssl/md4.h>
- #include <openssl/md5.h>
--    ], [SSL_library_init ()])
--    if test x"$LIBSSL" != x
--    then
--      ssl_found=yes
--      AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
--      AC_LIBOBJ([openssl])
--      LIBS="$LIBSSL $LIBS"
--    elif test x"$with_ssl" != x
--    then
--      AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
--    fi
-+      ], [SSL_library_init ()])
-+      if test x"$LIBSSL" != x
-+      then
-+        ssl_found=yes
-+        AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-+        AC_LIBOBJ([openssl])
-+        LIBS="$LIBSSL $LIBS"
-+      elif test x"$with_ssl" != x
-+      then
-+        AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
-+      fi
-+    ])
-   ])
- 
- ], [
-@@ -305,6 +325,14 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-     dnl default is -lgnutls
-     with_ssl=gnutls
- 
-+  PKG_CHECK_MODULES([GNUTLS], [gnutls], [
-+    AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
-+    AC_LIBOBJ([gnutls])
-+    LIBS="$GNUTLS_LIBS $LIBS"
-+    CFLAGS="$GNUTLS_CFLAGS -DHAVE_LIBGNUTLS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBGNUTLS], [1], [Define if using gnutls.])
-+  ], [
-+
-     dnl Now actually check for -lgnutls
-     AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
- #include <gnutls/gnutls.h>
-@@ -319,6 +347,8 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-       AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
-     fi
- 
-+    ])
-+
-     AC_CHECK_FUNCS(gnutls_priority_set_direct)
-   ]) # endif: --with-ssl != no?
- ]) # endif: --with-ssl == openssl?
-@@ -535,26 +565,43 @@ dnl
- dnl Check for UUID
- dnl
- 
--AC_CHECK_HEADER(uuid/uuid.h,
--                AC_CHECK_LIB(uuid, uuid_generate,
--                  [LIBS="${LIBS} -luuid"
--                   AC_DEFINE([HAVE_LIBUUID], 1,
--                             [Define if libuuid is available.])
--                  ])
--)
-+AC_ARG_WITH(libuuid, AC_HELP_STRING([--without-libuuid],
-+				    [Generate UUIDs for WARC files via libuuid]))
-+AS_IF([test "X$with_libuuid" != "Xno"],[
-+  PKG_CHECK_MODULES([UUID], uuid, [
-+    LIBS="$UUID_LIBS $LIBS"
-+    CFLAGS="$UUID_CFLAGS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBUUID], [1], [Define if using libuuid.])
-+  ], [
-+    AC_CHECK_HEADER(uuid/uuid.h,
-+		    AC_CHECK_LIB(uuid, uuid_generate,
-+				 [LIBS="${LIBS} -luuid"
-+				  AC_DEFINE([HAVE_LIBUUID], 1,
-+					    [Define if libuuid is available.])
-+				 ])
-+    )
-+  ])
-+])
- 
- dnl
- dnl Check for PCRE
- dnl
- 
--AC_CHECK_HEADER(pcre.h,
--                AC_CHECK_LIB(pcre, pcre_compile,
--                  [LIBS="${LIBS} -lpcre"
--                   AC_DEFINE([HAVE_LIBPCRE], 1,
--                             [Define if libpcre is available.])
--                  ])
--)
--
-+AS_IF([test "X$enable_pcre" != "Xno"],[
-+  PKG_CHECK_MODULES([PCRE], libpcre, [
-+    LIBS="$PCRE_LIBS $LIBS"
-+    CFLAGS="$PCRE_CFLAGS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBPCRE], [1], [Define if using libpcre.])
-+  ], [
-+    AC_CHECK_HEADER(pcre.h,
-+		    AC_CHECK_LIB(pcre, pcre_compile,
-+				 [LIBS="${LIBS} -lpcre"
-+				  AC_DEFINE([HAVE_LIBPCRE], 1,
-+					    [Define if libpcre is available.])
-+				 ])
-+    )
-+  ])
-+])
-  
- dnl Needed by src/Makefile.am
- AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"])
--- 
-1.9.3
-
diff --git a/net-misc/wget/files/wget-1.15-test_fix.patch b/net-misc/wget/files/wget-1.15-test_fix.patch
deleted file mode 100644
index 754e44f2d92e..000000000000
--- a/net-misc/wget/files/wget-1.15-test_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3a47a1a918e9076133c046f8792cf68973f7c585 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 22 Jan 2014 22:07:18 +0100
-Subject: [PATCH] Don't use --debug in Test--post-file.px
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- tests/Test--post-file.px | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/Test--post-file.px b/tests/Test--post-file.px
-index 1c017b7..1212af6 100755
---- a/tests/Test--post-file.px
-+++ b/tests/Test--post-file.px
-@@ -8,7 +8,7 @@ use HTTPTest;
- 
- ###############################################################################
- 
--my $cmdline = $WgetTest::WGETPATH . " -d --post-file=nofile http://localhost:{{port}}/";
-+my $cmdline = $WgetTest::WGETPATH . " --post-file=nofile http://localhost:{{port}}/";
- 
- my $expected_error_code = 3;
- 
--- 
-1.8.5.3
-
diff --git a/net-misc/wget/files/wget-1.16-fix-proxy-test-race.patch b/net-misc/wget/files/wget-1.16-fix-proxy-test-race.patch
deleted file mode 100644
index 8edafd2948b4..000000000000
--- a/net-misc/wget/files/wget-1.16-fix-proxy-test-race.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 3eff3ad69a46364475e1f4abdf9412cfa87e3d6c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Tue, 28 Oct 2014 11:40:34 +0100
-Subject: [PATCH] synchronize client and server in Test-proxied-https-auth.px
-
----
- tests/ChangeLog                  |  4 ++++
- tests/Test-proxied-https-auth.px | 36 +++++++++++++++++++++++++-----------
- 2 files changed, 29 insertions(+), 11 deletions(-)
-
-2014-10-28  Tim Ruehsen <tim.ruehsen@gmx.de>
-
-	* tests/Test-proxied-https-auth.px: synchronize client and server
-
-diff --git a/tests/Test-proxied-https-auth.px b/tests/Test-proxied-https-auth.px
-index cc987ff..272003f 100755
---- a/tests/Test-proxied-https-auth.px
-+++ b/tests/Test-proxied-https-auth.px
-@@ -49,12 +49,15 @@ sub get_request {
- }
- 
- sub do_server {
-+    my ($synch_callback) = @_;
-     my $alrm = alarm 10;
--
-     my $s = $SOCKET;
-     my $conn;
-     my $rqst;
-     my $rspn;
-+
-+    $synch_callback->();
-+
-     for my $expect_inner_auth (0, 1) {
-         $conn = $s->accept;
-         $rqst = $conn->get_request;
-@@ -90,7 +93,7 @@ sub do_server {
-                 Connection => 'close'
-                 ]);
-             $rspn->protocol('HTTP/1.0');
--            print $rspn->as_string;
-+            print STDERR $rspn->as_string;
-             print $conn $rspn->as_string;
-         } else {
-             die "No proxied auth\n" unless $rqst->header('Authorization');
-@@ -100,9 +103,9 @@ sub do_server {
-                 'Connection' => 'close',
-                 ], "foobarbaz\n");
-             $rspn->protocol('HTTP/1.0');
--            print "=====\n";
--            print $rspn->as_string;
--            print "\n=====\n";
-+            print STDERR "=====\n";
-+            print STDERR $rspn->as_string;
-+            print STDERR "\n=====\n";
-             print $conn $rspn->as_string;
-         }
-         $conn->close;
-@@ -113,18 +116,29 @@ sub do_server {
- }
- 
- sub fork_server {
--    my $pid = fork;
--    die "Couldn't fork" if ($pid < 0);
--    return $pid if $pid;
-+    pipe(FROM_CHILD, TO_PARENT) or die "Cannot create pipe!";
-+    select((select(TO_PARENT), $| = 1)[0]);
-+
-+    my $pid = fork();
-+    if ($pid < 0) {
-+        die "Cannot fork";
-+    } elsif ($pid == 0) {
-+        # child
-+        close FROM_CHILD;
-+        do_server(sub { print TO_PARENT "SYNC\n"; close TO_PARENT });
-+    } else {
-+        # parent
-+        close TO_PARENT;
-+        chomp(my $line = <FROM_CHILD>);
-+        close FROM_CHILD;
-+    }
- 
--    &do_server;
--    exit;
-+    return $pid;
- }
- 
- system ('rm -f needs-auth.txt');
- my $pid = &fork_server;
- 
--sleep 1;
- my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee"
-     . " --password=Dodgson -e https_proxy=localhost:{{port}}"
-     . " --no-check-certificate"
--- 
-2.1.2
-
diff --git a/net-misc/wget/files/wget-1.16-openssl-header.patch b/net-misc/wget/files/wget-1.16-openssl-header.patch
deleted file mode 100644
index 8df01c132454..000000000000
--- a/net-misc/wget/files/wget-1.16-openssl-header.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1b5928e14fe5f40b2c8396fc622317790c9a368f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 27 Oct 2014 14:39:41 -0400
-Subject: [PATCH] openssl: fix implicit decl warning
-
-Include the right header to fix:
-
-openssl.c: In function 'ssl_init':
-openssl.c:195:3: warning: implicit declaration of function
-	'ENGINE_load_builtin_engines' [-Wimplicit-function-declaration]
-   ENGINE_load_builtin_engines();
-   ^
----
- src/openssl.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/openssl.c b/src/openssl.c
-index e24954a..2a3e0d6 100644
---- a/src/openssl.c
-+++ b/src/openssl.c
-@@ -42,6 +42,7 @@ as that of the covered work.  */
- #include <openssl/rand.h>
- #if OPENSSL_VERSION_NUMBER >= 0x00907000
- #include <openssl/conf.h>
-+#include <openssl/engine.h>
- #endif
- 
- #include "utils.h"
--- 
-2.1.2
-
diff --git a/net-misc/wget/files/wget-1.16-openssl-no-ssl3.patch b/net-misc/wget/files/wget-1.16-openssl-no-ssl3.patch
deleted file mode 100644
index 641ea068c63f..000000000000
--- a/net-misc/wget/files/wget-1.16-openssl-no-ssl3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c81e3df2bc4d06835791427d888d4ae04a2384bc Mon Sep 17 00:00:00 2001
-From: Peter Meiser <meiser@gmx-topmail.de>
-Date: Wed, 29 Oct 2014 19:26:28 +0100
-Subject: [PATCH] Add guard for OpenSSL without SSLv3
-
----
- src/ChangeLog | 5 +++++
- src/openssl.c | 2 ++
- 2 files changed, 7 insertions(+)
-
-2014-10-29  Peter Meiser <meiser@gmx-topmail.de> (tiny change)
-
-	* openssl.c (ssl_init) [! OPENSSL_NO_SSL3]: Add guard for OpenSSL
-	without SSLv3.
-
-diff --git a/src/openssl.c b/src/openssl.c
-index e24954a..6f11650 100644
---- a/src/openssl.c
-+++ b/src/openssl.c
-@@ -208,9 +208,11 @@ ssl_init (void)
-       meth = SSLv2_client_method ();
-       break;
- #endif
-+#ifndef OPENSSL_NO_SSL3
-     case secure_protocol_sslv3:
-       meth = SSLv3_client_method ();
-       break;
-+#endif
-     case secure_protocol_auto:
-     case secure_protocol_pfs:
-     case secure_protocol_tlsv1:
--- 
-2.1.2
-
diff --git a/net-misc/wget/files/wget-1.16-pkg-config.patch b/net-misc/wget/files/wget-1.16-pkg-config.patch
deleted file mode 100644
index 0b8803bd2971..000000000000
--- a/net-misc/wget/files/wget-1.16-pkg-config.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From 5730efa0804468d342cb82d1ac9d5fc794ff572d Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 16 May 2014 11:29:53 +0200
-Subject: [PATCH] detect openssl/pcre/libuuid/zlib via pkg-config if it's
- available
-
-Newer versions of these packages ship with pkg-config files, so if we can
-detect it via those, do so.  If that fails, fall back to the old methods.
-
-Forward-ported to 1.15 release from b97942cd6b496501b396ea3bc2710010f4591542
-(Mon, 21 May 2012 18:39:59 -0400)
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 107 ++++++++++++++++++++++++++++++++++++++++++-----------------
- 1 file changed, 77 insertions(+), 30 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c5437bf..e0e2b25 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -68,6 +68,9 @@ AC_ARG_WITH(ssl,
- AC_ARG_WITH(zlib,
- [[  --without-zlib          disable zlib ]])
- 
-+AC_ARG_ENABLE(pcre, AC_HELP_STRING([--disable-pcre],
-+				   [Disable PCRE style regular expressions]))
-+
- AC_ARG_ENABLE(opie,
- [  --disable-opie          disable support for opie or s/key FTP login],
- ENABLE_OPIE=$enableval, ENABLE_OPIE=yes)
-@@ -237,12 +240,28 @@ dnl
- dnl Checks for libraries.
- dnl
- 
-+PKG_PROG_PKG_CONFIG
-+
- AS_IF([test x"$with_zlib" != xno], [
-   with_zlib=yes
--  AC_CHECK_LIB(z, compress)
-+  PKG_CHECK_MODULES([ZLIB], zlib, [
-+    LIBS="$ZLIB_LIBS $LIBS"
-+    CFLAGS="$ZLIB_CFLAGS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBZ], [1], [Define if using zlib.])
-+  ], [
-+    AC_CHECK_LIB(z, compress)
-+  ])
- ])
- 
- AS_IF([test x"$with_ssl" = xopenssl], [
-+  PKG_CHECK_MODULES([OPENSSL], [openssl], [
-+    AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-+    AC_LIBOBJ([openssl])
-+    LIBS="$OPENSSL_LIBS $LIBS"
-+    CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS"
-+    LIBSSL=" " # ntlm check below wants this
-+    AC_DEFINE([HAVE_LIBSSL], [1], [Define if using openssl.])
-+  ], [
-   dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
-   dnl doesn't record its dependency on libdl, so we need to make sure
-   dnl -ldl ends up in LIBS on systems that have it.  Most OSes use
-@@ -276,9 +295,9 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-     ;;
-   esac
- 
--  AS_IF([test x$ssl_found != xyes], [
--    dnl Now actually check for -lssl if it wasn't already found
--    AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
-+    AS_IF([test x$ssl_found != xyes], [
-+      dnl Now actually check for -lssl if it wasn't already found
-+      AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
- #include <openssl/ssl.h>
- #include <openssl/x509.h>
- #include <openssl/err.h>
-@@ -286,17 +305,18 @@ AS_IF([test x"$with_ssl" = xopenssl], [
- #include <openssl/des.h>
- #include <openssl/md4.h>
- #include <openssl/md5.h>
--    ], [SSL_library_init ()])
--    if test x"$LIBSSL" != x
--    then
--      ssl_found=yes
--      AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
--      AC_LIBOBJ([openssl])
--      LIBS="$LIBSSL $LIBS"
--    elif test x"$with_ssl" != x
--    then
--      AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
--    fi
-+      ], [SSL_library_init ()])
-+      if test x"$LIBSSL" != x
-+      then
-+        ssl_found=yes
-+        AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-+        AC_LIBOBJ([openssl])
-+        LIBS="$LIBSSL $LIBS"
-+      elif test x"$with_ssl" != x
-+      then
-+        AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
-+      fi
-+    ])
-   ])
- 
- ], [
-@@ -305,6 +325,14 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-     dnl default is -lgnutls
-     with_ssl=gnutls
- 
-+  PKG_CHECK_MODULES([GNUTLS], [gnutls], [
-+    AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
-+    AC_LIBOBJ([gnutls])
-+    LIBS="$GNUTLS_LIBS $LIBS"
-+    CFLAGS="$GNUTLS_CFLAGS -DHAVE_LIBGNUTLS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBGNUTLS], [1], [Define if using gnutls.])
-+  ], [
-+
-     dnl Now actually check for -lgnutls
-     AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
- #include <gnutls/gnutls.h>
-@@ -319,6 +347,8 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-       AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
-     fi
- 
-+    ])
-+
-     AC_CHECK_FUNCS(gnutls_priority_set_direct)
-   ]) # endif: --with-ssl != no?
- ]) # endif: --with-ssl == openssl?
-@@ -542,32 +542,51 @@ fi
- dnl
- dnl Check for UUID
- dnl
--AC_CHECK_HEADER(uuid.h,
--                AC_CHECK_FUNC(uuid, uuid_create,
--                  [AC_DEFINE([HAVE_UUID_CREATE], 1,
--                             [Define if uuid_create is available.])
--                  ])
--)
- 
--AC_CHECK_HEADER(uuid/uuid.h,
--                AC_CHECK_LIB(uuid, uuid_generate,
--                  [LIBS="${LIBS} -luuid"
--                   AC_DEFINE([HAVE_LIBUUID], 1,
--                             [Define if libuuid is available.])
--                  ])
--)
-+AC_ARG_WITH(libuuid, AC_HELP_STRING([--without-libuuid],
-+				    [Generate UUIDs for WARC files via libuuid]))
-+AS_IF([test "X$with_libuuid" != "Xno"],[
-+  PKG_CHECK_MODULES([UUID], uuid, [
-+    LIBS="$UUID_LIBS $LIBS"
-+    CFLAGS="$UUID_CFLAGS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBUUID], [1], [Define if using libuuid.])
-+  ], [
-+    AC_CHECK_HEADER(uuid.h,
-+                    AC_CHECK_FUNC(uuid, uuid_create,
-+                      [AC_DEFINE([HAVE_UUID_CREATE], 1,
-+                                 [Define if uuid_create is available.])
-+                      ])
-+    )
-+
-+    AC_CHECK_HEADER(uuid/uuid.h,
-+                    AC_CHECK_LIB(uuid, uuid_generate,
-+                      [LIBS="${LIBS} -luuid"
-+                       AC_DEFINE([HAVE_LIBUUID], 1,
-+                                 [Define if libuuid is available.])
-+                      ])
-+    )
-+  ])
-+])
- 
- dnl
- dnl Check for PCRE
- dnl
- 
--AC_CHECK_HEADER(pcre.h,
--                AC_CHECK_LIB(pcre, pcre_compile,
--                  [LIBS="${LIBS} -lpcre"
--                   AC_DEFINE([HAVE_LIBPCRE], 1,
--                             [Define if libpcre is available.])
--                  ])
--)
-+AS_IF([test "X$enable_pcre" != "Xno"],[
-+  PKG_CHECK_MODULES([PCRE], libpcre, [
-+    LIBS="$PCRE_LIBS $LIBS"
-+    CFLAGS="$PCRE_CFLAGS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBPCRE], [1], [Define if using libpcre.])
-+  ], [
-+    AC_CHECK_HEADER(pcre.h,
-+                    AC_CHECK_LIB(pcre, pcre_compile,
-+                      [LIBS="${LIBS} -lpcre"
-+                       AC_DEFINE([HAVE_LIBPCRE], 1,
-+                                 [Define if libpcre is available.])
-+                      ])
-+    )
-+  ])
-+])
- 
- 
- dnl Needed by src/Makefile.am
diff --git a/net-misc/wget/files/wget-1.16-tests-skip.patch b/net-misc/wget/files/wget-1.16-tests-skip.patch
deleted file mode 100644
index ce07cc1d01da..000000000000
--- a/net-misc/wget/files/wget-1.16-tests-skip.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9a85d61a39f9afd0f60e9e5fc59e7ade553c0541 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 27 Oct 2014 14:52:01 -0400
-Subject: [PATCH] tests: fix skip exit code
-
-The test harness looks for exit code 77 to mark tests as skipped, not
-exit 2.  Switch over so we get SKIP instead of FAIL.
----
- tests/WgetFeature.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/WgetFeature.pm b/tests/WgetFeature.pm
-index 0762314..118e79c 100644
---- a/tests/WgetFeature.pm
-+++ b/tests/WgetFeature.pm
-@@ -22,7 +22,7 @@ sub import
- 
-     unless ($have_features{$feature}) {
-         print $skip_messages{$feature}, "\n";
--        exit 2; # skip
-+        exit 77; # skip
-     }
- }
- 
--- 
-2.1.2
-
diff --git a/net-misc/wget/wget-1.16.1.ebuild b/net-misc/wget/wget-1.16.1.ebuild
deleted file mode 100644
index bf35d8bd23c1..000000000000
--- a/net-misc/wget/wget-1.16.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs autotools
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib"
-
-LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
-	pcre? ( dev-libs/libpcre[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls[static-libs(+)] )
-		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
-	)
-	uuid? ( sys-apps/util-linux[static-libs(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-		dev-perl/HTTP-Daemon
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	# openssl-0.9.8 now builds with -pthread on the BSD's
-	use elibc_FreeBSD && use ssl && append-ldflags -pthread
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-	econf \
-		--disable-assert \
-		--disable-rpath \
-		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
-		$(use_enable ssl opie) \
-		$(use_enable ssl digest) \
-		$(use_enable idn iri) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable ntlm) \
-		$(use_enable pcre) \
-		$(use_enable debug) \
-		$(use_with uuid libuuid) \
-		$(use_with zlib)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
-		"${ED}"/etc/wgetrc \
-		"${ED}"/usr/share/man/man1/wget.1 \
-		"${ED}"/usr/share/info/wget.info
-}
diff --git a/net-misc/wget/wget-1.16.2.ebuild b/net-misc/wget/wget-1.16.2.ebuild
deleted file mode 100644
index e4c8b2d0664e..000000000000
--- a/net-misc/wget/wget-1.16.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib"
-
-LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
-	pcre? ( dev-libs/libpcre[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls[static-libs(+)] )
-		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
-	)
-	uuid? ( sys-apps/util-linux[static-libs(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-		dev-perl/HTTP-Daemon
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-	econf \
-		--disable-assert \
-		--disable-rpath \
-		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
-		$(use_enable ssl opie) \
-		$(use_enable ssl digest) \
-		$(use_enable idn iri) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable ntlm) \
-		$(use_enable pcre) \
-		$(use_enable debug) \
-		$(use_with uuid libuuid) \
-		$(use_with zlib)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
-		"${ED}"/etc/wgetrc \
-		"${ED}"/usr/share/man/man1/wget.1 \
-		"${ED}"/usr/share/info/wget.info
-}
diff --git a/net-misc/wget/wget-1.16.ebuild b/net-misc/wget/wget-1.16.ebuild
deleted file mode 100644
index 7341404afb95..000000000000
--- a/net-misc/wget/wget-1.16.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs autotools
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib"
-
-LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
-	pcre? ( dev-libs/libpcre[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls[static-libs(+)] )
-		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
-	)
-	uuid? ( sys-apps/util-linux[static-libs(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-		dev-perl/HTTP-Daemon
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.16-pkg-config.patch
-	epatch "${FILESDIR}"/${PN}-1.16-openssl-header.patch
-	epatch "${FILESDIR}"/${PN}-1.16-tests-skip.patch
-	epatch "${FILESDIR}"/${P}-openssl-no-ssl3.patch
-	epatch "${FILESDIR}"/${P}-fix-proxy-test-race.patch
-	eautoreconf
-}
-
-src_configure() {
-	# openssl-0.9.8 now builds with -pthread on the BSD's
-	use elibc_FreeBSD && use ssl && append-ldflags -pthread
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-	econf \
-		--disable-rpath \
-		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
-		$(use_enable ssl opie) \
-		$(use_enable ssl digest) \
-		$(use_enable idn iri) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable ntlm) \
-		$(use_enable pcre) \
-		$(use_enable debug) \
-		$(use_with uuid libuuid) \
-		$(use_with zlib)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
-		"${ED}"/etc/wgetrc \
-		"${ED}"/usr/share/man/man1/wget.1 \
-		"${ED}"/usr/share/info/wget.info
-}
diff --git a/net-misc/wget/wget-1.16.3.ebuild b/net-misc/wget/wget-1.17.ebuild
similarity index 81%
rename from net-misc/wget/wget-1.16.3.ebuild
rename to net-misc/wget/wget-1.17.ebuild
index 30bebcce1a31..dc0a5883c40d 100644
--- a/net-misc/wget/wget-1.16.3.ebuild
+++ b/net-misc/wget/wget-1.17.ebuild
@@ -9,18 +9,23 @@ inherit flag-o-matic python-any-r1 toolchain-funcs
 
 DESCRIPTION="Network utility to retrieve files from the WWW"
 HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.xz"
+SRC_URI="mirror://gnu/wget/${P}.tar.xz
+	http://git.savannah.gnu.org/cgit/wget.git/patch/?id=2cfcadf5e6d5c444765aa460915ae27109a8dbce -> ${PN}-1.17-fix_disabled_ipv6.patch"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib"
+IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
+REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 
 LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
 	pcre? ( dev-libs/libpcre[static-libs(+)] )
 	ssl? (
 		gnutls? ( net-libs/gnutls[static-libs(+)] )
-		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
 	)
 	uuid? ( sys-apps/util-linux[static-libs(+)] )
 	zlib? ( sys-libs/zlib[static-libs(+)] )"
@@ -38,14 +43,16 @@ DEPEND="${RDEPEND}
 	)
 	nls? ( sys-devel/gettext )"
 
-REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
 DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	epatch "${DISTDIR}"/${P}-fix_disabled_ipv6.patch
+}
+
 src_configure() {
 	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
 	# the included gnutls -- force ioctl.h to include this header
diff --git a/profiles/package.mask b/profiles/package.mask
index d088c2728753..b17d5e98e67c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -68,13 +68,17 @@ sci-chemistry/pymol-apbs-plugin
 # Michał Górny <mgorny@gentoo.org> (11 Nov 2015)
 # Cleaned up Python versions masked for testing:
 # - python-config-X.Y compatibility removed,
+# - python[23] choice is now stored in config file rather than symlink,
+# - eselect-python reworked to reuse python-exec and wrap all execs,
 # - ABIFLAGS reintroduced for 3.3+.
 # Resulting API/ABI change can break reverse dependencies, especially
 # if upstream hardcodes paths or library names.
-=dev-lang/python-2.7.10-r3
-=dev-lang/python-3.3.5-r3
-=dev-lang/python-3.4.3-r3
-=dev-lang/python-3.5.0-r2
+=app-eselect/eselect-python-20151117
+=dev-lang/python-2.7.10-r4
+=dev-lang/python-3.3.5-r4
+=dev-lang/python-3.4.3-r4
+=dev-lang/python-3.5.0-r3
+=dev-lang/python-exec-2.1
 
 # Justin Lecher <jlec@gentoo.org> (10 Nov 2015)
 # Vulnerable package CVE-2014-{1932,1933}
@@ -240,6 +244,11 @@ virtual/python-imaging
 >=dev-cpp/pangomm-2.38.1
 >=dev-cpp/gtkmm-3.18.0
 >=dev-cpp/gtksourceviewmm-3.18.0
+>=app-office/pinpoint-0.1.8
+>=dev-vcs/gitg-3.18.0
+>=gnome-extra/nemo-2.8.4
+>=media-video/cheese-3.18.1
+>=net-libs/libsoup-gnome-2.52.2
 
 # Pacho Ramos <pacho@gentoo.org> (09 Nov 2015)
 # Not properly installed, dead for ages, upstream
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 28b27eeab934..7eadb342f0bb 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,5 @@
 DIST portage-2.2.20.1.tar.bz2 950298 SHA256 84dd3ed1d9fd0a3336e956d057590c75834a906ae62a450411232fe5a842475c SHA512 5f7373da20d448059e8fdc8a3593eaca780be3184f0494bac66f5eea7c33d00dd61b9e74cbe9a52413f08cef29d426ed8751e20e16be09178468c18d77a6ae2e WHIRLPOOL 99643ce0ab74c5df64fb5239948c6102bc39847ff88eaf210c069c0c9587c1e8bdd1a032a7e61c1225b6113645387861d439e9c4f103df4d0f042b73e1afc328
 DIST portage-2.2.23.tar.bz2 960229 SHA256 9aecc9f4c813810f99f6604a9806e268b162d90243a9769f1410b3a96822cdfb SHA512 17b8fe4967719bacd8f3ca324bde3328d82f5b7748a05b66cca165dcc8a4abbaf7e05ec61a54684cd1b001297dc0adc04c3771d0fd3cc4732f17ac9e0810e6ad WHIRLPOOL da7229c2be8330e898ef1e422a62683a003c16a640fee9d183c8afc8474779d302c0de639072099c8d47372fa0c74e2a635c485d8c7ed2b2344cacc857199578
 DIST portage-2.2.24.tar.bz2 972610 SHA256 c2dbd53dd474c6fe455ffa5920514a6afe467abf02959c33ddb7a7e363939550 SHA512 9dc00410de604db66843bdf62cf0ee7e93ff2c4d562390172c4f0c55ab98b2712078b0eb02c9f35d52633b0fff0b024736e25a1c66cf40ad61a6bf99a7cee4a6 WHIRLPOOL 3227c61662acf69abd843344d0fb1b7cc2cfa91c1bae48b08e1da8fdf42cda15834994852d42dfc089f189e318c657e12fd6b1c19885279e0bb5cfd2349235f8
+DIST portage-2.2.25.tar.bz2 961095 SHA256 834d1b1f3c6bc022b3608a826f940b5a43bfb13dd76377d237b001ec9cbad109 SHA512 9d64b2c7c48f38d48becf9961c5e7cdfc5428da59359b14cd37a3617f1db144258e8ba57d81fc64dc50e0aea755319ae08bd7ba6515c549c31096609fbd55d7c WHIRLPOOL 092d192d757e09e209c4fab529b3fe3786b5d639e2573dc36ad4dbd8fe365c8af32c24b05b289157cafe8d29c5a88f23323071d61a303d4a5c08f2b812547376
 DIST portage-2.2.8.tar.bz2 874672 SHA256 c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512 acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257 WHIRLPOOL d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2
diff --git a/sys-apps/portage/portage-2.2.25.ebuild b/sys-apps/portage/portage-2.2.25.ebuild
new file mode 100644
index 000000000000..43cb079e8c28
--- /dev/null
+++ b/sys-apps/portage/portage-2.2.25.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_3 python3_4 python3_5
+	python2_7
+)
+# Note: substituted below
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
+
+DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+			-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
+			-i cnf/repos.conf || die "sed failed"
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=( install_docbook )
+	use epydoc && targets+=( install_epydoc )
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.1.13" || \
+		{
+			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
+			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
+		} ; then
+		USERPRIV_UPGRADE=true
+		USERSYNC_UPGRADE=true
+		REPOS_CONF_UPGRADE=true
+		REPOS_CONF_SYNC=
+		type -P portageq >/dev/null 2>&1 && \
+			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
+	else
+		USERPRIV_UPGRADE=false
+		USERSYNC_UPGRADE=false
+		REPOS_CONF_UPGRADE=false
+	fi
+}
+
+get_ownership() {
+	case ${USERLAND} in
+		BSD)
+			stat -f '%Su:%Sg' "${1}"
+			;;
+		*)
+			stat -c '%U:%G' "${1}"
+			;;
+	esac
+}
+
+new_config_protect() {
+	# Generate a ._cfg file even if the target file
+	# does not exist, ensuring that the user will
+	# notice the config change.
+	local basename=${1##*/}
+	local dirname=${1%/*}
+	local i=0
+	while true ; do
+		local filename=$(
+			echo -n "${dirname}/._cfg"
+			printf "%04d" ${i}
+			echo -n "_${basename}"
+		)
+		[[ -e ${filename} ]] || break
+		(( i++ ))
+	done
+	echo "${filename}"
+}
+
+pkg_postinst() {
+
+	if ${REPOS_CONF_UPGRADE} ; then
+		einfo "Generating repos.conf"
+		local repo_name=
+		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
+			repo_name=$(< "${PORTDIR}/profiles/repo_name")
+		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
+			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
+			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
+		fi
+		local sync_type=
+		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
+
+		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
+			sync_type=cvs
+			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
+		fi
+
+		cat <<-EOF > "${T}/repos.conf"
+		[DEFAULT]
+		main-repo = ${repo_name:-gentoo}
+
+		[${repo_name:-gentoo}]
+		location = ${PORTDIR:-${EPREFIX}/usr/portage}
+		sync-type = ${sync_type:-rsync}
+		sync-uri = ${REPOS_CONF_SYNC}
+		EOF
+
+		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
+
+		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
+		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
+			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
+		fi
+		# Don't install the config update if the desired repos.conf directory
+		# and config file exist, since users may accept it blindly and break
+		# their config (bug #478726).
+		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
+			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
+
+		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
+			einfo "Generating make.conf PORTDIR setting for backward compatibility"
+			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
+				[[ -e ${dest} ]] && break
+			done
+			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
+			rm -rf "${T}/make.conf"
+			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
+			cat <<-EOF >> "${T}/make.conf"
+
+			# Set PORTDIR for backward compatibility with various tools:
+			#   gentoo-bashcomp - bug #478444
+			#   euse - bug #474574
+			#   euses and ufed - bug #478318
+			PORTDIR="${EPREFIX}/usr/portage"
+			EOF
+			mkdir -p "${dest%/*}"
+			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
+		fi
+	fi
+
+	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
+
+	if ${USERSYNC_UPGRADE} && \
+		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
+		local ownership=$(get_ownership "${PORTDIR}")
+		if [[ -n ${ownership} ]] ; then
+			einfo "Adjusting PORTDIR permissions for usersync"
+			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
+				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
+				-exec chown "${ownership}" {} +
+		fi
+	fi
+
+	# Do this last, since it could take a long time if there
+	# are lots of live sources, and the user may be tempted
+	# to kill emerge while it is running.
+	if ${USERPRIV_UPGRADE} && \
+		[[ -d ${distdir} && -w ${distdir} ]] ; then
+		local ownership=$(get_ownership "${distdir}")
+		if [[ ${ownership#*:} == portage ]] ; then
+			einfo "Adjusting DISTDIR permissions for userpriv"
+			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
+				-exec chown -R portage:portage {} +
+		fi
+	fi
+
+	einfo ""
+	einfo "This release of portage contains the new repoman code base"
+	einfo "This code base is still being developed.  So its API's are"
+	einfo "not to be considered stable and are subject to change."
+	einfo "The code released has been tested and considered ready for use."
+	einfo "This however does not guarantee it to be completely bug free."
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/sys-apps/shadow/files/shadow-4.2.1-verbose-error-when-uid-doesnt-match.patch b/sys-apps/shadow/files/shadow-4.2.1-verbose-error-when-uid-doesnt-match.patch
new file mode 100644
index 000000000000..340424eb12e3
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.2.1-verbose-error-when-uid-doesnt-match.patch
@@ -0,0 +1,76 @@
+From: Hank Leininger <hlein@korelogic.com>
+Date: Mon, 6 Apr 2015 08:22:48 -0500
+Subject: [PATCH] Expand the error message when newuidmap / newgidmap do not
+ like the user/group ownership of their target process.
+
+Currently the error is just:
+
+newuidmap: Target [pid] is owned by a different user
+
+With this patch it will be like:
+
+newuidmap: Target [pid] is owned by a different user: uid:0 pw_uid:0 st_uid:0, gid:0 pw_gid:0 st_gid:99
+
+Why is this useful?  Well, in my case...
+
+The grsecurity kernel-hardening patch includes an option to make parts
+of /proc unreadable, such as /proc/pid/ dirs for processes not owned by
+the current uid.  This comes with an option to make /proc/pid/
+directories readable by a specific gid; sysadmins and the like are then
+put into that group so they can see a full 'ps'.
+
+This means that the check in new[ug]idmap fails, as in the above quoted
+error - /proc/[targetpid] is owned by root, but the group is 99 so that
+users in group 99 can see the process.
+
+Some Googling finds dozens of people hitting this problem, but not
+*knowing* that they have hit this problem, because the errors and
+circumstances are non-obvious.
+
+Some graceful way of handling this and not failing, will be next ;)  But
+in the meantime it'd be nice to have new[ug]idmap emit a more useful
+error, so that it's easier to troubleshoot.
+
+Thanks!
+
+Signed-off-by: Hank Leininger <hlein@korelogic.com>
+Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
+---
+ src/newgidmap.c | 6 ++++--
+ src/newuidmap.c | 6 ++++--
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/newgidmap.c b/src/newgidmap.c
+index a532b45..451c6a6 100644
+--- a/src/newgidmap.c
++++ b/src/newgidmap.c
+@@ -161,8 +161,10 @@ int main(int argc, char **argv)
+ 	    (getgid() != pw->pw_gid) ||
+ 	    (pw->pw_uid != st.st_uid) ||
+ 	    (pw->pw_gid != st.st_gid)) {
+-		fprintf(stderr, _( "%s: Target %u is owned by a different user\n" ),
+-			Prog, target);
++		fprintf(stderr, _( "%s: Target %u is owned by a different user: uid:%lu pw_uid:%lu st_uid:%lu, gid:%lu pw_gid:%lu st_gid:%lu\n" ),
++			Prog, target,
++			(unsigned long int)getuid(), (unsigned long int)pw->pw_uid, (unsigned long int)st.st_uid,
++			(unsigned long int)getgid(), (unsigned long int)pw->pw_gid, (unsigned long int)st.st_gid);
+ 		return EXIT_FAILURE;
+ 	}
+ 
+diff --git a/src/newuidmap.c b/src/newuidmap.c
+index 5150078..9c8bc1b 100644
+--- a/src/newuidmap.c
++++ b/src/newuidmap.c
+@@ -161,8 +161,10 @@ int main(int argc, char **argv)
+ 	    (getgid() != pw->pw_gid) ||
+ 	    (pw->pw_uid != st.st_uid) ||
+ 	    (pw->pw_gid != st.st_gid)) {
+-		fprintf(stderr, _( "%s: Target %u is owned by a different user\n" ),
+-			Prog, target);
++		fprintf(stderr, _( "%s: Target process %u is owned by a different user: uid:%lu pw_uid:%lu st_uid:%lu, gid:%lu pw_gid:%lu st_gid:%lu\n" ),
++			Prog, target,
++			(unsigned long int)getuid(), (unsigned long int)pw->pw_uid, (unsigned long int)st.st_uid,
++			(unsigned long int)getgid(), (unsigned long int)pw->pw_gid, (unsigned long int)st.st_gid);
+ 		return EXIT_FAILURE;
+ 	}
+ 
diff --git a/sys-apps/shadow/shadow-4.2.1-r2.ebuild b/sys-apps/shadow/shadow-4.2.1-r2.ebuild
new file mode 100644
index 000000000000..c376f1e08915
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.2.1-r2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils libtool toolchain-funcs pam multilib autotools
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/"
+SRC_URI="http://pkg-shadow.alioth.debian.org/releases/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="acl audit cracklib nls pam selinux skey xattr"
+# Taken from the man/Makefile.am file.
+LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
+IUSE+=" $(printf 'linguas_%s ' ${LANGS[*]})"
+
+RDEPEND="acl? ( sys-apps/acl )
+	audit? ( sys-process/audit )
+	cracklib? ( >=sys-libs/cracklib-2.7-r3 )
+	pam? ( virtual/pam )
+	skey? ( sys-auth/skey )
+	selinux? (
+		>=sys-libs/libselinux-1.28
+		sys-libs/libsemanage
+	)
+	nls? ( virtual/libintl )
+	xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20150213 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch 
+	"${FILESDIR}"/${P}-cross-size-checks.patch
+	"${FILESDIR}"/${P}-verbose-error-when-uid-doesnt-match.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	epatch_user
+	# https://github.com/shadow-maint/shadow/pull/5
+	mv configure.{in,ac} || die
+	eautoreconf
+	#elibtoolize
+}
+
+src_configure() {
+	tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
+	econf \
+		--without-group-name-max-length \
+		--without-tcb \
+		--enable-shared=no \
+		--enable-static=yes \
+		$(use_with acl) \
+		$(use_with audit) \
+		$(use_with cracklib libcrack) \
+		$(use_with pam libpam) \
+		$(use_with skey) \
+		$(use_with selinux) \
+		$(use_enable nls) \
+		$(use_with elibc_glibc nscd) \
+		$(use_with xattr attr)
+	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
+
+	if use nls ; then
+		local l langs="po" # These are the pot files.
+		for l in ${LANGS[*]} ; do
+			use linguas_${l} && langs+=" ${l}"
+		done
+		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
+	fi
+}
+
+set_login_opt() {
+	local comment="" opt=$1 val=$2
+	if [[ -z ${val} ]]; then
+		comment="#"
+		sed -i \
+			-e "/^${opt}\>/s:^:#:" \
+			"${ED}"/etc/login.defs || die
+	else
+		sed -i -r \
+			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
+			"${ED}"/etc/login.defs
+	fi
+	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
+	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" suidperms=4711 install
+
+	# Remove libshadow and libmisc; see bug 37725 and the following
+	# comment from shadow's README.linux:
+	#   Currently, libshadow.a is for internal use only, so if you see
+	#   -lshadow in a Makefile of some other package, it is safe to
+	#   remove it.
+	rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
+
+	insinto /etc
+	if ! use pam ; then
+		insopts -m0600
+		doins etc/login.access etc/limits
+	fi
+
+	# needed for 'useradd -D'
+	insinto /etc/default
+	insopts -m0600
+	doins "${FILESDIR}"/default/useradd
+
+	# move passwd to / to help recover broke systems #64441
+	mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
+	dosym /bin/passwd /usr/bin/passwd
+
+	cd "${S}"
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	set_login_opt CREATE_HOME yes
+	if ! use pam ; then
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD SHA512
+		set_login_opt CONSOLE
+	else
+		dopamd "${FILESDIR}"/pam.d-include/shadow
+
+		for x in chpasswd chgpasswd newusers; do
+			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
+		done
+
+		for x in chage chsh chfn \
+				 user{add,del,mod} group{add,del,mod} ; do
+			newpamd "${FILESDIR}"/pam.d-include/shadow ${x}
+		done
+
+		# comment out login.defs options that pam hates
+		local opt sed_args=()
+		for opt in \
+			CHFN_AUTH \
+			CONSOLE \
+			CRACKLIB_DICTPATH \
+			ENV_HZ \
+			ENVIRON_FILE \
+			FAILLOG_ENAB \
+			FTMP_FILE \
+			LASTLOG_ENAB \
+			MAIL_CHECK_ENAB \
+			MOTD_FILE \
+			NOLOGINS_FILE \
+			OBSCURE_CHECKS_ENAB \
+			PASS_ALWAYS_WARN \
+			PASS_CHANGE_TRIES \
+			PASS_MIN_LEN \
+			PORTTIME_CHECKS_ENAB \
+			QUOTAS_ENAB \
+			SU_WHEEL_ONLY
+		do
+			set_login_opt ${opt}
+			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+		done
+		sed -i "${sed_args[@]}" \
+			-e 'b exit' \
+			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
+			-e ': exit' \
+			"${ED}"/etc/login.defs || die
+
+		# remove manpages that pam will install for us
+		# and/or don't apply when using pam
+		find "${ED}"/usr/share/man \
+			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+			-delete
+
+		# Remove pam.d files provided by pambase.
+		rm "${ED}"/etc/pam.d/{login,passwd,su} || die
+	fi
+
+	# Remove manpages that are handled by other packages
+	find "${ED}"/usr/share/man \
+		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
+		-delete
+
+	cd "${S}"
+	dodoc ChangeLog NEWS TODO
+	newdoc README README.download
+	cd doc
+	dodoc HOWTO README* WISHLIST *.txt
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
+		"${EROOT}/etc/login.defs.new"
+}
+
+pkg_postinst() {
+	# Enable shadow groups.
+	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
+		if grpck -r -R "${EROOT}" 2>/dev/null ; then
+			grpconv -R "${EROOT}"
+		else
+			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+		fi
+	fi
+
+	einfo "The 'adduser' symlink to 'useradd' has been dropped."
+}
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index 6702691d8d40..a65ac80c7e6e 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -1,3 +1,3 @@
 DIST xfsdump-3.1.3.tar.gz 826922 SHA256 f02138a5d96e06c506ac8cb6e4fedeb0bf7d7cf8b9747f262d0735b885dbf8fa SHA512 18f5ce7e249b317247012246fd7c5980f62cc46a5718adc80a3137be4f2d7c47edd7d1286e31fbae9c0629a49fc13482308e37950c5122165929088e467865b9 WHIRLPOOL cb80202e16c14ac279ffc698acf1ad3b1fe7365a451d05bba5ec5410b6cdcaf06f7f1986f374130cc40d0a43ccb0eedb2ed433a3e41c6701e9c94c247d821207
-DIST xfsdump-3.1.4.tar.gz 848188 SHA256 570eafd0721515bdd79cb0e295b701d49cdf81e71a0a0ff0df6d4c5cc1960943 SHA512 e82885ad6b3f1d81c1cdeff56714b73651e1c74eb4ce71574875ec0bb69b3fe707b40f85f0766b21ba589d13364ecfc0bad657a9b15c428cf821f926c3d66b25 WHIRLPOOL 5677000929f260b391743207a865c7529b788db46806a62c62bb6917025194913609cc804ead23314988f44853abc57f3c86ee22d2bde365697a35b0a7e3b607
 DIST xfsdump-3.1.5.tar.gz 848863 SHA256 2f1fad1754c94163a2401e69fa09ef06f587f780239a131e7ec0a14a3a3959e3 SHA512 107d23e3d1a84aaef0ef4c0f541f37a860ccbef996e0886a6f56f01c7998451210b127289c21ec71e9ef5db7d124d479b41017e9e3d5c2d9c68b2dbbfd316620 WHIRLPOOL ed7d6c11c4354540d8accb8c0d4955fc039bdead3c2f854e609756d14a856b862884adc1dba059ed28fa57ece76c8be3f073b8058c59dbac807a7af9fbbf482d
+DIST xfsdump-3.1.6.tar.gz 848698 SHA256 7f78c11ca527477d90e5e62b0778f3ad96f2b71c19173044e9aca9515fff42d0 SHA512 6d8eff10c65e0a0893525590953ccb7ec0095ba528725ffe3f18260e6cb8f66dd3945c60477500e84421a9ed57fae9e8f0f25c3c0900be3671f30ca6951ed5e7 WHIRLPOOL 87182e97a5676be6ad36cf74e37d9ca312d742d20eb5396917a156842fe62a23c582e16862fb384fe7706097d9f0c7a6a8faced06fec0a999ac06ceb426eb7e3
diff --git a/sys-fs/xfsdump/xfsdump-3.1.4.ebuild b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
similarity index 84%
rename from sys-fs/xfsdump/xfsdump-3.1.4.ebuild
rename to sys-fs/xfsdump/xfsdump-3.1.6.ebuild
index ffb1a5458d61..935ff6455437 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.4.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
 
 inherit multilib eutils
 
@@ -38,7 +38,7 @@ src_configure() {
 	export DEBUG=-DNDEBUG
 
 	econf \
-		--libdir=/$(get_libdir) \
-		--libexecdir=/usr/$(get_libdir) \
-		--sbindir=/sbin
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)" \
+		--sbindir="${EPREFIX}/sbin"
 }
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 33828c149197..82ff4396549a 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -11,7 +11,7 @@ DIST patch-3.10.93.xz 1199100 SHA256 2e4768460dd2dc560c1d6c97aed88969781d3e7c7d4
 DIST patch-3.12.50.xz 1390376 SHA256 37809e5d7b0877bf62b2d1f7cb03f079ee7299b3afce2b4eb339cbef32f80c33 SHA512 15f07ada969b484ded0b96461525da46d41aebca38bf13cb76ddc9199eb4f8d4e714da14e82a04ea674df766002661ef566a0e7c6bd94bef979619bc181ad70b WHIRLPOOL eda11f2eda7e4fcd72f7ff6b64f1ea2a2a7e22bbb2376173ee0fc4e1648eddeda21315227069e0975d831638840728e360ec202f63ee69bbb2feccef40bca74c
 DIST patch-3.14.57.xz 1033760 SHA256 8485f2762091f996ef81e4efd61001b024296fa9ddde1d78be584ea812225f3e SHA512 fc9bec0020ec5afcd0bf064f3f02888b5bc681b2908d08a547e7c4442915b2471f0ad66831d8623b4c48974890dcbeac1410491a0091af547a792e493217df39 WHIRLPOOL 712b6f8935abd5cc0388ea62547d0db1889622d159eb14748ea67dae2d8be970f7d2a4665c47711d8ecd7b61d69632403b89eded0552285af17a6fbfe189599b
 DIST patch-3.18.23.xz 690832 SHA256 52406a0efaefdffd6464ce5866213fa6c800d08d3e8c3af19f01a38c237e5212 SHA512 b52747facd9049ed3dc32f75aec605766e29c538204eb585ee029e6dea5a763921ac00e7778c42b2033dec8f5543e8eaccfefca3f9aba1a0345894cdc58b77fc WHIRLPOOL 3c61f2b884a8d4b4305b16954d4f0e83cba57fd862d11d0aa596c80e057fba84440d9aca10ae5c3a62caefcfe1cbf188d0811d279a507e5fe203356a4d108e1e
-DIST patch-3.2.72.xz 1486368 SHA256 4c11037f31cfdcc0aa171d1d83599dff0954464d0d395f9b474d9090285036c3 SHA512 6d9adc37abb563f8b69478ea904179009b52a88aaf07866e63f2e6cc9bc64dda18fbeddbba28a9412dfb9c6d52853986cd6fcd5e6e20be68fb1e4cde9d1be871 WHIRLPOOL 7034edc3b73bbb9096c7e68d91052dff1a68278839eb1e1ddf726699fac03466a2415c547f9b7d2f9fdcb7d041b7346da3e3cf734e1edd20ae4479c350d764d4
+DIST patch-3.2.73.xz 1494652 SHA256 ea40b581e5c8841152eaeaef967e96b208eb8fc7b5c009cd1f9eaa8a428c72a8 SHA512 64b6b71d8d42a283cde6ed8ffe5ee4a47eb075ddbef8e8d5cc7fdae8a47001c4571586ede1099d6216ef387c781940a7ccc3e9f4e31c23a400b2a76418026145 WHIRLPOOL e5ddcdceffe478b2a423ca1ecb89fcfc0d458d4993f3cba175dcff0590e9e2f23f251e2f1f22586f9844298453c9c0d8f930e0867b0897a7c2fc39ff21ac5cbb
 DIST patch-3.4.110.xz 1293116 SHA256 132362637b7ba272d58acbedb172a7233c238ec1d794af111af55ee8a406e12d SHA512 fc3f95dbf831b8edf9626632983b2d38dc017ff9db8718a79c9c3f714d1114c4fc8c6673854218c5230b3f71667b735945f6f80ae11e424894570941e7431b4a WHIRLPOOL 9f1ec18591c043ba103856d2667c776bebc3369aafcb27d75174aac9d7e00653c571b245dcc8aca735838117cab62178e7a2f63a616a594fc9a508e85a997cca
 DIST patch-4.1.13.xz 395456 SHA256 1c3ba78cbaa1a260798d6d0d2aa319ff41ae676b443e5bf06ab441436dcdd171 SHA512 0fa60b9fceb6103c11ed1df8d4f264d1c4efcd75da258709f1d0a6813f8117977fa2279b36da22bd69cc2bc808b092207a438c2e80a65a988f4c72363a605832 WHIRLPOOL 5c840870ee18de781a28218be44363662d5ae60ba033576f78305e40a1a9c14ae797341b6807327106c96f661a239fb270553f78d7d1f4bc29860d3fff2f8969
 DIST patch-4.2.6.xz 210240 SHA256 419f91fa4a6bb0d2c160ef6812341e5aac7e776550efe1d0958ae3b1ce0ea8ce SHA512 bc5414945ba11cc82f1007a7432f682253bc04babb4bd1d40c8f79bad9c9923ca088687caa6b7ec6d5a0b52b9a4d932e15f939b5af9f823e38bb6ad2df2faf4f WHIRLPOOL 99ca0c517cfbd0cf39cf4a2016557dfaeec3aa60854fb1135ddfa8d43b9b55679c92d25999a6d1ac8b92ad8541401f2f29735ad149b5931ccf00d81787d0ae0b
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.2.72.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.2.73.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.2.72.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.2.73.ebuild
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 75ca6d2e782f..41c94318a605 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,5 +1,3 @@
 DIST drupal-6.37.tar.gz 1112775 SHA256 e3db44fdeefa9c4b3edf31816a8cfcaffe300986dbebdc22769ec739d3296d5d SHA512 4895221c7fb2913618490722629888a4862f28633a49ba5363a0393974941c68d07a3e255d6f380d7d97d0aa3251a76c03d5d0f0ab4c968af301a1207d8d35a0 WHIRLPOOL 8d7a0576fba31f2fcf9035755d3ef9a521461d9b3dfab57eb8871fe66038f4056b690a84513bf61a639b4c5f8126fa5180734542b0036f5d089afb0cb2abfecd
 DIST drupal-7.41.tar.gz 3257325 SHA256 49ea620d191e81ffce0e7a96b5e7d12da672b3401c7ce1aff93fc941681eb111 SHA512 57ee4fb1044d958a9f5698d2046fcd69427be6da30c57918735ced3fc7dbe1ffc4c69cac8362cd668ef0769d78b20461d78905f7e91212062e56351818dfbaf9 WHIRLPOOL 931f98f5e9de14f2c6ffb1bf75686bfea73d8c73606a3a1ab7b0a64e9cf06b9375900403e877a209be7f57663a8446a24ea317ccf9c771a9f143c675102465b0
-DIST drupal-8.0.0-beta11.tar.gz 10500627 SHA256 0c7a6b84dc6019bc5afcf3066aa9c2a8a5cd4147a03d48314728156cc434bda1 SHA512 bdcac51cb8379711245d7e15a3bc879634c6c88af6799525f7dda3cd5be799193a3e4151d902569f9f008d89f309f7bca2180ebca4cb1f21bce87ac744461748 WHIRLPOOL 44b1a8670c5dfbf9d5208e5c5dc75a3e4c4a674befa1bd64b10409989d72da01e8e0420d9dc1e7d39b633fa49b80166c0e812f2deeb13304f4850fc777e1b36b
-DIST drupal-8.0.0-beta14.tar.gz 10493263 SHA256 0dc8e4c9b3ed2f4f9f50741a6d014278d85d98abea3d71a9936b46c2b8249978 SHA512 09a0c718519518a2536a1b72fbb5c79ee4a63fa453d9669539e87f5c70b9cbb43c42c433174dccd1bcf920a22e7766ca30df88663d6356c709ad958dcd8e968a WHIRLPOOL 62cdae3ed75fd383bca76a9c64a081d0c0a12e7591f2acbd568bf3de00ca7b1e7ffa2fdc126f625dbf07cc88d42f50b9d16b5a6d572b5afe1a8d8616a395b610
-DIST drupal-8.0.0-rc1.tar.gz 11498104 SHA256 0afdf737fd884f32c17ae0fc5174f7989c5909746e6c9a701bd9bcb99a1caa58 SHA512 c33446e24c02f28f66fb4e1b77c8c41eb67b756ee3015d94e6b11571980a95ca774d0d5331201e3a42534c9d11049e6a323b31ea5bef46d74330c6e95ba58580 WHIRLPOOL a74f50268c0da0f61d1d96368a93bb15ebe37a3d03b16c04e86426cf5ce39f555ea7c2527dcc395b811d1365569de84b2f9db317f5a7174684e75b5b0db5488d
+DIST drupal-8.0.0-rc4.tar.gz 11687995 SHA256 95689e799082bfedd2a77a202b1c07e9eae0fe6c3f53cd5c423082a4ca4aa0f5 SHA512 d1a2c50e0243fc70aaacfbb3c6e6f1844519ceaca6d88fe90e7fd27b6efff8162417747fe5c8078bd0b3d629e67b908caece24819af3aaa67f1a893ece632115 WHIRLPOOL a319088531e60f00ba9d830e5c52a7f14d729dc0611af0beea9aaef5b6696a8042f3c72ae67115341ba5326b73bb63cca0e5e44e291e18cb41a829e38a0e8baa
diff --git a/www-apps/drupal/drupal-8.0.0_beta14.ebuild b/www-apps/drupal/drupal-8.0.0_beta14.ebuild
deleted file mode 100644
index ca6797a03c37..000000000000
--- a/www-apps/drupal/drupal-8.0.0_beta14.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-MY_P=${P/_/-}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="http://drupal.org/"
-SRC_URI="http://drupal.org/files/projects/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	virtual/httpd-php
-	accelerator? ( ||
-		(
-			dev-php/xcache
-			(
-				>=dev-lang/php-5.5[opcache]
-				dev-php/pecl-apcu
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? ( dev-lang/php[sqlite] )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPGRADE.txt "
-
-	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-8.0.0_rc1.ebuild b/www-apps/drupal/drupal-8.0.0_rc1.ebuild
deleted file mode 100644
index ca6797a03c37..000000000000
--- a/www-apps/drupal/drupal-8.0.0_rc1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-MY_P=${P/_/-}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="http://drupal.org/"
-SRC_URI="http://drupal.org/files/projects/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	virtual/httpd-php
-	accelerator? ( ||
-		(
-			dev-php/xcache
-			(
-				>=dev-lang/php-5.5[opcache]
-				dev-php/pecl-apcu
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? ( dev-lang/php[sqlite] )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPGRADE.txt "
-
-	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-8.0.0_beta11.ebuild b/www-apps/drupal/drupal-8.0.0_rc4.ebuild
similarity index 100%
rename from www-apps/drupal/drupal-8.0.0_beta11.ebuild
rename to www-apps/drupal/drupal-8.0.0_rc4.ebuild
diff --git a/www-apps/drupal/files/postinstall-en.txt b/www-apps/drupal/files/postinstall-en.txt
index a8a59c184b5a..735436198cdf 100644
--- a/www-apps/drupal/files/postinstall-en.txt
+++ b/www-apps/drupal/files/postinstall-en.txt
@@ -11,7 +11,12 @@ location
 
 http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
 
-and provide the credential required for the database access.
+and provide the credentials required for the database access.
+
+If you installed into a vhost, for the above address to be accurate,
+you need to pass -h "<host>" and -d "<install dir>" into webapp_config.
+The protocol is hardcoded, so you'll have to use https:// if you're
+using an SSL / TLS connection.
 
 SECURITY NOTICE: If you use SSL on your Drupal installation, you
 should enable the PHP configuration option 'session.cookie-secure'
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 00fc25a7b2d8..f80411242df4 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-unstable_48.0.2560.0-1_amd64.deb 47781590 SHA256 abaf774b86ed8f2386967ae4515ad7aa99e30dbb1deb23b692a38510b2b5bae2 SHA512 c0a0397e5ac2907eb6feba3ef20d530d34e94a2bd6ed41993bd2c8a9a9ec6e42f15c6694a79ca402a262ed9a9edc1da0c87bae3847814e21a0865a5a112a89af WHIRLPOOL 03b0e86cc62ade80913e9a1298748c8a0507a90638be5fc4d3f2014af7fd8fbaf0a30cd6ac44a1c463c447de8670a6e2a04b747451f120335b94a616e72f7592
-DIST google-chrome-unstable_48.0.2560.0-1_i386.deb 47293262 SHA256 85099932fbc035b41b4b4d47188d305c0455c5fa83b3bc9e6136f403e96e27d7 SHA512 ee466fd9ad8fa15254785b1c5fb05f7e49584afb01ee8887e3c2980375334cd9d72fe72fc94885b1849db3ba5b2853210d252692ddc6b6dd1cae6b099979bd2c WHIRLPOOL 23d0f85d3a555b288c86d6b1d3bc77d9087c73e39f42fba6599c3754bc360ec1f7e987d8e7485c544246505719b53d28b6de7ec8c102086695ab619c06131c46
+DIST google-chrome-unstable_48.0.2564.8-1_amd64.deb 47870498 SHA256 1998d1667650b3864f154ec43ad55197b8743b56fcffbdad4a5442692e3d7101 SHA512 0e35be65548c961d1e9c9df7c9dff43f8791b477e821c79bd1aa7df04cd4c6d421b04e4498e872f2c85959391d5bf9974a95ba1590dc9981a1f90448fd424216 WHIRLPOOL 7053207b56910c120c5c2dcc8956327875bf1087b3970617c926fd71c1e76505bf60e480c0084fd25b0a443306f2b32284482bfc28cd11cf99cbbea032e554e1
+DIST google-chrome-unstable_48.0.2564.8-1_i386.deb 47645970 SHA256 4c6bfb140c627f05076f4cb297a21808b61d13c5c264ad1fc66d7dac3b47e2bc SHA512 a410d7cae3deef2a570cd7b14b63db9637cf0296e81fdd871c9f10bc6c3644bdbae80532af0ff1630daf68230bba9e5cef09e297a0d2df9a39ab42ea64ba582e WHIRLPOOL 4f997426fea60bbed8898b825303e131e188c18ae4c66ddc0c5ed5351627eebb637bb7d8b2340d939571656f2fb7bc50b721f8c025d5f9bbebdb579b43cf1dfd
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2560.0_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.8_p1.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-48.0.2560.0_p1.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.8_p1.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 633a053d507c..a9d10610b19c 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -2,5 +2,5 @@ DIST google-chrome-beta_47.0.2526.58-1_amd64.deb 47469772 SHA256 7cc64b7f209135e
 DIST google-chrome-beta_47.0.2526.58-1_i386.deb 47137450 SHA256 9bd238abadc0c390bb393518aec8359f61439b4a531df18ce4e2644bfecdbbea SHA512 9ad5b2ed3cecab383c4bb0f9185eaf161512fff5e4cb588e407650bceaa91ed7ac0116682f79260e7ee039a726feee8f2e2a6b2aaa1b91cbdea277125ea64464 WHIRLPOOL 13295cc8e745a7d89196ff20561523151a868a6d889822305c2ea8668cb4b465cd63959dd207cbdb4632ce866eb1bf0d483268b37684f45d65dd2b866fc0aa3f
 DIST google-chrome-stable_46.0.2490.86-1_amd64.deb 47301590 SHA256 29c434fe640825a88ca5871ce31b8cba9994776dc5c3c99e579998f14e3455ac SHA512 5fd15fa740843d4003c7fe64b7c0c45a07f26b9087a6dfb7f58d3c758f2e6045b20b4e8395c4bb790bf15d74fe56346fe2dc55c2cfbe517e8f793e1defd64013 WHIRLPOOL ceb26bfde2c58e86fd387ecc5c774a84d3cc8c69ec9ca1eb8e91e135f2bcc715c1105ba8e555544e27f8c562a8747e33a0dd40f55b68194cb804069d94f4dccf
 DIST google-chrome-stable_46.0.2490.86-1_i386.deb 47021428 SHA256 c8e8d548af976508d235f36fd73fd91515842dab4371b8cd6732e2c8b283016d SHA512 bee7901cd1e18981460f2d8158a7568fb0efc5030c28e017b73d5abe7ecdd8344965e50bb34a911f91fd8cf93b0978e7c91f2dffde55f8209fb39674ea6dfca5 WHIRLPOOL b551f698ab5fb1e04940826d85729e04bcab6e67f2240b48aef00284704d85a6018abcde4370b4436f7d8fb22f159ea489bfc6c1b73ffd25c8ee5059239198a2
-DIST google-chrome-unstable_48.0.2560.0-1_amd64.deb 47781590 SHA256 abaf774b86ed8f2386967ae4515ad7aa99e30dbb1deb23b692a38510b2b5bae2 SHA512 c0a0397e5ac2907eb6feba3ef20d530d34e94a2bd6ed41993bd2c8a9a9ec6e42f15c6694a79ca402a262ed9a9edc1da0c87bae3847814e21a0865a5a112a89af WHIRLPOOL 03b0e86cc62ade80913e9a1298748c8a0507a90638be5fc4d3f2014af7fd8fbaf0a30cd6ac44a1c463c447de8670a6e2a04b747451f120335b94a616e72f7592
-DIST google-chrome-unstable_48.0.2560.0-1_i386.deb 47293262 SHA256 85099932fbc035b41b4b4d47188d305c0455c5fa83b3bc9e6136f403e96e27d7 SHA512 ee466fd9ad8fa15254785b1c5fb05f7e49584afb01ee8887e3c2980375334cd9d72fe72fc94885b1849db3ba5b2853210d252692ddc6b6dd1cae6b099979bd2c WHIRLPOOL 23d0f85d3a555b288c86d6b1d3bc77d9087c73e39f42fba6599c3754bc360ec1f7e987d8e7485c544246505719b53d28b6de7ec8c102086695ab619c06131c46
+DIST google-chrome-unstable_48.0.2564.8-1_amd64.deb 47870498 SHA256 1998d1667650b3864f154ec43ad55197b8743b56fcffbdad4a5442692e3d7101 SHA512 0e35be65548c961d1e9c9df7c9dff43f8791b477e821c79bd1aa7df04cd4c6d421b04e4498e872f2c85959391d5bf9974a95ba1590dc9981a1f90448fd424216 WHIRLPOOL 7053207b56910c120c5c2dcc8956327875bf1087b3970617c926fd71c1e76505bf60e480c0084fd25b0a443306f2b32284482bfc28cd11cf99cbbea032e554e1
+DIST google-chrome-unstable_48.0.2564.8-1_i386.deb 47645970 SHA256 4c6bfb140c627f05076f4cb297a21808b61d13c5c264ad1fc66d7dac3b47e2bc SHA512 a410d7cae3deef2a570cd7b14b63db9637cf0296e81fdd871c9f10bc6c3644bdbae80532af0ff1630daf68230bba9e5cef09e297a0d2df9a39ab42ea64ba582e WHIRLPOOL 4f997426fea60bbed8898b825303e131e188c18ae4c66ddc0c5ed5351627eebb637bb7d8b2340d939571656f2fb7bc50b721f8c025d5f9bbebdb579b43cf1dfd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2560.0_alpha1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.8_alpha1.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2560.0_alpha1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.8_alpha1.ebuild
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 250d684e6046..078cc5b3758e 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -4,4 +4,4 @@ DIST gtk+-2.24.28.tar.xz 13354884 SHA256 b2c6441e98bc5232e5f9bba6965075dcf580a87
 DIST gtk+-3.14.13.tar.xz 15784112 SHA256 b1efcb1ef299f9b205e6f4512428315fd03484e5790f65bd3ac164e84ade90b0 SHA512 e4fcca57fe58821832ee0b542d86033a1028c19e2248929e25a8c16ef05603a93815556591bcc025995bfab1238ad4060fcdf4920ec2df22ab3175b404f3a207 WHIRLPOOL 36a77983701da6041f0762013638303d323a42487a6f6508e92dfa0571f8f13b8598a8187e9665e6eeb62e41b7c2533a1fe9d2b68f097e85599d373969d52da0
 DIST gtk+-3.16.6.tar.xz 18273872 SHA256 4d12726d0856a968b41802ae5c5971d7e9bac532717e309d3f81b9989da5ffbe SHA512 0b3417c57ef755c8eb498b6800cd9e1dc1df01d508425c968944aaa0d7ff50f25a00370f9a6ccf23a87cc9f7fb251447e63055149264b997ee5a681e98dc54ec WHIRLPOOL f944cce4396d2519d357ef75f1e9d420b64d77004110f0e7d2eb643ae5b3f8182db5be28e35269a57ecfe9cbc3280dc65008c30ce1c977d64d0fbb317e6f6bce
 DIST gtk+-3.16.7.tar.xz 18294656 SHA256 19689d14de54d182fad538153dbff6d41f53841f940aa871585fdea0306c7fba SHA512 8f74b3a4093ecf776466d3988806fdae081d10d5e74c66770b52f624076afe92d58efb68ace47fd0dbc5a170a577fc9a8d1b4768794aa4249433c95198db00c8 WHIRLPOOL f8b4d9fa6b7b3ed9702f76d28d729b745217e072898239517d320f0635e87691ca874a136607566cf53d73aead53833c5ecf484fc7aea74f3c26a1f14cc5a9b4
-DIST gtk+-3.18.4.tar.xz 18912812 SHA256 5400dcf280d28d24606f33d59ed48c717f7d3db425d4b6fb52e8002f0c76c7eb SHA512 ce0bd9d1a6739ed366e345cc3eda308e54fb0e092b237b7329efea3c0ee3e83c79294b38a9d158783ece406287a5baa28f713fab25ba3532f1127d0af40f0b2b WHIRLPOOL e8b0336b889e35fbc25c974a74731478f902f0ccd088a09a8c666072dd5704c8b5ff00b0901e4b1b3f2a539bb69e9b3396367f05acdbca0fa6be84c959fa0aee
+DIST gtk+-3.18.5.tar.xz 18912848 SHA256 107aeb9a4244ce3c044becdd6dffc32d83202595181597180d4c736302a71852 SHA512 5e12cab632bb250ec12dae9a146c4bbc9403d22f8f5888a6566588a5255489d7a1b2090c37ddbb464684cb56829f05ffa177d20be6ee22f3683a04dec2894c2a WHIRLPOOL 5a7a78cd432879250ffb3cc2a3df7a9ddb07503fb851e2361d3292c86a3c02fb57c0ac587fd113158d2cb377c6d79b3ac39ab1b52cbc5d19f0d0365938f3b60f
diff --git a/x11-libs/gtk+/gtk+-3.18.4.ebuild b/x11-libs/gtk+/gtk+-3.18.5.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.18.4.ebuild
rename to x11-libs/gtk+/gtk+-3.18.5.ebuild
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 3cee9890de5c..723998ff7d04 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,2 +1,2 @@
 DIST muffin-2.6.1.tar.gz 2702177 SHA256 0772ad6caace2f4570e7d3a0cbc8a6ef5f65be92c6a30cc95a59ed8bba6b5f74 SHA512 530e4bdabb780a16ddad237ab7aa1c2dbb688f6d1380dd0d18fa91b62675d36a2253415899d59957b7f34291c348b8a0e1a99214c3151c2fc2bc1d90f068d788 WHIRLPOOL d6832ac81051845432b21f66ff74499213f57dc66bea7d61f0a30c3a0aec54846911447451b8b54ccb0678ed00dfad90ce9cef9b2f2492d44e7c35adad2c5a24
-DIST muffin-2.8.2.tar.gz 2714407 SHA256 c611fe100ea79046e9e271dc651f10995d5f552dbaf896fba6d130c9a8345369 SHA512 70bbc7ccf6a1ff744b8b21729232f149e7413a1a970d0d98055fec47ec8b942af86df7a63fb45027c3f1b091002f543399dfd072efcd3bf88d754be5653d2cf5 WHIRLPOOL 3ad79fdf4f2c2b786e27dd3be69c4454b3c81f99f0638739f0c8bf737e5d17f7c371e122343c3847757f671bb6d839f6b49480714e1fcf778840c489d36b232e
+DIST muffin-2.8.3.tar.gz 2714820 SHA256 1eb36a91491f2d0beb346aa78dff7ec0bc1bf936b730c6fb18f9ca4e3e5fd93d SHA512 f026a9f4a5a48e5f969cf0e0d2d71af2d463c88f34d3172da00e8d56912db15467619b8f8d09d2708731d56ee05ebce6457bf84a80910575e7c386e00b462c94 WHIRLPOOL a32534e9c98284265233e337c0e4943d411a703765c1073798bcd41fe52ee2c44153b0170e6c0d3ae7fc62febd4722da7991b24339797cadf5615b87d42dce46
diff --git a/x11-wm/muffin/muffin-2.8.2.ebuild b/x11-wm/muffin/muffin-2.8.3.ebuild
similarity index 100%
rename from x11-wm/muffin/muffin-2.8.2.ebuild
rename to x11-wm/muffin/muffin-2.8.3.ebuild